diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
index 892739a..1510d99 100644
--- a/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.js
@@ -310,22 +310,24 @@ Page({
value2:app.globalData.value2,
value3:app.globalData.value3
})
- let _dataList = app.globalData.projectInfoList;
- if(app.globalData.type == "1"){
- that.setData({
- "type":'1',
- title:"工程列表",
- proCount:_dataList.length,
- projectInfoList:_dataList,
- })
- }else{
- that.setData({
- projectInfoList:_dataList,
- proCount:_dataList.length,
- title:"预警列表",
- "type":'2',
- })
- }
+ // let _dataList = app.globalData.projectInfoList;
+ // debugger
+ // if(app.globalData.type == "1"){
+ // that.setData({
+ // "type":'1',
+ // title:"工程列表",
+ // proCount:_dataList.length,
+ // projectInfoList:_dataList,
+ // })
+ // }
+ // else{
+ // that.setData({
+ // projectInfoList:_dataList,
+ // proCount:_dataList.length,
+ // title:"预警列表",
+ // "type":'2',
+ // })
+ // }
//加载用户组织架构信息
that.getFilstDept(res.data.deptId,res.data.userId);
}
@@ -460,16 +462,18 @@ Page({
method:"GET",
success:function(res){
that.setData({
- projectData:res.data
+ proCount:res.data.length,
+ projectData:res.data,
+ projectInfoList:res.data
})
- if(that.data.type == 1){
- that.setData({
- proCount:res.data.length,
- projectInfoList:res.data,
- })
- }else{
+ //if(that.data.type == 1){
+ // that.setData({
+ // proCount:res.data.length,
+ // projectInfoList:res.data,
+ // })
+ //}else{
//that.getEnvironCount(deptId,'',provinceId,cityId,areaId);
- }
+ //}
//关闭蒙版
that.onClickHide();
}
diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml b/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
index d18dea2..9c3a2b0 100644
--- a/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
+++ b/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml
@@ -17,8 +17,6 @@
-
-