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

package/src/filiale/yuansheng/pc/NewCheckpaper.vue

@@ -408,7 +408,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/tel_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -689,8 +689,16 @@ export default {
                     deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
                   }
                 }
+              } else if (items.f_item_name === '表底数异常差值') {
+                var deviation = this.$appdata.getSingleValue('气量异常差值允许误差')
+                if (parseFloat(items.f_item_value[0]).toString() != "NaN" && parseFloat(deviation).toString() != "NaN") {
+                  if (parseFloat(items.f_item_value[0]) > parseFloat(deviation) || parseFloat(items.f_item_value[0]) < parseFloat(deviation) * -1) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    deviceInfos.push(`${items.f_item_name}:${items.f_item_value[0]}`)
+                  }
+                }
               }
-
               //tag)
               //tag
               //tag
@@ -839,7 +847,7 @@ export default {
     },
     isred(val1, val2) {
       //tag
-      if (val2 == '气量异常差值' || val2 == '金额异常差值') {
+      if (val2 === '气量异常差值' || val2 === '金额异常差值') {
         return
       }
       for (let i = 0; i < this.devicesAll.length; i++) {

package/src/filiale/yuansheng/pc/PaperList.vue

@@ -32,13 +32,13 @@
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
 
-                <export-excel-safe :data="$parent.$parent.searchData"
+                <export-excel :data="$parent.$parent.searchData"
                               :field="$parent.$parent.excelHeaders"
                               :choose-col="true"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel>
 <!--                <export-excel :data="$parent.$parent.getCondition" -->
 <!--                              :field="$parent.$parent.getfield"-->
-<!--                              sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'-->
+<!--                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'-->
 <!--                              :choose-col="true"></export-excel>-->
 <!--                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="!$parent.$parent.audioshow">录音</button>-->
                 <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
@@ -322,7 +322,7 @@
   export default {
     title: '安检结果查看',
     data() {
-      let model = new PagedList('rs/sql/查找安检单', 20, {
+      let model = new PagedList('api/af-safecheck/sql/查找安检单', 20, {
         f_plan_id: 'this.f_plan_id',
         f_approved: 'this.f_approved',
         f_entry_status: 'this.f_entry',
@@ -396,7 +396,7 @@
       //获取省市区列表
       getPcd(val){
         this.pcds = [{label:'全部',value:''}]
-        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+        new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
           {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},
           {resolveMsg: null, rejectMsg: null}).then((pcdlist)=>{
           pcdlist.data.forEach((result)=>{
@@ -438,7 +438,7 @@
         ////tag
         ////tag
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
@@ -464,7 +464,7 @@
         ////tag
         this.cbcs=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,

package/src/filiale/yuansheng/pc/checkmsg.vue

@@ -107,7 +107,7 @@ let asyncReady = async function (self) {
   try {
     /*let res9 = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
     Vue.config = res9.data*/
-    let res= await new HttpResetClass().load('post','rs/sql/tel_singleTable_OrderBy',{data: {
+    let res= await new HttpResetClass().load('post','api/af-safecheck/sql/tel_singleTable_OrderBy',{data: {
         items: 'f_dir',
         tablename: 't_organization',
         condition: `id  = '${self.data.f_filialeid}'`,
@@ -277,7 +277,7 @@ export default {
   props: ['data','show'],
   async ready () {
     //tag
-    let res=await new HttpResetClass().load('POST','rs/sql/查询计划项表信息',{data:{f_userid:this.data.f_userinfoid}})
+    let res=await new HttpResetClass().load('POST','api/af-safecheck/sql/查询计划项表信息',{data:{f_userid:this.data.f_userinfoid}})
     this.planmeter=res.data[0]
     asyncReady(this).then(() => {
       // tag

package/src/filiale/yunchengminsheng/android/DailyworkloadQuery.vue

@@ -302,7 +302,7 @@ export default {
       check:'',
       plan:'',
       planid:'',//http://ssl.odc.hk:8300
-      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`}),
+      model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`}),
       criteriaShow: false,
       planoption:[],
       condition:'',
@@ -476,7 +476,7 @@ export default {
     },
     getpaperCount(condition){
       let http = new HttpResetClass()
-      http.load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
+      http.load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/Get_khrq_count`,{data:{condition:condition,f_filialeids:`${Vue.user.orgid}`}},{rejectMsg:null,resolveMsg:null}).then(row=>{
         if (row.data.length > 0){
           this.allPlanCount = 0
           this.ruhu = row.data

package/src/filiale/yunchengminsheng/android/PaperFeedback.vue

@@ -422,7 +422,7 @@
   //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
   //                 checkResult = '有隐患'
   //                 ////tag
-  //                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+  //                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
   //                 ////tag)
   //                 self.$set('detail.f_defect_id', res.data[0].id)
   //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -459,7 +459,7 @@
   //         self.undo()
   //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
   //         ////tag
-  //         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+  //         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
   //           ////tag
   //           if(ret.data.code ==200){
   //             ////tag
@@ -497,7 +497,7 @@
   //       }
   //     }else{
   //       ////tag
-  //       self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+  //       self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
   //         ////tag
   //         if(res.data.length != 0){
   //           self.$parent.$parent.user = res.data[0]
@@ -591,7 +591,7 @@
       },
       // async isoverDate(){
       //   ////tag
-      //   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.$parent.$parent.item.id+"'"
       //     }
       //   })
@@ -626,7 +626,6 @@
         HostApp.__this__ = null
       },
       takePic(prop, title, index) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         ////tag
@@ -647,6 +646,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({
@@ -1149,7 +1149,7 @@
         ////tag)
         let http = new HttpResetClass()
         ////tag
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1159,7 +1159,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         ////tag)
         ////tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1201,7 +1201,7 @@
         ////tag)
         let http = new HttpResetClass()
         ////tag
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1217,7 +1217,7 @@
           limit_times = Vue.config.safecheck.ApproveConfig.limit_times
           limit_value = Vue.config.safecheck.ApproveConfig.limit_value
         }
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             data: this.$parent.$parent.data,
             item: this.$parent.$parent.data.item,
@@ -1268,7 +1268,7 @@
           ////tag
           this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST', `${this.Url}/rs/sql/tel_singleTable_OrderBy`, {
+          http1.load('POST', `${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
             data: {
               items: 'f_user_telephone',
               tablename: 't_user',

package/src/filiale/yunchengminsheng/android/PhoneUpUserinfo.vue

@@ -572,7 +572,7 @@
         //tag
         if (this.selectStreet.id) {
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -663,7 +663,7 @@
             userinfoms.userfiles = []
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -678,7 +678,7 @@
                 let data = this.userinfo.addressinfo
                 data.f_address = this.userinfo_old.addressinfo.f_address ? this.userinfo_old.addressinfo.f_address : this.userinfo.addressinfo.f_address
                 data.f_operator = Vue.user.name
-                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/address_updateuseraddress`, {data: data}).then((res2) => {
+                new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/address_updateuseraddress`, {data: data}).then((res2) => {
                   this.$showMessage("修改用户地址信息成功！")
                 }).catch(error => {
                   this.$showMessage("修改用户地址信息！")
@@ -727,7 +727,7 @@
             userinfoms.userfiles = []
             this.userinfo_old.meterinfo[0].devicesinfo = this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {
+            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
               data: {
                 userinfo: userinfoms,
                 modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -842,7 +842,7 @@
           this.selectArea = {id: ''}
           this.area = []
           let pcdText = ` and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -875,7 +875,7 @@
           this.userinfo.addressinfo.f_slice_area = ''
           this.streets = []
           let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_street",
@@ -963,7 +963,7 @@
         if (this.selectStreet.id) {
           this.area = []
           let pcdText = text ? `and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'` : `and f_street_id=${this.selectStreet.id}`
-          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let res = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_area",
@@ -990,7 +990,7 @@
         if (this.selectPcd.id) {
           this.streets = []
           let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+          let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
             data: {
               items: "*",
               tablename: "t_street",
@@ -1061,7 +1061,7 @@
         this.wz_types = Vue.$appdata.getParam('安装位置')
         this.aroundmeters = Vue.$appdata.getParam('左右表')
         this.excessive = true
-        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_pcd",
@@ -1072,7 +1072,7 @@
         pcdlist.data.forEach((result) => {
           this.pcds.push({label: result.f_pcd, value: result})
         })
-        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+        let res = await new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
           f_userinfo_id: this.f_userinfo_id
         }, {resolveMsg: null, rejectMsg: null})
         this.userinfo = res.data
@@ -1106,7 +1106,7 @@
       console.log(this.showBox)
       if (this.showBox) {
         // 获取调压箱
-        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
+        new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/adjustableboxQuery`, {data: {condition: '1 = 1'}}, {
           resolveMsg: null,
           rejectMsg: null
         }).then((res) => {

package/src/filiale/yunchengminsheng/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,6 +454,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       //tag
@@ -568,6 +568,9 @@ export default {
                 let multiple = this.config[this.device.device].items[item].multiple?this.config[this.device.device].items[item].multiple:false
                 let options = this.config[this.device.device].items[item].options
                 if ((this.config[this.device.device].items[item].type == 'selector' || this.config[this.device.device].items[item].type == 'inputSelector') && item == this.f_items[n].f_item_name) {
+                  if (val.length > 1 && val.indexOf('正常') != -1){
+                    this.f_items[n].f_item_value.splice(val.indexOf('正常'),1)
+                  }
                   for (let i in options) {
                     if(typeof options[i]=='function'){
                       continue

package/src/filiale/yunchengminsheng/android/SafecheckOrderV.vue

@@ -575,7 +575,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})`,
@@ -1777,7 +1777,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+"'"
       //     }
       //   })

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

@@ -301,7 +301,7 @@
         this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的机表表号从' + this.userinfo.planmeterss.f_meter_no + '修改为' + f_meter_no, ['confirm', 'cancel']).then((butt) => {
           if (butt == 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdateBiaoHao`, {
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdateBiaoHao`, {
               f_meter_no: f_meter_no,
               f_userinfo_id: f_userinfo_id
             }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -324,7 +324,7 @@
         this.$showMessage('是否确定进行修改?', ['confirm', 'cancel']).then((butt) => {
           if (butt == 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdateBiaoXingHao`, {
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdateBiaoXingHao`, {
               biaoxinghao: this.biaoxinghao,
               f_userinfo_id: this.userinfo.f_userinfoid
             }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -348,7 +348,7 @@
         //tag)
         //tag
         let http1 = new HttpResetClass()
-        http1.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+        http1.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
           data: {
             items: 'gm.id,gm.f_meter_style',
             tablename: 't_gasbrand gb LEFT JOIN t_gasmodel gm ON gb.id= gm.f_gasbrand_id ',
@@ -373,7 +373,7 @@
         this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的电话号码从' + this.beforephone + '修改为' + f_user_phone, ['confirm', 'cancel']).then((butt) => {
           if (butt == 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdatePhone`, {
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdatePhone`, {
               f_user_phone: f_user_phone,
               f_userinfo_id: f_userinfo_id
             }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -420,7 +420,6 @@
         HostApp.__this__ = null
       },
       takePic (type ,prop, title) {
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -450,6 +449,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         HostApp._open_a_page({

package/src/filiale/yunchengminsheng/pc/NewCheckpaper.vue

@@ -438,7 +438,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/tel_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -712,7 +712,7 @@ export default {
         f_check_item_id:this.item.f_check_item_id,
         f_userinfo_id:this.item.f_userinfoid
       }
-      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+      new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
         resolveMsg: '安检审核成功！',
         rejectMsg: '安检审核出错！'
       }).then((res) => {
@@ -739,7 +739,7 @@ export default {
         f_check_item_id:this.item.f_check_item_id,
         f_userinfo_id:this.item.f_userinfoid
       }
-      new HttpResetClass().load('POST', '/rs/logic/updateAafeAudit', {data: reqdata}, {
+      new HttpResetClass().load('POST', '/api/af-safecheck/logic/updateAafeAudit', {data: reqdata}, {
         resolveMsg: '安检审核成功！',
         rejectMsg: '安检审核出错！'
       }).then((res) => {

package/src/filiale/yunchengminsheng/pc/checkUserList.vue

@@ -81,6 +81,21 @@
                     >
                     </v-select>
                   </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">表具状态:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_table_state"
+                      v-model="model.f_table_state"
+                      :options='$parent.$parent.tableStates'
+                      placeholder='请选择'
+                      condition="uf.f_table_state='{}'"
+                      :search="false"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
                   <div class="form-group col-sm-4" >
                     <label class="font_normal_body">用气性质:</label>
                     <v-select
@@ -332,11 +347,11 @@
             <!--<div class="form-group col-sm-4 button-range" >
 
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe   :data="$parent.$parent.exportParameter"
+              <export-excel   :data="$parent.$parent.exportParameter"
                                    :field="$parent.$parent.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                    template-name='安检计划明细' :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
 
             </div>-->
           </div>
@@ -389,7 +404,7 @@
     title: '计划管理',
     data() {
       return {
-        model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
+        model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
           "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
           "f_usertype": "''",
           "month": "''",
@@ -402,6 +417,7 @@
         showCondtion:false,
         userTypes:[],//用户类型
         userStates:[],//用户状态
+        tableStates:[],//表具状态
         gasproperties:[],//用气性质
         meter_classifys:[],//气表类型
         hasHousehold:[{label:"全部",value:""},{label:"已入户",value:"已入户"},{label:"未入户",value:"未入户"}],
@@ -432,7 +448,7 @@
     methods: {
       getCheckBook(){
         this.checkBooks=[]
-        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'id,f_check_book_name,f_check_book_type',
             tablename: 't_check_book',
@@ -520,7 +536,8 @@
           value: ''
         }, ...this.$appdata.getParam('用户类型')] : [{label: '全部', value: ''}]
 
-        this.userStates=this.$appdata.getParam('安检用户状态') ? [...this.$appdata.getParam('安检用户状态')] : []
+        this.userStates=this.$appdata.getParam('安检用户状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检用户状态')] : [{label: '全部', value: ''}]
+        this.tableStates=this.$appdata.getParam('安检表具状态') ? [{label: '全部', value: ''},...this.$appdata.getParam('安检表具状态')] : [{label: '全部', value: ''}]
         this.gasproperties=this.$appdata.getParam('用气性质') ? [{
           label: '全部',
           value: ''
@@ -533,7 +550,7 @@
       select_search(text){
         //tag
         let pcdText=text?` and f_residential_area like '%${text}%'`:''
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
           //tag)
           if(res.data.length>0){
             this.areaList=[]
@@ -550,7 +567,7 @@
         this.cbc=[]
         this.sliceArea=[]
         let http = new HttpResetClass()
-        let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
+        let getMeterReadingBooks = await http.load('POST','api/af-safecheck/logic/getMeterBooksData',
           {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'})
         this.cbc = [{label: '全部', value: ''}]
@@ -638,7 +655,7 @@
         if(this.selectplan && this.selectplan.id){
           this.$parent.isSend=true
           try{
-            let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
+            let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/AddCheckPlanItem", {
               data:{
                 f_operator:this.userlogin.name,
                 f_plan_id:this.selectplan.id,
@@ -677,7 +694,7 @@
         let data = {
           filepath: res.f_downloadpath
         }
-        new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+        new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_GetUserInfoFromExcel', {data: data}, {
           resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
           rejectMsg: '导入失败'
         }).then((res) => {

package/src/filiale/zhongsheng/android/AreaPlan.vue

@@ -359,7 +359,7 @@ export default {
   title: '安检计划项',
   data() {
     return {
-      model:Vue.android? new LocalPagedList('androidGetHasDone',5): new PagedList( 'AndroidRest/rs/sql/androidGetHasDone',5),
+      model:Vue.android? new LocalPagedList('androidGetHasDone',5): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetHasDone',5),
       showModal: false,
       param: null,
       yearList:[{label:"2020",value:"2020"},{label:"2021",value:"2021"},{label:"2022",value:"2022"},{label:"2023",value:"2023"},{label:"2024",value:"2024"},{label:"2025",value:"2025"},{label:"2026",value:"2026"},{label:"2027",value:"2027"},{label:"2028",value:"2028"},{label:"2029",value:"2029"},{label:"2030",value:"2030"}],
@@ -424,7 +424,7 @@ export default {
       this.$refs.paged.loadPage(this.$refs.paged.model.pageIndex)
     },
     inspect(row) {
-      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) => {
         //tag)
         row['f_plan_meters'] = response.data
         var pardate = {

package/src/filiale/zhongsheng/android/BuyRecords.vue

@@ -64,11 +64,11 @@ export default {
       //tag
       this.excessive=true
       let http = new HttpResetClass()
-      http.load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}).then((row) => {
+      http.load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}).then((row) => {
         this.model = row.data
         this.excessive = false
       })
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}).then((row) => {
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {items: '*', tablename: 't_sellinggas', orderitem: 'f_operate_date desc', condition:`f_userinfo_id = '${userinfoid}'`}}).then((row) => {
       //   this.model = row.data
       //   this.excessive=false
       // })