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

package/src/components/map/checkScreen.vue

@@ -227,13 +227,13 @@ export default {
         source: `root.getResourceById($${this.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($需要定位人员$) != -1)`,
         userid: this.$login.f.id
       }, {resolveMsg: null, rejectMsg: null})
-      debugger
+
       let arr1 = await new HttpResetClass().load('GET', `/rs/safePsoition/getPosition`, {}, {
         resolveMsg: null,
         rejectMsg: null
       })
       const today = Util.toStandardDateString()
-      let arr2 = await new HttpResetClass().load('POST', `/rs/sql/singleTable`, {
+      let arr2 = await new HttpResetClass().load('POST', `/api/af-safecheck/sql/singleTable`, {
         data: {
           tablename: 't_work_record',
           condition: `f_onsite_time >= '${today} 00:00:00' and f_onsite_time <= '${today} 23:59:59'`,
@@ -331,7 +331,7 @@ export default {
       }
       let td = Util.toStandardDateString()
       //获取今天上传的所有隐患
-      let arr = await new HttpResetClass().load('POST', `rs/sql/defectDetails`, {data: {condition: ` f_filialeid in ('${this.$login.f.orgid}') and tdil.f_create_time>'${Util.toStartDateYearString()} 00:00:00' and tdi.F_LONGITUDE is not null`}},
+      let arr = await new HttpResetClass().load('POST', `api/af-safecheck/sql/defectDetails`, {data: {condition: ` f_filialeid in ('${this.$login.f.orgid}') and tdil.f_create_time>'${Util.toStartDateYearString()} 00:00:00' and tdi.F_LONGITUDE is not null`}},
         {resolveMsg: null, rejectMsg: null})
       //tag)
       if (arr.data) {
@@ -445,13 +445,15 @@ export default {
 
 
       let a3=[]
-      for(let i=0;i<this.level2.length;i++){
-        a3.push({
-          lnglat: [this.level2[i].f_longitude,this.level2[i].f_latitude], //点标记位置
-          name: '二级隐患',
-          id:i,
-          rowstr:this.level2[i]
-        })
+      for(let o=0;o<this.level2.length;o++){
+        if (this.level2[o].f_longitude && this.level2[o].f_latitude){
+          a3.push({
+            lnglat: [this.level2[o].f_longitude,this.level2[o].f_latitude], //点标记位置
+            name: '二级隐患',
+            id:o,
+            rowstr:this.level2[o]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level2Mulchs.setData(a3);
@@ -459,13 +461,15 @@ export default {
       this.level2Mulchs.setMap(this.map);
 
       let a4=[]
-      for(let i=0;i<this.level3.length;i++){
-        a4.push({
-          lnglat: [this.level3[i].f_longitude, this.level3[i].f_latitude], //点标记位置
-          name: '三级隐患',
-          id:i,
-          rowstr:this.level3[i]
-        })
+      for(let p=0;p<this.level3.length;p++){
+        if (this.level3[p].f_longitude&&this.level3[p].f_latitude){
+          a4.push({
+            lnglat: [this.level3[p].f_longitude, this.level3[p].f_latitude], //点标记位置
+            name: '三级隐患',
+            id:p,
+            rowstr:this.level3[p]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.level3Mulchs.setData(a4);
@@ -474,13 +478,15 @@ export default {
 
 
       let a5=[]
-      for(let i=0;i<this.problems.length;i++){
-        a5.push({
-          lnglat: [this.problems[i].f_longitude, this.problems[i].f_latitude], //点标记位置
-          name: '普通问题',
-          id:i,
-          rowstr:this.problems[i]
-        })
+      for(let l=0;l<this.problems.length;l++){
+        if (this.problems[l].f_longitude&&this.problems[l].f_latitude){
+          a5.push({
+            lnglat: [this.problems[l].f_longitude, this.problems[l].f_latitude], //点标记位置
+            name: '普通问题',
+            id:l,
+            rowstr:this.problems[l]
+          })
+        }
       }
       // 将数组设置到 massMarks 图层
       this.problemsMulchs.setData(a5);

package/src/components/metterfiles/AddUserfiles.vue

@@ -184,7 +184,7 @@ let saveGen = function * (self) {
   let p = self.f_checker_selected[0].indexOf('-')
   self.model.f_checker = self.f_checker_selected[0].substring(0, p)
   self.model.f_checker_id = self.f_checker_selected[0].substring(p+1)
-  yield self.$post('rs/logic/人工录入', { data: self.model })
+  yield self.$post('api/af-safecheck/logic/人工录入', { data: self.model })
   // 通知项目保存成功。
   self.$back()
 }

package/src/components/metterfiles/MetterFiles.vue

@@ -49,7 +49,7 @@ import co from 'co'
 let info = function * (self) {
   self.f_userinfoid = self.user.f_userinfoid
   self.f_userfile_id = self.user.id
-  let back = yield self.$post('rs/sql/用户表档案', {data: {f_userinfoid: self.f_userinfoid,
+  let back = yield self.$post('api/af-safecheck/sql/用户表档案', {data: {f_userinfoid: self.f_userinfoid,
     f_userfile_id: self.f_userfile_id}}, {resolveMsg: null, rejectMsg: null})
   self.model.rows = back.data
   // self.$back()
@@ -60,7 +60,7 @@ export default {
   props: ['user', 'f', 'flag'],
   data () {
     return {
-    //   model: new PagedList('rs/sql/用户表档案', 20, {f_userinfoid: this.user.f_userinfoid,
+    //   model: new PagedList('api/af-safecheck/sql/用户表档案', 20, {f_userinfoid: this.user.f_userinfoid,
     // f_userfile_id: this.user.id})
       model: {
         rows: []
@@ -78,7 +78,7 @@ export default {
       this.$goto('metterfiles-add', {ro: this.user}, 'self', this.callback)
     },
     del (row, index) {
-      this.$post('rs/logic/删除表档案', {data: row}, {resolveMsg: null, rejectMsg: null})
+      this.$post('api/af-safecheck/logic/删除表档案', {data: row}, {resolveMsg: null, rejectMsg: null})
       this.model.rows.splice(index, 1)
     },
     callback () {

package/src/components/metterfiles/MetterfilesChange.vue

@@ -106,7 +106,7 @@ let info = function * (self) {
   self.model.f_meter_measurement = self.f_meter_measurement[0]
   self.model.f_meter_diameter = self.f_meter_diameter[0]
   //tag
-  // yield self.$post('rs/logic/修改表档案', {data: self.model}, {resolveMsg: null, rejectMsg: null})
+  // yield self.$post('api/af-safecheck/logic/修改表档案', {data: self.model}, {resolveMsg: null, rejectMsg: null})
   self.$back(self.model)
 }
 

package/src/components/metterfiles/UserFiles.vue

@@ -80,7 +80,7 @@ export default {
   props: ['f'],
   data () {
     return {
-      model: new PagedList('rs/sql/getuser', 20, {f_username: 'this.model.f_username',
+      model: new PagedList('api/af-safecheck/sql/getuser', 20, {f_username: 'this.model.f_username',
       f_user_type: 'this.f_user_type[0]', f_userid: 'this.model.f_userid',
         f_districtname: 'this.model.f_districtname'}),
       f_user_type: [''],
@@ -129,7 +129,7 @@ export default {
       this.$goto('userfileschange', {f: this.f, flag: 0}, 'self', this.callback)
     },
     del (row, index) {
-      this.$resetpost('rs/logic/人工录入删除', {data: row}, {resolveMsg: null, rejectMsg: null})
+      this.$resetpost('api/af-safecheck/logic/人工录入删除', {data: row}, {resolveMsg: null, rejectMsg: null})
       .then((res) => {
         this.model.rows.splice(index, 1)
       })

package/src/components/metterfiles/Userfileschange.vue

@@ -225,14 +225,14 @@ let saveGen = function * (self) {
     self.model.f_user_type = self.f_user_type[0]
     self.model.f_state = self.f_state[0]
     self.model.f_last_check_state = self.f_last_check_state[0]
-    yield self.$resetpost('rs/logic/人工录入修改', { data: self.model }, {resolveMsg: null, rejectMsg: null})
+    yield self.$resetpost('api/af-safecheck/logic/人工录入修改', { data: self.model }, {resolveMsg: null, rejectMsg: null})
   } else {
     self.model.f_sign = '1'
     self.model.f_subcompany = self.f_subcompany[0]
     self.model.f_user_type = self.f_user_type[0]
     self.model.f_last_check_state = self.f_last_check_state[0]
     self.model.f_state = self.f_state[0]
-    yield self.$resetpost('rs/logic/人工录入', { data: self.model }, {resolveMsg: null, rejectMsg: null})
+    yield self.$resetpost('api/af-safecheck/logic/人工录入', { data: self.model }, {resolveMsg: null, rejectMsg: null})
     .catch((res) => {
       window.alert('请确认用户编号是否重复')
     })
@@ -360,7 +360,7 @@ export default {
       this.f_state = ['点火']
     }
     if (this.flag === 1) {
-      this.$resetpost('rs/sql/用户表档案', {data: {f_userid: this.row.f_userid,
+      this.$resetpost('api/af-safecheck/sql/用户表档案', {data: {f_userid: this.row.f_userid,
         f_userfile_id: this.row.id}}, {resolveMsg: null, rejectMsg: '提取表档案失败'})
         .then((res) => {
           for (var i = 0; i < res.data.length; i++) {

package/src/components/noplan/NoPlanPaperList.vue

@@ -66,7 +66,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/noplan/NoPlanSearchUser.vue

@@ -50,11 +50,11 @@
                          close-on-select clear-button></v-select>
             </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"
                                  :choose-col="true"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="NoPlanSearchUser"
-                                 template-name='无计划安检情况'></export-excel-safe>
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="NoPlanSearchUser"
+                                 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}"
@@ -79,10 +79,10 @@
               </role-selector-safe>
             </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}"
@@ -209,7 +209,7 @@ export default {
         'f_residential_area': '小区名称',
         'f_address': '地址',
       },
-      model: new PagedList('rs/sql/NoPlanSearchUser', 20, {
+      model: new PagedList('api/af-safecheck/sql/NoPlanSearchUser', 20, {
         startDate:"this.startDate",
         endDate:"this.endDate",
         year:"this.year"

package/src/components/notice/NoticeQuery.vue

@@ -60,7 +60,7 @@ import AppData from '../../stores/AppData'
 export default {
   title: '公告查询',
   data () {
-    let model = new PagedList('rs/sql/公告查询', 20, {f_subcompany: 'this.f_division[0]'})
+    let model = new PagedList('api/af-safecheck/sql/公告查询', 20, {f_subcompany: 'this.f_division[0]'})
     model.f_division = [this.$login.f.f_fengongsi]
     return {
       model: model,

package/src/components/olddata/OldPaperList.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"
                               :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="search()">查询</button>
                 <div style="float: right" class="button_spacing"
@@ -250,7 +250,7 @@
     title: '安检结果查看',
     data() {
       return {
-        model: new PagedList('rs/sql/getOldCheckPaper', 20),
+        model: new PagedList('api/af-safecheck/sql/getOldCheckPaper', 20),
         audioshow:false,
         searchData: {
           condition: "1=1"

package/src/components/paper/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>
@@ -347,6 +347,9 @@
               <th v-if="$parent.$parent.$parent.safeAudit">
                 <nobr>审核状态</nobr>
               </th>
+              <th v-if="$parent.$parent.$parent.safeAudit">
+                <nobr>审核未通过原因</nobr>
+              </th>
               <th>
                 <nobr>操作</nobr>
               </th>
@@ -378,6 +381,9 @@
             <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">
               {{ row.f_approved ? row.f_approved : '未审核' }}
             </td>
+            <td style="text-align: center" v-show="$parent.$parent.$parent.safeAudit">
+              {{row.f_approved_note}}
+            </td>
             <td style="text-align: center">
               <button class="button_spacing button_search-1" @click='$parent.$parent.$parent.change(row)'>查看</button>
 
@@ -410,6 +416,7 @@
   import getNowDate from "../../utils/getNowDate";
   import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
   import BenzAMRRecorder from 'benz-amr-recorder'
+  import {toEndDateString, toStartDateString} from "../Util";
 
   //获取json配置文件
   let asyncReady = async function (self) {
@@ -441,7 +448,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',
@@ -496,7 +503,7 @@ export default {
           'f_safecheck_type':'安检类型',
           'f_repair_approved_note': '备注',
           'f_gas_date': '开户时间',
-          'f_plan_name': '计划名称',
+          'f_plan_name': '计划名称'
         },
         fun: this.$login.f,
         pcds:[],
@@ -525,7 +532,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) => {
@@ -536,7 +543,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)=>{
@@ -578,7 +585,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}`,
@@ -604,7 +611,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}`,
@@ -644,11 +651,11 @@ export default {
         asyncReady(this).then(() => {
           if (row.f_safe_type == '已挂表未办卡安检'){
             row.f_upload_state = '已传'
-            this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self',()=>this.search())
+            this.$goto('new-check-paper-temp', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
             return
           }
             row.f_upload_state = '已传'
-            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self',()=>this.search())
+            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
         }).catch(
           (respanse) => {
             alert('获取配置文件失败')
@@ -731,19 +738,20 @@ export default {
         'f_approved_by':'审核人',
         'f_approvedstart_time':'审核开始时间',
         'f_approved_time':'审核结束时间',
-        'f_approved':'审核状态'
+        'f_approved':'审核状态',
+        'f_approved_note': '审核备注'
       }
       this.excelHeaders = Object.assign({}, this.excelHeaders, oa)
     }
-      ////tag
       this.function = this.f
-      ////tag
       //获取气表品牌
       this.getTableBrands()
       let gen = select(this)
       //this.pianqu()
       this.Mreadibook(`('${this.$login.f.orgid}')`)
       co(gen)
+      this.$refs.paged.$refs.criteria.model.f_check_start = Util.toStartDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_check_end = Util.toEndDateString() + ' 23:59:59'
     },
     watch: {
       'model.f_no_checkplan'(val) {

package/src/components/paper/PaperVerify.vue

@@ -170,7 +170,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_check_plan.id',
                 f_approved: 'this.f_approved[0]',
                 f_entry_status: 'this.f_entry[0]',

package/src/components/paper/PlanChooser.vue

@@ -79,8 +79,10 @@
   let selectnew = function * (self) {
     let http = new HttpResetClass()
     http.load('POST', '/rs/search', {
-      source: `root.getResourceById($${self.$login.f.orgid}$,$organization$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
-      userid: self.$login.f.id
+        data:{
+          source: `this.getSpecialResByType($user$).where(row.getAttributes().get($rolestr$)!=null ).where(row.getAttributes().get($rolestr$).indexOf($安检员$) != -1)`,
+          userid: self.$login.f.orgid
+        }
       }, {resolveMsg: null, rejectMsg: null}).then((res) => {
       self.checkers = []
       let arr = []
@@ -107,7 +109,7 @@
       let moptions = []
       for(let i=1; i<=12; i++)
         moptions.push({label: i + '', value: i + ''})
-      let model = new PagedList('rs/sql/按年月人员提取安检计划', 20,
+      let model = new PagedList('api/af-safecheck/sql/按年月人员提取安检计划', 20,
         {f_subcompany:'this.f_subcompany',f_plan_name:'this.f_plan_name',f_checker_id: 'this.f_checker_id', f_plan_year: 'this.f_plan_year', f_plan_month: 'this.f_plan_month', f_is_share: 'this.f_is_share',f_filialeid:'this.f_filialeid'})
       model.f_checker_id = ''
       model.f_plan_name=''

package/src/components/paper/RepairVerify.vue

@@ -85,7 +85,7 @@ export default {
   title: '维修审核',
   props: ['f'],
   data() {
-    let model = new PagedList('rs/sql/查找维修单', 20, {
+    let model = new PagedList('api/af-safecheck/sql/查找维修单', 20, {
       f_plan_id: 'this.f_check_plan.id',
       f_repair_approved: 'this.f_approved[0]',
       f_no_checkplan: 'this.f_no_checkplan[0]',

package/src/components/paper/RepairVerifyForm.vue

@@ -47,7 +47,7 @@ import co from 'co'
 import Vue from 'vue'
 
 let syncVerify = function * (self) {
-  yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
+  yield self.$resetpost('api/af-safecheck/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'})
 }
 
 export default {

package/src/components/paper/VerifyForm.vue

@@ -47,7 +47,7 @@
   import Vue from 'vue'
 
   let syncApprove = function * (self) {
-    yield self.$resetpost('rs/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then(
+    yield self.$resetpost('api/af-safecheck/logic/ApprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then(
       (res)=>{
       if(res.data.code == 200){
       alert("安检单审核通过!")
@@ -58,7 +58,7 @@
   }
 
   let syncDisapprove = function * (self) {
-    yield self.$resetpost('rs/logic/DisapprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
+    yield self.$resetpost('api/af-safecheck/logic/DisapprovePaper', {data:{item: self.item}}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
       if (res.data.code == 200) {
       alert("安检单已打回!")
       self.$back('items')
@@ -67,7 +67,7 @@
   }
 
   let noPlanDisapprove = function * (self) {
-    yield self.$resetpost('rs/logic/NoPlanDisapprove', {data: self.item}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
+    yield self.$resetpost('api/af-safecheck/logic/NoPlanDisapprove', {data: self.item}, {resolveMsg: '操作成功！', rejectMsg: '操作失败！'}).then((res)=> {
       if (res.data.code == 200) {
       alert("安检单已打回!")
       self.$back('items')

package/src/components/paper/filialeCheckInfo.vue

@@ -6,10 +6,10 @@
           <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
             <div class="row">
               <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="FilialeCheckCount" template-name='当前周期各公司安检汇总情况'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="FilialeCheckCount" template-name='当前周期各公司安检汇总情况'></export-excel>
 
                 <button class="button_spacing button_search" @click="search()">查询</button>
               </div>
@@ -72,7 +72,7 @@
   export default {
     title: '总公司安检汇总',
     data() {
-      let model = new PagedList('rs/sql/FilialeCheckCount', 20)
+      let model = new PagedList('api/af-safecheck/sql/FilialeCheckCount', 20)
       return {
         searchData: {
           condition: "1 = 1"

package/src/components/pc/AddToCheckBook.vue

@@ -54,7 +54,7 @@
     },
     ready () {
       // this.close()
-      new HttpResetClass().load('POST','rs/sql/safe_singleTable_OrderBy',{data: {
+      new HttpResetClass().load('POST','api/af-safecheck/sql/safe_singleTable_OrderBy',{data: {
           items: 'id,f_check_book_name,f_check_book_type,f_user_type',
           tablename: 't_check_book',
           condition: `1=1`,
@@ -105,7 +105,7 @@
           return;
         }
         if(this.$parent.$refs.tabs.active ===0){
-          new HttpResetClass().load('POST', 'rs/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
+          new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
                 f_check_book_type:'小区',condition:userCondition}},
             {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
             if(res && res.data){
@@ -121,7 +121,7 @@
             }
           })
         }else{
-          new HttpResetClass().load('POST', 'rs/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
+          new HttpResetClass().load('POST', 'api/af-safecheck/logic/updateCheckBook', {data: {f_check_book_id: this.model.f_check_book_num,
                 f_check_book_type:'单位',condition:userCondition}},
             {resolveMsg: null, rejectMsg: '添加失败'}).then(res=>{
             if(res && res.data){

package/src/components/pc/AnnouncementPC.vue

@@ -191,7 +191,7 @@
   export default {
     title: '公告管理',
     data() {
-      let model = new PagedList('rs/sql/FetchAnnouncement', 20, {
+      let model = new PagedList('api/af-safecheck/sql/FetchAnnouncement', 20, {
         f_filialeids:"this.f_filialeid",
         orderitem: "'id desc'"
       })
@@ -296,7 +296,7 @@
         ////tag
         this.sliceArea=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'name',
               tablename: 't_zone',
               condition: `parentid  in ${val}`,
@@ -321,7 +321,7 @@
         ////tag
         this.cbcs=[]
         if (val){
-          new HttpResetClass().load('POST',`/rs/sql/tel_singleTable_OrderBy`, {data: {
+          new HttpResetClass().load('POST',`/api/af-safecheck/sql/tel_singleTable_OrderBy`, {data: {
               items: 'f_book_name,f_book_slice_area,id',
               tablename: 't_meter_book',
               condition: `f_filiale_id  in ${val}`,
@@ -363,7 +363,7 @@
               operator:"delete",
               id:row.id
             }
-            new HttpResetClass().load('POST','/rs/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
+            new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
               this.$showMessage(res.data.msg)
               this.$refs.paged.$refs.criteria.search()
             })
@@ -415,7 +415,7 @@
             f_orgid:'305',
             f_orgname:'荣成港华燃气公司'
           }
-          new HttpResetClass().load('POST','/rs/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
+          new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
             this.$showMessage(res.data.msg)
             this.f_title = ''
             this.f_content = ''
@@ -437,7 +437,7 @@
             f_content:this.f_content,
             id:this.rowId
           }
-          new HttpResetClass().load('POST','/rs/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
+          new HttpResetClass().load('POST','/api/af-safecheck/logic/safe_UpdateAnnouncement',{data:param}).then((res)=>{
             this.$showMessage(res.data.msg)
             this.f_title = ''
             this.f_content = ''

package/src/components/pc/CheckBook.vue

@@ -79,7 +79,7 @@ export default {
     },
     getGasbrand(){
       this.needProps.meter_gasbrand=[]
-      new HttpResetClass().load('POST', `/rs/sql/safe_singleTable_GroupBy`, {
+      new HttpResetClass().load('POST', `/api/af-safecheck/sql/safe_singleTable_GroupBy`, {
         data: {
           items: 'id,f_meter_brand',
           tablename: 't_gasbrand',
@@ -100,7 +100,7 @@ export default {
     },
     getCheckBook(){
       this.needProps.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',
@@ -134,7 +134,7 @@ export default {
         }
 
       }
-      new HttpResetClass().load("POST", `${this.$androidUtil.getProxyUrl()}/rs/sql/safe_singleTable_OrderBy`, {data:{items:"*",tablename:"t_area",orderitem:"id",condition:`f_orgid = '${this.$login.f.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.$login.f.orgid}' ${pcdText} `}}, {resolveMsg: null, rejectMsg: null}).then((res)=>{
         //tag)
         this.needProps.areaList=[]
         this.needProps.areaList.push({label:"全部",value:""})
@@ -152,7 +152,7 @@ export default {
       this.needProps.cbc=[]
       this.needProps.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.$login.f.orgid+"')"}},
         {resolveMsg: null, rejectMsg: '获取失败！！！'})
       this.needProps.cbc = [{label: '全部', value: ''}]

package/src/components/pc/CheckBookArea.vue

@@ -71,7 +71,7 @@ export default {
         orgid:this.$login.f.orgid,
         orgstr:this.$login.f.orgs,
       },
-      model: new PagedList('rs/sql/getCheckBookArea', 50),
+      model: new PagedList('api/af-safecheck/sql/getCheckBookArea', 50),
       checkAll:false,
       checkes:[],
       addcondata:''