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

package/src/filiale/liaoyuan/pc/checkPlanList.vue

@@ -0,0 +1,373 @@
+<template>
+  <div>
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div partial>
+          <div class="row">
+            <label class="form-group font_normal_body"><b>计划信息</b></label>
+            <div class="form-group col-sm-1" v-show="false">
+              <!--隐藏条件-->
+              <input type="text" class="input_search" v-model="model.f_plan_id"
+                     style="width: 95%" placeholder="计划id" condition=" i.f_plan_id='{}'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_userinfo_code"
+                     style="width: 95%" placeholder="客户编号" condition="i.f_userinfo_code='{}'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_user_name"
+                     style="width: 95%" placeholder="客户名称" condition="i.f_user_name like '%{}%'">
+            </div>
+            <div class="form-group col-sm-1" >
+              <input type="text" class="input_search" v-model="model.f_address"
+                     style="width: 95%" placeholder="客户地址" condition="i.f_address like '%{}%'">
+            </div>
+            <!--<div class="form-group col-sm-1" >
+              <v-select :width="'95%'"
+                        class="select select_list"
+                        :value.sync="$parent.$parent.f_state"
+                        v-model="$parent.$parent.f_state"
+                        :options='$parent.$parent.checkState'
+                        placeholder='安检状态'
+                        close-on-select
+                        value-single
+              >
+              </v-select>
+            </div>-->
+            <div class="form-group col-sm-3" >
+              <button class="button_new" style="margin-right: 10px"  @click="$parent.$parent.showUserCondition()">更多条件</button>
+              <button class="button_search" style="margin-right: 10px"  @click="search()">查询</button>
+<!--              <button class="button_search" style="margin-right: 10px"  @click="clear()">清除</button>-->
+<!--              <export-excel-safe :data="$parent.$parent.exportParameter"-->
+<!--                                 :field="$parent.$parent.exportExcelField"-->
+<!--                                 style="margin-left: 0px"-->
+<!--                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"-->
+<!--                                 :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">-->
+<!--              </export-excel-safe>-->
+              <export-excel-old :data="$parent.$parent.exportParameter"
+                                :field="$parent.$parent.exportExcelField"
+                                progress="safeGetExportProgress"
+                                sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem" :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'"></export-excel-old>
+            </div>
+            <div class="form-group col-sm-2 safe_p">
+              <label class="font_normal_body" :title="$parent.$parent.selectplan.f_plan_name">{{$parent.$parent.selectplan.f_plan_name?'当前选中 : '+$parent.$parent.selectplan.f_plan_name:''}}</label>
+            </div>
+            <div class="form-group col-sm-2" style="float: right">
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.showplanModal()">计划调整</button>
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.delPlanItem()" v-show="$parent.$parent.isdelete">移出计划</button>
+            </div>
+            <modal :show.sync="$parent.$parent.showCondtion" v-ref:modal :width="'50%'" :backdrop="false">
+              <div slot="modal-header" class="modal-header">
+                <h4 class="modal-title">
+                  计划内用户查询条件
+                </h4>
+              </div>
+              <div slot="modal-body" class="modal-body">
+                <div class="row">
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">是否已检:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_state"
+                      v-model="model.f_state"
+                      :options='$parent.$parent.checkState'
+                      @change="$parent.$parent.checkStateChange(model.f_state)"
+                      placeholder='请选择'
+                      condition="i.f_state='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检结果:</label>
+                    <v-select
+                      class="select select_list"
+                      :value.sync="model.f_check_state"
+                      v-model="model.f_check_state"
+                      :options='$parent.$parent.checkResults'
+                      placeholder='请选择'
+                      condition="i.f_last_check_state='{}'"
+                      close-on-select
+                      value-single
+                    >
+                    </v-select>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检起始:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      style="width:60%"
+                      :disabled-days-of-week="[]"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_startfile_time"
+                      v-model="model.f_startfile_time"
+                      condition="i.f_last_check_date >='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                  <div class="form-group col-sm-4" >
+                    <label class="font_normal_body">安检截止:</label>
+                    <datepicker
+                      placeholder='请选择'
+                      :disabled-days-of-week="[]"
+                      style="width:60%"
+                      :format="'yyyy-MM-dd'"
+                      :show-rest-button="reset"
+                      :value.sync="model.f_endfile_time"
+                      v-model="model.f_endfile_time"
+                      condition="i.f_last_check_date  <='{} 00:00:00'">
+                    </datepicker>
+                  </div>
+                </div>
+              </div>
+              <div slot="modal-footer" class="modal-footer" style="text-align: center">
+                <button class="button_search" style="margin-right: 15px" @click="search()">查询</button>
+                <button class="button_search" @click="$parent.$parent.cancel">取消</button>
+              </div>
+            </modal>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' class="table_sy">
+
+        <template partial='head'>
+          <tr>
+            <th><nobr><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.checkAll" @change="$parent.$parent.$parent.setCheckAll()"/> 全选</nobr></th>
+            <th><nobr>用户编号</nobr></th>
+            <th><nobr>用户名称</nobr></th>
+            <th><nobr>用户电话</nobr></th>
+            <th><nobr>用户类型</nobr></th>
+            <th><nobr>小区名称</nobr></th>
+            <th><nobr>安检状态</nobr></th>
+            <th><nobr>地址</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <td style="text-align: center;white-space:nowrap;"><input type="checkbox" onClick="event.cancelBubble = true" :checked="$parent.$parent.$parent.isChecked(row.f_check_item_id)"  @change="$parent.$parent.$parent.setCheckes(row.f_check_item_id)" /></td>
+          <td style="text-align: center"><nobr>{{row.f_userinfo_code}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_phone}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_residential_area}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_state==='已检'?row.f_last_check_state:'未检'}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_address}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+    <modal :show.sync="showPlanModal" v-ref:modalp>
+      <div slot="modal-header" class="modal-header">
+        <h4 class="modal-title">
+          计划内用户调整
+        </h4>
+      </div>
+      <div slot="modal-body" class="modal-body">
+        <plan-chooser :f.sync="userlogin.orgid" v-ref:chooser></plan-chooser>
+      </div>
+      <div slot="modal-footer" class="modal-footer" style="text-align: center">
+        <button class="button_search" style="margin-right: 15px" @click="dragtoOtherPlanIteem">确认</button>
+        <button class="button_search" @click="cancel">取消</button>
+      </div>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from "vue-client";
+  import Vue from "vue";
+
+  export default {
+    name: "PlanManage",
+    title: '计划管理',
+    data() {
+      return {
+        model:new PagedList('/api/af-safecheck/sql/planItem', 100, {}),
+        isdelete:this.$login.r ? this.$login.r.includes("安检计划删除"):false,
+        a:'1',
+        opt:[{label:"测试",value:"测试"}],
+        showCondtion:false,
+        checkAll:false,
+        checkes:[],
+        checkResults:[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}],
+        checkState:[{label:'全部',value:''},{label:'未检',value:'未检'},{label:'已检',value:'已检'}],
+        showPlanModal:false,
+        exportExcelField: {
+          'f_userinfo_code':'用户编号',
+          'f_user_name':'用户名称',
+          'f_user_type':'用户类型',
+          'f_residential_area':'小区名称',
+          'f_state':'安检状态',
+          'f_address':'地址',
+          'f_user_phone':'用户电话',
+          'f_newfile_date':'建档日期'
+        }
+      }
+    },
+    props:["selectplan","userlogin"],
+    ready(){
+
+    },
+    computed:{
+      exportParameter(){
+        // excel 导出条件拼接
+        return {
+          condition: this.$refs.paged.model.condition,
+          groupName: this.groupNameForSql
+        }
+      }
+    },
+    methods:{
+      clear(){
+        this.model.f_plan_id = '';
+        this.model.f_userinfo_code = '';
+        this.model.f_user_name = '';
+        this.model.f_address='';
+
+      },
+      //将某个计划下的一项拖到另一个计划
+      async dragtoOtherPlanIteem() {
+        //tag)
+
+        if (!this.$refs.modalp.$children[0].selectedRow.id) {
+          this.$showMessage("请选择需要调整到那个计划中！")
+          return
+        }
+        this.$parent.isSend=true
+        try{
+          let res=await new HttpResetClass().load("POST", "/api/af-safecheck/logic/UpCheckPlanItem", {
+            data:{
+              f_operator:this.userlogin.name,
+              f_plan_id:this.$refs.modalp.$children[0].selectedRow.id,
+              condition:this.model.condition,
+              switchCheckAll:true,
+              checkAll:this.checkAll,
+              param:this.checkes,
+              columnName: "i.id"
+            }
+          }, {resolveMsg: null, rejectMsg: null})
+          this.$parent.isSend=false
+          if(res.data.code==200){
+            this.$showMessage("更换安检计划成功！")
+            this.$parent.refreshPlan()
+          }else{
+            this.$showMessage("更换安检计划失败！")
+          }
+        }catch (e) {
+          this.$parent.isSend=false
+          this.$showMessage("更换安检计划失败！")
+        }
+      },
+      showplanModal(){
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要调整的用户！")
+          return
+        }
+        this.showPlanModal=true
+      },
+      showUserCondition(){
+        this.showCondtion=true
+      },
+      isChecked(v) {
+        // 如果全选，不在的按选中算，否则，在的按选中算
+        if (this.checkAll) {
+          return this.checkes.indexOf(v) == -1
+        } else {
+          return this.checkes.indexOf(v) != -1
+        }
+      },
+      setCheckAll() {
+        this.checkAll=this.checkAll?false:true;
+        // 全选改变后，清空选中数据
+        this.checkes = []
+      },
+      setCheckes(id) {
+        let index=this.checkes.indexOf(id)
+        if(index<0){
+          this.checkes.push(id)
+        }else{
+          this.checkes.splice(index,1)
+        }
+      },
+      cancel(){
+        this.showCondtion=false
+        this.showPlanModal=false
+      },
+      selfSearch (args) {
+        if(!this.selectplan.id){
+          this.$showMessage("请先选择一个计划！")
+          return
+        }
+        this.cancel()
+        this.checkes=[]
+        this.checkAll=false
+        args.condition+= ` and i.f_state!= '作废'`
+        this.model.search(args.condition, args.model, args.condValue)
+      },
+      checkStateChange(val){
+        if(val=='未检'){
+          this.checkResults=[]
+          this.$refs.paged.$refs.criteria.model.f_check_state=''
+        }else{
+          this.checkResults=[{label:'到访不遇',value:'到访不遇'},{label:'拒检',value:'拒检'},{label:'入户',value:'入户'}]
+        }
+      },
+      //修改计划项状态为作废
+      async delPlanItem() {
+        if(!this.selectplan || !this.selectplan.id){
+          this.$showMessage("请先打开一个计划再进行操作")
+          return
+        }
+        if(!this.checkAll && this.checkes.length==0){
+          this.$showMessage("请先在计划中勾选你要作废的用户！")
+          return
+        }
+        this.$showMessage("此操作无法撤回,确定要执行作废安检单操作吗？",['confirm','cancel']).then((button)=>{
+          if(button=='confirm'){
+            let resu=new HttpResetClass().load("POST", "/api/af-safecheck/logic/UpCheckPlanItemState", {
+              data: {
+                f_operator:this.userlogin.name,
+                condition:this.model.condition,
+                switchCheckAll:true,
+                checkAll:this.checkAll,
+                param:this.checkes,
+                columnName: "i.id"
+              }
+            }, {resolveMsg: null, rejectMsg: null}).then((resu)=>{
+
+              //tag)
+              if(resu.data.code==200){
+                this.$showMessage("移除安检单成功! 成功移除:"+resu.data.res.up+"条"+(resu.data.res.noup>0?"有"+resu.data.res.noup+"条已经不是 ‘未检’ 状态！":""))
+                //this.checkes=[]
+                //this.checkAll=false
+                this.$parent.refresh()
+              }else{
+                this.$showMessage("取消安检计划失败!")
+              }
+            })
+          }
+        })
+      }
+    },
+    watch:{
+      'selectplan.id' (){
+        //tag
+        if(this.selectplan.id){
+          this.$refs.paged.$refs.criteria.model.f_plan_id=this.selectplan.id
+          this.$refs.paged.$refs.criteria.search()
+        }
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .safe_p{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+</style>

package/src/filiale/liaoyuan/pc.js

@@ -8,7 +8,8 @@ let specialComp = {
   'new-check-paper': (resolve) => { require(['./pc/NewCheckpaper'], resolve) },
   'paper-main': (resolve) => { require(['./pc/PaperList'], resolve) },
   'check-search-user':(resolve) => {require(['./pc/CheckSearchUser'], resolve)},
-  'role-selector-safe':(resolve) => {require(['./pc/RoleSelector.vue'], resolve)}
+  'role-selector-safe':(resolve) => {require(['./pc/RoleSelector.vue'], resolve)},
+  'check-plan-list':(resolve) => {require(['./pc/checkPlanList'], resolve)}
 }
 exports.specialComp = specialComp
 

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

@@ -501,7 +501,7 @@ import co from 'co'
         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,
@@ -638,7 +638,7 @@ import co from 'co'
         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,
@@ -651,7 +651,7 @@ import co from 'co'
         await this.getNewOrder()
       },
       async manyokput(){
-        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/rs/logic/UpCheckPlanItem`, {data:{
+        let res= await this.$resetpost(`${this.$androidUtil.getProxyUrl()}/api/af-safecheck/logic/UpCheckPlanItem`, {data:{
             columnName:"i.id",
             condition:"1=1",
             f_plan_id:this.planid,
@@ -673,7 +673,7 @@ import co from 'co'
         if(this.plan){
           condition += ` and 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:'',
@@ -757,7 +757,7 @@ import co from 'co'
         var _this = this
         //tag
         if (row.f_upload_state == '未传' || (row.f_upload_state == '已传' && row.f_state == '未检' && row.f_no_checkplan != '无计划安检' ) ) {
-          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/rs/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
+          _this.$resetpost(`${_this.$androidUtil.getProxyUrl()}/api/af-safecheck/sql/查询计划项表信息`, {data: {f_userid: row.f_userinfoid}},{resolveMsg: null,rejectMsg: null}).then((response) => {
           //tag)
             row['f_plan_meters'] = response.data
             var pardate = {

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

@@ -338,7 +338,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})`,
@@ -1425,7 +1425,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/lixian/android/SafecheckUserInfo.vue

@@ -252,7 +252,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) => {
@@ -275,7 +275,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) => {
@@ -301,7 +301,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}'`,
@@ -327,7 +327,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/lixian/pc/CheckPlanAreaList.vue

@@ -55,11 +55,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>
@@ -186,7 +186,7 @@
   export default {
     data () {
       return {
-        model: new PagedList('rs/sql/LXgetCheckPlanAreaList', 99999),
+        model: new PagedList('api/af-safecheck/sql/LXgetCheckPlanAreaList', 99999),
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         row: {},
@@ -269,7 +269,7 @@
       },
        pl() {
          let getGasman = new HttpResetClass()
-         getGasman.load('POST', `rs/sql/safe_singleTable_OrderBy`, {
+         getGasman.load('POST', `api/af-safecheck/sql/safe_singleTable_OrderBy`, {
           data: {
             items: "id,f_plan_name",
             tablename: "t_check_plan",

package/src/filiale/lixian/pc/CheckSearchUser.vue

@@ -28,10 +28,10 @@
                      placeholder="地址" condition="f_address like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
-              <export-excel-safe :data="$parent.$parent.searchData"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
+                                 template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -184,10 +184,10 @@
                      placeholder="用户姓名" condition="f_user_name like '%{}%'">
             </div>
             <div :class="$parent.$parent.style" style="width: auto;margin-top:8px;float: right">
-              <export-excel-safe :data="$parent.$parent.searchData"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
-                                 template-name='用户安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="根据安检员查询用户档案"
+                                 template-name='用户安检情况'></export-excel>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_left':$parent.$parent.$parent.showItem,'button_shrink_right':!$parent.$parent.$parent.showItem}"
@@ -443,7 +443,7 @@ export default {
         'f_last_check_state': '安检状态',
         'f_defect_content': '安检结果'
       },
-      model: new PagedList('rs/sql/根据安检员查询用户档案', 20, {
+      model: new PagedList('api/af-safecheck/sql/根据安检员查询用户档案', 20, {
         orderitem: "'f_last_check_date'",
         timetype: "'dd'",
         f_defect_content: 'this.f_defect_content'
@@ -550,7 +550,7 @@ export default {
       //console.log(val)
       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}`,
@@ -803,7 +803,7 @@ export default {
       //console.log(val)
       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/lixian/pc/NewCheckpaper.vue

@@ -317,13 +317,13 @@ import {HttpResetClass} from "vue-client";
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res= await new HttpResetClass().load('post','rs/sql/tel_singleTable_OrderBy',{data: {
+    let res= await new HttpResetClass().load('post','api/af-safecheck/sql/tel_singleTable_OrderBy',{data: {
         items: 'f_dir',
         tablename: 't_organization',
         condition: `id  = '${self.item.f_filialeid}'`,
         orderitem: 'id'
       }})
-    let res2= await new HttpResetClass().load('post','rs/sql/tel_singleTable_OrderBy',{data: {
+    let res2= await new HttpResetClass().load('post','api/af-safecheck/sql/tel_singleTable_OrderBy',{data: {
         items: 'gb.f_meter_type',
         tablename: 't_gasbrand  gb left join t_userfiles tuf on gb.id=tuf.f_gasbrand_id',
         condition: `tuf.f_userfiles_id='${self.data.f_userfiles_id}'`,

package/src/filiale/lixian/pc/PaperChazhiMain.vue

@@ -32,10 +32,10 @@
               </div>
               <div class="form-group col-sm-2" style="width: auto;margin-top:8px;float: right">
 
-                <export-excel-safe :data="$parent.$parent.searchData"
+                <export-excel :data="$parent.$parent.searchData"
                                    :field="$parent.$parent.excelHeaders"
                                    progress="safeGetExportProgress"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy" template-name='异常差值明细'></export-excel-safe>
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy" template-name='异常差值明细'></export-excel>
                 <!--                <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="!$parent.$parent.audioshow">录音</button>-->
                 <button class="button_spacing button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
 
@@ -268,7 +268,7 @@ let select = function* (self) {
 export default {
   title: '差值明细查看',
   data() {
-    let model = new PagedList('rs/sql/getChazhi', 20, {
+    let model = new PagedList('api/af-safecheck/sql/getChazhi', 20, {
     })
     model.f_plan_id = ''
     model.f_approved = ''
@@ -361,7 +361,7 @@ export default {
       ////tag
       this.sliceArea=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
             items: 'name',
             tablename: 't_zone',
             condition: `parentid  in ${val}`,
@@ -386,7 +386,7 @@ export default {
       ////tag
       this.cbcs=[]
       if (val){
-        new HttpResetClass().load('POST',`/rs/sql/safe_singleTable_OrderBy`, {data: {
+        new HttpResetClass().load('POST',`/api/af-safecheck/sql/safe_singleTable_OrderBy`, {data: {
             items: 'f_book_name,f_book_slice_area,id',
             tablename: 't_meter_book',
             condition: `f_filiale_id  in ${val}`,