1. 安全监控历史数据添加时间查询条件

2. 保德注氮控制输入值修改

src/views/vent/deviceManager/deviceTable/index.vue

@@ -114,16 +114,33 @@
         },
       }
     );
-    formSchema.value.push({
-      label: '备用分站',
-      field: 'stationids',
-      component: 'ApiSelect',
-      componentProps: {
-        api: substationList,
-        labelField: 'strname',
-        valueField: 'id',
+    formSchema.value.push(
+      {
+        label: '备用分站',
+        field: 'stationids',
+        component: 'ApiSelect',
+        componentProps: {
+          api: substationList,
+          labelField: 'strname',
+          valueField: 'id',
+        },
       },
-    });
+      {
+        label: '是否显示',
+        field: 'linkId',
+        component: 'RadioGroup',
+        defaultValue: 1,
+        componentProps: () => {
+          return {
+            options: [
+              { label: '是', value: 1, key: '1' },
+              { label: '否', value: 0, key: '2' },
+            ],
+            stringToNumber: true,
+          };
+        },
+      }
+    );
   };
 
   onMounted(() => {

src/views/vent/monitorManager/compressor/components/nitrogenHome_bd.vue

@@ -899,7 +899,7 @@ function handleOK(passWord, handlerState) {
                 devicetype: kzParam.data.deviceType,
                 password: passWord,
                 paramcode:'m_stop',
-                value:'0',
+                value:'1',
             };
             break;
         case '备机停止':
@@ -908,7 +908,7 @@ function handleOK(passWord, handlerState) {
                 devicetype: kzParam.data.deviceType,
                 password: passWord,
                 paramcode:'b_stop',
-                value:'0',
+                value:'1',
             };
             break;
     }

src/views/vent/monitorManager/compressor/nitrogen.data.ts

@@ -211,8 +211,8 @@ export const zhudanOption = reactive({
 });
 
 export function getMonitorComponent() {
-  const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtdltmk';
+  // const { sysOrgCode } = useGlobSetting();
+  const sysOrgCode = 'sdmtjtbdmk';
   let nitrogenHome;
   switch (sysOrgCode) {
     case 'sdmtjtdltmk': //dltj
@@ -226,6 +226,7 @@ export function getMonitorComponent() {
     case 'sdmtjtbdmk': // bd
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_bd.vue'));
       return nitrogenHome;
+    case 'sdmtjtjjmk': // 锦界
     case 'sdmtjtyjlmk': //yjl
     case 'sdmtjtbltmk': // 补连塔
       // debugger;
@@ -234,7 +235,7 @@ export function getMonitorComponent() {
     case 'sdmtjtcctmk': // 寸草塔
       nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_blt.vue'));
       return nitrogenHome;
-    // case 'sdmtjtltmk': // 柳塔
+    // case 'sdmtjtjjmk': // 锦界
     //   nitrogenHome = defineAsyncComponent(() => import('./components/nitrogenHome_lt.vue'));
     //   return nitrogenHome;
     case 'lahgjtlnmy': // 潞宁

src/views/vent/monitorManager/gateMonitor/index.vue

@@ -42,7 +42,6 @@
             </template>
           </a-radio-group>
           <div class="button-box" @click="playAnimation(7)">切换模式</div>
-          <!-- <div class="button-box" @click="playAnimation(10)">自主联动控制</div> -->
         </div>
         <div class="vent-flex-m row" v-else>
           <div class="control-title">控制模式：</div>
@@ -586,7 +585,16 @@
         modalType.value = '4';
         modalIsShow.value = true;
         break;
-
+      case 8: // 打开中间门
+        modalTitle.value = '打开中间门';
+        modalType.value = '8';
+        modalIsShow.value = true;
+        break;
+      case 9: // 关闭中间门
+        modalTitle.value = '关闭中间门';
+        modalType.value = '9';
+        modalIsShow.value = true;
+        break;
       case 5: // 打开前后门
         modalTitle.value = '打开前后门';
         modalType.value = '5';
@@ -597,26 +605,12 @@
         modalType.value = '6';
         modalIsShow.value = true;
         break;
+
       case 7: // 控制模式切换
         modalTitle.value = '控制模式切换';
         modalType.value = '7';
         modalIsShow.value = true;
         break;
-      case 8: // 打开中间门
-        modalTitle.value = '打开中间门';
-        modalType.value = '8';
-        modalIsShow.value = true;
-        break;
-      case 9: // 关闭中间门
-        modalTitle.value = '关闭中间门';
-        modalType.value = '9';
-        modalIsShow.value = true;
-        break;
-      case 10: // 控制模式切换
-        modalTitle.value = '自主联动控制';
-        modalType.value = '10';
-        modalIsShow.value = true;
-        break;
     }
 
     if (globalConfig?.simulatedPassword) {
@@ -723,9 +717,6 @@
         data.paramcode = 'autoRoManualControl';
         data.value = selectData.contrlMod != 'loopCtrl' ? contrlValue : '';
         selectData.autoRoManual = null;
-
-      case '10': // 远程与就地
-        data.paramcode = 'ldkzControl';
     }
 
     if (data.paramcode) {

src/views/vent/monitorManager/nitrogen/components/nitrogenHome1.vue

@@ -32,9 +32,11 @@
                   <span
                     :class="{
                       'signal-round': true,
-                      'signal-round-run':selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] == '0',
-                      'signal-round-warning':selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] == '1',
-                      'signal-round-gry': selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] != '1' && selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] != '0',
+                      'signal-round-run': selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] == '0',
+                      'signal-round-warning': selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] == '1',
+                      'signal-round-gry':
+                        selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] != '1' &&
+                        selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${preMonitor.code}`] != '0',
                     }"
                   ></span>
                 </div>
@@ -61,9 +63,11 @@
                   <span
                     :class="{
                       'signal-round': true,
-                      'signal-round-run':selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] == '0',
-                      'signal-round-warning':selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] == '1',
-                      'signal-round-gry': selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] != '1' && selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] != '0',
+                      'signal-round-run': selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] == '0',
+                      'signal-round-warning': selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] == '1',
+                      'signal-round-gry':
+                        selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] != '1' &&
+                        selectData[`${deviceProperty.modelMonitor[0].key}${groupNum}${cqgMonitor.code}`] != '0',
                     }"
                   ></span>
                 </div>
@@ -117,9 +121,9 @@
                               <span
                                 :class="{
                                   'signal-round': true,
-                                  'signal-round-run':item.type=='sign' ? selectData[deviceKey + item.code] == '1' : selectData[deviceKey + item.code] == '0',
-                                  'signal-round-gry': selectData[deviceKey + item.code] != '0' && selectData[deviceKey + item.code] != '1',
-                                  'signal-round-warning':item.type=='sign' ? selectData[deviceKey + item.code] == '0' : selectData[deviceKey + item.code] == '1',
+                                  'signal-round-run': item.type === 'sign' && selectData[deviceKey + item.code] == '1',
+                                  'signal-round-gry': selectData[deviceKey + item.code] == '0' || !selectData[deviceKey + item.code],
+                                  'signal-round-warning': item.type === 'warning' && selectData[deviceKey + item.code] == '1',
                                 }"
                               ></span>
                             </div>
@@ -166,9 +170,9 @@
                             <span
                               :class="{
                                 'signal-round': true,
-                                'signal-round-run':item.type=='sign' ? selectData[deviceKey + item.code] == '1'  : selectData[deviceKey + item.code] == '0',
-                                'signal-round-gry': selectData[deviceKey + item.code] != '0' && selectData[deviceKey + item.code] != '1',
-                                'signal-round-warning':item.type=='sign' ? selectData[deviceKey + item.code] == '0'  : selectData[deviceKey + item.code] == '1',
+                                'signal-round-run': item.type === 'sign' && selectData[deviceKey + item.code] == '1',
+                                'signal-round-gry': selectData[deviceKey + item.code] == '0' || !selectData[deviceKey + item.code],
+                                'signal-round-warning': item.type === 'warning' && selectData[deviceKey + item.code] == '1',
                               }"
                             ></span>
                           </div>

src/views/vent/monitorManager/safetyMonitor/HistoryTable.vue

@@ -325,7 +325,6 @@
               },
               options: deviceOptions,
               onChange: (e, option) => {
-                console.log('2222', e, option);
                 if (option && (option['strinstallpos'] || option['strtype'] || option['devicekind']))
                   historyType.value = option['strtype'] || option['devicekind'];
                 if (option['strtype']) deviceTypeStr.value = option['strtype'];
@@ -339,6 +338,51 @@
               span: 4,
             },
           },
+          {
+            label: '间隔时间',
+            field: 'skip',
+            component: 'Select',
+            defaultValue: '8',
+            componentProps: {
+              options: [
+                {
+                  label: '1秒',
+                  value: '1',
+                },
+                {
+                  label: '5秒',
+                  value: '2',
+                },
+                {
+                  label: '10秒',
+                  value: '3',
+                },
+                {
+                  label: '30秒',
+                  value: '4',
+                },
+                {
+                  label: '1分钟',
+                  value: '5',
+                },
+                {
+                  label: '10分钟',
+                  value: '6',
+                },
+                {
+                  label: '30分钟',
+                  value: '7',
+                },
+                {
+                  label: '1小时',
+                  value: '8',
+                },
+              ],
+            },
+            colProps: {
+              span: 4,
+            },
+          },
         ],
       },
       pagination: {