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

package/src/filiale/wuan/android/CurrentCreateSheBei.vue

@@ -527,7 +527,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -653,7 +653,7 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
           condition:`it.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -666,7 +666,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"it.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -685,7 +685,7 @@
         if (!this.check){
           condition=`f_plan_name like '%`+this.plan+`%'`
         }
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
             condition:condition,
             f_filialeids:this.f_filialeids,
             groupitem:'',
@@ -769,7 +769,7 @@
         var _this = this
         //tag
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
+          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
           //tag)
             row['f_plan_meters'] = response.data
             var pardate = {

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

@@ -367,7 +367,7 @@ import co from 'co'
 //               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}`)
@@ -404,7 +404,7 @@ import co from 'co'
 //         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
@@ -443,7 +443,7 @@ import co from 'co'
 //       }
 //     }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]
@@ -537,7 +537,7 @@ export default {
     },
     // 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+"'"
     //     }
     //   })
@@ -1090,7 +1090,7 @@ export default {
       ////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",
@@ -1100,7 +1100,7 @@ export default {
       }, {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": "有效",
@@ -1142,7 +1142,7 @@ export default {
       ////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",
@@ -1158,7 +1158,7 @@ export default {
         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,
@@ -1209,7 +1209,7 @@ export default {
         ////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/wuan/android/SafecheckOrderV.vue

@@ -320,7 +320,7 @@ export default {
     },
     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})`,
@@ -1375,8 +1375,10 @@ export default {
         if(HostApp.__this__.role == 'inspect'
           && HostApp.__this__.data.f_approved
           && HostApp.__this__.data.f_approved == '打回') {
+          if (!this.data.f_onsite_time){
+            HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
+          }
           //tag
-          HostApp.__this__.data.f_onsite_time = Util.toStandardTimeString()
           HostApp.__this__.tick()
         }
       }
@@ -1407,7 +1409,7 @@ export default {
       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+"'"
     //     }
     //   })
@@ -1556,6 +1558,7 @@ export default {
       this.$set('data.f_state',this.item.f_state)
       //tag
       // 用户信息
+      this.$set('data.f_contract_id', this.item.f_plan_meters[0].f_contract_id)
       this.$set('data.f_user_name', this.item.f_user_name)
       this.$set('data.f_user_phone', this.item.f_user_phone)
       this.$set('data.f_userinfoid', this.item.f_userinfoid)
@@ -2235,3 +2238,4 @@ export default {
   padding: 13px 16px;
 }
 </style>
+

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

@@ -13,6 +13,10 @@
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户名称:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_user_name }}</p>
         </div>
+        <div class="col-xs-12" style="padding: 2px 0">
+          <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>合同编号:</b></p>
+          <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_contract_id}}</p>
+        </div>
         <div class="col-xs-12" style="padding: 2px 0">
           <p class="panel-title col-xs-5 text-left font" style="width: 21%;float: left"><b>用户类型:</b></p>
           <p class="panel-title col-xs-7 text-left input-font">{{ userinfo.f_check_type }}
@@ -240,9 +244,6 @@ export default {
         }
       }
     }
-    for (let i in this.userinfo) {
-      //tag + '：' + JSON.stringify(this.userinfo[i]))
-    }
     this.safecheckStateReady()
   },
   methods: {
@@ -250,7 +251,7 @@ export default {
       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) => {
@@ -273,7 +274,7 @@ export default {
       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) => {
@@ -299,7 +300,7 @@ export default {
       //tag)
       //tag
       let http1 = new HttpResetClass()
-      http1.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
+      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 ',
           condition: `f_meter_brand  = '${this.userinfo.planmeterss.f_aliasname}'`,
@@ -325,7 +326,7 @@ export default {
       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) => {
@@ -409,7 +410,9 @@ export default {
     start() {
       this.$parent.$parent.isStrat = true
       this.$set('action', !this.action)
-      this.$set('f_onsite_time', Util.toStandardTimeString())
+      if (!this.f_onsite_time){
+        this.$set('f_onsite_time', Util.toStandardTimeString())
+      }
     },
     safecheckStateReady() {
       //tag
@@ -441,7 +444,9 @@ export default {
       //tag
       if (this.f_onsite_time) {
         this.$parent.$parent.isStrat = true
-        this.$parent.$parent.data.f_onsite_time = Util.toStandardTimeString()
+        if (!this.$parent.$parent.data.f_onsite_time){
+          this.$parent.$parent.data.f_onsite_time = this.f_onsite_time
+        }
       }
       if (this.$parent.$parent.role == 'repair') {
         this.$set('style__', 'divmask')

package/src/filiale/wuan/pc/DefectListWeixiu.vue

@@ -194,7 +194,7 @@ import Vue from "vue";
 const upSolveDefect = function* (self) {
   let uploadData = self.solveModal.uploadData
   //tag)
-  self.$resetpost('/rs/logic/pcRepairDefect', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+  self.$resetpost('/api/af-safecheck/logic/pcRepairDefect', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
     .then(res => {
       if (res.data.code == 200) {
         self.$showMessage('隐患已处理。')
@@ -226,7 +226,7 @@ const sendRepair = function* (self) {
     uploadData.model.f_filiale_id = self.$login.f.orgid
     uploadData.toRepair = '一级派单'
   }
-  let res = yield self.$resetpost('/rs/sql/GetUserForRepaire', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaire', {data: {f_userinfo_id: self.check.f_userinfo_id}})
   preData.userInfo = res.data[0]
   uploadData.model = Object.assign(uploadData.model, preData.userInfo)
   uploadData.user.f_userinfo_id = preData.userInfo.f_userinfo_id
@@ -288,10 +288,10 @@ const sendRepair = function* (self) {
   uploadData.model.f_repairitems = repairitems
   //tag)
   // 调工单接口
-  let result = yield self.$resetpost('/rs/logic/callerSend', uploadData)
+  let result = yield self.$resetpost('/api/af-safecheck/logic/callerSend', uploadData)
   //tag)
   if (result.data.f_service_id) {
-    let updateRes = yield self.$resetpost('/rs/logic/updateDefectState', {f_paper_id:self.check.id,f_service_id:result.data.f_service_id,itemsId: self.$login.convertToIn(rows.map(row => row.id))})
+    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectState', {f_paper_id:self.check.id,f_service_id:result.data.f_service_id,itemsId: self.$login.convertToIn(rows.map(row => row.id))})
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
       self.model.search(`f_repaire_type != '无隐患'`, {})
@@ -304,7 +304,7 @@ export default {
   data() {
     return {
       repairimgs:[],
-      model: new PagedList('rs/sql/GetDefectByPaperId', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperId', 100, {
         f_paper_id: 'this.f_paper_id'
       }),
       showSolveModal: false,
@@ -392,7 +392,7 @@ export default {
     if (this.check) {
       this.model.f_paper_id = this.check.id
       this.model.search(`f_repaire_type != '无隐患'`, {})
-      new HttpResetClass().load('post',`/rs/sql/tel_singleTable_OrderBy`,{data: {
+      new HttpResetClass().load('post',`/api/af-safecheck/sql/tel_singleTable_OrderBy`,{data: {
           items: 'android_file',
           tablename: '\tt_check_paper tcp\n' +
             '\tLEFT JOIN t_serviceworkorder tswo ON tcp.f_SafeToRepair_id= tswo.f_service_id\n' +
@@ -459,7 +459,7 @@ export default {
       http.load('POST', '/rs/search', {data: val}, {resolveMsg: null, rejectMsg: null}).then((res) => {
         res.data.forEach((item) => {
           let http1 = new HttpResetClass()
-          http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+          http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
             data: {
               items: 'f_user_telephone',
               tablename: 't_user',

package/src/filiale/wuan/pc/DefectPaperWeiXiu.vue

@@ -50,10 +50,10 @@
                      @click="$parent.$parent.hidden()"></div>
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <div style="float: right">
-                <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
                                 :field="$parent.$parent.getfield"
                                 progress="safeGetExportProgress"
-                                sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                                sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -152,10 +152,10 @@
                      @click="$parent.$parent.hidden()"></div>
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content: $parent.$parent.model.f_defect_content}"
+                  <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content: $parent.$parent.model.f_defect_content}"
                                   :field="$parent.$parent.getfield"
                                   progress="safeGetExportProgress"
-                                  sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -327,7 +327,7 @@
   export default {
     title: '隐患查询',
     data() {
-      let model = new PagedList('rs/sql/GetCheckPaperByDefectNew', 20, {
+      let model = new PagedList('api/af-safecheck/sql/GetCheckPaperByDefectNew', 20, {
         f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
       })
       model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -398,7 +398,7 @@
         //tag
         this.sliceArea=[]
         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}`,
@@ -423,7 +423,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/wuan/pc/NewCheckpaper.vue

@@ -314,7 +314,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    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.item.f_filialeid}'`,

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

@@ -32,10 +32,10 @@
               </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"
                               progress="safeGetExportProgress"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></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>
 
@@ -277,7 +277,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',
@@ -380,7 +380,7 @@
         ////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}`,
@@ -406,7 +406,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/wuhai/android/AreaPlan.vue

@@ -352,7 +352,7 @@
     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,
         criteriaShow: false,
@@ -427,7 +427,7 @@
         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/wuhai/android/CurrentCreate.vue

@@ -497,7 +497,7 @@ export default {
       check:'',
       plan:'',
       planid:'',
-      model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+      model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
       showModal: false,
       showModal2:false,
       showModal3:false,
@@ -623,7 +623,7 @@ export default {
       this.check=''
     },
     async okput(){
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
           condition:`it.id='`+this.needid+`'`,
           f_plan_id:this.planid,
@@ -636,7 +636,7 @@ export default {
       await this.getNewOrder()
     },
     async manyokput(){
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
           columnName:"it.id",
           condition:"1=1",
           f_plan_id:this.planid,
@@ -655,7 +655,7 @@ export default {
       if (!this.check){
         condition=`f_plan_name like '%`+this.plan+`%'`
       }
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
           condition:condition,
           f_filialeids:this.f_filialeids,
           groupitem:'',
@@ -739,7 +739,7 @@ export default {
       var _this = this
       //tag
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-        _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/wuhai/android/PaperFeedback.vue

@@ -343,7 +343,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}`)
@@ -380,7 +380,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
@@ -419,7 +419,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]
@@ -510,7 +510,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+"'"
       //     }
       //   })
@@ -1063,7 +1063,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",
@@ -1073,7 +1073,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": "有效",
@@ -1115,7 +1115,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",
@@ -1125,7 +1125,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": "有效",
@@ -1175,7 +1175,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/wuhai/android/PhoneUpUserinfo.vue

@@ -418,7 +418,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`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.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 = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
                 //tag)
                 if(res.data.length>0){
                 this.area=[]
@@ -494,7 +494,7 @@
             this.userinfo_old.meterinfo[0].devicesinfo=this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
             //tag)
-            new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}维护档案信息`:'',address:{id:this.userinfo_old.addressinfo.id,oldid:this.userinfo_old.addressinfo.id}}},{resolveMsg: null, rejectMsg: null}).then((res1)=>{
+            new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}维护档案信息`:'',address:{id:this.userinfo_old.addressinfo.id,oldid:this.userinfo_old.addressinfo.id}}},{resolveMsg: null, rejectMsg: null}).then((res1)=>{
               //tag+res1.data.status)
               if(res1.data.status==200){
                 //本次修改信息包含需要审核信息
@@ -606,7 +606,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`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
+          let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
           ////tag)
           res.data.forEach((result)=>{
             this.area.push({label:result.f_residential_area,value:result})
@@ -635,7 +635,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`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+          let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
           streetlist.data.forEach((result)=>{
             this.streets.push({label:result.f_street,value:result})
           })
@@ -719,7 +719,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`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+          let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
           ////tag)
           res.data.forEach((result)=>{
             this.area.push({label:result.f_residential_area,value:result})
@@ -736,7 +736,7 @@
           //tag
           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`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+          let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
           streetlist.data.forEach((result)=>{
             //如果第一次进来有地址id 就拿下地址区域
             if(this.selectStreet.id && this.selectStreet.id==result.id){
@@ -815,13 +815,13 @@
         this.excessive=true
         //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
 
-        let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
+        let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
         //tag)
         pcdlist.data.forEach((result)=>{
           this.pcds.push({label:result.f_pcd,value:result})
         })
         ////tag)
-        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_code:'12381344',
           f_userinfo_id:this.f_userinfo_id
         }, {resolveMsg: null, rejectMsg: null})