新增卷帘

pages/control/index.vue

@@ -228,12 +228,16 @@ export default {
         { type: 'jm2k', name: '卷膜2开' },
         { type: 'jm2g', name: '卷膜2关' },
         { type: 'jm3k', name: '卷膜3开' },
-        { type: 'jm3g', name: '卷膜3关' }
+        { type: 'jm3g', name: '卷膜3关' },
+        { type: 'jlg', name: '卷帘关' },
+        { type: 'jlk', name: '卷帘开' }
       ],
       // 卡片状态
       show: {
         jbk: "暂停",
         jbg: "暂停",
+        jlg: "暂停",
+        jlk: "暂停",
         jm1k: "暂停",
         jm1g: "暂停",
         jm2k: "暂停",
@@ -245,6 +249,8 @@ export default {
       limitTimes: {
         jbkLimit: 0,
         jbgLimit: 0,
+        jlkLimit: 0,
+        jlgLimit: 0,
         jm1kLimit: 0,
         jm1gLimit: 0,
         jm2kLimit: 0,
@@ -255,6 +261,8 @@ export default {
       status: {
         jbk: 0,
         jbg: 0,
+        jlk: 0,
+        jlg: 0,
         jm1k: 0,
         jm1g: 0,
         jm2k: 0,
@@ -275,6 +283,7 @@ export default {
     // 定义所有互斥的键对：[k键, g键]
     const mutexPairs = [
       ['jbk', 'jbg'],
+      ['jlk', 'jlg'],
       ['jm1k', 'jm1g'],
       ['jm2k', 'jm2g'],
       ['jm3k', 'jm3g']
@@ -461,16 +470,9 @@ export default {
       Object.keys(this.liveData).forEach(key => {
         this.liveData[key] = '数据加载中...';
       });
-      this.limitTimes= {
+      Object.keys(this.limitTimes).forEach(key => {
-        jbkLimit: 0,
+        this.limitTimes[key] = 0;
-        jbgLimit: 0,
+      });
-        jm1kLimit: 0,
-        jm1gLimit: 0,
-        jm2kLimit: 0,
-        jm2gLimit: 0,
-        jm3kLimit: 0,
-        jm3gLimit: 0
-      };
       this.control = '正在加载中...';
       this.message = {};
       this.temp = '';
@@ -488,6 +490,8 @@ export default {
       const tipMap = {
         'jbk': {opposite: 'jbg', name: '卷被关', op: '卷被开'},
         'jbg': {opposite: 'jbk', name: '卷被开', op: '卷被关'},
+        'jlk': {opposite: 'jlg', name: '卷帘关', op: '卷帘开'},
+        'jlg': {opposite: 'jlk', name: '卷帘开', op: '卷帘关'},
         'jm1k': {opposite: 'jm1g', name: '卷膜1关', op: '卷膜1开'},
         'jm1g': {opposite: 'jm1k', name: '卷膜1开', op: '卷膜1关'},
         'jm2k': {opposite: 'jm2g', name: '卷膜2关', op: '卷膜2开'},
@@ -622,7 +626,7 @@ export default {
       // 业务逻辑：处理传感器数据、设备状态等
       // 设备状态展示
       if (this.value !== 1) {
-        var arr = ['jbk', "jbg", "jm1k", "jm1g", "jm2k", "jm2g", "jm3k", "jm3g"]
+        var arr = ['jbk', "jbg", "jm1k", "jm1g", "jm2k", "jm2g", "jm3k", "jm3g","jlk","jlg"]
         const allKeysNumeric = Object.keys(msgData).some(key => arr.includes(key));
         if (allKeysNumeric) {
           this.status = {...msgData}