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

package/src/components/rongcheng/AspiratedPaperMessage.vue

@@ -38,7 +38,7 @@
         <devicesm> </devicesm>
       </div>
       <div style="width: 95%;height: 900px;margin-left: 20px;float: left;">
-        <asp-paper-feedbackm v-bind:paper="this.data" ></asp-paper-feedbackm>
+        <asp-paper-feedbackm v-bind:paper="this.data"  :item="item" ></asp-paper-feedbackm>
       </div>
     </div>
   </div>

package/src/components/rongcheng/AspiratedUploadPage.vue

@@ -115,7 +115,7 @@
     methods: {
       inspect(row){
         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}}).then((response) => {
+          this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
             //tag)
             row['f_plan_meters'] = response.data
             let pardate = {

package/src/components/rongcheng/AspiratedUserInfo.vue

@@ -163,7 +163,7 @@
           title: '设备查看',
           safe: false
         })
-        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id})
+        this.$parent.$parent.$goto('PhoneDevicesInfo', {f_userinfo_id: f_userinfo_id,f_user_type:this.userinfo.f_check_type})
       },
       cameraCallBack(prop, fileName) {
         HostApp.__this__.$set(prop, fileName + '?' + Math.random())

package/src/components/rongcheng/CheckCurrentCreate.vue

@@ -375,6 +375,14 @@
                   <p class="panel-title col-xs-5 text-left font"><b>最后一次安检状态:</b></p>
                   <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_check_state }}</p>
                 </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>最后一次入户时间:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_ruhu_date }}</p>
+                </div>
+                <div class="col-xs-12">
+                  <p class="panel-title col-xs-5 text-left font"><b>隐患处理情况:</b></p>
+                  <p class="panel-title col-xs-7 text-left input-font">{{ row.f_last_defect_repair ? row.f_last_defect_repair : '未处理' }}</p>
+                </div>
 
                 <div class="col-xs-12">
                   <p class="panel-title col-xs-5 text-left font"><b>上次安检备注:</b></p>
@@ -553,7 +561,7 @@
         check:'',
         plan:'',
         planid:'',
-        model:Vue.android? new LocalPagedList('androidGetuserinfo',5,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfo',5,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2:false,
         showModal3:false,
@@ -667,7 +675,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,
@@ -680,7 +688,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:"it.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -699,7 +707,7 @@
         if (!this.check){
           condition=`f_plan_name like '%`+this.plan+`%'`+` and f_safecheck_type='年度普检'`
         }
-        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:'',
@@ -789,7 +797,7 @@
         //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}}).then((response) => {
+          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}).then((response) => {
             //tag)
             row['f_plan_meters'] = response.data
             var pardate = {

package/src/components/rongcheng/CheckPaperList.vue

@@ -70,7 +70,7 @@ export default {
   data() {
     return {
       rowdata: this.row,
-      model: new PagedList('rs/sql/查找安检单', 10, {
+      model: new PagedList('api/af-safecheck/sql/查找安检单', 10, {
         f_filialeid: "''",
         f_plan_id: "''",
         f_approved: "''",

package/src/components/rongcheng/CheckPlanList.vue

@@ -168,7 +168,7 @@
     data() {
       return {
         f_orgid: Vue.user.orgid,
-        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/androidCheckPlanList`, 20, {condition: 'this.condition'}),
+        model: new PagedList(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/androidCheckPlanList`, 20, {condition: 'this.condition'}),
         criteriaShow: false,
         plan_name :''
       }

package/src/components/rongcheng/CheckSearchArea.vue

@@ -119,10 +119,10 @@
             </div>
             <div class="col-sm-8"></div>
             <div style="float: right;margin-right: 10px">
-              <export-excel-safe :data="$parent.$parent.searchData"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="getAreaSafeRatioList"
-                                 template-name='小区安检率汇总'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="getAreaSafeRatioList"
+                                 template-name='小区安检率汇总'></export-excel>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
                    @click="$parent.$parent.hiddenr()"></div>
@@ -204,7 +204,7 @@
         moptions.push({label: i + '', value: i + ''})
 
       return {
-        model: new PagedList('rs/sql/getAreaSafeRatioList', 20, {
+        model: new PagedList('api/af-safecheck/sql/getAreaSafeRatioList', 20, {
           orderitem: "'f_userinfo_code'",
           startyear: 'this.startyear',
           startmon: 'this.startmon',
@@ -331,7 +331,7 @@
           this.$showMessage("请选择开始和结束时间")
         }
         condition += `and f_onsite_time > '${this.y_check_start} 00:00:00' and f_onsite_time < '${this.y_check_end} 23:59:59'`
-        new HttpResetClass().load('POST', 'rs/sql/FetchYearCheckRatio', {
+        new HttpResetClass().load('POST', 'api/af-safecheck/sql/FetchYearCheckRatio', {
           data: {
             condition: condition,
             f_createfile_date: this.y_check_end + ' 23:59:59',
@@ -347,7 +347,7 @@
       async initVillage() {
         this.villagesChick = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/safe_singleTable_GroupBy', {
+        let req = await HttpReset.load('POST', 'api/af-safecheck/sql/safe_singleTable_GroupBy', {
           data: {
             items: 'f_residential_area',
             tablename: 't_area',
@@ -367,7 +367,7 @@
       async initstreets() {
         this.streetslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street',
@@ -603,7 +603,7 @@
         }
         let HttpReset = new HttpResetClass()
         let redata = []
-        HttpReset.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
+        HttpReset.load('POST', '/api/af-safecheck/sql/safe_singleTable_GroupBy', {
           data: {
             items: "f_building",
             tablename: "t_user_address",

package/src/components/rongcheng/CheckSearchUser.vue

@@ -230,11 +230,35 @@
                   v-model="$parent.$parent.check_itemValue"
                   close-on-select clear-button> </v-select>
               </div>
+              <div class="col-sm-4" style="width: 20%">
+                <label class="font_normal_body">安检员</label>
+                <v-select
+                  placeholder='安检员'
+                  :value-single="true"
+                  class="select select_list"
+                  :value.sync="model.f_checker_id"
+                  :options='$parent.$parent.checkersid'
+                  v-model="model.f_checker_id"
+                  condition="f_checker_id = '{}'"
+                  close-on-select clear-button> </v-select>
+              </div>
+<!--              <div class="col-sm-4" style="width: 20%">-->
+<!--                <label class="font_normal_body">安检状态</label>-->
+<!--                <v-select-->
+<!--                  placeholder='安检状态'-->
+<!--                  :value-single="true"-->
+<!--                  class="select select_list"-->
+<!--                  :value.sync="model.f_entry"-->
+<!--                  :options='$parent.$parent.f_entry_status'-->
+<!--                  v-model="model.f_entry"-->
+<!--                  condition="f_last_check_state= '{}'"-->
+<!--                  close-on-select clear-button> </v-select>-->
+<!--              </div>-->
               <div class="col-sm-8"></div>
               <div style="float: right;margin-right: 10px">
-                <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>
                 <div style="float: right" class="button_spacing"
                      :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
                      @click="$parent.$parent.hiddenr()"></div>
@@ -374,19 +398,18 @@ import * as Util from './../Util'
 import Vue from 'vue'
 import {toStandardDateString} from "./../Util";
 
-// let select = function * (self,userid) {
-//   let http = new HttpResetClass()
-//   let getGasman = yield http.load('POST','/rs/search', {
-//     source: 'this.getChildByName($安检员$).getUsers()',
-//     userid: userid
-//   }, {resolveMsg: null, rejectMsg: null})
-//   console.log('获取安检员', getGasman)
-//   getGasman.data.forEach((checker)=>{
-//     self.checkersid.push({label:checker.name,value:checker.id})
-//   })
-//   self.checkersid.push({label:'全部',value:''})
-// }
-
+let select = function* (self) {
+  let http = new HttpResetClass()
+  let getGasman = yield http.load('POST','/rs/search', {
+    source: 'this.getParentByType($department$).getAllChildrens().where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1))',
+    userid: self.$login.f.id
+  }, {resolveMsg: null, rejectMsg: null})
+  //tag
+  self.checkersid.push({label: '全部', value: ''})
+  getGasman.data.forEach((checker) => {
+    self.checkersid.push({label: checker.name, value: checker.id})
+  })
+}
 
 export default {
   title: '民用用户安检情况',
@@ -426,7 +449,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result':'安检结果'
       },
-      model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {orderitem: "'f_userinfo_code'",timetype:"'dd'" ,con1:"this.con1",con2:"this.con2",f_itemname:'this.check_item',f_itemvalue:'this.check_itemValue',f_filialeids:`'(${this.$login.f.orgid})'`}),
+      model: new PagedList('api/af-safecheck/sql/根据安检员查询用户档案', 20, {orderitem: "'f_userinfo_code'",timetype:"'dd'" ,con1:"this.con1",con2:"this.con2",f_itemname:'this.check_item',f_itemvalue:'this.check_itemValue',f_filialeids:`'(${this.$login.f.orgid})'`}),
       orgstrs:[{label: '全部', value: ''}],
       checkersid:[],
       SafeCheckXZ:'',
@@ -435,7 +458,7 @@ export default {
       SafeCheckXZs: [{label: '全部', value: ''},{label: '已入户', value: '已入户'}, {label: '未入户', value: '未入户'}], // 安检筛选选项
       safe_rhs: [{label: '全部', value: ''},{label: '今年已入户', value: '今年已入户'}, {label: '今年未入户', value: '今年未入户'}], // 安检筛选选项
       SafeCheckSXs: [{label: '是', value: '是'}, {label: '否', value: '否'}, {label: '全部', value: ''},],
-      checkstatus:[{label: '全部', value: ''},{label: '到访不遇', value: '到访不遇'}, {label: '拒检', value: '拒检'}],
+      checkstatus:[{label: '全部', value: ''},{label: '到访不遇', value: '到访不遇'}, {label: '拒检', value: '拒检'},{label: '激光检漏', value: '激光检漏'},{label: '立杠保压', value: '立杠保压'},{label: '室外关阀', value: '室外关阀'}],
       IsShares: [{label: '是', value: '是'}, {label: '否', value: '否'}],
       IsShare:'否',
       checker: {},
@@ -471,7 +494,8 @@ export default {
       hasHousehold:'',
       check_items:[{label: '全部', value: ''}, ...this.$appdata.getParam('安检项名')],
       check_item:'',
-      check_itemValue:''
+      check_itemValue:'',
+      // f_entry_status: this.$appdata.getParam('安检状态'),
     }
   },
   props: {
@@ -496,6 +520,8 @@ export default {
     this.initVillage()
     this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStandardDateString()
     this.$refs.paged.$refs.criteria.model.f_check_end = Util.toStandardDateString()
+    let gen = select(this)
+    co(gen)
     // this.$refs.paged.$refs.criteria.search();
   },
   methods: {
@@ -508,7 +534,7 @@ export default {
         this.$showMessage("请选择开始和结束时间")
       }
       condition += `and f_onsite_time > '${this.y_check_start} 00:00:00' and f_onsite_time < '${this.y_check_end} 23:59:59'`
-      new HttpResetClass().load('POST', 'rs/sql/FetchYearCheckRatio', {
+      new HttpResetClass().load('POST', 'api/af-safecheck/sql/FetchYearCheckRatio', {
         data: {
           condition: condition,
           f_createfile_date:this.y_check_end+' 23:59:59',
@@ -524,7 +550,7 @@ export default {
     async initVillage(){
       this.villagesChick = []
       let HttpReset = new HttpResetClass()
-      let req = await HttpReset.load('POST', 'rs/sql/safe_singleTable_GroupBy', {
+      let req = await HttpReset.load('POST', 'api/af-safecheck/sql/safe_singleTable_GroupBy', {
         data: {
           items: 'f_residential_area',
           tablename: 't_area',
@@ -543,7 +569,7 @@ export default {
     async initstreets(){
       this.streetslist = []
       let HttpReset = new HttpResetClass()
-      let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_street',
@@ -612,12 +638,13 @@ export default {
       let con1='1=1 '
       let con2='1=1 '
       if(this.SafeCheckXZ == '已入户'){
-        args.condition += " and r > 0"
+        args.condition += " and r > 0 and f_last_check_state = '入户'"
         con1 += ` and  f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         con2 += ` and  f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         //args.condition += " and ( f_last_check_date > '"+ args.model.f_check_end + " 23:59:00' or  f_last_check_date < '"+ args.model.f_check_start + " 00:00:00' or f_last_check_date is null)"
       } else if(this.SafeCheckXZ == '未入户') {
         args.condition += " and r < 1"
+        args.condition += " and f_last_check_state != '入户'"
         con1 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         con2 += ` and f_offsite_time > '${args.model.f_check_start}' and f_offsite_time < '${args.model.f_check_end}'`
         if(args.model.f_check_state=='到访不遇'){
@@ -626,6 +653,9 @@ export default {
           args.condition += " and j > 0"
         }
       }
+      if (args.model.f_check_state){
+        args.condition += ` and f_last_check_state = '${args.model.f_check_state}'`
+      }
       this.model.check_item=this.check_item
       this.model.check_itemValue=this.check_itemValue
       /*if(this.hasHousehold=='今年已入户'){
@@ -801,7 +831,7 @@ export default {
       }
       let HttpReset = new HttpResetClass()
       let redata = []
-      HttpReset.load('POST', '/rs/sql/safe_singleTable_GroupBy', {
+      HttpReset.load('POST', '/api/af-safecheck/sql/safe_singleTable_GroupBy', {
         data: {
           items: "f_building",
           tablename: "t_user_address",

package/src/components/rongcheng/CheckSearchUserNo.vue

@@ -178,9 +178,9 @@
               </div>
               <div class="col-sm-8"></div>
               <div style="float: right;margin-right: 10px">
-                <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>
                 <div style="float: right" class="button_spacing"
                      :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
                      @click="$parent.$parent.hiddenr()"></div>
@@ -369,7 +369,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_last_check_result':'安检结果'
       },
-      model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {orderitem: "'f_userinfo_code'",timetype:"'dd'" ,con1:"this.con1",con2:"this.con2",f_itemname:'this.check_item',f_itemvalue:'this.check_itemValue',f_filialeids:`'(${this.$login.f.orgid})'`}),
+      model: new PagedList('api/af-safecheck/sql/根据安检员查询用户档案', 20, {orderitem: "'f_userinfo_code'",timetype:"'dd'" ,con1:"this.con1",con2:"this.con2",f_itemname:'this.check_item',f_itemvalue:'this.check_itemValue',f_filialeids:`'(${this.$login.f.orgid})'`}),
       orgstrs:[{label: '全部', value: ''}],
       checkersid:[],
       SafeCheckXZ:'',
@@ -438,7 +438,7 @@ export default {
         this.$showMessage("请选择开始和结束时间")
       }
       condition += `and f_onsite_time > '${this.y_check_start} 00:00:00' and f_onsite_time < '${this.y_check_end} 23:59:59'`
-      new HttpResetClass().load('POST', 'rs/sql/FetchYearCheckRatio', {
+      new HttpResetClass().load('POST', 'api/af-safecheck/sql/FetchYearCheckRatio', {
         data: {
           condition: condition,
           usertype:'非民用',
@@ -454,7 +454,7 @@ export default {
     async initstreets(){
       this.streetslist = []
       let HttpReset = new HttpResetClass()
-      let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+      let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
         data: {
           items: '*',
           tablename: 't_street',

package/src/components/rongcheng/CheckUserList.vue

@@ -48,10 +48,10 @@
             </div>
             <div class="form-group col-sm-4 button-range">
               <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
-              <export-excel-safe :data="$parent.$parent.searchData"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="getAreaSafeRatioUserList"
-                                 template-name='小区安检用户明细'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="getAreaSafeRatioUserList"
+                                 template-name='小区安检用户明细'></export-excel>
             </div>
           </div>
         </div>
@@ -118,7 +118,7 @@
     title: '小区用户明细',
     data() {
       return {
-        model: new PagedList('rs/sql/getAreaSafeRatioUserList', 50, {
+        model: new PagedList('api/af-safecheck/sql/getAreaSafeRatioUserList', 50, {
           startyear: 'this.startyear',
           startmon: 'this.startmon',
           endyear: 'this.endyear',

package/src/components/rongcheng/CurrentCreateOnline.vue

@@ -382,7 +382,7 @@
         check: '',
         plan: '',
         planid: '',
-        model:Vue.android? new LocalPagedList('androidGetuserinfoAsp',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/rs/sql/androidGetuserinfo',20,{condition:'this.condition'}),
+        model:Vue.android? new LocalPagedList('androidGetuserinfoAsp',20,{condition:'this.condition'}): new PagedList( 'AndroidRest/api/af-safecheck/sql/androidGetuserinfo',20,{condition:'this.condition'}),
         showModal: false,
         showModal2: false,
         showModal3: false,
@@ -523,7 +523,7 @@
         this.check = ''
       },
       async okput() {
-        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {
+        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {
           data: {
 
             condition: `i.id='` + this.needid + `'`,
@@ -537,7 +537,7 @@
         await this.getNewOrder()
       },
       async manyokput() {
-        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {
+        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {
           data: {
             columnName: "i.id",
             condition: "1=1",
@@ -557,7 +557,7 @@
         if (!this.check) {
           condition = `f_plan_name like '%` + this.plan + `%'`
         }
-        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/sql/预约计划下发`, {
+        let res = await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/预约计划下发`, {
           data: {
             condition: condition,
             f_filialeids: this.f_filialeids,
@@ -652,7 +652,7 @@
       inspect(row) {
         var _this = this
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && (row.f_state == '未检' || (row.f_state == '已检' && (row.f_last_check_state == '到访不遇' || row.f_last_check_state == '拒检'))) && row.f_no_checkplan != '无计划安检')) {
-          new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {
+          new HttpResetClass().load('post', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/tel_singleTable_OrderBy`, {
             data: {
               items: 'count(0) as count_num',
               tablename: 't_check_plan_item',
@@ -667,7 +667,7 @@
             }
             let myDate = new Date()
             // if (resp.data[0].f_end_time > myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDay() || !resp.data[0].f_end_time) {
-            _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}, {
+            _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}}, {
               resolveMsg: null,
               rejectMsg: null
             }).then((response) => {
@@ -745,7 +745,7 @@
           groupitem: 'f_residential_area'
         }
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           //tag
           res.data.forEach(item => this.residentialAreaOptions.push({
             label: item.f_residential_area,
@@ -769,7 +769,7 @@
           groupitem: 'f_building'
         }
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           //tag
           res.data.forEach(item => this.buildOptions.push({label: item.f_building, value: item.f_building}))
         })
@@ -789,7 +789,7 @@
           groupitem: 'f_unit'
         }
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           //tag
           res.data.forEach(item => this.unitOptions.push({label: item.f_unit, value: item.f_unit}))
         })
@@ -809,7 +809,7 @@
           groupitem: 'f_floor'
         }
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           //tag
           res.data.forEach(item => this.floors.push({label: item.f_floor, value: item.f_floor}))
         })
@@ -876,7 +876,7 @@
           groupitem: 'f_plan_name'
         }
         let http = new HttpResetClass()
-        http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+        http.load('POST', `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_GroupBy`, {data:criteria}, {resolveMsg: null, rejectMsg: null}).then((res) => {
           //tag
           res.data.forEach(item => this.planNameOptions.push({
             label: item.f_plan_name,

package/src/components/rongcheng/DefectList.vue

@@ -262,7 +262,7 @@
   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('隐患已处理。')
@@ -294,7 +294,7 @@
       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
@@ -356,10 +356,10 @@
     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/updateDefectStateZG',
+      let updateRes = yield self.$resetpost('/api/af-safecheck/logic/updateDefectStateZG',
         {itemsId: self.$login.convertToIn(rows.map(row => row.id)),
          paperid:self.check.id,
          f_rectification_man:self.toRepairModal.preData.f_repairman
@@ -375,7 +375,7 @@
     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,

package/src/components/rongcheng/DefectPaper.vue

@@ -41,9 +41,9 @@
                       </div>
                       <div :class="{'col-sm-6':$parent.$parent.$parent.showItem,'col-sm-4':!$parent.$parent.$parent.showItem}" style="float: right;padding-bottom:5px">
                         <div class="span" style="float: right;margin-top: 8px">
-                          <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"
-                                               sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectToExcel" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                                               sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectToExcel" template-name='安检计划明细' :choose-col="true"></export-excel>
                           <button class="button_search button_spacing" @click="$parent.$parent.showChooser1">转维修</button>
                           <button class="button_search button_spacing" @click="$parent.$parent.showChooser2">整改</button>
                           <button class="button_search button_spacing" @click="search">查询</button>
@@ -77,9 +77,9 @@
                    <!-- <div class="row">
                       <div :class="{'col-sm-7':$parent.$parent.$parent.showItem,'col-sm-7':!$parent.$parent.$parent.showItem}" style="float: right;padding-bottom:5px">
                         <div class="span" style="float: right;margin-top: 8px">
-                          <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"
-                                               sqlurl="rs/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectToExcel" template-name='安检计划明细' :choose-col="true"></export-excel-safe>
+                                               sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="GetCheckPaperByDefectToExcel" template-name='安检计划明细' :choose-col="true"></export-excel>
                           <button class="button_search button_spacing" @click="$parent.$parent.showChooser1">转维修</button>
                           <button class="button_search button_spacing" @click="$parent.$parent.showChooser2">整改</button>
                           <button class="button_search button_spacing" @click="search">查询</button>
@@ -383,7 +383,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'
       },{f_defect_count: '', f_fist_count: '', f_second_count: '',f_third_count: '',f_other_count:''})
       model.f_filialeids = '(' + this.$login.f.orgid + ')'
@@ -407,7 +407,7 @@
         defectType:[],
         userTypes:[{label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
         defectLeave:'',
-        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'}],
+        defectLeaveList:[{label:'全部',value:''},{label:'一级隐患',value:'一级隐患'},{label:'二级隐患',value:'二级隐患'},{label:'三级隐患',value:'三级隐患'},{label: '其他隐患',value:'其他隐患'}],
         thead: '',
         headData: ['入户状态','用户名','用户电话','用户地址','安检时间','安检员','计划名','是否有隐患','隐患数','一级隐患数','一级隐患','二级隐患数','二级隐患','三级隐患数','三级隐患','其他隐患','隐患内容'],
         bodyData: ['f_entry_status','f_user_name','f_user_phone','f_address','f_offsite_time','f_checker_name','f_plan_name','f_has_defect','f_defect_count','f_fist_count','f_fist_content','f_second_count','f_second_content','f_third_count','f_third_content','f_other_count','f_defect_content'],
@@ -468,6 +468,9 @@
           if(this.defectLeave=='三级隐患'){
             args.condition += ` and f_third_count > 0`
           }
+          if(this.defectLeave=='其他隐患'){
+            args.condition += ` and f_other_count > 0`
+          }
         }
         if(this.defectType.length>0){
           args.condition += ` and (`
@@ -525,7 +528,7 @@
         this.$showMessage('确定要整改当前选中用户吗？！', ['confirm', 'cancel']).then((msg)=>{
           if(msg=='confirm'){
             if (this.checkAll  ||  this.checkes.length>0) {
-              this.$resetpost(`/rs/logic/UploadRectification`,
+              this.$resetpost(`/api/af-safecheck/logic/UploadRectification`,
                 {
                   condition:this.model.params.condition,
                   f_filialeids:this.model.params.f_filialeids,
@@ -567,7 +570,7 @@
       },
       ok1() {
         if (this.checkAll  ||  this.checkes.length>0) {
-          this.$resetpost(`/rs/logic/SafeToRepair`,
+          this.$resetpost(`/api/af-safecheck/logic/SafeToRepair`,
             {
               condition:this.model.params.condition,
               f_filialeids:this.model.params.f_filialeids,
@@ -598,7 +601,7 @@
       async initstreets(){
         this.streetslist = []
         let HttpReset = new HttpResetClass()
-        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy', {
+        let req = await HttpReset.load('POST', 'api/af-safecheck/sql/address_singleTableOrderBy', {
           data: {
             items: '*',
             tablename: 't_street',