safecheck-client 3.0.34-gongyi → 3.0.35-2

package/src/filiale/zhoukou/android/SafecheckUserInfo.vue

@@ -193,25 +193,25 @@ import RadioGroup from "vue-client/src/vue-strap/src/radioGroup";
 import Radio from "vue-client/src/vue-strap/src/radioBtn";
 
 export default {
-  name: "SafecheckUserInfo",
+  title: "SafecheckUserInfo",
   props: ['userinfo'],
   data() {
     return this.$parent.$parent.data
   },
   created(){
     this.$set('showbModal',false)
-    console.log(this.showbModal)
+    //tag
     this.$set('biaoxinghao','')
   },
   ready() {
-    console.log("77777777777777777")
-    console.log(JSON.stringify(this.userinfo.planmeterss))
-    // console.log(JSON.stringify(this.userinfo.planmeterss.f_meter_no))
+    //tag
+    //tag)
+    // //tag)
     // this.$set('userinfo.f_meter_no',this.userinfo.planmeterss.f_meter_no)
-    // console.log(JSON.stringify(this.userinfo.f_meter_no))
+    // //tag)
     this.$set('beforephone',this.userinfo.f_user_phone)
     this.$set('gmlist',[])
-    console.log(this.beforephone)
+    //tag
     if(Vue.config.safecheck != undefined){
       if(Vue.config.safecheck.SafecheckUserinfo != undefined){
         if(Vue.config.safecheck.SafecheckUserinfo.updateuserphone != undefined) {
@@ -220,7 +220,7 @@ export default {
       }
     }
     for (let i in this.userinfo) {
-      console.log(JSON.stringify(i) + '：' + JSON.stringify(this.userinfo[i]))
+      //tag + '：' + JSON.stringify(this.userinfo[i]))
     }
     this.safecheckStateReady()
   },
@@ -247,8 +247,8 @@ export default {
         this.$showMessage("请选择表型号")
         return
       }
-      console.log("开始更新")
-      console.log(this.biaoxinghao)
+      //tag
+      //tag
       this.$showMessage("是否确定进行修改?",['confirm', 'cancel']).then((butt)=>{
         if(butt=="confirm"){
           let http = new HttpResetClass()
@@ -258,7 +258,7 @@ export default {
           }, {resolveMsg: null, rejectMsg: null}).then((res) => {
             if(res.data.code == 200){
               this.$showMessage('修改成功！')
-              console.log("开始关闭")
+              //tag
               this.showbModal=false
             }else{
               this.$showMessage('修改失败！,网络异常')
@@ -270,13 +270,13 @@ export default {
 
     },
     biaoxinghaocancel(){
-      console.log("开始关闭")
+      //tag
       this.showbModal=false
     },
     showbiaoxinghao(){
       this.gmlist=[]
-      console.log(JSON.stringify(this.userinfo.planmeterss))
-      console.log("9999999999999999999999999999999")
+      //tag)
+      //tag
       let http1 = new HttpResetClass()
       http1.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
           items: 'gm.id,gm.f_meter_style',
@@ -291,8 +291,8 @@ export default {
              value:res.id
            })
          })
-        console.log(JSON.stringify(this.gmlist))
-        console.log("8888888888888888888888")
+        //tag)
+        //tag
         this.showbModal=true
       })
 
@@ -335,14 +335,14 @@ export default {
     },
     cameraCallBack(prop, fileName) {
       HostApp.__this__.$set(prop, fileName + '?' + Math.random())
-      console.log('photo file name:' + HostApp.__this__.f_nongasuser_path)
+      //tag
       HostApp.__callback__ = null
       HostApp.__this__ = null
     },
     takePic(prop, title) {
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
-      console.log('this[prop]:' + this[prop])
+      //tag
       let fileName
       if (!this[prop] || this[prop].includes("nopic.png")) {
         fileName = Util.guid() + '-' + prop + '.jpg'
@@ -399,9 +399,9 @@ export default {
       this.$set('f_onsite_time', Util.toStandardTimeString())
     },
     safecheckStateReady() {
-      console.log('进入paperState====>', this.$parent.$parent.showBack)
-      console.log('parent.item====>', this.$parent.$parent.item)
-      console.log('model====>', this.$parent.$parent.model)
+      //tag
+      //tag
+      //tag
       if (!this.$parent.$parent.showBack) {
         this.$parent.$parent.showBack = true
       }
@@ -434,11 +434,11 @@ export default {
         this.start()
       }
       if (this.$parent.$parent.data.f_onsite_time) {
-        console.log('已经开始安检')
+        //tag
         this.$parent.$parent.startClick = true
       }
       this.action = true
-      console.log('this.f_onsite_time', this.f_onsite_time)
+      //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
         this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
@@ -449,7 +449,7 @@ export default {
       } else if (this.$parent.$parent.role == 'view') {
         this.$set('style__', 'divmask')
         this.$set('style_view_', 'divmask')
-        console.log('set style for ....')
+        //tag
       } else {
         this.$set('style__', '')
         this.$set('style_view_', '')
@@ -465,12 +465,12 @@ export default {
       this.$watch('f_usegas', (val) => {
         this.setUsegas(val)
       })
-      console.log("????????????????什么意思？？？？？？？？？？？？？1"+this.f_entry_status)
+      //tag
       this.setEntryClass(this.f_entry_status)
-      console.log("????????????????什么意思？？？？？？？？？？？？？2"+this.f_entry_status)
+      //tag
       this.$watch('f_entry_status', (val) => {
         this.setEntryClass(val)
-        console.log("值没变吗？？？？？？？？？"+val)
+        //tag
         if (val == '到访不遇') {
           this.f_rejectcheck_path = Vue.nopic
         }

package/src/filiale/zhoukou/android/UploadPage.vue

@@ -84,7 +84,7 @@ export default {
       this.enableButton=true
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检')) {
         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
           let pardate = {
             _this:this,
@@ -110,9 +110,9 @@ export default {
             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
             let pardate = {
               _this:this,
@@ -131,8 +131,8 @@ export default {
     },
     // 上传所有未成功上传的数据
     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
       // }
@@ -183,17 +183,17 @@ export default {
     },
     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.nocheckcount}条安检单由于网络异常上传失败！，${ret.nocheckcount}条安检单由于pc端计划被调整上传失败！,${ret.imgcount}条安检单由于图片上传失败！`)
           this.refresh()
@@ -204,13 +204,13 @@ export default {
     },
     // 查询所有未上传斌保存在手机上的数据
     // 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]
@@ -221,7 +221,7 @@ export default {
     //   }
     // },
     refresh() {
-      console.log("批量上传页面刷新")
+      //tag
       // hard code relationship
       //安卓
       let value = this.$androidUtil.path({alias: 'getCheckPlan', data:{}})
@@ -232,7 +232,7 @@ export default {
       }
       // //PC模拟安卓
       // this.$androidUtil.path({alias: 'getCheckPlan', data:{}}).then((value)=>{
-      //   console.log(value)
+      //   //tag
       //   if(value.data.length > 0){
       //     this.model = value.data
       //   }

package/src/filiale/zhoukou/android.js

@@ -6,7 +6,7 @@ let specialComp = {
   'safecheck-order-v': (resolve) => { require(['./android/SafecheckOrderV'], resolve) },
   'paper-feedback' : (resolve) => { require(['./android/PaperFeedback'], resolve) },
   'safecheck-devices': (resolve) => { require(['./android/SafecheckDevices'], resolve) },  // 安检单-安检设备
-  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserinfo'], resolve) },
+  'safecheck-userinfo': (resolve) => { require(['./android/SafecheckUserInfo'], resolve) },
   'current-create': (resolve) => { require(['./android/CurrentCreate'], resolve) },
   'android-defect-deal': (resolve) => { require(['./android/AndroidDefectDeal'], resolve) },
   'area-plan': (resolve) => { require(['./android/AreaPlan'], resolve) },

package/src/filiale/zhoukou/pc/CheckSearchUser.vue

@@ -395,7 +395,7 @@ import Vue from 'vue'
 //     source: 'this.getChildByName($安检员$).getUsers()',
 //     userid: userid
 //   }, {resolveMsg: null, rejectMsg: null})
-//   console.log('获取安检员', getGasman)
+//   //tag
 //   getGasman.data.forEach((checker)=>{
 //     self.checkersid.push({label:checker.name,value:checker.id})
 //   })
@@ -517,7 +517,7 @@ export default {
   methods: {
     getmeterbook(val){
 
-      console.log("进来111")
+      //tag
       this.cbc=[]
       this.cbc.push({
         label:'全部',
@@ -543,8 +543,8 @@ export default {
       }
     },
     Mreadibook(val){
-      //console.log("999999999")
-      //console.log(val)
+      ////tag
+      ////tag
       this.sliceArea=[]
       if (val){
         new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -578,7 +578,7 @@ export default {
         res.data.forEach((item) => {
           this.orgstrs.push({label: item.name, value: item.id})
         })
-        console.log(this.orgstrs.length)
+        //tag
       })
     },
     // 县域分公司发生改变
@@ -597,7 +597,7 @@ export default {
           var defect = JSON.parse(val)
           return defect.result
         } catch (e) {
-          console.log(val)
+          //tag
           return '正常'
         }
       }
@@ -640,7 +640,7 @@ export default {
         condition1: args.condition,
         condition2: con
       }
-      console.log('查询参数', condition)
+      //tag
       this.searchData.condition = condition
       return this.model.search(condition, args.model)
     },
@@ -726,16 +726,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) {
@@ -783,7 +783,7 @@ export default {
       return [{label: '全部', value: ''}, ...rs]
     },
     initAdjustables() {
-      console.log('初始化调压箱', this.$GetSaleParam)
+      //tag
       let arr = []
       let filter = this.$login.f.f_orgids
       this.$GetSaleParam.getAdjustable(filter).forEach((item) => {
@@ -795,8 +795,8 @@ export default {
       this.adjustables = [{label: '全部', value: ''}, ...arr]
     },
     getAllMeterBook(val){
-      //console.log("999999999")
-      //console.log(val)
+      ////tag
+      ////tag
       this.cbcs=[]
       if (val){
         new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
@@ -874,7 +874,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

package/src/filiale/zhoukou/pc/PaperDefectMain.vue

@@ -206,7 +206,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})
@@ -277,9 +277,9 @@
     },
     methods: {
       showaudio(){
-        console.log("999999999")
+        //tag
         this.audioshow=!this.audioshow
-        console.log(this.audioshow)
+        //tag
       },
       getmeterbook(val){
         this.cbc=[]
@@ -315,8 +315,8 @@
 
       },
       Mreadibook(val){
-        //console.log("999999999")
-        //console.log(val)
+        ////tag
+        ////tag
         this.sliceArea=[]
         if (val){
           new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
@@ -340,8 +340,8 @@
         }
       },
       getAllMeterBook(val){
-        //console.log("999999999")
-        //console.log(val)
+        ////tag
+        ////tag
         this.cbcs=[]
         if (val){
           new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
@@ -382,7 +382,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(
@@ -419,73 +419,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) {
@@ -517,10 +451,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/main-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.js

@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import { system } from 'system-clients'
+import safecheckAndroid from './safecheck-page'
+// import VueClipboard from 'vue-clipboard2'
+// Vue.use(VueClipboard)
+Vue.config.silent = true
+/** **************************通用组件******************************/
+all()
+// system(false,'shiquan')
+safecheckAndroid()
+// 打开热力系统登陆
+Vue.$heatCompatibility = false
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('system-clients/src/styles/less/aofeng/expandcss.less')
+Vue.component('load-data', (resolve) => { require(['./components/LoadData'], resolve) })
+// 测试
+// Vue.component('test', (resolve) => { require(['./components/Test'], resolve) });
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-//import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg=false
-system(Verificationfalg)
-// system()
-safecheck()
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('bayan')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/plugins/EmojiData.js

@@ -204,7 +204,7 @@ export var emoj2 = {
 }
 
 export function editorChange (content) {
-  console.log('传入内容为' + content)
+  //tag
   let html = content
   let plain = ''
   let n = html.length
@@ -255,7 +255,7 @@ export function editorChange (content) {
   // markup.textContent = emoj2Tag(plain)
 }
 export function emoj2Tag (plain) {
-  console.log('解析前的内容' + plain)
+  //tag
   let n = plain.length
   let i = 0
   let tag = ''
@@ -267,7 +267,7 @@ export function emoj2Tag (plain) {
         // 从4位长度开始匹配
         for (let j = 4; j < 9; j++) {
           let temo = plain.substr(i, j)
-          console.log('j---temo', j, temo, this.emoj2[temo])
+          //tag
           if (this.emoj2[temo] && j < 8) {
             if (hasOpeningTag) {
               tag += closingTag
@@ -316,7 +316,7 @@ export function emoj2Tag (plain) {
   if (hasOpeningTag) {
     tag += closingTag
   }
-  console.log('<---内容转换为标签后的内容为' + tag)
+  //tag
   return tag
 }
 export const str =

package/src/plugins/GerJsonObjectConfig.js

@@ -26,7 +26,7 @@ let ObjConfig = {
   },
   // 将object转成数组
   getChangeObject(obj){
-    console.log('1111===>' +JSON.stringify(obj))
+    //tag)
     var getconfig = []
     for(var key in obj){
       var fig = {