safecheck-client 3.0.34-gongyi → 3.0.35-2

package/examples/SafePlan-zhoukou/comp.js

@@ -153,7 +153,7 @@ export default class Comp {
   ]
   //下拉框条件改变json数组
   conditionListChange(modelname,ind,key,value,f){
-    console.log("------------"+ind+"-------------")
+    //tag
     this[modelname][ind]["num"]=ind
     this[modelname][ind][key]=value
     f()
@@ -186,7 +186,7 @@ export default class Comp {
         groupitem: 'f_residential_area'
       }
     }, {resolveMsg: null, rejectMsg: null})
-    console.log("res--------------"+JSON.stringify(res))
+    //tag)
     if (res.data) {
       let arr=["全部"]
       for(let i =0 ;i<res.data.length;i++){
@@ -202,9 +202,9 @@ export default class Comp {
     await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"("+this.filialeid+")",orderitem:"f_create_time desc"})
     // this.getAreaList()
     //加载安检员名单
-    console.log("-----------------"+JSON.stringify(this.areaList))
-    console.log(Vue.$appdata)
-    console.log("当前加载到的信息："+JSON.stringify(global.login))
+    //tag)
+    //tag
+    //tag)
     this.disableIssude=Vue.$appdata.getSingleValue('共享计划')
     this.disableButton=Vue.$appdata.getSingleValue('派发按钮')
     this.formatArrayFun('meter_classifys',Vue.$appdata.getParam('气表类型'))
@@ -222,8 +222,8 @@ export default class Comp {
     await this.getzhouqi()
     await this.searchUser(() => {
     })
-    console.log("777777777777777")
-    console.log(this.user.list.count)
+    //tag
+    //tag
     Vue.showMessage(this.user.list.count + "户已超过安检周期，请及时处理")
     this.startday=''
   }
@@ -231,13 +231,13 @@ export default class Comp {
   async getzhouqi(){
     let http = new HttpResetClass()
     http.load('post', `rs/sql/safe_getcirclelist`, {data:{condition:`1=1  and f_filialeid  in ('${this.filialeid}')`}}, {resolveMsg: null, rejectMsg: null}).then(res => {
-      console.log("888888888888888")
+      //tag
       let day=0
-      console.log(res.data.length)
+      //tag
       if (res.data.length>0){
         day=res.data[0].f_circle*365
       }
-      console.log('安检周期天===》'+day)
+      //tag
       this.startday=day
     })
 
@@ -245,19 +245,19 @@ export default class Comp {
   //补录功能组装数据
   zzsj(){
     let deviceconfig=ObjConfig.getObjConfig(this.needconfig.safecheck.DevicesConfig)
-    console.log("=============ZZSJ1>"+JSON.stringify(deviceconfig))
+    //tag)
     for (let i = 0; i < deviceconfig.length; i++) {
-      console.log("==============>"+JSON.stringify(deviceconfig[i]))
-      console.log("==============>"+JSON.stringify(deviceconfig[i].index))
+      //tag)
+      //tag)
       this.str[deviceconfig[i].index-1]=deviceconfig[i]
-      console.log("===========ZZSJ2>"+JSON.stringify(this.str[deviceconfig[i].index]))
+      //tag)
     }
   }
   readConfig () {
     let http = new HttpResetClass()
     http.load('GET', `/phone/rs/vue`, {}, {resolveMsg: null, rejectMsg: null}).then(res => {
       this.needconfig = res.data
-      console.log("请求得到的数据"+JSON.stringify(this.needconfig))
+      //tag)
       let aa=this.needconfig.safecheck.DevicesConfig
       this.zzsj()
     })
@@ -265,7 +265,7 @@ export default class Comp {
   }
   //当前页面属性发生改变事件
   fieldChange(modelname,value,f){
-    console.log("-------fieldChange"+value)
+    //tag
     if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
       this.setProperty(modelname,"checkername",value.name)
       this.setProperty(modelname,"checkerid",value.id)
@@ -292,7 +292,7 @@ export default class Comp {
     f()
   }
   async orgChange(value,f){
-    console.log("----orgChange"+JSON.stringify(value))
+    //tag)
     if(value.value==this.filialeid){
       f()
       return
@@ -310,19 +310,19 @@ export default class Comp {
   }
   //json下拉改变时间
   selectChanged(modelname,key,valuename,value,f){
-    console.log('value[valuename]'+modelname+key+valuename+'----'+JSON.stringify(value))
+    //tag)
     if(value.label=='全部' || !value){
       this[modelname].search.setField(key, '')
       this[modelname].search.setField(key+'name', '全部')
     }else{
-      console.log("value[valuename]"+value[valuename])
+      //tag
       this[modelname].search.setField(key, value.value)
       this[modelname].search.setField(key+'name', value.label)
     }
     f()
   }
   selectChange(modulename, property, value){
-    console.log("当前值11111"+modulename+"--------"+value)
+    //tag
     if(value=='全部'){
       this.setProperty(modulename, property, '')
     }else{
@@ -335,7 +335,7 @@ export default class Comp {
       if(!this[field][i].selectValue){
         continue
       }
-      console.log("this[field][i].column:"+this[field][i].column+"---"+"this[field][i].selectValue"+this[field][i].selectValue)
+      //tag
       this.setProperty(modelname,this[field][i].selectitem.column,this[field][i].selectValue)
     }
   }
@@ -384,7 +384,7 @@ export default class Comp {
     this.isSend=true
     this.checkplan.check.checkes=[]
     if(sortfield){//如果传入空串说明是查询      传入非空串就是排序
-      console.log("进入排序")
+      //tag
       if(sortfield==this.currentorder){
         this.isSend=false
         return
@@ -401,7 +401,7 @@ export default class Comp {
         fieldValue='f_create_time'
         break
     }
-    console.log("值"+sortfield+"--当前值"+this.currentorder+"---排序值："+fieldValue)
+    //tag
     await this.checkplan.searchList("/rs/sql/预约计划下发",
       {"f_plan_name": "f_plan_name like '%{}%'",
         "f_plan_year":"f_plan_year={}",
@@ -417,7 +417,7 @@ export default class Comp {
       }
     )
     //调刷新函数？？？？
-    console.log('调刷新函数？？？？--')
+    //tag
     f()
     this.isSend=false
   }
@@ -522,7 +522,7 @@ export default class Comp {
         this.checker.push(resRow)
       }
     })
-    console.log("安检员列表---"+JSON.stringify(res)+"---id"+this.filialeid)
+    //tag+"---id"+this.filialeid)
   }
 
   async searchPlanItems(f) {
@@ -578,7 +578,7 @@ export default class Comp {
     for (let i = 0; i <this.str.length ; i++) {
       this.fdevices.push({f_device_type:this.str[i].checkname,f_items:[]})
     }
-    console.log("supp最后的listbutton"+JSON.stringify(this.listbutton))
+    //tag)
     this.changeListButton()
   }
   //改变数组的样式
@@ -586,7 +586,7 @@ export default class Comp {
     let listarray=[]
     for (let i = 0; i < this.listbutton.length; i++) {
       if (!this.listbutton[i].mname){
-        console.log("这是"+this.listbutton[i].lname.length)
+        //tag
         listarray.push(this.listbutton[i])
         listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
         listarray.push({"lname":"","type":"","mname":"","selected":"","level":"","isdefect":""})
@@ -606,13 +606,13 @@ export default class Comp {
         }
       }
     }
-    console.log("需要的数据"+JSON.stringify(listarray))
+    //tag)
     this.listbutton=listarray
     this.tranlistbutton()
   }
 //横向分开list
   tranlistbutton(){
-    console.log("jinru111111111111")
+    //tag
     for (let i = 0; i < this.listbutton.length; i++) {
       if((i+1)%4==1){
         this.listbuttona.push(this.listbutton[i])
@@ -646,7 +646,7 @@ export default class Comp {
     this.checkplanitems.check.checkes=[]
     if(this.checkplanitems.search.model.f_plan_id){
       this.isSend=true
-      console.log("进入加载安检计划项"+this.checkplanitems.search.model.f_plan_id)
+      //tag
       this.jointCondition1("planitemconditionList","checkplanitems")
       await this.checkplanitems.searchList("/rs/sql/planItem",
         {"f_plan_id": "i.f_plan_id='{}'",
@@ -683,14 +683,14 @@ export default class Comp {
 
   //当选中列表中某项时触发
   addParam(modulename, id) {
-    console.log("当前值"+modulename+"--------"+id)
+    //tag
     this[modulename].check.setCheckes(id)
   }
 
   //设置属性值
   setProperty(modulename, property, value,f) {
 
-    console.log(modulename+"新添--"+property+"--"+value)
+    //tag
     if(property=='area'){
       this.selectChanged("user","meterbook","","",f)
       if(value=='全部'){
@@ -734,14 +734,14 @@ export default class Comp {
   }
   // 给新建安检计划设置属性值
   setNewPlan(property, value) {
-    console.log(value)
+    //tag
     this.newPlan[property] = value
     return this
   }
   //将某项拖动到计划中
   //dragParam：从拖动的起始位置传入的参数
   async dragtoPlan(f_plan_id,f_safecheck_type,f_filialeid,dragParam,f){
-    console.log("当前传入："+dragParam)
+    //tag
     await this.dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f)
     await this.dragtoOtherPlanIteem(f_plan_id,dragParam,f)
   }
@@ -749,7 +749,7 @@ export default class Comp {
   //将客户信息拖至计划中
   async dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f) {
 
-    console.log("计划id："+f_plan_id+"公司id："+this.filialeid)
+    //tag
     if(dragParam=='user'){
       this.jointCondition("user")
       if(this.checkplanitems.search.model.f_plan_id){
@@ -792,7 +792,7 @@ export default class Comp {
             columnName: "ua.id"
           }
         }, {resolveMsg: null, rejectMsg: null})
-        console.log("重复数量-"+JSON.stringify(res.data.result)+"---"+res.data.result.length)
+        //tag+"---"+res.data.result.length)
         if(res.data.code==200){
           //alert("添加成功！有"+res.data.result.length+"条用户地址已经存在于其他计划中:  \n"+res.data.result.reduce((c,v)=>{c += v.f_user_name+":"+v.f_address+"\n"}),0)
           Vue.showMessage("添加成功！"+(res.data.result.length>0?"有"+res.data.result.length+"条用户地址已经存在于其他计划中":""))
@@ -853,7 +853,7 @@ export default class Comp {
 
   //修改计划项状态为作废
   async delPlanItem(dragParam,f) {
-    console.log("进入作废计划项方法")
+    //tag
     if(dragParam=='item'){
       Vue.showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
         if(button=='confirm'){
@@ -879,7 +879,7 @@ export default class Comp {
             }
           }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
 
-            console.log("-----------"+JSON.stringify(resu.data))
+            //tag)
             if(resu.data.code==200){
               Vue.showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
               this.searchUser(f)
@@ -906,7 +906,7 @@ export default class Comp {
     }
     this.isSend=true
     let res=await this.http.load("POST","/rs/sql/getCheckplan", {data: {condition:"f_plan_name='"+this.newPlan.f_plan_name+"'",sortfield:'f_create_time desc'}})
-    console.log("结果-"+res.data.length)
+    //tag
     if(res.data.length>0){
       Vue.showMessage("计划名称不能重复！")
       this.isSend=false
@@ -1058,7 +1058,7 @@ export default class Comp {
       }
     }
 
-    console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
+    //tag)
   }
   //返回遍历的option
   reoption(key1,key2){
@@ -1117,7 +1117,7 @@ export default class Comp {
         columnName: "f_plan_id"
       }
     }, {resolveMsg: "删除成功！", rejectMsg: "删除失败！"})
-    console.log(JSON.stringify(res))
+    //tag)
     if(res.data.code==200){
       Vue.showMessage("删除成功！"+res.data.message,"success",2500)
       await  this.loadCheckPlan('',()=>{})
@@ -1132,7 +1132,7 @@ export default class Comp {
   //修改计划时 用来存储当前选中要修改的计划
   plan={}
   setPlanVal(value){
-    console.log(value)
+    //tag
     this.plan=JSON.parse(JSON.stringify( value ))
   }
   setPlan(key,val){
@@ -1172,9 +1172,9 @@ export default class Comp {
   }
 
   /*  getDataLength(modelname){
-      console.log("sdadasdasdasdadasdadddddddddddddddddddddddddddddddddddddddddddd")
+      //tag
       let l=this[modelname].list.data.length
-      console.log("--"+l)
+      //tag
       return l
     }*/
   //新建安检计划非空判断
@@ -1216,7 +1216,7 @@ export default class Comp {
         this.suppplanitem["f_checker_id"]=this.checkerMess[i].id
       }
     }
-    //console.log(this.fdevices)
+    ////tag
     //return;
     this.suppplanitem["f_devices"]=this.fdevices
     this.suppplanitem.f_check_type=this.suppplanitem.f_user_type
@@ -1300,9 +1300,9 @@ export default class Comp {
         for (let j = 0; j <fde.length; j++) {
           if (suppf[i].f_device_type==fde[j].f_device_type){
             for (let k = 0; k <suppf[i].f_items.length ; k++) {
-              // console.log("789456123")
+              // //tag
               for (let l = 0; l <fde[j].f_items.length ; l++) {
-                // console.log("11111111111111")
+                // //tag
                 if (suppf[i].f_items[k].f_item_name==fde[j].f_items[l].f_item_name) {
                   fde[j].f_items[l]["id"]=suppf[i].f_items[k].id
                   if (suppf[i].f_items[k].f_item_lists.length!=0){
@@ -1347,7 +1347,7 @@ export default class Comp {
         }
       }
     }
-//console.log(this.fdevices)
+////tag
   }
   /*  getAreaList() {
       let res = this.http.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
@@ -1430,7 +1430,7 @@ export default class Comp {
         }
       }
       ,{resolveMsg: null, rejectMsg: null})
-    console.log("excel结果---"+JSON.stringify(res))
+    //tag)
     let link = document.createElement('a');
     let path = res.data[0].filename
     //webapps这个是在服务器上导出用的
@@ -1451,9 +1451,9 @@ export default class Comp {
       {data: {f_orgid: "('"+this.filialeid+"')"}},
       {resolveMsg: null, rejectMsg: '获取失败！！！'})
     this.cbc = [{label: '全部', value: '全部'}]
-    console.log('22222222222222222222222222222222222222')
-    console.log(JSON.stringify(getMeterReadingBooks))
-    console.log('22222222222222222222222222222222222222')
+    //tag
+    //tag)
+    //tag
     this.meterbooks=[]
     this.meterbooks=getMeterReadingBooks.data.meterbooks
     this.meterbooks.forEach((res) => {
@@ -1474,7 +1474,7 @@ export default class Comp {
       userid: global.login.id
       //userid:"15130"
     }, {resolveMsg: null, rejectMsg: '获取分公司出错！！！'})
-    console.log("分公司--"+JSON.stringify(orgs))
+    //tag)
     this.orgs = []
     if(orgs.data.length>0){
       orgs.data.forEach((res) => {
@@ -1495,15 +1495,15 @@ export default class Comp {
       userid: global.login.id
     }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
     this.sliceArea = ['全部']
-    console.log('11111111111111111111111111111111111111')
-    console.log(getAllArea.data)
-    console.log('11111111111111111111111111111111111111')
+    //tag
+    //tag
+    //tag
     getAllArea.data.forEach((res) => {
       if(res.parentid==this.filialeid){
         this.sliceArea.push(res.name)
       }
     })
-    console.log('片区' + this.sliceArea)
+    //tag
   }
 
   show1(){

package/examples/SafePlanItem/App.vue

@@ -11,11 +11,11 @@ export default {
 
   ready() {
     if (this.$login) {
-      console.log('登录信息', this.$login.f)
+      //tag
       global.login=this.$login.f
     }
 
-    console.log('登录信息',this.$login.f)
+    //tag
     // 设置模板为测试,,
     global.canvas = "TestDataComponent";
     global.myjson = Object.assign(global.myjson, {
@@ -23,7 +23,7 @@ export default {
     });
     loadWasm().then(()=> {
       global.stat = new Comp()
-        console.log(global.stat)
+        //tag
         run()
     })
   }

package/examples/SafePlanItem/TestData.js

@@ -412,11 +412,11 @@ export default class TestData {
   }
 
   addNewPlan(){
-    console.log("添加新计划")
+    //tag
   }
 
   cancel(){
-    console.log("取消")
+    //tag
   }
 
   //设置属性值
@@ -438,7 +438,7 @@ export default class TestData {
 
   //删除计划项
   delPlanItem = function () {
-    console.log("开始执行删除")
+    //tag
   }
   //新建计划
   addCheckPlan = function () {

package/examples/SafePlanItem/comp.js

@@ -59,7 +59,7 @@ export default class Comp {
   }
   getResult(val){
     let b=JSON.parse(val)
-    console.log(val)
+    //tag
     if(val){
       return b.result
     }else{