提交代码

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();
       }

miniprogram/pages/gongchengliebiao/gongchengliebiao.wxml

@@ -17,8 +17,6 @@
 <button  bindtap="onLogout"  style="width: 60px;padding: 0px;height: 60px;line-height: 60px;border-radius: 30px;color: #8ca4ee;position: fixed;bottom: 20px;right: 20px;text-align: center;">退出</button>
 <view class="max_content">
  
-
- 
   <view class="list_max">
     <van-row gutter="5">
       <van-col span="6">