...

src/components/JgButtonGroup/index.vue

@@ -30,6 +30,7 @@ export default {
           this.collectEntityId = newVal[0] && newVal[0].id || ''
         }
       },
+      immediate: true
     },
     collectEntityId: {
       handler(newVal) {

src/store/modules/company.js

@@ -5,6 +5,7 @@ import { findCurrentAcquisitionStation } from '@/api/AcquisitionStation'
 
 const company = {
   state: {
+    systemTitle: 'JG-ADC工业生产监测系统',
     clientCode: '',
     companyName: '',
     factoryName: '',

src/views/WarnSet/WarnSetModal.vue

@@ -127,11 +127,13 @@ export default {
             entityName: entity.entityName,
           }
           for (const e of entity.collectEntityTagVoList) {
-            columnsMap.set(e.tableColumn, { label: e.desc + '(' + e.unit + ')', prop: e.tableColumn })
-            obj[e.tableColumn + 'warnMinValue'] = e.warnMinValue
-            obj[e.tableColumn + 'warnMaxValue'] = e.warnMaxValue
-            obj.tagId = e.id
-            obj.tableColumn = e.tableColumn
+            if (e.tableColumn !== 'FEEDBACK') {
+              columnsMap.set(e.tableColumn, { label: e.desc + '(' + e.unit + ')', prop: e.tableColumn })
+              obj[e.tableColumn + 'warnMinValue'] = e.warnMinValue
+              obj[e.tableColumn + 'warnMaxValue'] = e.warnMaxValue
+              obj.tagId = e.id
+              obj.tableColumn = e.tableColumn
+            }
           }
           this.tableData.push(obj)
         }