safecheck-client 3.0.30-61-t1 → 3.0.30-61-t3

package/src/components/pc/CheckBookList.vue

@@ -297,7 +297,7 @@ export default {
     ok (){
       //tag
       let http = new HttpResetClass()
-      http.load('POST', 'rs/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
+      http.load('POST', 'api/af-safecheck/logic/safeEntity', {data:{tableName:'t_check_book',entityData:this.checkBook}},
         {resolveMsg: '更新片区信息成功', rejectMsg: '保存片区信息成功'}).then(res=>{
           if (res.data.code===200){
             this.$showMessage('修改成功')
@@ -331,9 +331,9 @@ export default {
         let http = new HttpResetClass()
         let upAddress = `update t_user_address set f_check_book_id = null where f_check_book_id = '${val.id}'`
         let delCheckBook= `delete from t_check_book where id ='${val.id}'`
-        await http.load('POST', 'rs/logic/runSQL', {data: {sql: upAddress}},
+        await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upAddress}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
-        await http.load('POST', 'rs/logic/runSQL', {data: {sql: delCheckBook}},
+        await http.load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delCheckBook}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('删除成功')
         this.$refs.paged.$refs.criteria.search()

package/src/components/pc/CheckBookSearchArea.vue

@@ -287,7 +287,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: addUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
           {resolveMsg: null, rejectMsg: '添加用户失败'})
         this.$showMessage('添加用户成功')
         this.selectBook = ''
@@ -324,7 +324,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: upUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upUser}},
           {resolveMsg: null, rejectMsg: '调整用户失败'})
         this.$showMessage('调整用户成功')
         this.selectBook = ''
@@ -399,7 +399,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: delUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delUser}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('从片区删除所选用户成功')
         this.selectBook = ''
@@ -451,7 +451,7 @@ export default {
         checkBook: this.checkBook,
         sqlStr: condition
       }
-      new HttpResetClass().load('post', 'rs/logic/AddCheckBook', {data}).then(res => {
+      new HttpResetClass().load('post', 'api/af-safecheck/logic/AddCheckBook', {data}).then(res => {
         //tag)
         if (res.data.id) {
           this.$showMessage('创建成功')

package/src/components/pc/CheckBookSearchUser.vue

@@ -319,7 +319,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-       await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: addUser}},
+       await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: addUser}},
          {resolveMsg: null, rejectMsg: '添加用户失败'})
        this.$showMessage('添加用户成功')
        this.selectBook = ''
@@ -356,7 +356,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: upUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: upUser}},
           {resolveMsg: null, rejectMsg: '调整用户失败'})
         this.$showMessage('调整用户成功')
         this.selectBook = ''
@@ -431,7 +431,7 @@ export default {
                 tui.f_user_state = '正常'
           AND ( tuf.f_table_state= '正常' OR tuf.f_table_state= '停用' )
           AND ${userCondition}`
-        await new HttpResetClass().load('POST', 'rs/logic/runSQL', {data: {sql: delUser}},
+        await new HttpResetClass().load('POST', 'api/af-safecheck/logic/runSQL', {data: {sql: delUser}},
           {resolveMsg: null, rejectMsg: '删除片区失败'})
         this.$showMessage('从片区删除所选用户成功')
         this.selectBook = ''
@@ -483,7 +483,7 @@ export default {
         checkBook: this.checkBook,
         sqlStr: condition
       }
-      new HttpResetClass().load('post', 'rs/logic/AddCheckBook', {data}).then(res => {
+      new HttpResetClass().load('post', 'api/af-safecheck/logic/AddCheckBook', {data}).then(res => {
         //tag)
         if (res.data.id) {
           this.$showMessage('创建成功')

package/src/components/pc/CheckBookSearchUserList.vue

@@ -527,7 +527,7 @@ export default {
       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: ''}]

package/src/components/pc/CheckNoDetail.vue

@@ -35,9 +35,9 @@
                 </div>
                 <div class="form-group col-sm-4 button-range" >
                     <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.excelHeaders"
-                                         sqlurl="rs/logic/SafeExportExcel" sql-name="noplanItem"
+                                         sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="noplanItem"
                                          template-name='无计划安检单明细' :choose-col="true">
                     </export-excel-safe>
 

package/src/components/pc/DefectDeal.vue

@@ -29,10 +29,10 @@
                           condition="f_is_repaired = '{}'"></v-select>
               </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="defectDetails" template-name='隐患处置'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="defectDetails" template-name='隐患处置'></export-excel-safe>
                 <button style="margin-left: 4px" class="button_search button_spacing" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
                 <button style="margin-left: 4px" class="button_search button_spacing"  @click="$parent.$parent.toRepair" v-if="$parent.$parent.canToRepair == '是'">转维修</button>
                 <button style="margin-left: 4px" class="button_search button_spacing" @click="search()">查询</button>

package/src/components/pc/Edit.vue

@@ -1,126 +1,126 @@
-<template>
-  <div>
-    <button @click="handleClick">渲染</button>
-    <button @click="savePaper">保存</button>
-    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 600px;"></iframe>
-  </div>
-</template>
-
-<script>
-import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
-import * as util from "../Util"
-
-export default {
-  title: 'App',
-  data() {
-    return {
-      inputText: '',
-      showSketchPage: false,
-      sketchPageSrc: '/sketch',
-      sketchId: '',
-      title: '',
-      paperMessage: ''
-    };
-  },
-  props: {
-    row: {
-      type: Object
-    }
-  },
-  ready() {
-    if (this.row) {
-      try {
-        let hex = Buffer.from(this.row.blob, 'hex').toString('utf8');
-        if (!hex.includes('{')) {
-          this.inputText = Buffer.from(hex, 'hex').toString('utf8');
-        } else {
-          this.inputText = hex;
-        }
-      } catch (e) {
-        this.$showMessage('网络异常请联系管理员')
-      }
-    }
-    this.handleClick()
-  },
-  methods: {
-    handleClick() {
-      this.showSketchPage = true;
-      this.$nextTick(() => {
-        const sketchIframe = document.getElementById('aaaa2');
-
-        window.addEventListener('message', (event) => {
-          if (JSON.parse(event.data.param).gadgets.length > 0) {
-            this.paperMessage = event.data.param;
-          }
-        });
-
-        sketchIframe.contentWindow.postMessage(this.inputText, '*');
-      })
-    },
-    savePaper() {
-      if (!this.paperMessage) {
-        this.$showMessage('请先点击左上角保存图标')
-        return
-      }
-      let param = JSON.parse(this.paperMessage)
-      if (!param.title) {
-        this.$showMessage('请填写示意图标题')
-        return
-      }
-      param.sketchId = param.sketchId ? param.sketchId : util.generateUUID()
-      let gadgets = param.gadgets
-      if (gadgets.length > 0) {
-        var jsonString = JSON.stringify(param);
-        var reqdata = {
-          blob: Buffer.from(jsonString,'utf8').toString('hex'),
-          orgid: this.$login.f.orgid,
-          orgname: this.$login.f.orgs,
-          title: param.title,
-          sketchId: param.sketchId
-        }
-        new HttpResetClass().load('POST', 'rs/logic/savePaperEdit', {data: reqdata}).then(res => {
-          if (res.data.code === 200) {
-            this.$showMessage('保存成功')
-          } else {
-            this.$showMessage('保存失败')
-          }
-        })
-      }
-    },
-    hexToBytes(hex) {
-      for (var bytes = [], c = 0; c < hex.length; c += 2)
-        bytes.push(parseInt(hex.substring(c, 2), 16));
-      return new Uint8Array(bytes);
-    },
-    decodeHexStringToJSON(hexString) {
-      // 去除前缀 "0x"
-      var cleanHexString = hexString.slice(2);
-
-      // 将十六进制字符串转换为字节数组
-      var byteArray = this.hexToBytes(cleanHexString);
-
-      // 创建 Blob 对象
-      var blob = new Blob([byteArray], {type: 'application/json'});
-
-      // 读取 Blob 为文本
-      return new Promise(function(resolve, reject) {
-        var reader = new FileReader();
-        reader.onloadend = function() {
-          resolve(reader.result);
-        };
-        reader.onerror = function() {
-          reject(reader.error);
-        };
-        reader.readAsText(blob, 'UTF-8');
-      });
-    }
-  },
-  // beforeDestroy() {
-  //   this.savePaper()
-  // }
-}
-</script>
-
-<style>
-/* 这里可以添加样式 */
-</style>
+<template>
+  <div>
+    <button @click="handleClick">渲染</button>
+    <button @click="savePaper">保存</button>
+    <iframe v-if="showSketchPage" :src="sketchPageSrc" id="aaaa2" style="width: 100%; height: 600px;"></iframe>
+  </div>
+</template>
+
+<script>
+import HttpResetClass from "vue-client/src/plugins/HttpResetClass";
+import * as util from "../Util"
+
+export default {
+  title: 'App',
+  data() {
+    return {
+      inputText: '',
+      showSketchPage: false,
+      sketchPageSrc: '/sketch',
+      sketchId: '',
+      title: '',
+      paperMessage: ''
+    };
+  },
+  props: {
+    row: {
+      type: Object
+    }
+  },
+  ready() {
+    if (this.row) {
+      try {
+        let hex = Buffer.from(this.row.blob, 'hex').toString('utf8');
+        if (!hex.includes('{')) {
+          this.inputText = Buffer.from(hex, 'hex').toString('utf8');
+        } else {
+          this.inputText = hex;
+        }
+      } catch (e) {
+        this.$showMessage('网络异常请联系管理员')
+      }
+    }
+    this.handleClick()
+  },
+  methods: {
+    handleClick() {
+      this.showSketchPage = true;
+      this.$nextTick(() => {
+        const sketchIframe = document.getElementById('aaaa2');
+
+        window.addEventListener('message', (event) => {
+          if (JSON.parse(event.data.param).gadgets.length > 0) {
+            this.paperMessage = event.data.param;
+          }
+        });
+
+        sketchIframe.contentWindow.postMessage(this.inputText, '*');
+      })
+    },
+    savePaper() {
+      if (!this.paperMessage) {
+        this.$showMessage('请先点击左上角保存图标')
+        return
+      }
+      let param = JSON.parse(this.paperMessage)
+      if (!param.title) {
+        this.$showMessage('请填写示意图标题')
+        return
+      }
+      param.sketchId = param.sketchId ? param.sketchId : util.generateUUID()
+      let gadgets = param.gadgets
+      if (gadgets.length > 0) {
+        var jsonString = JSON.stringify(param);
+        var reqdata = {
+          blob: Buffer.from(jsonString,'utf8').toString('hex'),
+          orgid: this.$login.f.orgid,
+          orgname: this.$login.f.orgs,
+          title: param.title,
+          sketchId: param.sketchId
+        }
+        new HttpResetClass().load('POST', 'api/af-safecheck/logic/savePaperEdit', {data: reqdata}).then(res => {
+          if (res.data.code === 200) {
+            this.$showMessage('保存成功')
+          } else {
+            this.$showMessage('保存失败')
+          }
+        })
+      }
+    },
+    hexToBytes(hex) {
+      for (var bytes = [], c = 0; c < hex.length; c += 2)
+        bytes.push(parseInt(hex.substring(c, 2), 16));
+      return new Uint8Array(bytes);
+    },
+    decodeHexStringToJSON(hexString) {
+      // 去除前缀 "0x"
+      var cleanHexString = hexString.slice(2);
+
+      // 将十六进制字符串转换为字节数组
+      var byteArray = this.hexToBytes(cleanHexString);
+
+      // 创建 Blob 对象
+      var blob = new Blob([byteArray], {type: 'application/json'});
+
+      // 读取 Blob 为文本
+      return new Promise(function(resolve, reject) {
+        var reader = new FileReader();
+        reader.onloadend = function() {
+          resolve(reader.result);
+        };
+        reader.onerror = function() {
+          reject(reader.error);
+        };
+        reader.readAsText(blob, 'UTF-8');
+      });
+    }
+  },
+  // beforeDestroy() {
+  //   this.savePaper()
+  // }
+}
+</script>
+
+<style>
+/* 这里可以添加样式 */
+</style>

package/src/components/pc/NewCheckpaper.vue

@@ -909,37 +909,40 @@ let asyncReady = async function (self) {
     //tag
     //tag)
     console.log(res)
-    if (!res.data[0].f_dir) {
-      self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    } else {
-      //this.f_dir=res.data[0].f_dir
-      let url = self.newConfig == '是' ? '/safecheck/rs/safe_vue' : '/safecheck/rs/vue'
-      try {
-        let res1 = await new HttpResetClass().load('GET', `${url}/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取居民配置项成功！',
-          rejectMsg: '获取居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        if (!Vue.config.safecheck) {
-          Vue.config = {safecheck: {}}
-        }
-        Vue.config.safecheck.DevicesConfig = res1.data
-        console.log(Vue.config.safecheck.DevicesConfig)
-        /*})*/
-        let res2 = await new HttpResetClass().load('GET', `${url}/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取非居民配置项成功！',
-          rejectMsg: '获取非居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesSetConfig = res2.data
-        /*}).then(res=> {
-        })*/
+    // 兼容旧版分公司获取
+    if(res.data.length>0){
+      if (!res.data[0].f_dir) {
+        self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
+      } else {
+        //this.f_dir=res.data[0].f_dir
+        let url = self.newConfig == '是' ? '/safecheck/rs/safe_vue' : '/safecheck/rs/vue'
+        try {
+          let res1 = await new HttpResetClass().load('GET', `${url}/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })/*.then(res=>{*/
+          //tag
+          //this.safeConfig["民用配置项"]=Object.assign({},res.data)
+          if (!Vue.config.safecheck) {
+            Vue.config = {safecheck: {}}
+          }
+          Vue.config.safecheck.DevicesConfig = res1.data
+          console.log(Vue.config.safecheck.DevicesConfig)
+          /*})*/
+          let res2 = await new HttpResetClass().load('GET', `${url}/DevicesSetConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
+            resolveMsg: null,
+            rejectMsg: null
+          })/*.then(res=>{*/
+          //tag
+          //this.safeConfig["非民用配置项"]=Object.assign({},res.data)
+          Vue.config.safecheck.DevicesSetConfig = res2.data
+          /*}).then(res=> {
+          })*/
 
-      } catch (e) {
-        self.$showMessage("获取配置文件失败" + e)
-        self.loading = false
+        } catch (e) {
+          // self.$showMessage("获取配置文件失败" + e)
+          self.loading = false
+        }
       }
     }
     if (self.data.f_recheck_id) {
@@ -1824,7 +1827,7 @@ export default {
         } else if (this.role == 'androidview') {
           id = this.item.f_paper_id
         }
-        this.$resetpost(`rs/path/getUserinfomation`, {data: {condition: `id = '${id}'`}}).then((respanse) => {
+        this.$resetpost(`api/af-safecheck/logic/path_getCheckPaper`, {data: {id:id}}).then((respanse) => {
             //tag
             if (respanse.data.length != 0) {
               // 包含 其它 特殊处理的数组

package/src/components/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-safe>
 <!--                <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>
 

package/src/components/pc/PaperDefectMain.vue

@@ -26,10 +26,10 @@
                        style="width: 60%" placeholder="小区" condition="f_residential_area like '%{}%'">
               </div>
               <div class="form-group col-sm-4" style="display: flex; gap: 15px">
-                <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="defectDetails" template-name='安检隐患明细'></export-excel-safe>
+                              sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="defectDetails" template-name='安检隐患明细'></export-excel-safe>
                 <button class="button_search" @click="$parent.$parent.showaudio()" v-if="$parent.$parent.audioshow">隐藏</button>
                 <button class="button_search"  @click="$parent.$parent.toRepair" v-if="$parent.$parent.canToRepair == '是'">转维修</button>
                 <button class="button_search" @click="search()">查询</button>

package/src/components/pc/PaperEdit.vue

@@ -30,10 +30,10 @@
                        style="width: 60%" placeholder="单位名称" >
               </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="queryPaperEdit"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="queryPaperEdit"
                                    template-name='图纸编辑'></export-excel-safe>
                 <button class="button_spacing button_search" @click="$parent.$parent.search()">查询</button>
                 <button class="button_spacing button_search" @click="$parent.$parent.change()">新建</button>

package/src/components/pc/PaperVisitMain.vue

@@ -46,10 +46,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="queryNoVisit" template-name='到访不遇'></export-excel-safe>
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="queryNoVisit" template-name='到访不遇'></export-excel-safe>
                 <button class="button_spacing button_search" @click="search()">查询</button>
               </div>
             </div>

package/src/components/pc/SafeVisitHistory.vue

@@ -42,9 +42,9 @@
                   <button type="button" name="button"
                           class="button_search button_spacing" @click="$parent.$parent.search">查询
                   </button>
-                  <export-excel-safe :data="$parent.$parent.searchData"
+                  <export-excel :data="$parent.$parent.searchData"
                                     :field="$parent.$parent.excelHeaders"
-                                    sqlurl="rs/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy"
+                                    sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="safe_singleTable_OrderBy"
                                     :template-name="$parent.$parent.excelTitle"></export-excel-safe>
                 </div>
               </div>

package/src/components/pc/SafecheckDeviceList.vue

@@ -41,10 +41,10 @@
                   </role-selector-safe>
                 </div>
                 <div class="form-group col-sm-2" style="width: auto;margin-top:8px;">
-                  <export-excel-safe :data="$parent.$parent.searchData"
+                  <export-excel :data="$parent.$parent.searchData"
                                      :field="$parent.$parent.excelHeaders"
                                      progress="safeGetExportProgress"
-                                     sqlurl="rs/logic/SafeExportExcel"
+                                     sqlurl="api/af-safecheck/logic/SafeExportExcel"
                                      sql-name="safe_singleTable_OrderBy"
                                      template-name='安检设备'></export-excel-safe>
                   <button style="margin-left: 4px" class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>

package/src/components/pc/SelectCheckNoPlan.vue

@@ -41,10 +41,10 @@
             </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"
+              <export-excel :data="$parent.$parent.searchData"
                                  :field="$parent.$parent.excelHeaders"
                                  progress="safeGetExportProgress"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="noplanCount"
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="noplanCount"
                                  template-name='无计划安检单'></export-excel-safe>
               <button type="button" class="button_search button_spacing" @click="search()">查询</button>
 <!--              <button type="button" class="button_new-1 button_spacing" data-toggle="dropdown"-->
@@ -205,7 +205,7 @@
       getOrgid() {
         this.depments = []
         let http = new HttpResetClass()
-        http.load('POST', 'rs/logic/GetOrgid', {
+        http.load('POST', 'api/af-safecheck/logic/GetOrgid', {
           orgid: this.$login.f.orgid
         }, {resolveMsg: null, rejectMsg: null}).then((ress) => {
           this.depments.push({label: '全部', value: ''})

package/src/components/pc/SelectCheckPlanAndNoPLan.vue

@@ -79,10 +79,10 @@
             <!--</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"
+              <export-excel   :data="$parent.$parent.searchData"
                                    :field="$parent.$parent.excelHeaders"
                                    progress="safeGetExportProgress"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planCount" template-name='安检计划明细' ></export-excel-safe>
               <button 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}"-->

package/src/components/planmanage/checkPlanList.vue

@@ -38,10 +38,10 @@
               <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"
+              <export-excel :data="$parent.$parent.exportParameter"
                                  :field="$parent.$parent.exportExcelField"
                                  style="margin-left: 0px"
-                                 sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                 sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                  :template-name="$parent.$parent.selectplan.f_plan_name + '安检计划导出'" :choose-col="true">
               </export-excel-safe>
             </div>

package/src/components/planmanage/checkUserList.vue

@@ -332,9 +332,9 @@
             <!--<div class="form-group col-sm-4 button-range" >
 
               <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.excelHeaders"
-                                   sqlurl="rs/logic/SafeExportExcel" sql-name="planItem"
+                                   sqlurl="api/af-safecheck/logic/SafeExportExcel" sql-name="planItem"
                                    template-name='安检计划明细' :choose-col="true">
               </export-excel-safe>
 
@@ -553,7 +553,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: ''}]