safecheck-client 4.0.1-9 → 4.0.1-91

package/src/filiale/xinkang/pc/NewCheckpaper.vue

@@ -376,43 +376,10 @@ import {HttpResetClass} from "vue-client";
 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)
-    if (!res.data[0].f_dir) {
-      self.$showMessage("该公司无组织目录，无法获取配置文件，请联系管理员确认")
-    } else {
-      //this.f_dir=res.data[0].f_dir
-      try {
-        let res1 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/DevicesConfig.json?folderName=phonevues&orgDir=${res.data[0].f_dir}`, {}, {
-          resolveMsg: '获取居民配置项成功！',
-          rejectMsg: '获取居民配置项出错！'
-        })/*.then(res=>{*/
-        //tag
-        //this.safeConfig["民用配置项"]=Object.assign({},res.data)
-        Vue.config.safecheck.DevicesConfig = res1.data
-        /*})*/
-        let res2 = await new HttpResetClass().load('GET', `/safecheck/rs/vue/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=> {
-        })*/
-
-      } catch (e) {
-        self.$showMessage("获取配置文件失败" + e)
-      }
-    }
+    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) {
@@ -630,6 +597,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];
+          }
+        })
+      })
+    },
     devicesCollect() {
       //tag
       //tag)
@@ -670,24 +649,29 @@ export default {
                   if (!this.config[this.data[device][item].f_device_type].items[items.f_item_name] && (items.isdefect && (items.isdefect=='true' || items.isdefect==true))) {
                     continue
                   }
-                  if(items.f_is_defect != true && items.f_is_defect != 'true'){
-                    continue
-                  }
-                  let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
-                  if(items.f_item_name == '是否开放式厨房') {
-                    console.log('是否开放式厨房', options)
-                    console.log('f_item_value', f_item_value)
-                  }
-                  for (let option in options) {
-                    if (options[option].data == f_item_value) {
-                      if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
-                        checkResult = '有隐患'
-                        this.result = '有隐患'
-                        defects = `${defects}:${options[option].data}/`
-                        // let level = options[option].level
-                      }
-                    }
+                  // if(items.f_is_defect != true && items.f_is_defect != 'true'){
+                  //   continue
+                  // }
+                  if (items.f_is_defect == 'true' || items.f_is_defect == true) {
+                    checkResult = '有隐患'
+                    this.result = '有隐患'
+                    defects = `${defects}:${f_item_value}/`
                   }
+                  // let options = this.config[this.data[device][item].f_device_type].items[items.f_item_name].options
+                  // if(items.f_item_name == '是否开放式厨房') {
+                  //   console.log('是否开放式厨房', options)
+                  //   console.log('f_item_value', f_item_value)
+                  // }
+                  // for (let option in options) {
+                  //   if (options[option].data == f_item_value) {
+                  //     if ((options[option].isdefect == 'true' || options[option].isdefect == true) && (items.f_is_defect == 'true' || items.f_is_defect == true)) {
+                  //       checkResult = '有隐患'
+                  //       this.result = '有隐患'
+                  //       defects = `${defects}:${options[option].data}/`
+                  //       // let level = options[option].level
+                  //     }
+                  //   }
+                  // }
                   //tag)
                 }
                 if (defects != '') {
@@ -971,20 +955,24 @@ export default {
     },
 
     back() {
-      if (this.role == 'inspect') {
-        if (!this.isStrat) {
-          this.$back()
-          return
+        if (this.role == 'inspect') {
+          if (!this.isStrat) {
+            this.$emit('showback')
+            return
+          } else {
+            this.savePaper(true).then(() => {
+              this.$emit('showback')
+              this.isStrat = false
+            })
+          }
         } else {
-          this.savePaper(true).then(() => {
+          if(this.gotoitem){
             this.$back()
-            this.isStrat = false
-          })
+            return
+          }
+          this.$emit('showback')
         }
-      } else {
-        this.$back()
-      }
-    },
+      },
     checkIsStart() {
       alert('asdad')
       return
@@ -1343,6 +1331,7 @@ export default {
   },
 
   ready() {
+  asyncReady(this).then(async ()  => {
     this.putDevices()
     if (this.item.f_state != '未检' || this.item.f_no_checkplan == '无计划安检') {
       if (this.role != 'inspect') {
@@ -1353,7 +1342,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) {
               // 包含 其它 特殊处理的数组
@@ -1401,7 +1390,6 @@ export default {
             }
             // this.$goto('paper-message-blank', {userinfo:this.data,devices:this.devices,config:this.config,role:this.role}, 'self')
             this.isshow = true
-            asyncReady(this).then(async ()  => {
               //tag
               //tag)
               if (this.data.f_check_type == '民用') {
@@ -1419,7 +1407,7 @@ export default {
               }
               console.log('this.data.f_collection_type--------------',this.data.f_collection_type)
               if(!this.data.f_collection_type){
-                await this.$resetpost('api/af-safecheck/sql/SafecheckTableModel', {data: {condition: ` 1 = 1 and pim.f_plan_item_id = '${this.item.f_check_item_id}'`}}).then((res) => {
+                 this.$resetpost('api/af-safecheck/sql/SafecheckTableModel', {data: {condition: ` 1 = 1 and pim.f_plan_item_id = '${this.item.f_check_item_id}'`}}).then((res) => {
                   //tag)
                   if(res.data.length>0){
                     this.meter_classify = res.data[0].f_meter_classify
@@ -1459,9 +1447,6 @@ export default {
               this.deviceconfig2[1].items = jsonSort(this.deviceconfig2[1].items, "index")
               this.deviceconfig2 = jsonSort(this.deviceconfig2, "index")
               this.getDeviceAll()
-
-
-            })
           }
         ).catch(
           (respanse) => {
@@ -1470,7 +1455,7 @@ export default {
           })
       }
     }
-
+  })
   },
   watch: {
     //   'isUpload'(val){

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

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex-row">
+  <div class="flex-row" v-show="showinfo1">
     <div class="basic-main">
       <criteria-paged :model="model" v-ref:paged @sort="sort">
         <criteria partial='criteria' class="search_area" @condition-changed='$parent.selfSearch' v-ref:criteria>
@@ -266,6 +266,8 @@
       <check-msg v-if="showcheckmsg" :show="showcheckmsg" :data="checkInfo"></check-msg>
     </div>
   </div>
+  <new-check-paper v-if="showinfo2" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback1"></new-check-paper>
+  <new-check-paper-temp  v-if="showinfo3" :f_plan_id="shouinfodata.f_check_plan_id" :item="shouinfodata" :role="'view'" v-on:showback="showback2"></new-check-paper-temp>
 </template>
 
 <script>
@@ -333,7 +335,11 @@ import BenzAMRRecorder from 'benz-amr-recorder'
       // }
       // model.f_subcompany = this.$login.f.f_fengongsi
       return {
+        showinfo1:true,
+        showinfo2:false,
+        showinfo3:false,
         audioshow:false,
+        shouinfodata:{},
         searchData: {
           condition: "1=1",
           orderitem: "f_offsite_time desc",
@@ -376,6 +382,14 @@ import BenzAMRRecorder from 'benz-amr-recorder'
       }
     },
     methods: {
+      showback1(){
+        this.showinfo1 = true
+        this.showinfo2 = false
+      },
+      showback2(){
+        this.showinfo1 = true
+        this.showinfo3 = false
+      },
       //获取省市区列表
       getPcd(val){
         this.pcds = [{label:'全部',value:''}]
@@ -484,15 +498,16 @@ import BenzAMRRecorder from 'benz-amr-recorder'
       },
 
       change(row) {
-        // Vue.$login = {jwt: row.f_checker_id}
-        asyncReady(this).then(() => {
-            ////tag)
-            row.f_upload_state = '已传'
-            this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
-        }).catch(
-          (respanse) => {
-            alert('获取配置文件失败')
-          })
+        row.f_upload_state = '已传'
+        this.shouinfodata = JSON.parse(JSON.stringify(row))
+        this.showinfo1 = false
+        if (row.f_safe_type == '已挂表未办卡安检'){
+          this.showinfo2 = false
+          this.showinfo3 = true
+          return
+        }
+        this.showinfo2 = true
+        this.showinfo3 = false
       },
       readConfig() {
         let gen = asyncReady(this)