bug-5455 设备

src/views/component/device/index.vue

@@ -1265,11 +1265,15 @@ export default {
       if (!selection || selection.length === 0) {
         return this.$message.warning('请选择要删除的数据！')
       }
-      this.$confirm('确定删除所选项？删除后无法恢复！', '提示', {
-        confirmButtonText: '继续',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
+      this.$confirm(
+        `此操作将永久删除已选中的${selection.length}条数据, 是否确定? `,
+        '提示',
+        {
+          confirmButtonText: '继续',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }
+      )
         .then(async () => {
           await removeEquipmentCard({
             ids: selection + ''

src/views/platform/risk/riskV2.vue

@@ -902,6 +902,7 @@ export default {
       try {
         // 先检查状态
         await this.getIsFinish()
+
         // 更新主表
         const updateParamsRecord = {
           tableName: 't_fxpgjlb2',
@@ -914,6 +915,14 @@ export default {
             }
           ]
         }
+        updateParamsRecord.updList.forEach((item) => {
+          Object.keys(item.param).forEach((key) => {
+            if (key.endsWith('_label_value')) {
+              delete item.param[key]
+            }
+          })
+        })
+        console.log('updateParamsRecord', updateParamsRecord)
         await this.$common.request('update', updateParamsRecord)
 
         // 当前人员数组
@@ -967,7 +976,9 @@ export default {
           await this.goEdit(flag)
         } else {
           this.$confirm(
-            `风险类型${this.onlyoneWay ? '' : '和风险系数计算公式'}保存后不可再修改，是否继续?`,
+            `风险类型${
+              this.onlyoneWay ? '' : '和风险系数计算公式'
+            }保存后不可再修改，是否继续?`,
             '提示',
             {
               confirmButtonText: '继续',
@@ -1058,6 +1069,7 @@ export default {
       this.isEdit = !!(this.params && this.params.id_)
       if (this.isEdit) {
         this.infoFxssbData = this.params
+        console.log('infoFxssbData', this.infoFxssbData)
         this.preParams = JSON.parse(JSON.stringify(this.params))
         this.isPingGuRen =
           this.params.ping_gu_ren_yuan_.indexOf(this.userId) >= 0

src/views/system/jbdScan/goods/deviceTag.vue

@@ -269,7 +269,7 @@ export default {
       if (!id) {
         return ''
       }
-      const people = personData.find((i) => i.id_ === id)
+      const people = personData.find((i) => i.ID_ === id)
       return people?.NAME_
     }
   }

src/views/system/jbdScan/goods/deviceTagTemplateThree.vue

@@ -23,10 +23,10 @@
                           item.deviceStatus === '合格'
                             ? 'triangle'
                             : item.deviceStatus === '停用'
-                              ? 'triangleRed'
-                              : item.deviceStatus === '限用'
-                                ? 'triangleYellow'
-                                : 'triangleGray'
+                            ? 'triangleRed'
+                            : item.deviceStatus === '限用'
+                            ? 'triangleYellow'
+                            : 'triangleGray'
                         "
                       >
                         <div class="label" style="border: 0">
@@ -295,7 +295,7 @@ export default {
       if (!id) {
         return ''
       }
-      return personData.find((i) => i.id_ === id).NAME_
+      return personData.find((i) => i.ID_ === id).NAME_
     },
     findData(prop, value, sbjdData) {
       const result = sbjdData.find((el) => el.yuan_she_bei_bian == value)