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

package/src/filiale/zhongyi/android/SafecheckOrderV.vue

@@ -388,7 +388,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})`,
@@ -1521,7 +1521,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/zhongyi/pc/DefectListNew.vue

@@ -196,12 +196,12 @@ 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('隐患已处理。')
         self.showSolveModal = false
-        self.model.search('f_repaire_type != \'无隐患\'', {})
+        self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
       }
     })
 }
@@ -229,7 +229,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
@@ -291,7 +291,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 = {
@@ -300,10 +300,10 @@ 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 != '无隐患'`, {})
+      self.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
   }
 }
@@ -312,7 +312,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,
@@ -400,7 +400,7 @@ export default {
     this.model.f_item_value = `(SELECT stuff(( SELECT ',' + f_item_value FROM t_devices_items_lists WHERE ( f_is_defect = 'true' OR di.f_is_defect = 'true') AND f_item_id = di.id FOR xml path ( '' ) ),1,1,'' ) )`
     if (this.check) {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     }
     this.getEmp()
   },
@@ -413,9 +413,9 @@ 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.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
           this.showSolveModal = false
           this.showToRepairModal = false
           this.$showMessage('提交成功')
@@ -487,14 +487,14 @@ export default {
   watch: {
     'check'() {
       this.model.f_paper_id = this.check.id
-      this.model.search(`f_repaire_type != '无隐患'`, {})
+      this.model.search(`(f_repaire_type != '无隐患' or f_repaire_type is null)`, {})
     },
     'model.rows'() {
       //
       if (this.model.rows.length > 0) {
         let tempRow = this.model.rows
         for (let i = 0; i < tempRow.length; i++) {
-          if (tempRow[i].f_repaire_type == '未处理') {
+          if (tempRow[i].f_repaire_type == '未处理' ||  !tempRow[i].f_repaire_type ) {
             this.needRepair = true
             return
           }

package/src/filiale/zhongyi/pc/checkScreen.vue

@@ -232,7 +232,7 @@
         }
         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/zhoukou/android/AndroidDefectDeal.vue

@@ -250,7 +250,7 @@
           f_dealer_id:Vue.user.id
         },
         f_filialeids:'',
-        model:new PagedList( `${this.$androidUtil.getProxyUrl()}/rs/sql/AndroidDealWith`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
+        model:new PagedList( `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/AndroidDealWith`,20,{condition:'this.condition',f_filialeids:`'${Vue.user.orgid}'`,f_checker_id:`'${Vue.user.id}'`}),
         criteriaShow: false,
 
       }

package/src/filiale/zhoukou/android/AreaPlan.vue

@@ -373,7 +373,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,
@@ -441,7 +441,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/zhoukou/android/CurrentCreate.vue

@@ -499,7 +499,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,
@@ -626,7 +626,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,
@@ -639,7 +639,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,
@@ -658,7 +658,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:'',
@@ -746,7 +746,7 @@
         var _this = this
         //tag
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) || (row.f_upload_state == '已传' && row.f_last_check_state != '入户' ) ) {
-          _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)
             if(response.data.length>0){
               row['f_plan_meters'] = response.data

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

@@ -360,7 +360,7 @@
   //               if(items.f_is_defect == true || items.f_is_defect == 'true'){
   //                 checkResult = '有隐患'
   //                 //tag
-  //                 let res = yield self.$resetpost(`${self.Url}/rs/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
+  //                 let res = yield self.$resetpost(`${self.Url}/api/af-safecheck/sql/getDeviceItem`,{data:{f_device_id:codata[device][item].f_device_id,f_item_name:items.f_item_name}})
   //                 //tag)
   //                 self.$set('detail.f_defect_id', res.data[0].id)
   //                 self.$set('detail.f_project',`${items.f_item_name}：${items.f_item_value}`)
@@ -397,7 +397,7 @@
   //         self.undo()
   //         self.$set('paper.f_SafeToRepair_id',res.data.f_service_id)
   //         //tag
-  //         self.$resetpost(`${self.Url}/rs/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
+  //         self.$resetpost(`${self.Url}/api/af-safecheck/logic/updatePaperRepair`,{data:{f_paper_id:self.paper.f_paper_id,f_SafeToRepair_id:res.data.f_service_id}}).then((ret)=>{
   //           //tag
   //           if(ret.data.code ==200){
   //             //tag
@@ -436,7 +436,7 @@
         }
       }else{
         //tag
-        self.$resetpost(`${self.Url}/rs/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
+        self.$resetpost(`${self.Url}/api/af-safecheck/sql/safeCheckgetUserInfo`,{data:{id:self.paper.f_userinfoid}},{resolveMsg: null, rejectMsg: null}).then((res)=>{
           //tag
           if(res.data.length != 0){
             self.$parent.$parent.user = res.data[0]
@@ -526,7 +526,7 @@
       },
       // async isoverDate(){
       //   //tag
-      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidGetuserinfo`, {data:{
+      //   let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidGetuserinfo`, {data:{
       //       condition:"f_plan_item_id='"+this.$parent.$parent.item.id+"'"
       //     }
       //   })
@@ -1085,7 +1085,7 @@
         //tag)
         let http = new HttpResetClass()
         //tag
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1095,7 +1095,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         //tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             "f_operat_type": "取消拉黑",
             "f_state": "有效",
@@ -1137,7 +1137,7 @@
         //tag)
         let http = new HttpResetClass()
         //tag
-        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {
+        let res1 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "version",
             tablename: "t_userinfo",
@@ -1147,7 +1147,7 @@
         }, {resolveMsg: null, rejectMsg: null})
         //tag)
         //tag
-        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/backlistOperate`, {
+        let res2 = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/backlistOperate`, {
           data: {
             "f_operat_type": "拉黑",
             "f_state": "有效",
@@ -1197,7 +1197,7 @@
           //tag
           this.$parent.$parent.model.serviceacitivity[0].f_reciever = val.name
           let http1 = new HttpResetClass()
-          http1.load('POST', `${this.Url}/rs/sql/tel_singleTable_OrderBy`, {
+          http1.load('POST', `${this.Url}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
             data: {
               items: 'f_user_telephone',
               tablename: 't_user',

package/src/filiale/zhoukou/android/PhoneUpUserinfo.vue

@@ -423,7 +423,7 @@
         //tag
         if(this.selectStreet.id){
           let pcdText=text?`and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'`:`and f_street_id=${this.selectStreet.id}`
-          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+          new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
                 ////tag)
                 if(res.data.length>0){
                 this.area=[]
@@ -499,7 +499,7 @@
             this.userinfo_old.meterinfo[0].devicesinfo=this.model
             userinfoms.userfiles.push(this.userinfo_old.meterinfo[0])
             //tag)
-            new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_fileSave`, {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}维护档案信息`:'',address:{id:this.userinfo_old.addressinfo.id,oldid:this.userinfo_old.addressinfo.id}}},{resolveMsg: null, rejectMsg: null}).then((res1)=>{
+            new HttpResetClass().load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_fileSave`, {data: {userinfo: userinfoms,modifyReason:this.f_source?`${this.f_source}维护档案信息`:'',address:{id:this.userinfo_old.addressinfo.id,oldid:this.userinfo_old.addressinfo.id}}},{resolveMsg: null, rejectMsg: null}).then((res1)=>{
               //tag+res1.data.status)
               if(res1.data.status==200){
                 //本次修改信息包含需要审核信息
@@ -618,7 +618,7 @@
           this.selectArea={id:''}
           this.area=[]
           let pcdText=` and f_street_id=${this.selectStreet.id}`
-          let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
+          let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null})
           ////tag)
           res.data.forEach((result)=>{
             this.area.push({label:result.f_residential_area,value:result})
@@ -647,7 +647,7 @@
           this.userinfo.addressinfo.f_slice_area=''
           this.streets=[]
           let pcdText=`and f_pcd_id=${this.selectPcd.id}`
-          let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+          let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
           streetlist.data.forEach((result)=>{
             this.streets.push({label:result.f_street,value:result})
           })
@@ -731,7 +731,7 @@
         if(this.selectStreet.id){
           this.area=[]
           let pcdText=text?`and f_street_id=${this.selectStreet.id} and f_residential_area like '%${text}%'`:`and f_street_id=${this.selectStreet.id}`
-          let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+          let res= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
           ////tag)
           res.data.forEach((result)=>{
             this.area.push({label:result.f_residential_area,value:result})
@@ -748,7 +748,7 @@
           //tag
           this.streets=[]
           let pcdText=`and f_pcd_id=${this.selectPcd.id}`
-          let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
+          let streetlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_street",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}' ${pcdText}`}}, {resolveMsg: null, rejectMsg: null})
           streetlist.data.forEach((result)=>{
             //如果第一次进来有地址id 就拿下地址区域
             if(this.selectStreet.id && this.selectStreet.id==result.id){
@@ -852,13 +852,13 @@
         this.excessive=true
         //Vue.user.orgid ${this.f_userinfo_id} ${Vue.user.orgid}    ${Vue.user.orgid}
 
-        let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
+        let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_pcd",orderitem:"id",condition:`f_orgid = '${Vue.user.orgid}'`}}, {resolveMsg: null, rejectMsg: null})
         //tag)
         pcdlist.data.forEach((result)=>{
           this.pcds.push({label:result.f_pcd,value:result})
         })
         ////tag)
-        let res=await new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/rs/logic/filemanage_getFilesDetail`, {
+        let res=await new HttpResetClass().load('post',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/filemanage_getFilesDetail`, {
           //f_userinfo_code:'12381344',
           f_userinfo_id:this.f_userinfo_id
         }, {resolveMsg: null, rejectMsg: null})

package/src/filiale/zhoukou/android/SafecheckOrderV.vue

@@ -551,7 +551,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})`,
@@ -1502,7 +1502,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/zhoukou/android/SafecheckUserInfo.vue

@@ -229,7 +229,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) => {
@@ -252,7 +252,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) => {
@@ -278,7 +278,7 @@ export default {
       //tag)
       //tag
       let http1 = new HttpResetClass()
-      http1.load('POST',`${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: {
+      http1.load('POST',`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
           items: 'gm.id,gm.f_meter_style',
           tablename: 't_gasbrand gb LEFT JOIN t_gasmodel gm ON gb.id= gm.f_gasbrand_id ',
           condition: `f_meter_brand  = '${this.userinfo.planmeterss.f_aliasname}'`,
@@ -304,7 +304,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/zhoukou/android/UploadPage.vue

@@ -83,7 +83,7 @@ export default {
       }
       this.enableButton=true
       if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检')) {
-        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
           let pardate = {

package/src/filiale/zhoukou/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}"
@@ -186,10 +186,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}"
@@ -440,7 +440,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'
@@ -547,7 +547,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}`,
@@ -799,7 +799,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/zhoukou/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="defectDetails" template-name='安检隐患明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="defectDetails" 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>
 
@@ -216,7 +216,7 @@
   export default {
     title: '隐患明细查看',
     data() {
-      let model = new PagedList('rs/sql/defectDetails', 20)
+      let model = new PagedList('api/af-safecheck/sql/defectDetails', 20)
       model.f_plan_id = ''
       model.f_approved = ''
       model.f_entry = ''
@@ -319,7 +319,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}`,
@@ -344,7 +344,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/main-/345/215/225/351/241/265/351/235/242/346/211/223/345/214/205/347/224/250.js

@@ -0,0 +1,24 @@
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+// import { system } from 'system-clients'
+import safecheckAndroid from './safecheck-page'
+// import VueClipboard from 'vue-clipboard2'
+// Vue.use(VueClipboard)
+Vue.config.silent = true
+/** **************************通用组件******************************/
+all()
+// system(false,'shiquan')
+safecheckAndroid()
+// 打开热力系统登陆
+Vue.$heatCompatibility = false
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('system-clients/src/styles/less/aofeng/expandcss.less')
+Vue.component('load-data', (resolve) => { require(['./components/LoadData'], resolve) })
+// 测试
+// Vue.component('test', (resolve) => { require(['./components/Test'], resolve) });
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/main.js

@@ -1,33 +1,33 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import { system } from 'system-clients'
-import safecheck from './safecheck'
-import echarts from 'echarts'
-// import safecheck from './rongcheng'
-
-all()
-// 验证码开关赋值
-var Verificationfalg = false
-system(Verificationfalg)
-// system()
-safecheck('yongzhou');
-// safecheck('rizhao')
-require('./bootstrap/less/bootstrap.less')
-require('./expandcss.less')
-
-Vue.prototype.$echarts = echarts
-Vue.android = false
-
-Vue.url = '/SafeCheck/rs/'
-if(Vue.android)
-  Vue.url = Vue.staticUrl
-Vue.interval = 1*60*1000
-Vue.nopic = 'file:///android_asset/nopic.png'
-Vue.mapSetup = false
-
-/* eslint-disable no-new */
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import { system } from 'system-clients'
+import safecheck from './safecheck'
+import echarts from 'echarts'
+// import safecheck from './rongcheng'
+
+all()
+// 验证码开关赋值
+var Verificationfalg = false
+system(Verificationfalg)
+// system()
+safecheck('siyang')
+// safecheck('rizhao')
+require('./bootstrap/less/bootstrap.less')
+require('./expandcss.less')
+
+Vue.prototype.$echarts = echarts
+Vue.android = false
+
+Vue.url = '/SafeCheck/rs/'
+if(Vue.android)
+  Vue.url = Vue.staticUrl
+Vue.interval = 1*60*1000
+Vue.nopic = 'file:///android_asset/nopic.png'
+Vue.mapSetup = false
+
+/* eslint-disable no-new */
+new Vue({
+  el: 'body',
+  components: { App }
+})

package/src/plugins/GetCheckParams.js

@@ -15,7 +15,7 @@ let GetCheckParam = {
     return GetCheckParam.bookcodes
   },
   async initinputtor () {
-    let res = await Vue.resetpost('rs/sql/sale_getAlluserRes', {data: {
+    let res = await Vue.resetpost('api/af-safecheck/sql/sale_getAlluserRes', {data: {
       condition: ' 1=1'
     }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
     console.log('resdata:', res.data)

package/src/plugins/LoadCheckParams.js

@@ -4,7 +4,7 @@ import GetCheckParam from './GetCheckParams'
 let loadMeterBookGen = async function (f_filialeid) {
   let http = new HttpResetClass()
   if (GetCheckParam.meterbooks.length === 0) {
-    let getMeterBooks = await http.load('POST', 'rs/logic/sale_getMeterBooksData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+    let getMeterBooks = await http.load('POST', 'api/af-safecheck/logic/sale_getMeterBooksData', {data: {f_orgid: f_filialeid || Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
     if (getMeterBooks.data) {
       LoadCheckParam.organizeBooksData(getMeterBooks.data)
     }