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

package/src/filiale/lixian/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>
 
@@ -227,7 +227,7 @@
   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.f_defect_content,tcp.f_userinfo_code,tcp.f_user_name,tcp.f_user_phone,tcp.f_residential_area,tcp.f_address,tcp.f_checker_name,tcp.f_offsite_time,tcp.f_filialeid,tpd.f_device_type,ditls.f_item_name,ditls.f_item_value'",
         tablename: "'t_check_paper tcp LEFT JOIN t_paper_devices tpd ON tcp.id= tpd.f_paper_id LEFT JOIN ( SELECT dits.f_is_defect,dits.f_device_id, dits.f_item_name, ditl.f_item_value 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'"
@@ -370,7 +370,7 @@
         ////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}`,
@@ -395,7 +395,7 @@
         ////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/lixian/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>
 
@@ -299,7 +299,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',
@@ -407,7 +407,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}`,
@@ -432,7 +432,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}`,
@@ -470,7 +470,7 @@
         //tag
         this.$showMessage('确认作废当前安检单吗？', ['confirm', 'cancel']).then((res) => {
           if (res === 'confirm') {
-            this.$resetpost('rs/logic/DelCheckPaper', {id:row.id}).then((res) => {
+            this.$resetpost('api/af-safecheck/logic/DelCheckPaper', {id:row.id}).then((res) => {
               //tag
               if(res.data.code == 200){
                 this.$showMessage('作废成功')
@@ -555,12 +555,12 @@
         if (this.$refs.paged.$refs.criteria.model.f_is_delete == '是') {
           //tag
           this.isdel = '是'
-          this.model.url = 'rs/sql/QueryDelCheckPaper'
+          this.model.url = 'api/af-safecheck/sql/QueryDelCheckPaper'
 
         }else {
           //tag
           this.isdel = '否'
-          this.model.url = 'rs/sql/查找安检单'
+          this.model.url = 'api/af-safecheck/sql/查找安检单'
         }
         this.model.search(args.condition, args.model, args.condValue)
       }

package/src/filiale/lixian/pc/checkPlanList.vue

@@ -38,12 +38,12 @@
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
               <button class="button_search" style="margin-right: 10px"  @click="clear()">清除</button>
-              <export-excel-safe :data="$parent.$parent.exportParameter"
+              <export-excel :data="$parent.$parent.exportParameter"
                                  :field="$parent.$parent.exportExcelField"
                                  style="margin-left: 0px"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                  :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
             </div>
             <div class="form-group col-sm-2 safe_p">
               <label class="font_normal_body" :title="$parent.$parent.selectplan.f_plan_name">{{$parent.$parent.selectplan.f_plan_name?'当前选中 : '+$parent.$parent.selectplan.f_plan_name:''}}</label>
@@ -177,7 +177,7 @@
     title: '计划管理',
     data() {
       return {
-        model:new PagedList('/rs/sql/planItem', 100, {}),
+        model:new PagedList('/api/af-safecheck/sql/planItem', 100, {}),
         a:'1',
         opt:[{label:"测试",value:"测试"}],
         showCondtion:false,
@@ -228,7 +228,7 @@
         }
         this.$parent.isSend=true
         try{
-          let res=await new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItem", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/UpCheckPlanItem", {
             data:{
               f_operator:this.userlogin.name,
               f_plan_id:this.$refs.modalp.$children[0].selectedRow.id,
@@ -320,7 +320,7 @@
         }
         this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
           if(button=='confirm'){
-            let resu=new HttpResetClass().load("POST", "/rs/logic/UpCheckPlanItemState", {
+            let resu=new HttpResetClass().load("POST", "/api/af-safecheck/logic/UpCheckPlanItemState", {
               data: {
                 f_operator:this.userlogin.name,
                 condition:this.model.condition,

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

@@ -351,11 +351,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>
@@ -404,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": "''",
@@ -453,7 +453,7 @@
       },
       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',
@@ -558,7 +558,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=[]
@@ -575,7 +575,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: ''}]
@@ -663,7 +663,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,
@@ -702,7 +702,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/minsheng/android/AreaPlan.vue

@@ -372,7 +372,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,
@@ -435,7 +435,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/minsheng/android/CurrentCreate.vue

@@ -517,7 +517,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,
@@ -653,7 +653,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:`i.id='`+this.needid+`'`,
           f_plan_id:this.planid,
@@ -666,7 +666,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:"i.id",
           condition:"1=1",
           f_plan_id:this.planid,
@@ -688,7 +688,7 @@ export default {
       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:'',
@@ -771,7 +771,7 @@ export default {
     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}'`
@@ -780,7 +780,7 @@ export default {
         this.getcheckplandata = getcheckplan.data[0]
         if(this.getcheckplandata){
           if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) || [1, 2].indexOf(row.f_check_version) >= 0 )  {
-            _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/minsheng/android/PhoneUpUserinfo.vue

@@ -562,7 +562,7 @@ export default {
       //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",
@@ -659,7 +659,7 @@ export default {
           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}维护档案信息` : '',
@@ -675,7 +675,7 @@ export default {
               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("修改用户地址信息！")
@@ -732,7 +732,7 @@ export default {
           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`, {
+          new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {
             data: {
               userinfo: userinfoms,
               modifyReason: this.f_source ? `${this.f_source}维护档案信息` : '',
@@ -867,7 +867,7 @@ export default {
         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",
@@ -903,7 +903,7 @@ export default {
         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",
@@ -994,7 +994,7 @@ export default {
       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",
@@ -1024,7 +1024,7 @@ export default {
         //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`, {
+        let streetlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_street",
@@ -1118,7 +1118,7 @@ export default {
       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`, {
+      let pcdlist = await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "*",
           tablename: "t_pcd",
@@ -1131,7 +1131,7 @@ export default {
         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})
@@ -1175,7 +1175,7 @@ export default {
     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/minsheng/android/SafecheckUserInfo.vue

@@ -276,7 +276,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) => {
@@ -299,7 +299,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) => {
@@ -323,7 +323,7 @@ export default {
       //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 ',
@@ -348,7 +348,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/minsheng/android/SwitchValve.vue

@@ -289,7 +289,7 @@
     title: '开关阀',
     data () {
       return {
-        model: Vue.android ? new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/SwitchValveSeachUser`, 5) : new PagedList( 'AndroidRest/rs/sql/SwitchValveSeachUser',5),
+        model: Vue.android ? new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/SwitchValveSeachUser`, 5) : new PagedList( 'AndroidRest/api/af-safecheck/sql/SwitchValveSeachUser',5),
         f_meternumber: '',
         f_userinfo_code: '',
         f_operator: Vue.user.name,
@@ -326,7 +326,7 @@
     methods: {
       getbuilding(area) {
         this.building=[{label:'全部',value:''}]
-        let res = new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {
+        let res = new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
           data: {
             items: "f_building",
             tablename: "t_user_address",
@@ -342,7 +342,7 @@
         })
       },
       async getAreaList() {
-        let res =await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {
+        let res =await new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
           data: {
             items: 'f_residential_area',
             tablename: 't_area',
@@ -358,7 +358,7 @@
       },
       getunit(f_residential_area,f_building){
         this.unit=[{label:'全部',value:''}]
-        let res = new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {
+        let res = new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
           data: {
             items: "f_unit",
             tablename: "t_user_address",
@@ -382,7 +382,7 @@
             partner: "cqsemay_bcts", // 固定值
             version:"v1", // 固定值
             tasked:this.getuuid(), // 任务id
-            notifyUrl:"http://192.168.2.10:8445/webmeter/rs/logic/XiMeiSystemCallBack", // 固定值
+            notifyUrl:"http://192.168.2.10:8445/webmeter/api/af-safecheck/logic/XiMeiSystemCallBack", // 固定值
             meterNo: val.f_meternumber,// 表号
             signType:" MD5" //固定值
           },
@@ -392,7 +392,7 @@
           userId:val.f_userfiles_id,   // 表档案ID
           dataId: null // 操作记录ID
         }
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/webmeter/rs/logic/syncSaveSetParamsTemplate`, {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/webmeter/api/af-safecheck/logic/syncSaveSetParamsTemplate`, {data: datas},{resolveMsg: `清理成功`, rejectMsg: `清理失败`}).then(res => {
         })
       },
       getuuid(){
@@ -469,7 +469,7 @@
           meternumberf: this.thisOneData.f_meternumber,  //表号
           contentData: {isOpen: msg=='开阀' ? 1 : 0},  // oper 为true 时为开阀   false 为关阀
         }
-        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/iot_saveInstruct`, {data: data}).then((row) => {
+        this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/iot_saveInstruct`, {data: data}).then((row) => {
           this.$showMessage(`${msg}指令发送成功，请等候2分钟进行查询`)
           //tag
           this.thisOneData = '';

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

@@ -27,11 +27,11 @@
                      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"
                                  :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>
               <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}"
@@ -194,10 +194,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}"
@@ -454,7 +454,7 @@ export default {
         'f_last_check_result': '安检结果',
         'f_createfile_date': '建档日期'
       },
-      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'
@@ -534,7 +534,7 @@ export default {
      searchInfo(val){
       this.dialogVisible = true
       //tag
-       new HttpResetClass().load('POST','rs/logic/QrcodeUtil', {
+       new HttpResetClass().load('POST','api/af-safecheck/logic/QrcodeUtil', {
         data: {
           id:val
         }
@@ -551,7 +551,7 @@ export default {
     //获取省市区列表
     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)=>{
@@ -590,7 +590,7 @@ export default {
       ////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}`,
@@ -851,7 +851,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/minsheng/pc/DefectListNew.vue

@@ -206,7 +206,7 @@ import co from 'co'
 const upSolveDefect = function * (self) {
   let uploadData = self.solveModal.uploadData
   //tag)
-  self.$resetpost('/rs/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
+  self.$resetpost('/api/af-safecheck/logic/pcRepairDefectNew', self.solveModal.uploadData, {resolveMsg: null, rejectMsg: null})
     .then(res => {
       if (res.data.code === 200) {
         self.$showMessage('隐患已处理。')
@@ -238,7 +238,7 @@ const sendRepair = function* (self) {
     uploadData.model.f_filiale_id = self.$login.f.orgid
     uploadData.toRepair = '一级派单'
   }
-  let res = yield self.$resetpost('/rs/sql/GetUserForRepaireNew2', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew2', {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
@@ -300,7 +300,7 @@ 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) {
     const data = {
@@ -309,7 +309,7 @@ const sendRepair = function* (self) {
       itemsId: self.$login.convertToIn(rows.map(row => row.id))
     }
     //tag
-    let updateRes = yield self.$resetpost('/rs/logic/updateDefectStateNew', data)
+    let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
     if (updateRes.data.code == 200) {
       self.$showMessage('隐患已转维修。')
       self.model.search(`f_repaire_type != '无隐患'`, {})
@@ -321,7 +321,7 @@ export default {
   title: '隐患项列表',
   data() {
     return {
-      model: new PagedList('rs/sql/GetDefectByPaperIdNew2', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew2', 100, {
         f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
       }),
       showSolveModal: false,
@@ -426,7 +426,7 @@ export default {
         info:info
       }
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      http.load('POST', 'api/af-safecheck/logic/DefectAuditUpdate', data, {resolveMsg: null, rejectMsg: null}).then((res) => {
         if(res.data.code == 200){
           this.model.search(`f_repaire_type != '无隐患'`, {})
           this.showSolveModal = false
@@ -488,7 +488,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',