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

package/src/filiale/shexian/pc.js

@@ -7,6 +7,7 @@ let specialComp = {
   'safe-defect-paper-new': (resolve) => { require(['./pc/DefectPaperNew'], resolve) },
   'safe-defect-list-new': (resolve) => { require(['./pc/DefectListNew'], resolve) },
   'paper-defect-main': (resolve) => { require(['./pc/PaperDefectMain'], resolve) },
+  'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
 }
 exports.specialComp = specialComp
 

package/src/filiale/shimen/android/CurrentCreate.vue

@@ -484,7 +484,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,
@@ -610,7 +610,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,
@@ -623,7 +623,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,
@@ -642,7 +642,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:'',
@@ -727,14 +727,14 @@
         var _this = this
         //tag
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-          let resinfo= await _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}})
+          let resinfo= await _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}})
           //tag)
           row['f_plan_meters'] = resinfo.data
           // 调用石门第三方接口，返回用户表底以及购气记录
           //tag
           try {
             var http1 = new HttpResetClass()
-            var sellinginfo = await http1.load('POST', `${_this.$androidUtil.getProxyUrl()}/rs/logic/SaUserMeterGasInfo`, {data:{f_userinfo_code:row.f_userinfo_code}}, {resolveMsg: null, rejectMsg: null})
+            var sellinginfo = await http1.load('POST', `${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/SaUserMeterGasInfo`, {data:{f_userinfo_code:row.f_userinfo_code}}, {resolveMsg: null, rejectMsg: null})
             //tag)
             if(sellinginfo.data.code == '200'){
               var  meterinfo = ''

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

@@ -340,7 +340,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}`)
@@ -377,7 +377,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
@@ -416,7 +416,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]
@@ -506,7 +506,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+"'"
       //     }
       //   })
@@ -1059,7 +1059,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",
@@ -1069,7 +1069,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": "有效",
@@ -1111,7 +1111,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",
@@ -1121,7 +1121,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": "有效",
@@ -1171,7 +1171,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/shimen/android/PhoneSellInfo.vue

@@ -53,7 +53,7 @@
         }
         //tag
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/SaUserSellingGasInfo`, {data:{f_userinfo_code:userinfoid}}).then((row) => {
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/SaUserSellingGasInfo`, {data:{f_userinfo_code:userinfoid}}).then((row) => {
           var sellgas
           if(typeof row.data.sellgas === 'string'){
              sellgas = JSON.parse(row.data.sellgas)

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

@@ -220,7 +220,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) => {
@@ -243,7 +243,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) => {
@@ -269,7 +269,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}'`,
@@ -295,7 +295,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) => {

package/src/filiale/shimen/pc/CheckPlanAreaList.vue

@@ -57,11 +57,11 @@
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                      @click="$parent.$parent.hidden()">
                 </div>
-<!--                <export-excel-safe   :data="$parent.$parent.exportParameter"
+<!--                <export-excel   :data="$parent.$parent.exportParameter"
                                      :field="$parent.$parent.exportExcelField"
-                                     sqlurl="rs/logic/SafeExportExcel" sql-name="getCheckPlanAreaList"
+                                     sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="getCheckPlanAreaList"
                                      template-name='安检汇总' :choose-col="true">
-                </export-excel-safe>-->
+                </export-excel>-->
                 <button id="btnaaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.exportexcel()"
                         v-el:cx>导出</button>
@@ -188,7 +188,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+        model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -271,7 +271,7 @@
       },
        pl() {
          let getGasman = new HttpResetClass()
-         getGasman.load('POST', `rs/sql/safe_singleTable_OrderBy`, {
+         getGasman.load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "id,f_plan_name",
             tablename: "t_check_plan",

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

@@ -28,10 +28,10 @@
                      placeholder="地址" condition="f_address like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" 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"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
+                                 template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -184,10 +184,10 @@
                      placeholder="用户姓名" condition="f_user_name like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" 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"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
+                                 template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -443,7 +443,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_defect_content': '安检结果'
       },
-      model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
+      model: new PagedList('api/af-safecheck/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
         timetype: "'dd'",
         f_defect_content: 'this.f_defect_content'
@@ -550,7 +550,7 @@ export default {
       ////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}`,
@@ -803,7 +803,7 @@ export default {
       ////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/shimen/pc/DefectList.vue

@@ -179,7 +179,7 @@
   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('隐患已处理。')
@@ -211,7 +211,7 @@
       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
@@ -271,10 +271,10 @@
     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', {itemsId: self.$login.convertToIn(rows.map(row => row.id))})
+      let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectState', {itemsId: self.$login.convertToIn(rows.map(row => row.id))})
       if (updateRes.data.code == 200) {
         self.$showMessage('隐患已转维修。')
         self.model.search(`f_repaire_type != '无隐患'`, {})
@@ -286,7 +286,7 @@
     title: '隐患项列表',
     data() {
       return {
-        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,
@@ -426,7 +426,7 @@
         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/shimen/pc/NewCheckpaper.vue

@@ -390,7 +390,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',

package/src/filiale/shimen/pc/PaperDefectMain.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="safe_singleTable_OrderBy" template-name='安检隐患明细'></export-excel-safe>
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy" 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>
 
@@ -249,7 +249,7 @@ let select = function* (self) {
 export default {
   title: '隐患明细查看',
   data() {
-    let model = new PagedList('rs/sql/safe_singleTable_OrderBy', 20, {
+    let model = new PagedList('api/af-safecheck/sql/safe_singleTable_OrderBy', 20, {
       items: "'tcp.*,tpd.f_device_type,ditls.f_item_name,ditls.f_item_value,ditls.f_path,ass.f_user_type,ass.version'",
       tablename: "'t_check_paper tcp LEFT JOIN t_paper_devices tpd ON tcp.id= tpd.f_paper_id  LEFT JOIN t_userfiles ass on tcp.f_userinfoid=ass.f_userinfo_id LEFT JOIN (SELECT dits.f_is_defect,dits.f_device_id,dits.f_item_name,ditl.f_item_value ,dits.f_path FROM t_devices_items dits LEFT JOIN t_devices_items_lists ditl ON dits.id = ditl.f_item_id ) ditls ON tpd.id= ditls.f_device_id'",
       orderitem: "'f_offsite_time'"
@@ -422,7 +422,7 @@ export default {
       ////tag
       this.sliceArea=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
             items: 'name',
             tablename: 't_zone',
             condition: `parentid  in ${val}`,
@@ -447,7 +447,7 @@ export default {
       ////tag
       this.cbcs=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_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/shimen/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>
 
@@ -275,7 +275,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',
@@ -366,7 +366,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}`,
@@ -391,7 +391,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/shiquan/android/AreaPlan.vue

@@ -362,7 +362,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,
@@ -425,7 +425,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/shiquan/android/CurrentCreate.vue

@@ -500,7 +500,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,
@@ -636,7 +636,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:`i.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -649,7 +649,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:"i.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -671,7 +671,7 @@
         if(this.plan){
           condition += ` and 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:'',
@@ -754,7 +754,7 @@
       inspect(row) {
         var _this = this
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: {
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/singleTable`, {data: {
             items: 'id',
             tablename: 't_check_plan_item',
             condition:  `id  = '${row.id}'`
@@ -763,7 +763,7 @@
           this.getcheckplandata = getcheckplan.data[0]
           if(this.getcheckplandata){
             if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) || row.f_check_version <3 ) {
-              _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
                 var pardate = {
                   _this:_this,

package/src/filiale/shiquan/android/SafecheckDevices.vue

@@ -439,7 +439,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -459,6 +458,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/filiale/shiquan/pc/checkUserList.vue

@@ -344,11 +344,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>
@@ -396,7 +396,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": "''",
@@ -442,7 +442,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',
@@ -552,7 +552,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=[]
@@ -569,7 +569,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: ''}]
@@ -657,7 +657,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,
@@ -696,7 +696,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) => {