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

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

@@ -507,7 +507,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,
@@ -643,7 +643,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,
@@ -656,7 +656,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,
@@ -675,7 +675,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:'',
@@ -759,7 +759,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 = {
@@ -809,8 +809,13 @@
           condition += " and ti.f_address like '%"+this.$refs.paged.$refs.cri.model.f_keyword+"%'"
         if(this.$refs.paged.$refs.cri.model.f_user_name)
           condition += " and ti.f_user_name like '%"+this.$refs.paged.$refs.cri.model.f_user_name+"%'"
-        if(this.$refs.paged.$refs.cri.model.f_state[0])
+        if(this.$refs.paged.$refs.cri.model.f_state[0] == '未检' ){
+          condition += " and (ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"' or ti.f_last_check_state = '到访不遇' ) "
+        }
+        if(this.$refs.paged.$refs.cri.model.f_state[0] == '已检' ){
           condition += " and ti.f_state='"+this.$refs.paged.$refs.cri.model.f_state[0]+"'"
+        }
+
         // if(this.$refs.paged.$refs.cri.model.f_last_state[0])
         //   condition += " and ti.f_last_check_state='"+this.$refs.paged.$refs.cri.model.f_last_state[0]+"'"
         if(this.$refs.paged.$refs.cri.model.f_user_type[0])
@@ -823,7 +828,7 @@
           condition += " and ti.f_enter_number like '%"+this.$refs.paged.$refs.cri.model.f_enter_number+"%'"
 
         //tag
-        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检')) and ti.f_no_checkplan = '有计划安检'" + condition)
+        this.model.search("((f_complete = '' or f_complete = null or f_complete = '未完成') or (f_state = '未检') or ti.f_last_check_state = '到访不遇') and ti.f_no_checkplan = '有计划安检'" + condition)
       },
       getNewOrder(){
         HostApp.__this__ = this

package/src/filiale/zhongsheng/android/IgnitionInformation.vue

@@ -112,12 +112,12 @@ export default {
       //tag
       this.excessive = true
       let http = new HttpResetClass()
-      http.load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/IgnitionInfor`, {data: {condition: `f_userinfo_id in (${userinfoid})`}}).then((row) => {
+      http.load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/IgnitionInfor`, {data: {condition: `f_userinfo_id in (${userinfoid})`}}).then((row) => {
         this.model = row.data
         this.excessive = false
       })
       //tag
-      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/IgnitionInfor`, {condition:`f_userinfo_id = '${this.f_userinfo_id}'`}).then((row) => {
+      // this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/IgnitionInfor`, {condition:`f_userinfo_id = '${this.f_userinfo_id}'`}).then((row) => {
       //   this.model = row.data
       //   this.excessive=false
       // })

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

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

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

@@ -418,7 +418,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=[]
@@ -494,7 +494,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){
                 //本次修改信息包含需要审核信息
@@ -606,7 +606,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})
@@ -635,7 +635,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})
           })
@@ -719,7 +719,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})
@@ -736,7 +736,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){
@@ -815,13 +815,13 @@
         this.excessive=true
         //Vue.user.orgid ${this.f_userinfo_id} 10101    ${Vue.user.orgid}
 
-        let pcdlist= await new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {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/zhongsheng/android/SafecheckOrderV.vue

@@ -389,7 +389,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})`,
@@ -1519,7 +1519,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/zhongsheng/android/SafecheckUserInfo.vue

@@ -225,7 +225,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) => {
@@ -248,7 +248,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) => {
@@ -272,7 +272,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}'`,
@@ -294,7 +294,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/zhongsheng/pc/CheckPlanAreaList.vue

@@ -57,11 +57,11 @@
                      :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
                      @click="$parent.$parent.hidden()">
                 </div>
-                <!--                <export-excel-safe   :data="$parent.$parent.exportParameter"
+                <!--                <export-excel   :data="$parent.$parent.exportParameter"
                                                      :field="$parent.$parent.exportExcelField"
-                                                     sqlurl="rs/logic/SafeExportExcel" sql-name="getCheckPlanAreaList"
+                                                     sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="getCheckPlanAreaList"
                                                      template-name='安检汇总' :choose-col="true">
-                                </export-excel-safe>-->
+                                </export-excel>-->
                 <button id="btnaaaa" style="float: right" class="button_search"
                         @click="$parent.$parent.exportexcel()"
                         v-el:cx>导出</button>
@@ -188,7 +188,7 @@ import XLSX from "xlsx";
 export default {
   data () {
     return {
-      model: new PagedList('rs/sql/getCheckPlanAreaList', 99999),
+      model: new PagedList('api/af-safecheck/sql/getCheckPlanAreaList', 99999),
       // 公司下拉
       curorgid: [this.$login.f.orgid],
       row: {},
@@ -271,7 +271,7 @@ export default {
     },
     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/zhongsheng/pc/DefectListWeixiu.vue

@@ -204,7 +204,7 @@ import co from 'co'
 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('隐患已处理。')
@@ -236,7 +236,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
@@ -298,10 +298,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 != '无隐患'`, {})
@@ -313,7 +313,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,
@@ -416,7 +416,7 @@ export default {
       // //tag)
       // const sql = `update t_devices_items set f_is_repaired = '已处理',f_remarks='${this.dealRow.f_remarks}' where id ='${this.dealRow.id}'`
       // //tag
-      this.$resetpost('/rs/logic/checkdealwith', {data: {remak: this.dealRow.f_remarks,f_paper_id:this.dealRow.f_paper_id,id:this.dealRow.id}}, {resolveMsg: '处理成功', rejectMsg: '处理失败!!!'})
+      this.$resetpost('/api/af-safecheck/logic/checkdealwith', {data: {remak: this.dealRow.f_remarks,f_paper_id:this.dealRow.f_paper_id,id:this.dealRow.id}}, {resolveMsg: '处理成功', rejectMsg: '处理失败!!!'})
       this.dealModal = false
     },
     solveDefect (row, type) {
@@ -467,7 +467,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/zhongsheng/pc/DefectPaperWeiXiu.vue

@@ -37,7 +37,6 @@
                 v-model='model.f_repaired'
                 :value.sync="model.f_repaired"
                 :options='$parent.$parent.repaired'
-                condition="f_repaired  = '{}'"
                 close-on-select clear-button> </v-select>
             </div>
             <div class=" col-sm-4 form-group button-range"  >
@@ -50,10 +49,10 @@
                      @click="$parent.$parent.hidden()"></div>
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</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="GetCheckPaperByDefect" template-name='安检隐患明细' :choose-col="true"></export-excel-safe>
+                                sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检隐患明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -152,10 +151,10 @@
                      @click="$parent.$parent.hidden()"></div>
                 <button style="float: right" class="button_search button_spacing" @click="search">查询</button>
                 <div style="float: right">
-                  <export-excel-safe   :data="{condition: $parent.$parent.model.condition,f_filialeids:$parent.$parent.model.f_filialeids}"
+                  <export-excel   :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="GetCheckPaperByDefect" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                                  sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefect" template-name='安检计划明细' :choose-col="true"></export-excel>
                 </div>
               </div>
             </div>
@@ -179,7 +178,6 @@
                 v-model='model.f_repaired'
                 :value.sync="model.f_repaired"
                 :options='$parent.$parent.repaired'
-                condition="f_repaired  = '{}'"
                 close-on-select clear-button> </v-select>
             </div>
 
@@ -324,7 +322,7 @@
   export default {
     title: '隐患查询',
     data() {
-      let model = new PagedList('rs/sql/GetCheckPaperByDefect', 20, {
+      let model = new PagedList('api/af-safecheck/sql/GetCheckPaperByDefect', 20, {
         f_filialeids: 'this.f_filialeids',f_defect_content: 'this.f_defect_content'
       })
       model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -394,7 +392,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}`,
@@ -419,7 +417,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}`,
@@ -457,6 +455,12 @@
         if (this.f_check_plan.f_plan_name) {
           args.condition += ` and f_check_plan_id = '${this.f_check_plan.id}'`
         }
+        if(args.model.f_repaired == '未修'){
+          args.condition += ` and f_defect_count != f_is_repaired `
+        }
+        if(args.model.f_repaired == '已处理'){
+          args.condition += ` and f_defect_count = f_is_repaired `
+        }
         this.model.search(args.condition, args.model)
       },
       getRes(obj) {

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

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

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

@@ -37,13 +37,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>
@@ -345,7 +345,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',
@@ -425,7 +425,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)=>{
@@ -467,7 +467,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}`,
@@ -493,7 +493,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/zhongsheng/pc/UserInfoAudit.vue

@@ -111,7 +111,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
@@ -135,7 +135,7 @@ export default {
     },
     change(row) {
       //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) => {
@@ -189,10 +189,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)
@@ -200,7 +200,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("审核成功,用户信息已更新！")
@@ -237,7 +237,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/filiale/zhongyi/android/CurrentCreate.vue

@@ -500,7 +500,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -636,7 +636,7 @@
         this.check=''
       },
       async okput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
 
           condition:`i.id='`+this.needid+`'`,
             f_plan_id:this.planid,
@@ -649,7 +649,7 @@
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"i.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -668,7 +668,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:'',
@@ -752,7 +752,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 = {