safecheck-client 4.0.0-98 → 4.0.1-1

package/src/components/android/SwitchValve.vue

@@ -256,8 +256,8 @@ export default {
     },
     selfSearch () {
       //tag
-      // let condition =  ` uf.f_filialeid = '${this.filialeid}'`
-      let condition =  ` 1=1 `
+      let condition =  ` f_filialeid = '${this.filialeid}'`
+      // let condition =  ` 1=1 `
       condition += this.condition
       condition += this.f_meternumber ? ` and f_meternumber = '${this.f_meternumber}'` : ""
       condition += this.f_userinfo_code ? ` and f_userinfo_code = '${this.f_userinfo_code}'` : ""

package/src/components/map/PersonTrack.vue

@@ -187,10 +187,12 @@ export default {
       this.toUserIds = this.$login.convertToIn(idsEnd); //所有的员工ID
       this.searchUserEndOption = dataEnd
 
-      let resp = await new HttpResetClass().load('POST', `/api/af-safecheck/sql/singleTable`, {
+      let resp = await new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
+          items:'*',
           tablename: 't_department',
           condition: `parentid = '${this.$login.f.orgid}' and f_dep_type = '部门'`,
+          orderitem:'id desc'
         }
       }, {resolveMsg: null, rejectMsg: null})
       //tag)

package/src/components/map/checkScreen.vue

@@ -100,7 +100,7 @@
     </div>
 
   </div>
-<!--  <work-busy :is-busy="loading"></work-busy>-->
+  <!--  <work-busy :is-busy="loading"></work-busy>-->
 </template>
 
 <script>
@@ -233,23 +233,31 @@ export default {
         rejectMsg: null
       })
       const today = Util.toStandardDateString()
-      let arr2 = await new HttpResetClass().load('POST', `/api/af-safecheck/sql/singleTable`, {
+      let arr2 = await new HttpResetClass().load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
         data: {
+          items:'*',
           tablename: 't_work_record',
           condition: `f_onsite_time >= '${today} 00:00:00' and f_onsite_time <= '${today} 23:59:59'`,
+          orderitem: 'id'
         }}, {
         resolveMsg: null,
         rejectMsg: null
       })
-
+      arr1.data =  JSON.parse(arr1.data.replaceAll(/([{,]\s*)([0-9]+)(\s*=\s*{)/g, '$1"$2"$3').replaceAll('=',':'))
+      console.log('arr1.data',arr1.data)
       const checkerOptions = [{label: '全部', value: ''}]
-      if (res.data){
-        for (const item of res.data) {
-          checkerOptions.push({
-            label: item.name,
-            value: item.name
-          })
-        }
+      if(res.data){
+        res.data.forEach((checker)=>{
+          for(let check in arr1.data){
+            let checkerpos = arr1.data[check]
+            if(checker.id==check){
+              checkerpos.userid=checker.userid
+              checkerpos.f_user_telephone=checker.f_user_telephone
+              checkerpos.rolestr=checker.rolestr
+              this.checkers.push(checkerpos)
+            }
+          }
+        })
       }
       this.checkerOptions = checkerOptions
       if (res.data && arr2.data){
@@ -271,7 +279,7 @@ export default {
       for (let id in arr1.data) {
         const datachecke = {}
         datachecke.id = id
-        const parse = JSON.parse(arr1.data[id])
+        const parse = arr1.data[id]
         let lxhm = this.$appdata.getSingleValue("离线毫秒数")
         if (isEmpty(lxhm)){
           lxhm = 300000
@@ -316,7 +324,7 @@ export default {
         res.data.forEach((checker) => {
           var lixian = true
           for (var i =0;i < this.allpersonnelsum.length;i++) {
-            if (this.allpersonnelsum[i].userid == checker.id) {
+            if (this.allpersonnelsum[i].id == checker.id) {
               this.allpersonnelsum[i].f_user_telephone = checker.f_user_telephone
               //在线
               lixian = false
@@ -598,7 +606,33 @@ export default {
         autoMove:true,
         content: '',
         offset: new AMap.Pixel(0, -25)
-      });
+      })
+      this.checkerMulchs = new AMap.MassMarks([], {
+        opacity: 0.8, // 图层的透明度，取值范围[0,1]，1代表完全不透明，0代表完全透明
+        zIndex: 111, //图层叠加的顺序值，0表示最底层。默认zIndex：5
+        cursor: 'pointer', //指定鼠标悬停时的鼠标样式，自定义cursor，IE仅支持cur/ani/ico格式，Opera不支持自定义cursor
+        //alwaysRender:false,
+        style: this.styleObject[0]
+      })
+      this.checkerMulchs.on('click', function (e) {
+        //tag)
+        let checkAddress = '未获取到实时位置'
+        console.log('e.data.lnglat=', e.data.lnglat)
+        console.log('地图222')
+        that.geocoder.getAddress(e.data.lnglat, function (status, result) {
+          //
+          if (status === 'complete' && result.regeocode) {
+            checkAddress = result.regeocode.formattedAddress
+          } else {
+            e.data.rowstr.checkAddress = checkAddress
+          }
+          e.data.rowstr.checkAddress = checkAddress
+          console.log('e.data.rowstr=', e.data.rowstr)
+          let defectContent = that.getCheckerContent(e.data.rowstr)
+          that.infoWindow.setContent(defectContent)
+          that.infoWindow.open(that.map, e.data.lnglat)
+        })
+      })
       //安检员点位
       /*this.checkerMulchs = new AMap.MassMarks([], {
         opacity: 0.8, // 图层的透明度，取值范围[0,1]，1代表完全不透明，0代表完全透明