safecheck-client 3.0.30-62-t10 → 3.0.30-62-t12

package/src/components/pc/NewCheckpaper.vue

@@ -943,74 +943,18 @@ import * as Util from '../Util'
 import {jsonSort} from '../../utils/LdapHelper'
 import {HttpResetClass} from "vue-client";
 import {forEach} from "mocha/lib/utils";
-
 let asyncReady = async function (self) {
   // 获取配置信息
   try {
-    let res = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
-      data: {
-        items: 'f_dir',
-        tablename: 't_organization',
-        condition: `id  = '${self.item.f_filialeid}'`,
-        orderitem: 'id'
-      }
-    })/*.then(res=>{*/
-    //tag
-    //tag)
-    console.log(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
-        }
-      }
-    }
-    if (self.data.f_recheck_id) {
-      let res3 = await new HttpResetClass().load('post', 'api/af-safecheck/sql/safe_singleTable_OrderBy', {
-        data: {
-          items: '*',
-          tablename: 't_check_paper',
-          condition: `id  = '${self.data.f_recheck_id}'`,
-          orderitem: 'id'
-        }
-      })
-      self.lastCheckData = res3.data[0]
-    }
+    let res = await new HttpResetClass().load('get','/api/af-safecheck/vue',null, {resolveMsg: null, rejectMsg: null})
+    self.delConfigKey(res.data)
+    Vue.config.safecheck=res.data
+    console.log('获取配置结果===', res.data)
   } catch (error) {
     // 忽略704,文件找不到异常R
     if (error.status !== 704) {
       throw error
     }
-    this.loading = false
   }
 }
 export default {
@@ -1148,6 +1092,18 @@ export default {
     }
   },
   methods: {
+    delConfigKey(obj){
+      // 从琉璃中获取的配置中会包含 $开头的一些额外描述新的key。为了兼容v3的代码逻辑在此函数中去掉
+      Object.keys(obj).forEach(key =>{
+        Object.keys(obj[key]).forEach(col => {
+          // 检查键是否以$开头
+          if (col.startsWith('$')) {
+            // 使用delete操作符删除键
+            delete obj[key][col];
+          }
+        })
+      })
+    },
     exportToPDF() {
       const element = document.getElementById('toPdf') // 替换为您要导出的页面元素的ID
       html2pdf(element)