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

package/src/components/userfileNew/UserInfoAuditNew.vue

@@ -100,7 +100,7 @@ export default {
   components: {InfoModifyModal},
   title: '档案审核',
   data() {
-    let model = new PagedList('rs/sql/用户档案审核查询', 20, {
+    let model = new PagedList('api/af-safecheck/sql/用户档案审核查询', 20, {
       groupitem: '""', orderitem: '"f_time desc"', f_approved: 'this.f_approved[0]',filialestr:'this.filialestr'
     })
     model.filialestr = this.$login.f.orgid
@@ -126,7 +126,7 @@ export default {
     change(row, type) {
       this.type = type
       //tag)
-      new HttpResetClass().load('post',`/rs/logic/filemanage_getFilesDetail`, {
+      new HttpResetClass().load('post',`/api/af-safecheck/logic/filemanage_getFilesDetail`, {
         //f_userinfo_code:'12381344',
         f_userinfo_id:row.f_userinfoid
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -209,10 +209,10 @@ export default {
         useraddressms.f_operator=row.f_modifier
         useraddressms.f_operatorid=row.f_modifier_id
         try{
-          let res1=await new HttpResetClass().load('POST','/rs/logic/filemanage_fileSave', {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}审核通过更改档案信息`:'',address:{id:this.userInformation.addressinfo.id,oldid:this.userInformation.addressinfo.id}}},{resolveMsg: null, rejectMsg: null})
+          let res1=await new HttpResetClass().load('POST','/api/af-safecheck/logic/filemanage_fileSave', {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}审核通过更改档案信息`:'',address:{id:this.userInformation.addressinfo.id,oldid:this.userInformation.addressinfo.id}}},{resolveMsg: null, rejectMsg: null})
           //tag)
           if(res1.data.status==200){
-            let res2=await new HttpResetClass().load('POST','/rs/logic/address_updateuseraddress', useraddressms,{resolveMsg: null, rejectMsg: null})
+            let res2=await new HttpResetClass().load('POST','/api/af-safecheck/logic/address_updateuseraddress', useraddressms,{resolveMsg: null, rejectMsg: null})
             //tag)
             if(res2.data.id){
               //tag)
@@ -220,7 +220,7 @@ export default {
               this.info.f_approved_by=this.$login.f.name
               this.info.f_approved_time=Util.toStandardTimeString()
               //tag)
-              let res3=await new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null})
+              let res3=await new HttpResetClass().load('POST','/api/af-safecheck/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null})
                 //tag)
                 if(res3.data.code==200){
                   this.$showMessage("审核成功,用户信息已更新！")
@@ -259,7 +259,7 @@ export default {
       this.info.f_approved='未通过'
       this.info.f_approved_by=this.$login.f.name
       this.info.f_approved_time=Util.toStandardTimeString()
-      new HttpResetClass().load('POST','/rs/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null}).then((res3)=>{
+      new HttpResetClass().load('POST','/api/af-safecheck/logic/SaveEntity', {data:{row:this.info,tablename:'t_modify_userinfo'}},{resolveMsg: null, rejectMsg: null}).then((res3)=>{
         //tag)
         if(res3.data.code==200){
           this.$showMessage("审核成功,审核结果:未通过！")

package/src/components/userfileNew/UserinfoModify.vue

@@ -120,7 +120,7 @@
           }
       },
       async ready(){
-        let pcdlist = await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`, {
+        let pcdlist = await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "*",
             tablename: "t_pcd",
@@ -158,7 +158,7 @@
             this.content.f_slice_area = ''
             this.streets = []
             let pcdText = `and f_pcd_id=${this.selectPcd.id}`
-            let streetlist = await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`, {
+            let streetlist = await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
               data: {
                 items: "*",
                 tablename: "t_street",
@@ -187,7 +187,7 @@
             this.selectArea={id:''}
             this.area=[]
             let pcdText=` and f_street_id=${this.selectStreet.id}`
-            let res= await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
+            let res= await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
             ////tag)
             res.data.forEach((result)=>{
               this.area.push({label:result.f_residential_area,value:result})
@@ -208,7 +208,7 @@
             //tag
             this.streets=[]
             let pcdText=`and f_pcd_id=${this.selectPcd.id}`
-            let streetlist= await new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+            let streetlist= await new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
             streetlist.data.forEach((result)=>{
               this.streets.push({label:result.f_street,value:result})
             })
@@ -220,7 +220,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 = '${this.$login.f.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 = '${this.$login.f.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
             res.data.forEach((result)=>{
               this.area.push({label:result.f_residential_area,value:result})
             })
@@ -233,7 +233,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", `/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+            new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.$login.f.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
               //tag)
               if(res.data.length>0){
                 this.area=[]

package/src/components/userfileaudit/UserFileaudit.vue

@@ -61,7 +61,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '档案审核',
   data () {
-    let model = new PagedList('rs/sql/用户档案审核查询', 20, {items: '"*"', tablename: '"t_tmp_userfiles"', groupitem: '""', orderitem: '"f_user_oldid"',
+    let model = new PagedList('api/af-safecheck/sql/用户档案审核查询', 20, {items: '"*"', tablename: '"t_tmp_userfiles"', groupitem: '""', orderitem: '"f_user_oldid"',
      f_subcompany: 'this.f_subcompany[0]', f_approved: 'this.f_approved[0]'})
     model.f_subcompany = [Vue.f_subcompany]
     model.f_archive_date = ''

package/src/components/userfileaudit/UserfileChangeaudit.vue

@@ -180,7 +180,7 @@ let saveGen = function * (self) {
     self.model.f_checker_id = self.f_checker_selected[0].substring(p+1)
   }else{*/
     self.model.f_checker = self.f_checker_selected[0]
-  yield self.$resetpost('rs/logic/审核档案修改', { data: self.model })
+  yield self.$resetpost('api/af-safecheck/logic/审核档案修改', { data: self.model })
   self.$back()
 }
 
@@ -213,7 +213,7 @@ export default {
     this.f_user_type = [this.model.f_user_type]
     this.f_division = [this.model.f_subcompany]
     let that = this
-    this.$resetpost('rs/sql/提取临时表档案', {data:{f_tmp_userfile_id: this.model.id}}, {resolveMsg: null, rejectMsg: '提取表档案失败'}).then(
+    this.$resetpost('api/af-safecheck/sql/提取临时表档案', {data:{f_tmp_userfile_id: this.model.id}}, {resolveMsg: null, rejectMsg: '提取表档案失败'}).then(
       (response) => {
         that.$set('model.rows', response.data)
       }

package/src/filiale/ALshan/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/ALshan/pc/DefectListWeixiu.vue

@@ -180,7 +180,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('隐患已处理。')
@@ -212,7 +212,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
@@ -274,10 +274,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', {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 != '无隐患'`, {})
@@ -289,7 +289,7 @@ export default {
   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,
@@ -429,7 +429,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/ALshan/pc/checkUserList.vue

@@ -330,11 +330,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>
@@ -382,7 +382,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": "''",
@@ -427,7 +427,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',
@@ -511,7 +511,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=[]
@@ -528,7 +528,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: ''}]
@@ -616,7 +616,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,
@@ -655,7 +655,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/Util.js

@@ -20,6 +20,18 @@ export function getAttendanceState(item, timeToWork, timeToGo) {
     item.f_state = '正常'
 }
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
+
+export function dateAddDay (date, day) {
+  date.setDate(date.getDate() + Number.parseInt(day));
+  let month = date.getMonth()+1
+  let date2 = date.getDate()
+  return date.getFullYear() + '-' + (month<10? '0'+ month : month) + '-' + (date2<10? '0'+ date2 : date2)
+}
+
 // 字符串进行解密
 export function uncompileStr (code) {
   code = unescape(code)

package/src/filiale/ancheng/android/NewCheckpaperAndroid.vue

@@ -391,7 +391,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', `${self.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+    let res = await new HttpResetClass().load('post', `${self.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
       data: {
         items: 'f_dir',
         tablename: 't_organization',

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

@@ -496,7 +496,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+"'"
     //     }
     //   })
@@ -1126,7 +1126,7 @@ export default {
       }
       this.paper.f_blocking_cause = this.deletecause
       let http = new HttpResetClass()
-      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",
@@ -1134,7 +1134,7 @@ export default {
           orderitem: "f_userinfo_id"
         }
       }, {resolveMsg: null, rejectMsg: null})
-      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": "有效",
@@ -1174,7 +1174,7 @@ export default {
       }
       this.paper.f_blocking_cause = this.cause
       let http = new HttpResetClass()
-      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",
@@ -1188,7 +1188,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,
@@ -1238,7 +1238,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/ancheng/android/SafecheckOrderV.vue

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

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

@@ -261,7 +261,7 @@
         this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的机表表号从' + this.userinfo.planmeterss.f_meter_no + '修改为' + f_meter_no, ['confirm', 'cancel']).then((butt) => {
           if (butt == 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdateBiaoHao`, {
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdateBiaoHao`, {
               f_meter_no: f_meter_no,
               f_userinfo_id: f_userinfo_id
             }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -284,7 +284,7 @@
         this.$showMessage('是否确定进行修改?', ['confirm', 'cancel']).then((butt) => {
           if (butt == 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdateBiaoXingHao`, {
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdateBiaoXingHao`, {
               biaoxinghao: this.biaoxinghao,
               f_userinfo_id: this.userinfo.f_userinfoid
             }, {resolveMsg: null, rejectMsg: null}).then((res) => {
@@ -308,7 +308,7 @@
         //tag)
         //tag
         let http1 = new HttpResetClass()
-        http1.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+        http1.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
           data: {
             items: 'gm.id,gm.f_meter_style',
             tablename: 't_gasbrand gb LEFT JOIN t_gasmodel gm ON gb.id= gm.f_gasbrand_id ',
@@ -333,7 +333,7 @@
         this.$showMessage('将用户 ' + this.userinfo.f_user_name + '的电话号码从' + this.beforephone + '修改为' + f_user_phone, ['confirm', 'cancel']).then((butt) => {
           if (butt == 'confirm') {
             let http = new HttpResetClass()
-            http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/safecheckUpdatePhone`, {
+            http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/safecheckUpdatePhone`, {
               f_user_phone: f_user_phone,
               f_userinfo_id: f_userinfo_id
             }, {resolveMsg: null, rejectMsg: null}).then((res) => {

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

@@ -773,7 +773,7 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
       data: {
         items: 'f_dir',
         tablename: 't_organization',
@@ -818,7 +818,7 @@ let asyncReady = async function (self) {
       }
     }
     if (self.data.f_recheck_id){
-      let res3 = await new HttpResetClass().load('post', 'rs/sql/safe_singleTable_OrderBy', {
+      let res3 = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
         data: {
           items: '*',
           tablename: 't_check_paper',

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

@@ -32,13 +32,13 @@
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
 
-                <export-excel-safe :data="$parent.$parent.searchData"
+                <export-excel :data="$parent.$parent.searchData"
                               :field="$parent.$parent.excelHeaders"
                               :choose-col="true"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检计划明细'></export-excel>
 <!--                <export-excel :data="$parent.$parent.getCondition" -->
 <!--                              :field="$parent.$parent.getfield"-->
-<!--                              sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'-->
+<!--                              sqlurl="api/af-safecheck/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'-->
 <!--                              :choose-col="true"></export-excel>-->
 <!--                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="!$parent.$parent.audioshow">录音</button>-->
                 <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
@@ -334,7 +334,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',
@@ -411,7 +411,7 @@
     },
     methods: {
       getpricename() {
-        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: "f_price_name",
@@ -434,7 +434,7 @@
       //获取省市区列表
       getPcd(val){
         this.pcds = [{label:'全部',value:''}]
-        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+        new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
           {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid in ${val}`}},
           {resolveMsg: null, rejectMsg: null}).then((pcdlist)=>{
           pcdlist.data.forEach((result)=>{
@@ -476,7 +476,7 @@
         ////tag
         ////tag
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
@@ -502,7 +502,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/ancheng/pc/checkScreen.vue

@@ -267,7 +267,7 @@ export default {
     async querySserSatus () {
       //tag)
       let http1 = new HttpResetClass()
-      let resp = await http1.load('POST', `/rs/sql/tel_singleTable_OrderBy`, {
+      let resp = await http1.load('POST', `/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
         data: {
           items: 'name lable,id userid,\'在线\' states',
           tablename: 't_user',
@@ -357,7 +357,7 @@ export default {
       }
       let td = Util.toStandardDateString()
       //获取今天上传的所有隐患
-      let arr = await new HttpResetClass().load('POST', `rs/sql/defectDetails`, {data: {condition: ` f_filialeid in ('${this.$login.f.orgid}') and tdil.f_create_time>'${Util.toStartDateYearString()} 00:00:00' and tdi.F_LONGITUDE is not null`}},
+      let arr = await new HttpResetClass().load('POST', `api/af-safecheck/sql/defectDetails`, {data: {condition: ` f_filialeid in ('${this.$login.f.orgid}') and tdil.f_create_time>'${Util.toStartDateYearString()} 00:00:00' and tdi.F_LONGITUDE is not null`}},
         {resolveMsg: null, rejectMsg: null})
       //tag)
       if (arr.data) {

package/src/filiale/ankangyihua/android/AddPlanItem.vue

@@ -219,7 +219,7 @@
   export default {
     title: '安检员B',
     data () {
-      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
+      let model = new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/提取用户档案`, 20, { groupitem: '""', orderitem: '"f_residential_area,CAST(build as int),f_unit,CAST(floor1 as int),f_room"',f_check_type:'this.f_check_type[0]',
         f_user_name:'this.model.f_username',myCycle: 'this.myCycle',
         fyCycle: 'this.fyCycle', f_user_type:'this.f_user_type',f_sign: 'this.f_sign[0]',
         f_residential_area:'this.model.f_districtname', f_address:'this.model.f_address',
@@ -264,7 +264,7 @@
       }
     },
     ready () {
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getSafeCheckCycle`,{},{resolveMsg: null, rejectMsg: null}).then((res) => {
       //   //tag)
       //   if(res.data.code == 200){
       //     this.model.myCycle = res.data.civil.value
@@ -297,7 +297,7 @@
       },
       getCheckTime(){
         //tag
-        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`,{data: {
+        new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`,{data: {
             items: 'f_circle,f_start_time',
             tablename: 't_safe_circle',
             condition: `f_filialeid  = '${Vue.user.orgid}'`,
@@ -341,7 +341,7 @@
               info.f_state = '未检'
               info.f_no_checkplan = '无计划安检'
               //tag
-              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+              this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
                 //tag)
                 info['f_plan_meters'] = response.data
                 var pardate = {
@@ -360,7 +360,7 @@
           info.f_state = '未检'
           info.f_no_checkplan = '无计划安检'
           //tag
-          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`,{data:{f_userid:info.f_userinfo_id}}).then((response)=>{
             //tag)
             info['f_plan_meters'] = response.data
             var pardate = {
@@ -377,7 +377,7 @@
       Mreadibook(){
         this.cbc=[]
         let http = new HttpResetClass()
-        http.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/getMeterBooksData`,
+        http.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/getMeterBooksData`,
           {data: {f_orgid: "('"+Vue.user.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'}).then((getMeterReadingBooks)=>{
           this.cbc = [{label: '全部', value: ''}]