safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/components/inspections/AddInspectPlanItem.vue

@@ -181,7 +181,7 @@ export default {
   },
   ready () {
     /*this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
-      console.log(JSON.stringify(res))
+      //tag)
       if(res.data.code == 200){
         this.model.myCycle = res.data.civil.value
         this.model.fyCycle = res.data.civilian.value
@@ -203,14 +203,14 @@ export default {
   },
   methods:{
     getCheckTime(){
-      console.log("进入方法")
+      //tag
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
           items: 'f_circle,f_start_time',
           tablename: 't_safe_circle',
           condition: `f_filialeid  = '${Vue.user.orgid}'`,
           orderitem: 'id'
         }}).then(res=>{
-        console.log("res==>"+JSON.stringify(res.data))
+        //tag)
         let  nocheck=''
         let  ischeck=''
         if (res.data[0]){
@@ -220,31 +220,31 @@ export default {
 
           }else{
             let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
-            console.log(addtime)
+            //tag
             let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
-            console.log(time)
+            //tag
             nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
             ischeck=`ua.f_last_check_date>'${time}'`
           }
-          console.log(ischeck)
+          //tag
           this.ischecks=[
             {label: '全部', value: ''},
             {label: '已检', value: ischeck },
             {label: '未检', value: nocheck},
           ]
-          console.log(this.ischecks)
+          //tag
         }else{
           this.$showMessage("未配置安检周期")
         }
 
       })
-      console.log("出方法")
+      //tag
     },
     inspect (info){
         info.id = ''
         info.f_state = '未检'
         info.f_no_checkplan = '无计划安检'
-        console.log(info)
+        //tag
           var pardate = {
             _this:this,
             tittle:'巡检详情',
@@ -260,9 +260,9 @@ export default {
         {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
         {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
         this.cbc = [{label: '全部', value: ''}]
-        console.log('22222222222222222222222222222222222222')
-        console.log(JSON.stringify(getMeterReadingBooks))
-        console.log('22222222222222222222222222222222222222')
+        //tag
+        //tag)
+        //tag
         getMeterReadingBooks.data.meterbooks.forEach((res) => {
           this.cbc.push({label: res.f_book_name, value: res.id})
           /*if(res.f_book_slice_area){

package/src/components/inspections/AddInspectPlanItems.vue

@@ -181,7 +181,7 @@ export default {
   },
   ready () {
     /*this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
-      console.log(JSON.stringify(res))
+      //tag)
       if(res.data.code == 200){
         this.model.myCycle = res.data.civil.value
         this.model.fyCycle = res.data.civilian.value
@@ -203,14 +203,14 @@ export default {
   },
   methods:{
     getCheckTime(){
-      console.log("进入方法")
+      //tag
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
           items: 'f_circle,f_start_time',
           tablename: 't_safe_circle',
           condition: `f_filialeid  = '${Vue.user.orgid}'`,
           orderitem: 'id'
         }}).then(res=>{
-        console.log("res==>"+JSON.stringify(res.data))
+        //tag)
         let  nocheck=''
         let  ischeck=''
         if (res.data[0]){
@@ -220,31 +220,31 @@ export default {
 
           }else{
             let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
-            console.log(addtime)
+            //tag
             let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
-            console.log(time)
+            //tag
             nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
             ischeck=`ua.f_last_check_date>'${time}'`
           }
-          console.log(ischeck)
+          //tag
           this.ischecks=[
             {label: '全部', value: ''},
             {label: '已检', value: ischeck },
             {label: '未检', value: nocheck},
           ]
-          console.log(this.ischecks)
+          //tag
         }else{
           this.$showMessage("未配置安检周期")
         }
 
       })
-      console.log("出方法")
+      //tag
     },
     inspect (info){
         info.id = ''
         info.f_state = '未检'
         info.f_no_checkplan = '无计划安检'
-        console.log(info)
+        //tag
           var pardate = {
             _this:this,
             tittle:'巡检详情',
@@ -260,9 +260,9 @@ export default {
         {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
         {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
         this.cbc = [{label: '全部', value: ''}]
-        console.log('22222222222222222222222222222222222222')
-        console.log(JSON.stringify(getMeterReadingBooks))
-        console.log('22222222222222222222222222222222222222')
+        //tag
+        //tag)
+        //tag
         getMeterReadingBooks.data.meterbooks.forEach((res) => {
           this.cbc.push({label: res.f_book_name, value: res.id})
           /*if(res.f_book_slice_area){

package/src/components/inspections/AddInspectPlanItemss.vue

@@ -171,7 +171,7 @@ export default {
   ready () {
 
     /*this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
-      console.log(JSON.stringify(res))
+      //tag)
       if(res.data.code == 200){
         this.model.myCycle = res.data.civil.value
         this.model.fyCycle = res.data.civilian.value
@@ -182,8 +182,8 @@ export default {
     })
     this.getCheckTime()
     this.Mreadibook()*/
-    console.log("aaaaaaaaaaaaa")
-    console.log(this.model)
+    //tag
+    //tag
   },
   computed: {
     reload(){
@@ -195,14 +195,14 @@ export default {
   },
   methods:{
     getCheckTime(){
-      console.log("进入方法")
+      //tag
       new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
           items: 'f_circle,f_start_time',
           tablename: 't_safe_circle',
           condition: `f_filialeid  = '${Vue.user.orgid}'`,
           orderitem: 'id'
         }}).then(res=>{
-        console.log("res==>"+JSON.stringify(res.data))
+        //tag)
         let  nocheck=''
         let  ischeck=''
         if (res.data[0]){
@@ -212,31 +212,31 @@ export default {
 
           }else{
             let addtime= (Util.toStandardTimeString().substring(0,4)-res.data[0].f_start_time.substring(0,4))%res.data[0].f_circle
-            console.log(addtime)
+            //tag
             let time =(Util.toStandardTimeString().substring(0,4)-addtime)+'-01-01 00:00:00'
-            console.log(time)
+            //tag
             nocheck=`(ua.f_last_check_date<'${time}' or ua.f_last_check_date is null)`
             ischeck=`ua.f_last_check_date>'${time}'`
           }
-          console.log(ischeck)
+          //tag
           this.ischecks=[
             {label: '全部', value: ''},
             {label: '已检', value: ischeck },
             {label: '未检', value: nocheck},
           ]
-          console.log(this.ischecks)
+          //tag
         }else{
           this.$showMessage("未配置安检周期")
         }
 
       })
-      console.log("出方法")
+      //tag
     },
     inspect (info){
         info.id = ''
         info.f_state = '未检'
         info.f_no_checkplan = '无计划安检'
-        console.log(info)
+        //tag
           var pardate = {
             _this:this,
             tittle:'巡检详情',
@@ -252,9 +252,9 @@ export default {
         {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
         {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
         this.cbc = [{label: '全部', value: ''}]
-        console.log('22222222222222222222222222222222222222')
-        console.log(JSON.stringify(getMeterReadingBooks))
-        console.log('22222222222222222222222222222222222222')
+        //tag
+        //tag)
+        //tag
         getMeterReadingBooks.data.meterbooks.forEach((res) => {
           this.cbc.push({label: res.f_book_name, value: res.id})
           /*if(res.f_book_slice_area){

package/src/components/inspections/Checked.vue

@@ -321,12 +321,12 @@
     },
     methods: {
       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) {
@@ -391,7 +391,7 @@
       },
       selfSearch (args) {
         args.condition += " and f_complete = '已完成' "
-        console.log('args ==>' + JSON.stringify(args))
+        //tag)
         this.model.search(args.condition,args.model)
       },
       hidden() {

package/src/components/inspections/DisplayInspectionList.vue

@@ -376,8 +376,8 @@ let asyncReady = async function (self) {
         orderitem: 'id'
       }
     })/*.then(res=>{*/
-    console.log("aaaaaaaaaaaaaaaa")
-    console.log(JSON.stringify(res.data[0].f_dir))
+    //tag
+    //tag)
     if (!res.data[0].f_dir) {
       self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
     } else {
@@ -387,7 +387,7 @@ let asyncReady = async function (self) {
           resolveMsg: '获取居民配置项成功！',
           rejectMsg: '获取居民配置项出错！'
         })/*.then(res=>{*/
-        console.log('111111111111居民===>', res1.data)
+        //tag
         //this.safeConfig["民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesConfig = res1.data
         /*})*/
@@ -395,7 +395,7 @@ let asyncReady = async function (self) {
           resolveMsg: '获取非居民配置项成功！',
           rejectMsg: '获取非居民配置项出错！'
         })/*.then(res=>{*/
-        console.log('22222222222222非居民===>', res2.data)
+        //tag
         //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
         Vue.config.safecheck.DevicesSetConfig = res2.data
         /*}).then(res=> {
@@ -475,7 +475,7 @@ export default {
       },
       set(val) {
         if (this.isStrat) {
-          debugger;
+          //;
           this.$goto(val, {userinfo: this.data}, 'paper-router')
         } else {
           this.$showMessage('未开始安检！')
@@ -490,16 +490,16 @@ export default {
   },
   methods: {
     devicesCollect() {
-      console.log("4444444")
-      console.log(JSON.stringify(this.config))
-      console.log(JSON.stringify(this.deviceconfig2))
-      console.log("4444444")
+      //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")) {
@@ -510,7 +510,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 = ''
@@ -519,10 +519,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
                   }
@@ -537,7 +537,7 @@ export default {
                       }
                     }
                   }
-                  console.log('defects=====>' + JSON.stringify(defects))
+                  //tag)
                 }
                 if (defects != '') {
                   deviceInfos.push(`${items.f_item_name}${defects.substring(0, defects.length - 1)}`)
@@ -548,7 +548,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 = '有隐患'
@@ -558,7 +558,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 = '有隐患'
@@ -567,9 +567,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') {
@@ -578,13 +578,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)))
             }
 
@@ -606,7 +606,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) {
@@ -620,9 +620,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['巡检']['非民用']])
@@ -662,8 +662,8 @@ export default {
 
     },
     showpath(val1, val2) {
-      console.log("555555555555555555")
-      console.log(val1)
+      //tag
+      //tag
       if (val1) {
         this.showimg1 = val1
         this.picturename = val2
@@ -671,7 +671,7 @@ export default {
       }
     },
     showpicture(val1, val2) {
-      console.log("77777777777777")
+      //tag
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
@@ -697,7 +697,7 @@ export default {
       }
     },
     isred(val1, val2) {
-      console.log("77777777777777")
+      //tag
       if (val2 == '气量异常差值' || val2 == '金额异常差值') {
         return
       }
@@ -763,14 +763,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()
 
     },
@@ -796,7 +796,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
@@ -854,11 +854,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()
         }
@@ -1120,12 +1120,12 @@ export default {
           id = this.item.f_paper_id
         }
         this.$resetpost(`rs/path/getInspection`, {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) {
@@ -1136,11 +1136,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)
                           }
@@ -1163,12 +1163,12 @@ 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
-              console.log("66666666666")
-              console.log(JSON.stringify(this.data))
+              //tag
+              //tag)
           if (this.item.f_safecheck_type=='巡检'){
             this.deviceconfig = Vue.config.safecheck[Vue.config.safecheck.SafecheckType['巡检']['非民用']]
 
@@ -1181,10 +1181,10 @@ export default {
           }
                          /*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)
               }*/
               this.deviceconfig2 = ObjConfig.getObjConfig(this.deviceconfig)
               this.deviceconfig2[0].items = jsonSort(this.deviceconfig2[0].items, "index")
@@ -1200,11 +1200,11 @@ export default {
   },
   watch: {
     //   'isUpload'(val){
-    //     console.log('isUpload发生变化===>'+val)
+    //     //tag
     //   }
   },
   destroyed() {
-    console.log('退出当前页Set')
+    //tag
     this.disableTimer()
   }
 }

package/src/components/inspections/InsUploadPage.vue

@@ -103,8 +103,8 @@
       },
       // 上传所有未成功上传的数据
       async uploadAll() {
-        console.log(`this.model==>${this.model}`)
-        console.log(`this.model.rows.length==>${this.model.length}`)
+        //tag
+        //tag
         // if(this.model.rows.length <= 0){
         //   this.model.rows = this.result
         // }
@@ -133,17 +133,17 @@
       },
       upload(){
         this.uploadAll().then((res)=>{
-          console.log('批量上传执行结果===》'+JSON.stringify(res))
+          //tag)
           this.refresh()
         })
 
       },
       uploadCallBack(jo){
-        console.log('jo -->' + JSON.stringify(jo))
-        console.log('jo.state -->' + JSON.stringify(jo.state))
+        //tag)
+        //tag)
         if(jo.state == 'ok'){
           let ret = JSON.parse(jo.result)
-          console.log('ret ===> '+ JSON.stringify(ret))
+          //tag)
           if(ret.state == 0){
             HostApp.alert(`${ret.successcount}条巡检单上传成功，${ret.invalidcount}条巡检单已作废，${ret.failedcount}条巡检单上传失败！`)
             this.refresh()
@@ -154,13 +154,13 @@
       },
       // 查询所有未上传斌保存在手机上的数据
       // download() {
-      //   console.log(`Vue.user========>${Vue.user}`)
+      //   //tag
       //   let res = this.$androidUtil.bzLogic('getCheckPlanInfo',{condition:this.condition})
-      //   console.log(`res.data.data===>${res.data.data}`)
-      //   console.log(`res.data.code===>${res.data.code}`)
+      //   //tag
+      //   //tag
       //
       //   if (res.data && res.data.code === 200) {
-      //     console.log("查询到结果")
+      //     //tag
       //       if (res.data.data.length > 0) {
       //         this.context = `有${res.data.data.length}条数据未上传，请点击上传按钮，自动上传`
       //         this.resultdata  = [...res.data.data]
@@ -171,7 +171,7 @@
       //   }
       // },
       refresh() {
-        console.log("批量上传页面刷新")
+        //tag
         // hard code relationship
         //安卓
         let value = this.$androidUtil.path({alias: 'getInspectionPlan', data:{}})
@@ -182,7 +182,7 @@
         }
         // //PC模拟安卓
         // this.$androidUtil.path({alias: 'getCheckPlan', data:{}}).then((value)=>{
-        //   console.log(value)
+        //   //tag
         //   if(value.data.length > 0){
         //     this.model = value.data
         //   }