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

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

@@ -302,11 +302,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>
@@ -355,7 +355,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": "''",
@@ -398,7 +398,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',
@@ -478,7 +478,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=[]
@@ -495,7 +495,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: ''}]
@@ -583,7 +583,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,
@@ -622,7 +622,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/gehua/android/CurrentCreate.vue

@@ -505,7 +505,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,
@@ -641,7 +641,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,
@@ -654,7 +654,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,
@@ -673,7 +673,7 @@ export default {
       if (!this.check){
         condition=`f_plan_name like '%`+this.plan+`%'`
       }
-      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {data:{
+      let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {data:{
           condition:condition,
           f_filialeids:this.f_filialeids,
           groupitem:'',
@@ -756,7 +756,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}'`
@@ -765,7 +765,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 != '无计划安检' ) ) {
-            _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/gehua/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"
                               :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 class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
 
                 <button class="button_spacing button_search" @click="search()">查询</button>
@@ -273,7 +273,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',
@@ -333,7 +333,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)=>{
@@ -376,7 +376,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}`,
@@ -401,7 +401,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/gehua/pc/checkUserList.vue

@@ -321,11 +321,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>
@@ -374,7 +374,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": "''",
@@ -418,7 +418,7 @@
     },
     methods: {
       gasbrand() {
-        new HttpResetClass().load('POST',  `/rs/sql/tel_singleTable_GroupBy`, {
+        new HttpResetClass().load('POST',  `/api/af-safecheck/sql/tel_singleTable_GroupBy`, {
           data: {
             items: 'f_meter_brand,id',
             tablename: 't_gasbrand',
@@ -437,7 +437,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',
@@ -517,7 +517,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=[]
@@ -534,7 +534,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: ''}]
@@ -622,7 +622,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,
@@ -661,7 +661,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/guangxi/android/AreaPlan.vue

@@ -382,7 +382,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,
@@ -445,7 +445,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/guangxi/android/CurrentCreate.vue

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

@@ -195,7 +195,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('隐患已处理。')
@@ -227,7 +227,7 @@ const sendRepair = function* (self) {
     uploadData.model.f_filiale_id = self.$login.f.orgid
     uploadData.toRepair = '一级派单'
   }
-  let res = yield self.$resetpost('/rs/sql/GetUserForRepaireNew', {data: {f_userinfo_id: self.check.f_userinfo_id}})
+  let res = yield self.$resetpost('/api/af-safecheck/sql/GetUserForRepaireNew', {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
@@ -289,7 +289,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 = {
@@ -298,7 +298,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 != '无隐患'`, {})
@@ -310,7 +310,7 @@ export default {
   title: '隐患项列表',
   data() {
     return {
-      model: new PagedList('rs/sql/GetDefectByPaperIdNew', 100, {
+      model: new PagedList('api/af-safecheck/sql/GetDefectByPaperIdNew', 100, {
         f_paper_id: 'this.f_paper_id',f_item_value: 'this.f_item_value'
       }),
       showSolveModal: false,
@@ -411,7 +411,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
@@ -471,7 +471,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/guangxi/pc/DefectPaperNew.vue

@@ -52,10 +52,10 @@
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <button style="float: right" class="button_search button_spacing" @click="$parent.$parent.toRepair">转维修</button>
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
+                  <export-excel   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids,f_defect_content:$parent.$parent.model.f_defect_content}"
                                       :field="$parent.$parent.getfield"
                                       progress="safeGetExportProgress"
-                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                                      sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检隐患明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -196,7 +196,7 @@
                   <export-excel-old   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
                                       :field="$parent.$parent.getfield"
                                       progress="safeGetExportProgress"
-                                      sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-old>
+                                      sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectNew" template-name='安检计划明细' :choose-col="true"></export-excel-old>
                 </div>
               </div>
             </div>
@@ -476,7 +476,7 @@ let select = function* (self) {
 export default {
   title: '隐患查询',
   data() {
-    let model = new PagedList('rs/sql/GetCheckPaperByDefectNew', 20, {
+    let model = new PagedList('api/af-safecheck/sql/GetCheckPaperByDefectNew', 20, {
       f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
     })
     model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -579,7 +579,7 @@ export default {
 
         })
         let http1 = new HttpResetClass()
-        http1.load('POST', 'rs/sql/tel_singleTable_OrderBy', {
+        http1.load('POST', 'api/af-safecheck/sql/tel_singleTable_OrderBy', {
           data: {
             items: 'id,f_user_telephone',
             tablename: 't_user',
@@ -619,13 +619,13 @@ export default {
         f_defect_content: this.model.params.f_defect_content,
         condition:this.model.params.condition
       }
-      let res1= await new HttpResetClass().load('post','rs/sql/GetCheckPaperByDefectNew',{data: data })
+      let res1= await new HttpResetClass().load('post','api/af-safecheck/sql/GetCheckPaperByDefectNew',{data: data })
       for (let i = 0; i < res1.data.length; i++) {
         let data1={
           f_paper_id: res1.data[i].id,
           condition:`f_repaire_type != '无隐患'`
         }
-        let res2 = await new HttpResetClass().load('POST' , 'rs/sql/GetDefectByPaperIdNew' , {data: data1 } )
+        let res2 = await new HttpResetClass().load('POST' , 'api/af-safecheck/sql/GetDefectByPaperIdNew' , {data: data1 } )
         //tag
         const uploadData = {
           model: {
@@ -681,7 +681,7 @@ export default {
         uploadData.model.f_outlets = this.$login.f.deps
         uploadData.model.f_filiale_id = this.$login.f.orgid
         uploadData.toRepair = '一级派单'
-        let res3 = await new HttpResetClass().load('post','/rs/sql/GetUserForRepaireNew', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
+        let res3 = await new HttpResetClass().load('post','/api/af-safecheck/sql/GetUserForRepaireNew', {data: {f_userinfo_id: res1.data[i].f_userinfo_id}})
         uploadData.model = Object.assign(uploadData.model, res3.data[0])
         uploadData.user.f_userinfo_id = res3.data[0].f_userinfo_id
         uploadData.model.f_repair_date = Util.getNowDate()
@@ -757,7 +757,7 @@ export default {
           //tag)
           let rows=this.callSends[this.timercount].rows
           //tag)
-          let result = await this.$resetpost('/rs/logic/callerSend', this.callSends[this.timercount])
+          let result = await this.$resetpost('/api/af-safecheck/logic/callerSend', this.callSends[this.timercount])
           //tag)
           if (result.data.f_service_id) {
             const data = {
@@ -766,7 +766,7 @@ export default {
               itemsId: this.$login.convertToIn(rows.map(row => row.id))
             }
             //tag
-            let updateRes = await this.$resetpost('/rs/logic/updateDefectStateNew', data)
+            let updateRes = await this.$resetpost('/api/af-safecheck/logic/updateDefectStateNew', data)
           }
           this.toRepairCount++
           //tag
@@ -853,7 +853,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}`,
@@ -878,7 +878,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/hanzhong/android/PaperFeedback.vue

@@ -383,7 +383,7 @@ import co from 'co'
 //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
 //                 checkResult = '有隐患'
 //                 ////tag
-//                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+//                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
 //                 ////tag)
 //                 self.$set('detail.f_defect_id', res.data[0].id)
 //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -420,7 +420,7 @@ import co from 'co'
 //         self.undo()
 //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
 //         ////tag
-//         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+//         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
 //           ////tag
 //           if(ret.data.code ==200){
 //             ////tag
@@ -459,7 +459,7 @@ import co from 'co'
 //       }
 //     }else{
 //       ////tag
-//       self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+//       self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
 //         ////tag
 //         if(res.data.length != 0){
 //           self.$parent.$parent.user = res.data[0]
@@ -554,7 +554,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+"'"
     //     }
     //   })
@@ -608,7 +608,6 @@ export default {
       HostApp.__this__ = null
     },
     takePic(prop, title, index) {
-      const obj = HostApp.getGpsDetailAddress()
       HostApp.__callback__ = this.cameraCallBack
       HostApp.__this__ = this
       ////tag
@@ -629,6 +628,7 @@ export default {
       }
       let jingweidu = ''
       if (this.$parent.$parent.is_has_jingweidu == 'true'){
+        const obj = HostApp.getGpsDetailAddress()
         jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
       }
       HostApp._open_a_page({
@@ -1131,7 +1131,7 @@ export default {
       ////tag)
       let http = new HttpResetClass()
       ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -1141,7 +1141,7 @@ export default {
       }, {resolveMsg: null, rejectMsg: null})
       ////tag)
       ////tag
-      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+      let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
         data: {
           "f_operat_type": "取消拉黑",
           "f_state": "有效",
@@ -1183,7 +1183,7 @@ export default {
       ////tag)
       let http = new HttpResetClass()
       ////tag
-      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+      let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
         data: {
           items: "version",
           tablename: "t_userinfo",
@@ -1199,7 +1199,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,
@@ -1252,7 +1252,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/hanzhong/android/SafecheckDevices.vue

@@ -435,7 +435,6 @@
         if (this.role == 'androidview') {
           return
         }
-        const obj = HostApp.getGpsDetailAddress()
         HostApp.__callback__ = this.cameraCallBack
         HostApp.__this__ = this
         //tag
@@ -455,6 +454,7 @@
         }
         let jingweidu = ''
         if (this.$parent.$parent.is_has_jingweidu == 'true'){
+          const obj = HostApp.getGpsDetailAddress()
           jingweidu =  '\t经度：' + obj.longitude+ '\t纬度：' + obj.latitude
         }
         //tag