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

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

@@ -37,10 +37,10 @@
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
 
-                <export-excel-safe :data="$parent.$parent.searchData"
+                <export-excel :data="$parent.$parent.searchData"
                               :field="$parent.$parent.excelHeaders"
                               :choose-col="true"
-                              sqlurl="rs/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检记录明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="查找安检单" template-name='安检记录明细'></export-excel>
                 <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
 
                 <button class="button_spacing button_search" @click="search()">查询</button>
@@ -274,7 +274,7 @@
                        style="width: 60%" placeholder="距上次安检天数" >
               </div>
               <div class="form-group col-sm-2"  v-show="$parent.$parent.criteriaShow">
-                <label class="font_normal_body">到访不遇次数</label>
+                <label class="font_normal_body">到访次数</label>
                 <input type="number" class="input_search" v-model="model.f_check_version"
                        style="width: 60%" placeholder="到访不遇次数" condition="f_check_version = '{}'" >
               </div>
@@ -443,7 +443,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',
@@ -528,7 +528,7 @@ export default {
     methods: {
             //气表品牌查询
       getTableBrands() {
-        new HttpResetClass().load("POST", `/rs/sql/safe_singleTable_OrderBy`,
+        new HttpResetClass().load("POST", `/api/af-safecheck/sql/safe_singleTable_OrderBy`,
           {data: {items: "*", tablename: "t_gasbrand", orderitem: "id", condition: ` 1=1 `}},
           {resolveMsg: null, rejectMsg: null}).then((resp) => {
           resp.data.forEach((result) => {
@@ -539,7 +539,7 @@ export default {
       //获取省市区列表
       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)=>{
@@ -581,7 +581,7 @@ export default {
         ////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}`,
@@ -607,7 +607,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/yongzhou/pc/PlanManage.vue

@@ -462,7 +462,7 @@
           return Vue.$appdata.getParam('安检类型')
         },*/
         async loadpage(){
-          //await this.checkplan.searchList("/rs/sql/预约计划下发", {},{groupitem:"",f_filialeids:"('"+this.userlogin.orgid+"')",orderitem:"f_create_time desc"})
+          //await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发", {},{groupitem:"",f_filialeids:"('"+this.userlogin.orgid+"')",orderitem:"f_create_time desc"})
           await this.loadCheckPlan()
           await this.searchChecker(this.userlogin.id)
         },
@@ -505,7 +505,7 @@
             return
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST","/rs/sql/getCheckplan", {data: {condition:"f_plan_name='"+this.createPlan.f_plan_name+"'",sortfield:'f_create_time desc'}})
+          let res=await new HttpResetClass().load("POST","/api/af-safecheck/sql/getCheckplan", {data: {condition:"f_plan_name='"+this.createPlan.f_plan_name+"'",sortfield:'f_create_time desc'}})
           console.log("结果-"+res.data.length)
           if(res.data.length>0){
             Vue.showMessage("计划名称不能重复！")
@@ -525,7 +525,7 @@
           this.createPlan.f_filialeid=this.userlogin.orgid
           this.createPlan.f_create_operator=this.userlogin.name
           this.createPlan.f_create_time=Util.toStandardTimeString()
-          await new HttpResetClass().load('POST',"/rs/logic/createCheckPlan", {"data": this.createPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'})
+          await new HttpResetClass().load('POST',"/api/af-safecheck/logic/createCheckPlan", {"data": this.createPlan},{resolveMsg : '新建计划成功！', rejectMsg : '新建计划失败！'})
           //await this.loadCheckPlan('',()=>{})
           this.createPlan={
             f_plan_name:'',
@@ -619,7 +619,7 @@
           }
           console.log("--------fieldValue"+fieldValue)
           this.cancel()
-          await this.checkplan.searchList("/rs/sql/预约计划下发",
+          await this.checkplan.searchList("/api/af-safecheck/sql/预约计划下发",
             {"f_plan_name": "f_plan_name like '%{}%'",
               "f_plan_year":"f_plan_year={}",
               "f_plan_month":"f_plan_month={}",
@@ -683,7 +683,7 @@
             this.upCheckPlan.f_checker=this.upCheckPlan.checker.name
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST", "/rs/logic/updateCheckPlan", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/updateCheckPlan", {
             data:{
               f_checker:this.upCheckPlan.f_checker,
               f_safecheck_type:this.upCheckPlan.f_safecheck_type,
@@ -710,7 +710,7 @@
             return
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST", "/rs/logic/NewBespeakCheckPlan", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/NewBespeakCheckPlan", {
             data:{
               f_issued:'是',
               f_issue_time:Util.toStandardTimeString(),
@@ -734,7 +734,7 @@
             return
           }
           this.isSend=true
-          let res=await new HttpResetClass().load("POST", "/rs/logic/deleteCheckPlan", {
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/deleteCheckPlan", {
             data:{
               f_operator:this.userlogin.orgstr,//global.login.name,
               condition:"",

package/src/filiale/yongzhou/pc/SelectCheckPlan.vue

@@ -0,0 +1,364 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' class="search_area" @condition-changed='$parent.search' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div :class="{'form-group col-sm-6':$parent.$parent.$parent.showItem,'form-group col-sm-4':!$parent.$parent.$parent.showItem}" style="margin: 0">
+              <role-selector-safe
+                role-name="安检员"
+                role-lable="安&ensp;检&ensp;员"
+                @re-res="$parent.$parent.getRes"
+                :value.sync="model.f_checker_id"
+                v-model="model.f_checker_id">
+              </role-selector-safe>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_start"
+                placeholder='起始月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">计划截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_check_end"
+                placeholder='结束月份' style="width:60%"
+                :disabled-days-of-week="[]"
+                :format="'yyyy-MM'"
+                :select-month="true"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" >
+              <label class="font_normal_body">安检状态</label>
+              <v-select :value.sync="model.f_last_check_state" :options='$parent.$parent.checkStates' placeholder='上次安检状态' close-on-select
+                        style="width:60% "   class="select select_list"  v-model='model.f_last_check_state'   condition="i.f_last_check_state = '{}'">
+              </v-select>
+            </div>-->
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检起始</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_start_time"
+                placeholder='安检起始' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <label class="font_normal_body">安检截止</label>
+              <datepicker
+                :value.sync="$parent.$parent.f_end_time"
+                placeholder='安检截止' style="width:60%"
+                :show-rest-button="reset">
+              </datepicker>
+            </div>
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检起始</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_start_time"-->
+            <!--placeholder='起始时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <!--<div :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}" v-if="$parent.$parent.criteriaShow">-->
+            <!--<label class="font_normal_body">安检结束</label>-->
+            <!--<datepicker-->
+            <!--:value.sync="$parent.$parent.f_end_time"-->
+            <!--placeholder='结束时间' style="width:60%"-->
+            <!--:disabled-days-of-week="[]"-->
+            <!--:format="'yyyy-MM-dd'"-->
+            <!--:show-rest-button="reset">-->
+            <!--</datepicker>-->
+            <!--</div>-->
+            <div style="width: auto;margin-top:8px;float: right" :class="{'form-group col-sm-3':$parent.$parent.$parent.showItem,'form-group col-sm-2':!$parent.$parent.$parent.showItem}">
+              <export-excel-safe   :data="$parent.$parent.searchData"
+                                   :field="$parent.$parent.excelHeaders"
+                                   progress="safeGetExportProgress"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
+              <button id="btnaaa" type="button" class="button_search button_spacing" @click="search()">查询</button>
+              <!--<div class="button_spacing"-->
+              <!--:class="{'button_shrink_top':$parent.criteriaShow,'button_shrink_bottom':!$parent.criteriaShow}"-->
+              <!--@click="$parent.$parent.hidden()">-->
+              <!--</div>-->
+              <div class="button_spacing"
+                   :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
+                   @click="$parent.$parent.hiddenr()"></div>
+            </div>
+          </div>
+          <div class="row">
+            <div class="col-sm-12">
+              <label class="control-label" style="color: #c7254e">汇 总 项</label>
+              <input type="checkbox" id="f_residential_area" value="f_residential_area" v-model="$parent.$parent.nameForSql"/>
+              <label for="f_residential_area">小区名称</label>
+          </div>
+        </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+            <th>
+              <nobr>序号</nobr>
+            </th>
+            <th v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"><nobr>小区名称</nobr></th>
+            <th>安检员</th>
+            <th>总入户量</th>
+            <th>总到访不遇量</th>
+            <th>总拒检量</th>
+            <th>安检总量</th>
+            <th>计划总数</th>
+            <th>入户</th>
+            <th>到访不遇</th>
+            <th>拒检</th>
+            <th>无计划总数</th>
+            <th>无计划入户</th>
+            <th>无计划到访不遇</th>
+            <th>无计划拒检</th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center;">{{$index + 1}}</td>
+          <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')">{{row.f_residential_area}}</td>
+          <td style="text-align: center">{{row.f_checker}}</td>
+          <td style="text-align: center">{{row.ruhu_total}}</td>
+          <td style="text-align: center">{{row.daofang_total}}</td>
+          <td style="text-align: center">{{row.jujian_total}}</td>
+          <td style="text-align: center">{{row.total_sum}}</td>
+          <td style="text-align: center">{{row.plannum}}</td>
+          <td style="text-align: center">{{row.ruhu}}</td>
+          <td style="text-align: center">{{row.daofang}}</td>
+          <td style="text-align: center">{{row.jujian}}</td>
+          <td style="text-align: center">{{row.no_plan_num}}</td>
+          <td style="text-align: center">{{row.noruhu}}</td>
+          <td style="text-align: center">{{row.nodaofang}}</td>
+          <td style="text-align: center">{{row.nojujian}}</td>
+        </template>
+        <template partial="foot">
+          <td style="text-align: center"><span><b>合计：</b></span></td>
+          <td style="text-align:center" v-if="$parent.$parent.$parent.nameForSql.includes('f_residential_area')"></td>
+          <td style="text-align:center;"></td>
+          <td style="text-align: center">{{model.sums.ruhu_total}}</td>
+          <td style="text-align: center">{{model.sums.daofang_total}}</td>
+          <td style="text-align: center">{{model.sums.jujian_total}}</td>
+          <td style="text-align: center">{{model.sums.total_sum}}</td>
+          <td style="text-align: center">{{model.sums.plannum}}</td>
+          <td style="text-align: center">{{model.sums.ruhu}}</td>
+          <td style="text-align: center">{{model.sums.daofang}}</td>
+          <td style="text-align: center">{{model.sums.jujian}}</td>
+          <td style="text-align: center">{{model.sums.no_plan_num}}</td>
+          <td style="text-align: center">{{model.sums.noruhu}}</td>
+          <td style="text-align: center">{{model.sums.nodaofang}}</td>
+          <td style="text-align: center">{{model.sums.nojujian}}</td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+
+
+export default {
+  title: '安检计划查询',
+  data() {
+    let options = []
+    let year = (new Date()).getFullYear()
+    for (let i = year - 8; i <= year + 1; i++)
+      options.push({label: i + '', value: i + ''})
+    let model = new PagedList('api/af-safecheck/sql/planCount', 20, {
+      f_filialeids: 'this.f_filialeids',
+      f_start_time: 'this.f_start_time',
+      condition1:'this.condition1',
+      condition2:'this.condition2',
+      condition3:'this.condition3',
+      otheritem:'this.otheritem',
+      f_end_time: 'this.f_end_time'
+    }, {plannum: '', ruhu: '', jujian: '', daofang: '',no_plan_num:'',noruhu:'',nodaofang:'',nojujian:'',ruhu_total:'',daofang_total:'',jujian_total:'',total_sum:''})
+    model.f_filialeids = '('+this.$login.f.orgid+')'
+    return {
+      excelHeaders:{
+        'f_checker': '安检员',
+        'plannum': '计划总数',
+        // 'yrj': '计划中已入户',
+        // 'wrj': '计划中未入户',
+        'ruhu': '入户',
+        'jujian': '拒检',
+        'daofang': '到访不遇',
+        'no_plan_num': '无计划总数',
+        'noruhu': '无计划入户',
+        'nojujian': '无计划拒检',
+        'nodaofang': '无计划到访不遇'
+      },
+      nameForSql: [],
+      groupNameForSql: '',
+      searchData:{
+        condition:"1=1",
+        condition1:"1=1",
+        condition2:"1=1",
+        condition3:"and 1=1",
+        otheritem:'',
+        f_plan_year:year[0],
+        f_checker:'',
+        f_filialeids:'('+this.$login.f.orgid+')',
+        f_start_time:'',
+        f_end_time:''
+      },
+      checker: this.$login.f,
+      checkers: [],
+      checkersname: [],
+      checkStates: this.$appdata.getParam('安检状态'),
+      f: this.$login.f,
+      criteriaShow: false,
+      model: model,
+      c_year_list: options,
+      f_check_start:'',
+      f_check_end: '',
+      f_start_time:'',
+      f_end_time:''
+    }
+  },
+  methods: {
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    hiddenr() {
+      this.$parent.showItem = !this.$parent.showItem
+    },
+    search(args) {
+      if (this.nameForSql.length >0 ){
+        this.excelHeaders = {
+          'f_residential_area':'小区名称',
+          'f_checker': '安检员',
+          'plannum': '计划总数',
+          'ruhu': '入户',
+          'jujian': '拒检',
+          'daofang': '到访不遇',
+          'no_plan_num': '无计划总数',
+          'noruhu': '无计划入户',
+          'nojujian': '无计划拒检',
+          'nodaofang': '无计划到访不遇'
+        }
+        this.groupNameForSql = `,${this.nameForSql.join().trim()}`
+      }else {
+        this.excelHeaders = {
+          'f_checker': '安检员',
+          'plannum': '计划总数',
+          'ruhu': '入户',
+          'jujian': '拒检',
+          'daofang': '到访不遇',
+          'no_plan_num': '无计划总数',
+          'noruhu': '无计划入户',
+          'nojujian': '无计划拒检',
+          'nodaofang': '无计划到访不遇'
+        }
+        this.groupNameForSql = ``
+      }
+
+      let tempStr = args.condition
+      let condition1 =tempStr
+      let condition2 =tempStr
+      let condition3 = ' and 1=1 '
+      if (this.f_check_start) {
+        condition1 += ` AND f_plan_year >= ${this.f_check_start.substr(0,4)} `
+        condition1 += ` AND f_plan_month >= ${this.f_check_start.substr(5,2)} `
+      }
+      if (this.f_check_end) {
+        condition1 += ` AND f_plan_year <= ${this.f_check_end.substr(0,4)} `
+        condition1 += ` AND f_plan_month <= ${this.f_check_end.substr(5,2)} `
+      }
+      if(this.f_start_time){
+        condition2 += ` AND f_offsite_time >= '${this.f_start_time} 00:00:00'`
+      }
+      if (this.f_end_time){
+        condition2 += ` AND f_offsite_time <= '${this.f_end_time} 23:59:59'`
+      }
+      if (this.$refs.paged.$refs.cri.model.f_checker_id){
+        condition3 += ` AND f_checker = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+        condition2 += ` AND f_checker_name = '${this.$refs.paged.$refs.cri.model.f_checker_id}' `
+      }
+      this.model.f_start_time=this.f_start_time
+      this.model.f_end_time=this.f_end_time
+      this.model.condition1=condition1
+      this.model.condition2=condition2
+      this.model.condition3=condition3
+      this.model.otheritem = this.groupNameForSql
+      this.searchData.condition1=condition1
+      this.searchData.condition2=condition2
+      this.searchData.condition3=condition3
+      this.searchData.otheritem = this.groupNameForSql
+      this.model.search(args.condition, args.model)
+    },
+    getRes(obj){
+      this.model.f_filialeids = this.$login.convertToIn(obj.resids);
+      //tag
+    }
+  },
+  ready() {
+    this.model.id = this.$login.f.id
+    this.model.f_subcompany = this.$login.f.f_fengongsi
+    this.model.f_filialeid = this.$login.f.orgid
+  },
+
+  watch: {
+    'nameForSql' () {
+      var e = document.createEvent("MouseEvents");
+      e.initEvent("click", true, true);
+      document.getElementById("btnaaa").dispatchEvent(e);
+    },
+    'model.condition'(val) {
+      if(val){
+        this.searchData.condition = val
+      }
+    },
+    'model.f_checker'(val) {
+      if(val){
+        this.searchData.f_checker = val
+      }
+    },
+    'f_start_time'(val) {
+      if(val){
+        this.searchData.f_start_time = val
+      }
+    },
+    'f_end_time'(val) {
+      if(val){
+        this.searchData.f_end_time = val
+      }
+    },
+    'checker'() {
+      // //tag
+      //tag
+      this.model.chosenOrg = this.checker[0]
+    },
+    'model.rows.length'() {
+      // 如果查询无结果，将合计置为0
+      if(this.model.rows.length < 1 &&this. model.sums){
+        this.model.sums.yrj = 0
+        this.model.sums.no_plan_num = 0
+        this.model.sums.wrj = 0
+        this.model.sums.ruhu = 0
+        this.model.sums.jujian = 0
+        this.model.sums.daofang = 0
+        this.model.sums.ruhu_total=0
+        this.model.sums.daofang_total=0
+        this.model.sums.jujian_total=0
+        this.model.sums.total_sum=0
+      }
+    }
+  },
+  computed: {
+    selected() {
+      // //tag
+      // this.$parent.showItem=!this.$parent.showItem
+      return this.$refs.paged.$refs.grid.selected
+    }
+  }
+}
+</script>

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

@@ -39,12 +39,12 @@
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUploadCodeCondition()">导入编号</button>
               <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.clearUserInfoId()">清空编号</button>
               <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
-              <export-excel-safe :data="$parent.$parent.exportParameter"
+              <export-excel :data="$parent.$parent.exportParameter"
                                  :field="$parent.$parent.exportExcelField"
                                  style="margin-left: 0px"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ"
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="FetchUserFileByOrgNoRuHuSXQ"
                                  template-name='用户信息' :choose-col="true">
-              </export-excel-safe>
+              </export-excel>
             </div>
             <div class="form-group col-sm-1" style="float: right">
               <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.dragtoPlanItem()">添入计划</button>
@@ -403,7 +403,7 @@
     title: '计划管理',
     data() {
       return {
-        model:new PagedList('/rs/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
+        model:new PagedList('/api/af-safecheck/sql/FetchUserFileByOrgNoRuHuSXQ', 100, {
           "orderitem": "'f_residential_area,f_building,f_unit,f_floor,f_room'",
           "f_usertype": "''",
           "month": "''",
@@ -468,7 +468,7 @@
     methods: {
       getCheckBook(){
         this.checkBooks=[]
-        new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_OrderBy`, {
+        new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: 'id,f_check_book_name,f_check_book_type',
             tablename: 't_check_book',
@@ -549,7 +549,7 @@
       select_search(text){
         //tag
         let pcdText=text?` and f_residential_area like '%${text}%'`:''
-        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
+        new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.userlogin.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
           //tag)
           if(res.data.length>0){
             this.areaList=[]
@@ -566,7 +566,7 @@
         this.cbc=[]
         this.sliceArea=[]
         let http = new HttpResetClass()
-        let getMeterReadingBooks = await http.load('POST','rs/logic/getMeterBooksData',
+        let getMeterReadingBooks = await http.load('POST','api/af-safecheck/logic/getMeterBooksData',
           {data: {f_orgid: "('"+this.userlogin.orgid+"')"}},
           {resolveMsg: null, rejectMsg: '获取失败！！！'})
         this.cbc = [{label: '全部', value: ''}]
@@ -654,7 +654,7 @@
         if(this.selectplan && this.selectplan.id){
           this.$parent.isSend=true
           try{
-            let res=await new HttpResetClass().load("POST", "/rs/logic/AddCheckPlanItem", {
+            let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/AddCheckPlanItem", {
               data:{
                 f_operator:this.userlogin.name,
                 f_plan_id:this.selectplan.id,
@@ -693,7 +693,7 @@
         let data = {
           filepath: res.f_downloadpath
         }
-        new HttpResetClass().load('POST','/rs/logic/safe_GetUserInfoFromExcel', {data: data}, {
+        new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_GetUserInfoFromExcel', {data: data}, {
           resolveMsg: '导入成功！已生成条件，若要去除导入条件请点击旁边 ‘清空用户编号’ 按钮。',
           rejectMsg: '导入失败'
         }).then((res) => {