safecheck-client 3.0.34-gongyi → 3.0.35-2

package/examples/SafePlan-shaoguan/comp.js

@@ -147,7 +147,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()
@@ -183,21 +183,21 @@ export default class Comp {
     this.getGasMan()
    // this.getAreaList()
     //加载安检员名单
-    console.log("-----------------")
-    console.log(Vue.$appdata)
-    console.log("当前加载到的信息："+JSON.stringify(global.login))
+    //tag
+    //tag
+    //tag)
     this.searchChecker(global.login.id)
 
   }
   //补录功能组装数据
   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)
     }
 
   }
@@ -205,7 +205,7 @@ export default class Comp {
     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()
     })
@@ -213,7 +213,7 @@ export default class Comp {
   }
   //当前页面属性发生改变事件
   fieldChange(modelname,value,f){
-    console.log(value)
+    //tag
     if(modelname=="user" || modelname=="checkplan" || modelname=="checkplanitems"){
       this.setProperty(modelname,"checkername",value.name)
       this.setProperty(modelname,"checkerid",value.id)
@@ -233,7 +233,7 @@ export default class Comp {
       return
     }
     this[modelname]=value
-    console.log("77777777")
+    //tag
     this.setDefaultData()
     f()
   }
@@ -241,7 +241,7 @@ setDefaultData(){
   this.suppplanitem["f_usegas"]='已使用'
   this.suppplanitem["f_entry_status"]='入户'
 
-  console.log(this.suppplanitem)
+  //tag
 
 }
 
@@ -250,7 +250,7 @@ setDefaultData(){
       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)
     }
   }
@@ -299,7 +299,7 @@ setDefaultData(){
     this.isSend=true
     this.checkplan.check.checkes=[]
     if(sortfield){//如果传入空串说明是查询      传入非空串就是排序
-      console.log("进入排序")
+      //tag
       if(sortfield==this.currentorder){
         return
       }else{
@@ -315,7 +315,7 @@ setDefaultData(){
         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={}",
@@ -393,7 +393,7 @@ setDefaultData(){
     }, {resolveMsg: null, rejectMsg: null})
     this.checker=res.data
 
-    console.log("安检员列表---"+JSON.stringify(res)+"---id"+this.filialeid)
+    //tag+"---id"+this.filialeid)
   }
 
   async searchPlanItems(f) {
@@ -449,17 +449,17 @@ setDefaultData(){
     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()
-    console.log("999999999")
-    console.log(this.suppplanitem)
+    //tag
+    //tag
   }
   //改变数组的样式
   changeListButton(){
     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":""})
@@ -479,13 +479,13 @@ setDefaultData(){
         }
       }
     }
-    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])
@@ -498,8 +498,8 @@ setDefaultData(){
       }
     }
     this.suppplanitem["f_usegas"]='已使用'
-    console.log('5656565')
-    console.log(this.suppplanitem)
+    //tag
+    //tag
   }
   // 打开安检计划，加载安检计划的所有安检单
   async openPlan(plan, f) {
@@ -521,7 +521,7 @@ setDefaultData(){
     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='{}'",
@@ -558,13 +558,13 @@ setDefaultData(){
 
   //当选中列表中某项时触发
   addParam(modulename, id) {
-    console.log("当前值"+modulename+"--------"+id)
+    //tag
       this[modulename].check.setCheckes(id)
   }
 
   //设置属性值
   setProperty(modulename, property, value) {
-    console.log(modulename+"新添--"+property+"--"+value)
+    //tag
     this[modulename].search.setField(property, value)
   }
 
@@ -574,14 +574,14 @@ setDefaultData(){
 }
   // 给新建安检计划设置属性值
   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)
   }
@@ -589,7 +589,7 @@ setDefaultData(){
   //将客户信息拖至计划中
   async dragtoPlanItem(f_plan_id,f_safecheck_type,dragParam,f) {
 
-    console.log("计划id："+f_plan_id+"公司id："+this.filialeid)
+    //tag
     if(dragParam=='user'){
       this.jointCondition1("conditionList","user")
       if(this.checkplanitems.search.model.f_plan_id){
@@ -616,7 +616,7 @@ setDefaultData(){
             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+"条用户地址已经存在于其他计划中":""))
@@ -674,7 +674,7 @@ setDefaultData(){
 
   //修改计划项状态为作废
   async delPlanItem(dragParam,f) {
-    console.log("进入作废计划项方法")
+    //tag
     if(dragParam=='item'){
       this.isSend=true
       let resu=await this.http.load("POST", "/rs/logic/UpCheckPlanItemState", {
@@ -697,7 +697,7 @@ setDefaultData(){
           columnName: "i.id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      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+"条已经不是 ‘未检’ 状态！":""))
         await this.searchUser(()=>{})
@@ -719,7 +719,7 @@ setDefaultData(){
     }
     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("计划名称不能重复！")
       return
@@ -789,7 +789,7 @@ setDefaultData(){
       }
     }
 
-console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
+//tag)
   }
   //返回遍历的option
   reoption(key1,key2){
@@ -848,7 +848,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         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('',()=>{})
@@ -863,7 +863,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   //修改计划时 用来存储当前选中要修改的计划
   plan={}
   setPlanVal(value){
-    console.log(value)
+    //tag
     this.plan=JSON.parse(JSON.stringify( value ))
   }
   setPlan(key,val){
@@ -899,9 +899,9 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   }
 
 /*  getDataLength(modelname){
-    console.log("sdadasdasdasdadasdadddddddddddddddddddddddddddddddddddddddddddd")
+    //tag
     let l=this[modelname].list.data.length
-    console.log("--"+l)
+    //tag
     return l
   }*/
   //新建安检计划非空判断
@@ -944,7 +944,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
           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
@@ -964,7 +964,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   }
   async addnewPaper(f){
     this.isSend=true
-    console.log("9999999999"+this.isSend)
+    //tag
     delete this.suppplanitem.id
     if(!this.suppplanitem.f_onsite_time){
       Vue.showMessage("提交失败,请输入开始时间！")
@@ -986,7 +986,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
   }
  async updatePaper(f){
     this.isSend=true
-    console.log("9999999999"+this.isSend)
+    //tag
     await this.addNewPaper(f)
     this.isSend=false
   }
@@ -1028,9 +1028,9 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         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){
@@ -1075,7 +1075,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         }
       }
     }
-//console.log(this.fdevices)
+////tag
   }
   getAreaList() {
     let res = this.http.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
@@ -1158,7 +1158,7 @@ console.log("get最后的listbutton"+JSON.stringify(this.listbutton))
         }
       }
       ,{resolveMsg: null, rejectMsg: null})
-    console.log("excel结果---"+JSON.stringify(res))
+    //tag)
     let link = document.createElement('a');
     let path = res.data[0].filename
     //webapps这个是在服务器上导出用的

package/examples/SafePlan-tongchuan/App.vue

@@ -28,7 +28,7 @@ data(){
    try{
 
      if (this.$login) {
-       console.log('登录信息', this.$login.f)
+       //tag
        global.login=this.$login.f
      }
      this.comp=new Comp()
@@ -43,7 +43,7 @@ data(){
      loadWasm().then(()=> {
        global.stat = this.comp
        global.stat.ready().then(()=> {
-         console.log(global.stat)
+         //tag
          run()
          this.comp.isSend=false
        })
@@ -55,8 +55,8 @@ data(){
   },
   events: {
     onFileUpload: function (file, res) {
-      console.log("-------------"+JSON.stringify(res))
-      console.log("-file------------"+JSON.stringify(file))
+      //tag)
+      //tag)
       let data = {
         filepath: res.f_downloadpath
       }

package/examples/SafePlan-tongchuan/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 () {