safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/components/checkplan/checkmsgZG.vue

@@ -307,14 +307,14 @@ export default {
     // let index = value.indexOf('.')
     // this.company = value.substring(index+1,value.length)
     /*this.$resetpost('rs/path/getUserinfomation', {data:{condition:`id = '${this.data.id}'`}}).then((res)=>{
-      console.log('res',res.data)
+      //tag
       if(res.data.length>0){
         this.userinfo = res.data[0]
         if(this.userinfo.f_sign_path != ''){
           this.userinfo.f_sign_path = 'rs/image/file/' + this.userinfo.f_sign_path
         }
         this.$resetpost('rs/sql/getCompany', {data:{f_filialeid:this.$login.f.orgid}}).then((res)=>{
-          console.log('res===>',res)
+          //tag
           if(res.data.length >0){
             this.company = res.data[0].value
           }else{
@@ -323,7 +323,7 @@ export default {
           }
         })
       }else{
-        console.log('没找到')
+        //tag
         this.$showMessage('未查询到该用户安检单信息')
         this.$parent.showcheckmsg = false
       }
@@ -334,7 +334,7 @@ export default {
       this.$parent.showcheckmsg = false
     },
     gotoPage(val,data,self='tab'){
-      console.log(data)
+      //tag
       data.f_type = '回访'
       data.f_telvisit_type = '安检'
       this.$goto(val,{row:data},self)
@@ -355,7 +355,7 @@ export default {
       return currentdate;
     },
     // getId(){
-    //   console.log('返回值:')
+    //   //tag
     // },
     //获取隐患信息
     getHidden(){
@@ -374,7 +374,7 @@ export default {
         let device = this.userinfo.f_devices[item]
         f_device_type = device.f_device_type
         //判断当前设备是否已存在，已存在命名加1
-        console.log('=======>>',this.equipmentmsgs)
+        //tag
         if (this.equipmentmsgs.length == 0){
           if(this.Hinvestigations.length != 0){
             let m = 0
@@ -391,13 +391,13 @@ export default {
           let m = 0
           let n = 0
           for (let n in this.equipmentmsgs){
-            console.log('是否有正常设备')
+            //tag
             if(this.equipmentmsgs[n].f_device_type.indexOf(f_device_type) != -1){
               m = m+1
             }
           }
           for (let i in this.Hinvestigations){
-            console.log('隐患设备循环')
+            //tag
             if(this.Hinvestigations[i].f_device_type.indexOf(f_device_type) != -1){
               n = n+1
             }
@@ -413,24 +413,24 @@ export default {
 
         //取出除燃气表外正常设备信息
           for (let i in device.f_items){
-            console.log('=========')
-            console.log('device.f_items[i].f_is_defect')
-            console.log(device.f_items[i].f_is_defect)
-            console.log('device.f_items[i].f_is_defect != true')
-            console.log(!device.f_items[i].f_is_defect)
-            console.log('')
-            console.log(device.f_items[i].f_item_value != '' && !device.f_items[i].f_is_defect)
+            //tag
+            //tag
+            //tag
+            //tag
+            //tag
+            //tag
+            //tag
             if(device.f_items[i].f_item_value != '' && device.f_items[i].f_is_defect != 'true'){
               if(device.f_device_type == '燃气表'){
                 this.$set('deviceInfo.name',device.f_items[i].f_item_name)
                 this.$set('deviceInfo.value',device.f_items[i].f_item_value)
-                console.log('this.deviceInfo,',this.deviceInfo)
+                //tag
                 this.device.push(JSON.parse(JSON.stringify(this.deviceInfo)))
                 // deviceInfo = deviceInfo + `,${f_device_type}${device.f_items[i].f_item_name}${device.f_items[i].f_item_value}`
               }else{
                 this.$set('normal.name',device.f_items[i].f_item_name)
                 this.$set('normal.value',device.f_items[i].f_item_value)
-                console.log('this.normal,',JSON.parse(JSON.stringify(this.normal)))
+                //tag))
                 this.normalDevice.push(JSON.parse(JSON.stringify(this.normal)))
               }
             }else if(device.f_items[i].f_item_value != '' && device.f_items[i].f_is_defect == 'true'){
@@ -439,22 +439,22 @@ export default {
                 if(device.f_device_type != '燃气表'){
                   this.$set('Hinvestigation.name',device.f_items[i].f_item_name)
                   this.$set('Hinvestigation.value',device.f_items[i].f_item_value)
-                  console.log('this.Hinvestigation,',JSON.parse(JSON.stringify(this.Hinvestigation)))
+                  //tag))
                   this.HazardDevice.push(JSON.parse(JSON.stringify(this.Hinvestigation)))
                 }
               }
-              console.log('f_device_type',f_device_type)
+              //tag
             }
-            console.log('f_device_type',f_device_type)
+            //tag
           }
           if(this.device.length != 0){
             if(device.f_device_type == '燃气表'){
-              console.log('燃气表信息===》',this.device)
+              //tag
               this.$set('deviceInfos.f_device_type',f_device_type)
               this.$set('deviceInfos.value',this.device)
               this.device = []
               this.devices.push(JSON.parse(JSON.stringify(this.deviceInfos)))
-              console.log('this.devices',this.devices)
+              //tag
               // this.devices.push(this.device)
             }
           }
@@ -465,7 +465,7 @@ export default {
               this.$set('normalDevices.f_device_type',f_device_type)
               this.$set('normalDevices.value',this.normalDevice)
               this.normalDevice = []
-              console.log('this.normalDevices',this.normalDevices)
+              //tag
               values = JSON.parse(JSON.stringify(this.normalDevices))
               this.equipmentmsgs.push(values)
             }
@@ -475,7 +475,7 @@ export default {
           this.$set('HazardDevices.f_device_type',f_device_type)
           this.$set('HazardDevices.value',this.HazardDevice)
           this.HazardDevice = []
-          console.log('this.normalDevices',this.HazardDevices)
+          //tag
           values = JSON.parse(JSON.stringify(this.HazardDevices))
           this.Hinvestigations.push(values)
         }
@@ -483,7 +483,7 @@ export default {
       this.drowspan = this.devices.length
       this.erowspan = this.equipmentmsgs.length
       //设备隐患
-      console.log('结束',this.userinfo.f_defect_content)
+      //tag
       let f_defect_content = JSON.parse(JSON.stringify(JSON.parse(this.userinfo.f_defect_content)))
       this.f_defect_content = f_defect_content.result
       // for (let defect of f_defect_content.data){
@@ -495,7 +495,7 @@ export default {
       // }
       this.hrowspan = this.Hinvestigations.length
       setTimeout(()=> {
-        console.log('关闭打印提示框')
+        //tag
         this.$parent.showcheckmsg = false
       }, 1000)
     },

package/src/components/createcheckplan/CreatePlan.vue

@@ -390,10 +390,10 @@
     self.checkboxModel.f_filialeids = self.model.f_filialeids
     self.checkboxModel.createWay = self.createWay
     self.checkboxModel.repeated = self.repeated
-    console.log('self.model',self.model)
+    //tag
       self.checkboxModel.planWay = 'add'
       yield self.$resetpost('rs/logic/GenCallInAllPlan', {data: self.checkboxModel},{resolveMsg: null, rejectMsg: null}).then((res)=>{
-        console.log(res.data)
+        //tag
         if(res.data.code == 200) {
           self.$showMessage(`添加成功！现在${self.checkplan.f_plan_name}共有${res.data.countItem}个计划！`)
           self.$emit('finish')
@@ -424,7 +424,7 @@
     self.checkboxModel.repeated = self.repeated
     yield self.$resetpost('rs/logic/GenCallInAllPlan', {data: self.checkboxModel}, {resolveMsg: null, rejectMsg: null})
       .then((respanse) => {
-        console.log(respanse)
+        //tag
         self.showModal = false
         if (respanse.data.code == 200) {
           self.$showMessage("预约计划生成成功!")
@@ -447,10 +447,10 @@
     self.repeated = -1
     let checkIdArray = []
     data = self.model.params
-    console.log('data ===> '+JSON.stringify(data))
+    //tag)
     yield self.$resetpost('rs/sql/getExistCheckItem/n', {data:data}, {resolveMsg: null, rejectMsg: null})
       .then((res) => {
-        console.log(res.data.n)
+        //tag
         self.repeated = res.data.n
       })
   }
@@ -460,7 +460,7 @@
       resolveMsg: null,
       rejectMsg: '获取营收参数出错！！！'
     })
-    console.log('获取营收参数', getParams)
+    //tag
     if (getParams.data) {
       let arr = []
       getParams.data.adjustable.forEach((item, index) => {
@@ -473,24 +473,24 @@
     }
   }
     let select = function* (self) {
-      console.log(3)
+      //tag
       let http = new HttpResetClass()
       let getGasman = yield http.load('POST', '/rs/search', {
         source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
         userid: self.$login.f.id
       }, {resolveMsg: null, rejectMsg: null})
-      console.log(4)
-      console.log('获取安检员', getGasman)
+      //tag
+      //tag
       getGasman.data.forEach((checker) => {
         self.checkers.push({label: checker.name, value: checker})
       })
     }
 
     let searchSafeCycle= function* (self){
-      console.log('获取民用非民用安检周期')
+      //tag
       let http = new HttpResetClass()
       yield http.load('POST', 'rs/logic/getSafeCheckCycle', {},{resolveMsg: null, rejectMsg: null}).then((res)=>{
-        console.log('安检周期',res.data)
+        //tag
         if(res.data.code == 200){
           self.civil = res.data.civil.value
           self.civilian = res.data.civilian.value
@@ -585,29 +585,29 @@
       },
       ready() {
         this.getAreaList()
-        console.log('this.arealist===> ' + JSON.stringify(this.areaslist))
-        console.log('CreatePlan启动了')
+        //tag)
+        //tag
         if (this.rowsdata){
-          console.log('传进数据了')
+          //tag
           this.model.rows = this.rowsdata
         }
         this.model.chosenOrg = {id: 0}
-        console.log(this.$login.f)
+        //tag
         this.model.f_filialeid = this.$login.f.orgid
         // this.model.f_filiale = this.$login.f.f_fengongsi
         this.model.f_OrgStr = this.$login.f.orgpathstr
-        console.log(0)
+        //tag
         let param = seachData(this)
-        console.log(1)
+        //tag
         co(param)
-        console.log(2)
+        //tag
         let gen = select(this)
         co(gen)
         let single = searchSafeCycle(this)
         co(single)
         if(this.checkplan){
-          console.log('this.checkplan')
-          console.log(this.checkplan)
+          //tag
+          //tag
           this.checkboxModel.f_plan_name = this.checkplan.f_plan_name
           this.checkboxModel.f_plan_year = this.checkplan.f_plan_year
           this.checkboxModel.f_plan_month = this.checkplan.f_plan_month
@@ -617,8 +617,8 @@
           }else {
             this.checkboxModel.IsShare = '是'
           }
-          console.log('this.checkboxModel')
-          console.log(this.checkboxModel)
+          //tag
+          //tag
         }
         let f_start_time = this.$appdata.getSingleValue('安检间隔月份')
         if(f_start_time){
@@ -649,90 +649,12 @@
           this.checkboxModel.f_checker = val.name
           this.checkboxModel.f_checker_id = val.id
         },
-        dangerplan(){
-          this.$resetpost('rs/sql/getRemind', {data:{condition :` 1 = 1 and f_filialeid in ${this.model.f_filialeids}`}}, {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 aa=''
-                let bb =JSON.parse(row.f_last_check_result)
-               /* if (bb.result){
-                  aa=aa+bb.result
-                  if (bb.data.length>0){
-                    aa = aa +'\n隐患为：'
-                    for (let key of bb.data){
-                      let str = JSON.stringify(key)
-                      aa = aa+str+'\n'
-                    }
-                  }
-
-                }*/
-               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
-                }
-              }
-              console.log('查询到的数据',res)
-              this.model.rows = res.data
-              this.$showMessage('目前有'+res.data.length+'户存在隐患需要及时安检，其中'+b+'户需要在两天内安检，'
-                      +c+'户已超时，未在规定时间内安检')
-
-            }
-            else {
-              this.$showMessage('当前没有存在隐患需要安检的用户')
-            }
-
-          })
-        },
        async search(args) {
-          console.log('this.areaslist ===>' + JSON.stringify(this.areaslist))
+          //tag)
          this.checkrows = []
          this.checkedAll = false
          this.sqlname = 'ByOrgChecker'
-         console.log('查询结束')
+         //tag
          this.model.url = 'rs/sql/根据安检员查询用户档案'
           await this.model1.search(args.condition, args.model)
 
@@ -866,16 +788,16 @@
               for (let j = 0; j < respanse.data.length; j++) {
                 _this.checkrows.push(respanse.data[j])
               }
-              console.log(_this.checkrows);
+              //tag;
             }
               })
           }
         },
         addChecked(item) {
-          console.log(item);
+          //tag;
           if (!item.checked) {
             this.checkrows.push(item);
-            console.log(this.checkrows);
+            //tag;
           } else {
             for (let i = 0; i < this.checkrows.length; i++) {
               if (item.f_userinfo_id == this.checkrows[i].f_userinfo_id) {
@@ -932,7 +854,7 @@
           return [{label: '全部', value: ''}, ...rs]
         },
         initAdjustables() {
-          console.log('初始化调压箱', this.$GetSaleParam)
+          //tag
           let arr = []
           let filter = this.$login.f.orgid
           this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
@@ -945,7 +867,7 @@
         },
         getRes(obj){
           this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-          console.log(this.model.f_filialeids)
+          //tag
         },
         checkExist(){
           co(checkItems(this))
@@ -982,7 +904,7 @@
           }
         },
         // 'checker'(val){
-        //   console.log("checker",this.checker)
+        //   //tag
         //   if(val){
         //     this.checkboxModel.f_checker = this.checker[0].name
         //     this.checkboxModel.f_checker_id = this.checker[0].id
@@ -1014,7 +936,7 @@
       },
       computed: {
         getCondition(){
-          console.log('this.orderitem===>',this.model.orderitem)
+          //tag
           return {condition: `${this.$refs.paged.$refs.criteria.condition}`,orderitem:`${this.model.orderitem}`,
             f_filialeid:this.model.f_filialeid,month: this.model.month,SafeCheckSX:this.model.SafeCheckSX,
               f_usertype:this.model.f_usertype,f_last_check_state:this.model.f_last_check_state,f_new_account:this.model.f_new_account,

package/src/components/createcheckplan/CreatePlanWuan.vue

@@ -357,13 +357,13 @@ let AddItem = function* (self) {
   self.checkboxModel.f_filialeids = self.model.f_filialeids
   self.checkboxModel.createWay = self.createWay
   self.checkboxModel.repeated = self.repeated
-  console.log('self.model', self.model)
+  //tag
   self.checkboxModel.planWay = 'add'
   yield self.$resetpost('rs/logic/GenCallInAllPlan', {data: self.checkboxModel}, {
     resolveMsg: null,
     rejectMsg: null
   }).then((res) => {
-    console.log(res.data)
+    //tag
     if (res.data.code == 200) {
       self.$showMessage(`添加成功！现在${self.checkplan.f_plan_name}共有${res.data.countItem}个计划！`)
       self.$emit('finish')
@@ -397,7 +397,7 @@ let saveGen = function* (self) {
   self.checkboxModel.repeated = self.repeated
   yield self.$resetpost('rs/logic/GenCallInAllPlan', {data: self.checkboxModel}, {resolveMsg: null, rejectMsg: null})
     .then((respanse) => {
-      console.log(respanse)
+      //tag
       self.showModal = false
       if (respanse.data.code == 200) {
         self.$showMessage("预约计划生成成功!")
@@ -420,10 +420,10 @@ let checkItems = function* (self) {
   self.repeated = -1
   let checkIdArray = []
   data = self.model.params
-  console.log('data ===> ' + JSON.stringify(data))
+  //tag)
   yield self.$resetpost('rs/sql/getExistCheckItem/n', {data: data}, {resolveMsg: null, rejectMsg: null})
     .then((res) => {
-      console.log(res.data.n)
+      //tag
       self.repeated = res.data.n
     })
 }
@@ -433,7 +433,7 @@ let seachData = function* (self) {
     resolveMsg: null,
     rejectMsg: '获取营收参数出错！！！'
   })
-  console.log('获取营收参数', getParams)
+  //tag
   if (getParams.data) {
     let arr = []
     getParams.data.adjustable.forEach((item, index) => {
@@ -446,24 +446,24 @@ let seachData = function* (self) {
   }
 }
 let select = function* (self) {
-  console.log(3)
+  //tag
   let http = new HttpResetClass()
   let getGasman = yield http.load('POST', '/rs/search', {
     source: 'tool.getChildrenOfResName($安检员$)',
     userid: self.$login.f.id
   }, {resolveMsg: null, rejectMsg: null})
-  console.log(4)
-  console.log('获取安检员', getGasman)
+  //tag
+  //tag
   getGasman.data.forEach((checker) => {
     self.checkers.push({label: checker.name, value: checker})
   })
 }
 
 let searchSafeCycle = function* (self) {
-  console.log('获取民用非民用安检周期')
+  //tag
   let http = new HttpResetClass()
   yield http.load('POST', 'rs/logic/getSafeCheckCycle', {}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-    console.log('安检周期', res.data)
+    //tag
     if (res.data.code == 200) {
       self.civil = res.data.civil.value
       self.civilian = res.data.civilian.value
@@ -571,7 +571,7 @@ export default {
   ready() {
     let gen  = select(this);
     co(gen)
-    console.log("进入ready")
+    //tag
   },
   methods: {
 
@@ -597,83 +597,6 @@ export default {
       this.checkboxModel.f_checker = val.name
       this.checkboxModel.f_checker_id = val.id
     },
-    dangerplan() {
-      this.$resetpost('rs/sql/getRemind', {data: {condition: ` 1 = 1 and f_filialeid in ${this.model.f_filialeids}`}}, {
-        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 aa = ''
-            let bb = JSON.parse(row.f_last_check_result)
-            /* if (bb.result){
-               aa=aa+bb.result
-               if (bb.data.length>0){
-                 aa = aa +'\n隐患为：'
-                 for (let key of bb.data){
-                   let str = JSON.stringify(key)
-                   aa = aa+str+'\n'
-                 }
-               }
-
-             }*/
-            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
-            }
-          }
-          console.log('查询到的数据', res)
-          this.model.rows = res.data
-          this.$showMessage('目前有' + res.data.length + '户存在隐患需要及时安检，其中' + b + '户需要在两天内安检，'
-            + c + '户已超时，未在规定时间内安检')
-
-        } else {
-          this.$showMessage('当前没有存在隐患需要安检的用户')
-        }
-
-      })
-    },
     async search(args) {
       args.condition+=" and uf.f_usetype='设备维护'"
       this.plancondition=args.condition
@@ -764,11 +687,11 @@ export default {
           }
 
         }
-        console.log("888888888888888")
-        console.log(savedate)
-        console.log(JSON.stringify(savedate))
+        //tag
+        //tag
+        //tag)
         new HttpResetClass().load('post','rs/logic/CreatePlanThenAdd',savedate).then(res=>{
-          console.log(JSON.stringify(res))
+          //tag)
           if (res.data.code=='200'){
             this.showModal=false
             this.checkrows = []
@@ -825,16 +748,16 @@ export default {
               for (let j = 0; j < respanse.data.length; j++) {
                 _this.checkrows.push(respanse.data[j])
               }
-              console.log(_this.checkrows);
+              //tag;
             }
           })
       }
     },
     addChecked(item) {
-      console.log(item);
+      //tag;
       if (!item.checked) {
         this.checkrows.push(item);
-        console.log(this.checkrows);
+        //tag;
       } else {
         for (let i = 0; i < this.checkrows.length; i++) {
           if (item.f_userinfo_id == this.checkrows[i].f_userinfo_id) {
@@ -891,7 +814,7 @@ export default {
       return [{label: '全部', value: ''}, ...rs]
     },
     initAdjustables() {
-      console.log('初始化调压箱', this.$GetSaleParam)
+      //tag
       let arr = []
       let filter = this.$login.f.orgid
       this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
@@ -904,7 +827,7 @@ export default {
     },
     getRes(obj) {
       this.model.f_filialeids = this.$login.convertToIn(obj.resids);
-      console.log(this.model.f_filialeids)
+      //tag
     },
     checkExist() {
       co(checkItems(this))
@@ -941,7 +864,7 @@ export default {
       }
     },
     // 'checker'(val){
-    //   console.log("checker",this.checker)
+    //   //tag
     //   if(val){
     //     this.checkboxModel.f_checker = this.checker[0].name
     //     this.checkboxModel.f_checker_id = this.checker[0].id
@@ -973,7 +896,7 @@ export default {
   },
   computed: {
     getCondition() {
-      console.log('this.orderitem===>', this.model.orderitem)
+      //tag
       return {
         condition: `${this.$refs.paged.$refs.criteria.condition}`,
         orderitem: `${this.model.orderitem}`,