safecheck-client 3.0.34-gongyi → 3.0.35-2

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

@@ -320,20 +320,20 @@ let asyncReady = async function (self) {
         condition: `id  = '${self.item.f_filialeid}'`,
         orderitem: 'id'
       }})/*.then(res=>{*/
-    console.log("aaaaaaaaaaaaaaaa")
-    console.log(JSON.stringify(res.data[0].f_dir))
+    //tag
+    //tag)
     if (!res.data[0].f_dir){
       this.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
     }else{
       //this.f_dir=res.data[0].f_dir
       try {
         let res1=await new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取居民配置项成功！', rejectMsg: '获取居民配置项出错！'})/*.then(res=>{*/
-        console.log('111111111111居民===>', res1.data)
+        //tag
         //this.safeConfig["民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesConfig=res1.data
         /*})*/
         let res2=await new HttpResetClass().load('GET',`/safecheck/rs/vue/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {},{resolveMsg: '获取非居民配置项成功！', rejectMsg: '获取非居民配置项出错！'})/*.then(res=>{*/
-        console.log('22222222222222非居民===>', res2.data)
+        //tag
         //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesSetConfig=res2.data
         /*}).then(res=> {
@@ -447,7 +447,7 @@ export default {
       },
       set(val) {
         if(this.isStrat){
-          debugger;
+          //;
           this.$goto(val, {userinfo:this.data}, 'paper-router')
         }else{
           this.$showMessage('未开始安检！')
@@ -462,17 +462,17 @@ export default {
   },
   methods: {
     devicesCollect(){
-      // console.log("111111111111111"+this.paper[device])
-      console.log("4444444")
-      console.log(JSON.stringify(this.config))
-      console.log(JSON.stringify(this.deviceconfig2))
-      console.log("4444444")
+      // //tag
+      //tag
+      //tag)
+      //tag)
+      //tag
 
       this.deviceCollects = []
       let checkResult = '正常'
       this.result = '正常'
       let codata = JSON.parse(JSON.stringify(this.data))
-      console.log("111111111111"+JSON.stringify(codata))
+      //tag)
       for(let device in this.data){
         let f_device_type
         if(device.startsWith("device")){
@@ -483,7 +483,7 @@ export default {
             }else{
               f_device_type = this.data[device][item].f_device_type
             }
-            // console.log('codata[device][item]=>',codata[device][item])
+            // //tag
             let deviceInfos = []
             for(let i in this.data[device][item].f_items){
               let defects = ''
@@ -492,10 +492,10 @@ export default {
                 for (let i in items.f_item_value) {
                   let f_item_value = items.f_item_value[i]
 
-                  console.log('f_item_value => ' + JSON.stringify(f_item_value))
-                  console.log('f_device_type => ' + JSON.stringify(f_device_type))
-                  console.log('this.paper[device][item] => ' + JSON.stringify(this.data[device][item]))
-                  console.log('this.config[this.paper[device][item].f_device_type] => ' + JSON.stringify(this.config[this.data[device][item].f_device_type]))
+                  //tag)
+                  //tag)
+                  //tag)
+                  //tag)
                   if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name]){
                     continue
                   }
@@ -510,7 +510,7 @@ export default {
                       }
                     }
                   }
-                  console.log('defects=====>'+JSON.stringify(defects))
+                  //tag)
                 }
                 if(defects != ''){
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
@@ -521,7 +521,7 @@ export default {
                 deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
               }else if(items.f_item_name == '金额异常差值'){
                 var deviation = this.$appdata.getSingleValue('金额异常差值允许误差')
-                console.log(items.f_item_value[0]+'金额异常差值允许误差'+deviation)
+                //tag
                 if(parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN"){
                   if(parseFloat(items.f_item_value[0])>parseFloat(deviation) || parseFloat(items.f_item_value[0])<parseFloat(deviation)*-1){
                     checkResult = '有隐患'
@@ -531,7 +531,7 @@ export default {
                 }
               }else if(items.f_item_name == '气量异常差值'){
                 var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
-                console.log(items.f_item_value[0]+'气量异常差值允许误差'+deviation)
+                //tag
                 if(parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN"){
                   if(parseFloat(items.f_item_value[0])>parseFloat(deviation) || parseFloat(items.f_item_value[0])<parseFloat(deviation)*-1){
                     checkResult = '有隐患'
@@ -540,9 +540,9 @@ export default {
                   }
                 }
               }
-              console.log('deviceInfos========>'+JSON.stringify(deviceInfos))
-              console.log('items.f_is_defect')
-              console.log(items.f_is_defect)
+              //tag)
+              //tag
+              //tag
               if (items.type === 'selector') {
                 items.selected = []
               } else if (items.type === 'inputSelector') {
@@ -551,13 +551,13 @@ export default {
             }
 
 
-            console.log('deviceCollect',this.deviceCollect)
+            //tag
             this.$set('deviceCollect.name',f_device_type)
             this.$set('deviceCollect.value',checkResult)
             this.$set('deviceCollect.devices',deviceInfos)
-            console.log("5555555555"+JSON.stringify(this.deviceCollect))
+            //tag)
             if (this.deviceCollect.name){
-              console.log("999999998888888"+this.deviceCollect.name)
+              //tag
               this.deviceCollects.push(JSON.parse(JSON.stringify(this.deviceCollect)))
             }
 
@@ -579,7 +579,7 @@ export default {
       this.imgshow=false
     },
     putDevices() {
-      //console.log('Vue.config.safecheck', Vue.config.safecheck.safetype)
+      ////tag
       this.$set('data.approve', "true")
       this.$set('data.writeback', "false")
       if (Vue.config.safecheck.ApproveConfig != undefined) {
@@ -593,9 +593,9 @@ export default {
           this.livedispose = Vue.config.safecheck.ApproveConfig.livedispose
         }
       }
-      console.log('当前安检类型----'+this.item.f_safecheck_type)
+      //tag
 
-      console.log(JSON.stringify(this.data))
+      //tag)
       if(!this.item.f_safecheck_type){
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
       }else{
@@ -630,8 +630,8 @@ export default {
 
     },
     showpath(val1,val2){
-      console.log("555555555555555555")
-      console.log(val1)
+      //tag
+      //tag
       if (val1){
         this.showimg1=val1
         this.picturename=val2
@@ -639,7 +639,7 @@ export default {
       }
     },
     showpicture(val1,val2){
-      console.log("77777777777777")
+      //tag
       if (val2=='气量异常差值'||val2=='金额异常差值'){
         return
       }
@@ -665,7 +665,7 @@ export default {
       }
     },
     isred(val1,val2){
-      console.log("77777777777777")
+      //tag
       if (val2=='气量异常差值'||val2=='金额异常差值'){
         return
       }
@@ -727,14 +727,14 @@ export default {
     getDeviceAll(){
       let keyall=  Object.keys(this.data)
       for (let i = 0; i < keyall.length; i++) {
-        console.log(JSON.stringify(keyall))
+        //tag)
         if (keyall[i].startsWith('device') && keyall[i] !='deviceundefined'){
           this.devicesAll.push(this.data[keyall[i]])
-          console.log(keyall[i])
+          //tag
         }
       }
-      console.log("666666666666666666")
-      console.log(JSON.stringify(this.devicesAll))
+      //tag
+      //tag)
       this.devicesCollect()
 
     },
@@ -760,7 +760,7 @@ export default {
     },
 
     viewPic(fileName) {
-      console.log('view pic: ' + fileName)
+      //tag
       if(this.role == 'view') {
         if(!fileName.endsWith('nopic.png')) {
           this.pic_to_be_viewed = fileName
@@ -818,11 +818,11 @@ export default {
         HostApp.__this__.$set('data', paper)
         HostApp.__this__.$goto('paper-state', {}, 'paper-router')
         // 如果打回重检则重新计时
-        console.log('HostApp.__this__.role' + HostApp.__this__.role + ' HostApp.__this__.f_approved:' + HostApp.__this__.data.f_approved)
+        //tag
         if(HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
-          console.log('打回')
+          //tag
           HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
@@ -1070,12 +1070,12 @@ export default {
           id = this.item.f_paper_id
         }
         this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
-            console.log('result....', respanse)
+            //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组
               // 对应位置
 
-              console.log('devices => ', respanse.data[0])
+              //tag
 
               that.data = Object.assign(that.data, respanse.data[0])
               if (respanse.data[0].f_devices) {
@@ -1086,11 +1086,11 @@ export default {
                   for (let de in that.devices) {
                     if (that.devices[de].device == item.f_device_type) {
                       item.f_items.forEach((f_item) => {
-                        console.log('f_item====>', f_item)
-                        console.log('f_item.f_path====>', f_item.f_path)
+                        //tag
+                        //tag
                         let itemValues = []
                         f_item.f_item_lists.forEach((tempItem) => {
-                          console.log('emm => ', f_item.f_item_name, '   ', tempItem.f_item_value)
+                          //tag
                           if (tempItem.f_item_value !== 'null') {
                             itemValues.push(tempItem.f_item_value)
                           }
@@ -1113,29 +1113,29 @@ export default {
               } else {
                 Util.androidRatifyPics(that.data, this.$androidUtil.getProxyUrl())
               }
-              console.log("that.data:", that.data)
+              //tag
             }
             // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
             this.isshow = true
           asyncReady(this).then(() => {
-            console.log("66666666666")
-            console.log(JSON.stringify(this.data))
+            //tag
+            //tag)
             if (this.data.f_check_type=='民用'){
               this.deviceconfig=Vue.config.safecheck.DevicesConfig
-              console.log("deviceconfig1==>"+JSON.stringify(this.deviceconfig))
+              //tag)
             }else if (this.data.f_check_type=='非民用'){
               this.deviceconfig=Vue.config.safecheck.DevicesSetConfig
-              console.log("deviceconfig2==>"+JSON.stringify(this.deviceconfig))
+              //tag)
             }
             if (this.data.f_collection_type=='按气量'){
               let aaa=Object.assign({},this.config["燃气表"])
               this.deviceconfig["燃气表"]=aaa
-              console.log("deviceconfig3==>"+JSON.stringify(this.deviceconfig))
+              //tag)
             }else{
               let aaa=Object.assign({},this.config2["燃气表"])
               this.deviceconfig["燃气表"]=aaa
               //this.deviceconfig["燃气表"]=this.config2["燃气表"]
-              console.log("deviceconfig4==>"+JSON.stringify(this.deviceconfig))
+              //tag)
             }
             this.deviceconfig2=ObjConfig.getObjConfig(this.deviceconfig)
             this.deviceconfig2[0].items=jsonSort(this.deviceconfig2[0].items,"index")
@@ -1148,7 +1148,7 @@ export default {
           }
         ).catch(
           (respanse) => {
-            console.log('respanse', respanse)
+            //tag
             alert('查找安检单失败')
           })
       }
@@ -1157,11 +1157,11 @@ export default {
   },
   watch:{
     //   'isUpload'(val){
-    //     console.log('isUpload发生变化===>'+val)
+    //     //tag
     //   }
   },
   destroyed() {
-    console.log('退出当前页Set')
+    //tag
     this.disableTimer()
   }
 }

package/src/filiale/wuan/pc/PaperList.vue

@@ -267,7 +267,7 @@
       source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
       userid: self.$login.f.id
     }, {resolveMsg: null, rejectMsg: null})
-    //console.log('获取安检员', getGasman)
+    ////tag
     self.checkersid.push({label: '全部', value: ''})
     getGasman.data.forEach((checker) => {
       self.checkersid.push({label: checker.name, value: checker.id})
@@ -346,9 +346,9 @@
     },
     methods: {
       showaudio(){
-        console.log("999999999")
+        //tag
         this.audioshow=!this.audioshow
-        console.log(this.audioshow)
+        //tag
       },
       getmeterbook(val){
         this.cbc=[]
@@ -376,8 +376,8 @@
         }
       },
       Mreadibook(val){
-        //console.log("999999999")
-        //console.log(val)
+        ////tag
+        ////tag
 
         if (val){
           new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -402,8 +402,8 @@
         }
       },
       getAllMeterBook(val){
-        //console.log("999999999")
-        //console.log(val)
+        ////tag
+        ////tag
         this.cbcs=[]
         if (val){
           new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -444,7 +444,7 @@
       change(row) {
         // Vue.$login = {jwt: row.f_checker_id}
         asyncReady(this).then(() => {
-            //console.log("开始进入单子"+JSON.stringify(Vue.config))
+            ////tag)
             row.f_upload_state = '已传'
             this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
         }).catch(
@@ -481,73 +481,7 @@
         this.showcheckmsg = true
         this.checkInfo = row
       },
-      remind() {
-        this.$resetpost('rs/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid = '${this.$login.f.orgid}'`}}, {
-          resolveMsg: null,
-          rejectMsg: null
-        }).then((res) => {
 
-          if (res.data.length > 0) {
-            let a = 0
-            let b = 0
-            let c = 0
-
-            for (let row of res.data) {
-              let bb = JSON.parse(row.f_last_check_result)
-              if (!bb.result) {
-                bb.result = ''
-              }
-              row.danger = bb
-              if (row.f_last_check_result.indexOf('A')) {
-                a = a + 1
-                //console.log('包含A')
-                if (row.nocheckday > 5 && row.nocheckday <= 7) {
-                  b = b + 1
-                  row.color = 'yellow'
-                } else if (row.nocheckday > 7) {
-                  c = c + 1
-                  row.color = 'red'
-                }
-                continue
-              }
-              if (row.f_last_check_result.indexOf('B')) {
-                a = a + 1
-                //console.log('包含B')
-                if (row.nocheckday > 12 && row.nocheckday <= 14) {
-                  b = b + 1
-                  row.color = 'yellow'
-                } else if (row.nocheckday > 14) {
-                  c = c + 1
-                  row.color = 'red'
-                }
-                continue
-              }
-              if (row.f_last_check_result.indexOf('C')) {
-                a = a + 1
-                //console.log('包含C')
-                if (row.nocheckday > 28 && row.nocheckday <= 30) {
-                  b = b + 1
-                  row.color = 'yellow'
-                } else if (row.nocheckday > 30) {
-                  c = c + 1
-                  row.color = 'red'
-                }
-                continue
-              }
-            }
-            this.$showMessage('目前有' + res.data.length + '户存在隐患需要及时安检，其中' + b + '户需要在两天内安检，'
-              + c + '户已超时，未在规定时间内安检，是否立刻前往计划生成页面生成计划？', ['confirm', 'cancel']).then((res1) => {
-              if (res1 === 'confirm') {
-                //console.log('查询到的数据', res)
-                this.$goto('create-plan', {rowsdata: res.data}, 'self', null)
-              }
-            })
-
-          }
-
-
-        })
-      },
       sort(field, rule) {
         // 将所有排序方式设为不排序，实现相互排斥
         for (let key in this.orderFields) {
@@ -569,7 +503,7 @@
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch(args) {
-        //console.log("9999999999999999")
+        ////tag
         args.condition+=" and f_safecheck_type='年度普检'"
         this.searchData.condition=args.condition
         this.model.search(args.condition, args.model, args.condValue)
@@ -577,10 +511,10 @@
     },
 
     ready() {
-      //console.log('这里是PaperList', this.$login.f)
+      ////tag
       this.function = this.f
-      //console.log(this.f)
-      //this.remind()
+      ////tag
+
       let gen = select(this)
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)

package/src/filiale/wuhai/android/AreaPlan.vue

@@ -411,24 +411,24 @@
       SecurityCheck(){
           let resa = this.$androidUtil.bzLogic('GetSecurityCheck', {da:''
               })
-        console.log('resa哈哈哈 '+ JSON.stringify(resa))
+        //tag)
            if(resa.code==200){
              //将后台返回的值进行渲染赋值
                 this.suibian = resa.obj.data[0]
            }
       },
       refresh() {
-        console.log("refresh items state")
+        //tag
         // hard code relationship
         this.$refs.paged.$refs.cri.search()
       },
       reload(){
-        console.log('页面刷新 ')
+        //tag
         this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
       },
       inspect(row) {
         this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
-        console.log(JSON.stringify(response))
+        //tag)
         row['f_plan_meters'] = response.data
           var pardate = {
             _this:this,
@@ -451,9 +451,9 @@
             groupitem: 'f_plan_item_id'
           }
           let result = HostApp._executeTask({'type':'sql', 'data':{'alias': 'safe_singleTable_GroupBy', 'criteria': criteria}})
-          console.log('网络环境异常 调取本地数据结果result ===> ' + JSON.stringify(result))
+          //tag)
           if(result.code == 200){
-            console.log('=== ===> ' + JSON.stringify(result.data))
+            //tag)
             row['f_plan_meters'] = result.data.rows
             var pardate = {
               _this:this,
@@ -518,7 +518,7 @@
       },
       selfSearch (args) {
         args.condition += " and f_complete = '已完成' "
-        console.log('args ==>' + JSON.stringify(args))
+        //tag)
         this.model.search(args.condition,args.model)
       },
       hidden() {