safecheck-client 3.0.33-11 → 3.0.33-111

package/src/filiale/rongchuang/pc.js

@@ -5,6 +5,7 @@ import Vue from "vue";
 let specialComp = {
   // 计划管理用户
   'check-user-list': (resolve) => { require(['./pc/checkUserList'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
 }
 exports.specialComp = specialComp

package/src/filiale/tianke/pc/checkScreen.vue

@@ -232,26 +232,20 @@
         }
         let td=Util.toStandardDateString()
         //获取今天上传的所有隐患
-        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and f_upload_date>'${Util.toStartDateYearString()} 00:00:00' and f_longitude is not null`}},
+        let arr=await new HttpResetClass().load("POST", `rs/sql/defectDetails`, {data:{condition:` f_filialeid in ('${this.$login.f.orgid}') and f_upload_date>'${Util.toStandardDateString()} 00:00:00'`}},
           {resolveMsg: null, rejectMsg: null})
         //tag)
         if(arr.data){
           this.todayDefectList=[]
           arr.data.forEach((defect)=>{
-            //拿出今天的隐患放到今日隐患列表中
-            console.log("td",td)
-            console.log("defect",defect)
-            console.log("defect",defect)
             if(defect.f_upload_date.indexOf(td)!=-1){
               this.todayDefectList.push(defect)
             }
-            //取出一二三级隐患
-            console.log("二级隐患",defect.f_defect_level=='二级隐患')
-            if(defect.f_defect_level=='一级隐患'){
+            if(defect.f_defect_level.indexOf('一级') >=0){
               this.level1.push(defect)
-            }else if(defect.f_defect_level=='二级隐患'){
+            }else if(defect.f_defect_level.indexOf('二级') >=0){
               this.level2.push(defect)
-            }else if(defect.f_defect_level=='三级隐患'){
+            }else if(defect.f_defect_level.indexOf('三级') >=0){
               this.level3.push(defect)
             }else{
               this.problems.push(defect)
@@ -348,13 +342,15 @@
 
 
         let a3=[]
-        for(let i=0;i<this.level2.length;i++){
-          a3.push({
-            lnglat: [this.level2[i].f_longitude,this.level2[i].f_latitude], //点标记位置
-            name: '二级隐患',
-            id:i,
-            rowstr:this.level2[i]
-          })
+        for(let o=0;o<this.level2.length;o++){
+          if (this.level2[o].f_longitude && this.level2[o].f_latitude){
+            a3.push({
+              lnglat: [this.level2[o].f_longitude,this.level2[o].f_latitude], //点标记位置
+              name: '二级隐患',
+              id:o,
+              rowstr:this.level2[o]
+            })
+          }
         }
         // 将数组设置到 massMarks 图层
         this.level2Mulchs.setData(a3);
@@ -362,13 +358,15 @@
         this.level2Mulchs.setMap(this.map);
 
         let a4=[]
-        for(let i=0;i<this.level3.length;i++){
-          a4.push({
-            lnglat: [this.level3[i].f_longitude, this.level3[i].f_latitude], //点标记位置
-            name: '三级隐患',
-            id:i,
-            rowstr:this.level3[i]
-          })
+        for(let p=0;p<this.level3.length;p++){
+          if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+            a4.push({
+              lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+              name: '三级隐患',
+              id:p,
+              rowstr:this.level3[p]
+            })
+          }
         }
         // 将数组设置到 massMarks 图层
         this.level3Mulchs.setData(a4);
@@ -377,13 +375,15 @@
 
 
         let a5=[]
-        for(let i=0;i<this.problems.length;i++){
-          a5.push({
-            lnglat: [this.problems[i].f_longitude, this.problems[i].f_latitude], //点标记位置
-            name: '普通问题',
-            id:i,
-            rowstr:this.problems[i]
-          })
+        for(let l=0;l<this.problems.length;l++){
+          if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+            a5.push({
+              lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+              name: '普通问题',
+              id:l,
+              rowstr:this.problems[l]
+            })
+          }
         }
         // 将数组设置到 massMarks 图层
         this.problemsMulchs.setData(a5);
@@ -469,10 +469,15 @@
         let that=this
         this.map = new AMap.Map('check_map', {
           zoom: 12,
+          center: [116.80030599999998, 37.65219],
+          showIndoorMap: false,
           viewMode: '2D',  //设置地图模式
           lang: 'zh_cn',  //设置地图语言类型
           zindex: 99
         });
+
+        let bounds = this.map.getBounds();
+        this.map.setLimitBounds(bounds);
         // 异步加载地图插件
         AMap.plugin(
           ['AMap.ToolBar','AMap.Geolocation','AMap.Geocoder'], () => {//异步加载插件

package/src/filiale/tongchuan/pc/NewCheckpaper.vue

@@ -601,7 +601,7 @@ export default {
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
                 }
-              } else if (items.type === 'string') {
+              } else if (items.type === 'string' && items.f_is_defect && items.f_item_value[0]) {
                 checkResult = '有隐患'
                 this.result = '有隐患'
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)

package/src/filiale/tongchuan/pc/checkUserList.vue

@@ -344,8 +344,8 @@
         },
         props:["selectplan","userlogin"],
         ready(){
-          this.$refs.paged.$refs.criteria.model.f_user_state='正常'
-          this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
+          // this.$refs.paged.$refs.criteria.model.f_user_state='正常'
+          // this.$refs.paged.$refs.criteria.model.f_endfile_time=Util.toStartDateYearString()
           //this.$refs.paged.$refs.criteria.model.f_hasHousehold='未入户'
           this.setConList()
           this.loadpage()