safecheck-client 3.0.30-62 → 3.0.30-62-t4

package/src/components/android/SafecheckDevices.vue

@@ -435,7 +435,6 @@ export default {
       if (this.role == 'androidview') {
         return
       }
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       //tag
@@ -455,7 +454,10 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
+        this.f_items[prop].f_longitude = obj.longitude
+        this.f_items[prop].f_latitude = obj.latitude
       }
       //tag
       //tag
@@ -751,7 +753,7 @@ export default {
       this.f_items[this.f_gas_aberrant_number.index].f_is_defect = false
       if(val=='已用气量'){
         //剩余气量 = 累购-已用
-        this.f_items[this.f_gas_balance.index].f_item_value= this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value
+        this.f_items[this.f_gas_balance.index].f_item_value= (this.f_items[this.f_total_gas.index].f_item_value-this.f_items[this.f_table_base.index].f_item_value).toFixed(2)
         if (isNaN(this.f_items[this.f_gas_balance.index].f_item_value)) {
           this.f_items[this.f_gas_balance.index].f_item_value = null
         }
@@ -1011,7 +1013,9 @@ export default {
         f_else: '',
         f_p1_path: '',
         f_p2_path: '',
-        f_p3_path: ''
+        f_p3_path: '',
+        f_longitude:'',
+        f_latitude:''
       }
       //tag)
       //tag)

package/src/components/android/SafecheckDevicesTemp.vue

@@ -435,7 +435,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -455,6 +454,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag

package/src/components/android/SafecheckOrderV.vue

@@ -268,7 +268,8 @@
               "剩余金额":{"index":9,"type":"number","checkmust": false},
               "气量异常差值":{"index":10,"type":"number","readonly": true},
               "金额异常差值":{"index":10,"type":"number","readonly": true},
-              "表箱号":{"index":11,"type":"string","readonly": true},
+              "系统余额":{"index":10,"type":"number","readonly": true},
+              "表封号":{"index":11,"type":"string","readonly": true},
               "燃气表照片":{"index":12,"type":"picture","checkmust": false}
             }
             // 注意，配置项的index必须与上面的固定配置保持'顺序'
@@ -581,7 +582,7 @@
       },
       getImgGen(){
         let http = new HttpResetClass()
-        http.load('POST','rs/sql/tel_singleTable_OrderBy', {data: {
+        http.load('POST','api/af-safecheck/sql/tel_singleTable_OrderBy', {data: {
             items: '*',
             tablename: 't_files',
             condition: `id in (${this.ids})`,
@@ -685,14 +686,16 @@
         let prefix = '用户基本信息：'
         if(Util.required(this.data.f_user_name))
           return prefix + '用户名必须输入'
+        if (!this.data.f_user_phone){
+          return '请输入正确的电话号码'
+        }
         if(!(/^\d{11}$/.test(this.data.f_user_phone.trim()))) {
-
           return '请输入正确的电话号码'
         }
         // if(Util.required(this.data.f_residential_area))
         //   return prefix + '小区名称必须输入'
-        if(Util.required(this.data.f_address))
-          return prefix + '地址必须输入'
+        // if(Util.required(this.data.f_address))
+        //   return prefix + '地址必须输入'
       },
       verifyDevices() {
         for (let dev in this.config) {
@@ -1309,7 +1312,7 @@
             // 多长截断一次
             let subLength = 800
             for (let i = 0; i < paramStr.length; i += subLength) {
-              HostApp.param_cache(paramStr.substr(i, subLength))
+              HostApp.param_cache(paramStr.slice(i, i + subLength))
             }
             HostApp.__this__ = this
             HostApp.syncLogic({
@@ -1371,7 +1374,7 @@
             // 多长截断一次
             let subLength = 800
             for (let i = 0; i < paramStr.length; i += subLength) {
-              HostApp.param_cache(paramStr.substr(i, subLength))
+              HostApp.param_cache(paramStr.slice(i, i + subLength))
             }
             HostApp.__this__ = this
             HostApp.syncLogic({
@@ -1598,7 +1601,7 @@
               // 多长截断一次
               let subLength = 800
               for (let i = 0; i < paramStr.length; i += subLength) {
-                HostApp.param_cache(paramStr.substr(i, subLength))
+                HostApp.param_cache(paramStr.slice(i, i + subLength))
               }
               HostApp.__this__ = this
               HostApp.syncLogic({
@@ -1652,7 +1655,7 @@
             }
             // 预约安检回更预约安检单
             if(this.data.isupdateplanitem == 'true' && this.data.f_SafeToRepair_id){
-              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/ReturnSafeService`, {data:{
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/ReturnSafeService`, {data:{
                   f_paper_id:this.data.f_paper_id,
                   f_service_id:this.data.f_SafeToRepair_id
                 }
@@ -1695,12 +1698,15 @@
             this.$dispatch('confirm')
           }else if(res.code == 710){
             this.$showMessage('上传照片失败,请检查网络是否正常！'+res.msg)
+            this.onlySave = true
             return
           }else if(res.code == 711){
             this.$showMessage('该安检单已被管理员调整，请联系管理员!')
+            this.onlySave = true
             return
           }else if(res.code == 712){
-            this.$showMessage('网络异常，请重新上传，多次上传失败请联系管理员!')
+            this.$showMessage('网络异常，请缓存后重新尝试上传，多次上传失败请联系管理员!')
+            this.onlySave = true
             return
           }
           else{
@@ -1796,7 +1802,7 @@
         return obj;
       },
       // async isoverDate(){
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
       //       condition:"f_plan_item_id='"+this.item.id+"'"
       //     }
       //   })
@@ -2015,7 +2021,7 @@
               if (this.item.f_plan_meters[i].f_meter_type) {
                 this.data.f_meter_type=this.item.f_plan_meters[i].f_meter_type
                 //tag)
-                if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') > 0) {
+                if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('机表') >= 0) {
                   this.data['device' + this.devices[de].n].push({
                     f_device_type: "燃气表",
                     f_items: [
@@ -2068,7 +2074,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2130,7 +2136,7 @@
                         f_defect_level: null,
                         f_device_id: "",
                         f_is_defect: "",
-                        f_item_name: "表箱号",
+                        f_item_name: "表封号",
                         f_item_value: this.item.f_plan_meters[i].f_metertitles,
                         f_path: "",
                         type: "string"
@@ -2138,7 +2144,69 @@
                     ]
                   })
                 }
-                if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
+             if(this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_meter_type.indexOf('物联网表') >= 0){
+               //tag
+               this.data['device' + this.devices[de].n].forEach(device => {
+                 //tag)
+                 if (!this.data.f_collection_type) {
+                   this.data.f_collection_type = this.item.f_plan_meters[i].f_collection_type
+                   delete this.config['燃气表']['items']['累购气量']
+                   delete this.config['燃气表']['items']['已用金额']
+                   delete this.config['燃气表']['items']['剩余气量']
+                   delete this.config['燃气表']['items']['气量异常差值']
+                   delete this.config['燃气表']['items']['金额异常差值']
+                   device.f_items.push(
+                     {
+                       f_defect_level: null,
+                       f_device_id: "",
+                       f_is_defect: "",
+                       f_item_name: "初始表底",
+                       isshow: true,
+                       f_item_value: this.item.f_plan_meters[i].f_initial_base,
+                       f_path: "",
+                       type: "number"
+                     },
+                     {
+                       f_defect_level: null,
+                       f_device_id: "",
+                       f_is_defect: "",
+                       f_item_name: "累购金额",
+                       f_item_value: this.item.f_plan_meters[i].f_total_fee,
+                       f_path: "",
+                       type: "number"
+                     },
+                     {
+                       f_defect_level: null,
+                       f_device_id: "",
+                       f_is_defect: "",
+                       f_item_name: "已用气量",
+                       f_item_value: this.item.f_plan_meters[i].f_meter_base,
+                       f_path: "",
+                       type: "number"
+                     },
+                     {
+                       f_defect_level: null,
+                       f_device_id: "",
+                       f_is_defect: "",
+                       f_item_name: "剩余金额",
+                       f_item_value: '',
+                       f_path: "",
+                       type: "number"
+                     },
+                     {
+                       f_defect_level: null,
+                       f_device_id: "",
+                       f_is_defect: "",
+                       f_item_name: "系统余额",
+                       f_item_value: this.item.f_plan_meters[i].f_balance_amount,
+                       f_path: "",
+                       type: "number"
+                     }
+                   )
+                   //tag)
+                 }
+               })
+             } else if (this.devices[de].device == "燃气表" && this.item.f_plan_meters[i].f_collection_type) {
                   this.data['device' + this.devices[de].n].forEach(device => {
                     //tag)
                     //tag)
@@ -2159,6 +2227,7 @@
                         delete this.config['燃气表']['items']['已用气量']
                         delete this.config['燃气表']['items']['剩余气量']
                         delete this.config['燃气表']['items']['气量异常差值']
+                        delete this.config['燃气表']['items']['系统余额']
                         device.f_items.push(
                           {
                             f_defect_level: null,
@@ -2217,6 +2286,7 @@
                         delete this.config['燃气表']['items']['已用金额']
                         delete this.config['燃气表']['items']['剩余金额']
                         delete this.config['燃气表']['items']['金额异常差值']
+                        delete this.config['燃气表']['items']['系统余额']
                         device.f_items.push(
                           {
                             f_defect_level: null,
@@ -2269,8 +2339,7 @@
                       }
                     }
                   })
-                }
-                else if(this.devices[de].device == "燃气表"){
+                } else if(this.devices[de].device == "燃气表"){
                   //tag
                   this.data['device' + this.devices[de].n].forEach(device => {
                     //tag)
@@ -2280,6 +2349,7 @@
                       delete this.config['燃气表']['items']['已用金额']
                       delete this.config['燃气表']['items']['剩余金额']
                       delete this.config['燃气表']['items']['金额异常差值']
+                      delete this.config['燃气表']['items']['系统余额']
                       device.f_items.push(
                         {
                           f_defect_level: null,
@@ -2388,11 +2458,13 @@
               delete this.config['燃气表']['items']['已用金额']
               delete this.config['燃气表']['items']['剩余金额']
               delete this.config['燃气表']['items']['金额异常差值']
+              delete this.config['燃气表']['items']['系统余额']
             } else if (this.data.f_collection_type == '按金额') {
               delete this.config['燃气表']['items']['累购气量']
               delete this.config['燃气表']['items']['已用气量']
               delete this.config['燃气表']['items']['剩余气量']
               delete this.config['燃气表']['items']['气量异常差值']
+              delete this.config['燃气表']['items']['系统余额']
             }
             //tag)
             if (value.data[0].f_devices) {
@@ -2548,7 +2620,7 @@
             })
         }
       }else{
-        if(this.parentPage && this.parentPage=='CurrentCreate'){
+        if(this.parentPage && (this.parentPage ==  'CurrentCreate' || this.parentPage == 'AddPlanItem') ){
           //tag
           let isRecodr = this.$appdata.getSingleValue('无限制录音'); //单值参数，为true则是开启全程录音
           if (isRecodr) {

package/src/components/android/SafecheckUser.vue

@@ -331,7 +331,7 @@
       editUserInfo() {
         var r = confirm("确定是否修改用户信息？")
         if (r) {
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/SaveEntity`,
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/SaveEntity`,
                   {
                     data: {
                       row: {

package/src/components/android/SwitchValve.vue

@@ -189,7 +189,7 @@ export default {
   title: '开关阀',
   data () {
     return {
-      model: Vue.android ? new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/SwitchValveSeachUser`, 5) : new PagedList( 'AndroidRest/rs/sql/SwitchValveSeachUser',5),
+      model: Vue.android ? new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/SwitchValveSeachUser`, 5) : new PagedList( 'AndroidRest/api/af-safecheck/sql/SwitchValveSeachUser',5),
       f_meternumber: '',
       f_userinfo_code: '',
       f_operator: Vue.user.name,
@@ -228,7 +228,7 @@ export default {
           partner: "cqsemay_bcts", // 固定值
           version:"v1", // 固定值
           tasked:this.getuuid(), // 任务id
-          notifyUrl:"http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack", // 固定值
+          notifyUrl:"http://192.168.2.10:8445/webmeter/api/af-safecheck/logic/XiMeiSystemCallBack", // 固定值
           meterNo: val.f_meternumber,// 表号
           signType:" MD5" //固定值
         },
@@ -238,7 +238,7 @@ export default {
         userId:val.f_userfiles_id,   // 表档案ID
         dataId: null // 操作记录ID
       }
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/webmeter/rs/logic/syncSaveSetParamsTemplate`, {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/webmeter/api/af-safecheck/logic/syncSaveSetParamsTemplate`, {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
       })
     },
     getuuid(){
@@ -295,7 +295,7 @@ export default {
         meternumberf: this.thisOneData.f_meternumber,  //表号
         contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
       }
-      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/iot_saveInstruct`, {data: data}).then((row) => {
+      this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
         this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
         //tag
         this.thisOneData = '';

package/src/components/android/SystemSetting.vue

@@ -51,7 +51,7 @@ export default {
   methods: {
     changePass() {
       let deliver = {ename:Vue.user.ename,password:this.password,newpassword:this.newpassword,affirmpassword:this.affirmpassword}
-      let res = this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/EditPassword`, {data:deliver})
+      let res = this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/EditPassword`, {data:deliver})
       if (res.code == 200) {
         this.password = ''
         this.newpassword = ''

package/src/components/android/UploadPage.vue

@@ -78,7 +78,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) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
           row['f_plan_meters'] = response.data
           let pardate = {
             _this:this,