[Mod 0000]矿端预警消息推送列表查询接口新增查询条件

src/layouts/default/header/components/VoiceBroadcast.vue

@@ -92,13 +92,20 @@
 
       async function clearInfo() {
         await cleanAlarm();
-        const res = await list({ pageSize: 20, devicetype: '', sort: 'createTime', delFlag: 0 });
+        const res = await list({ pageSize: 20, devicetype: '', sort: 'createTime', delFlag: 0, nwartype_end: '999' });
         broadcastList.value = res['records'];
       }
 
       async function toSelectList(key) {
         activeKey.value = key;
-        const res = await list({ pageSize: 20, devicetype: '', isok: key == 1 ? 0 : key == 2 ? 1 : null, sort: 'createTime', delFlag: 0 });
+        const res = await list({
+          pageSize: 20,
+          devicetype: '',
+          isok: key == 1 ? 0 : key == 2 ? 1 : null,
+          sort: 'createTime',
+          delFlag: 0,
+          nwartype_end: '999',
+        });
         broadcastList.value = res['records'];
         const isHasWarning = broadcastList.value.findIndex((item) => !item['isok']);
         if (key !== 2) isWarningDot.value = isHasWarning > -1 ? true : false;

src/views/vent/monitorManager/alarmMonitor/common/gasCcb.vue

@@ -18,18 +18,18 @@
               items.val == 0 && items.name == '报警状态'
                 ? '正常'
                 : items.val == 101 && items.name == '报警状态'
-                  ? '较低风险'
-                  : items.val == 102 && items.name == '报警状态'
-                    ? '低风险'
-                    : items.val == 103 && items.name == '报警状态'
-                      ? '中风险'
-                      : items.val == 104 && items.name == '报警状态'
-                        ? '高风险'
-                        : items.val == 201 && items.name == '报警状态'
-                          ? '报警'
-                          : items.val == 1001 && items.name == '报警状态'
-                            ? '网络断开'
-                            : items.val
+                ? '较低风险'
+                : items.val == 102 && items.name == '报警状态'
+                ? '低风险'
+                : items.val == 103 && items.name == '报警状态'
+                ? '中风险'
+                : items.val == 104 && items.name == '报警状态'
+                ? '高风险'
+                : items.val == 201 && items.name == '报警状态'
+                ? '报警'
+                : items.val == 1001 && items.name == '报警状态'
+                ? '网络断开'
+                : items.val
             }}</span
           >
         </div>
@@ -54,18 +54,18 @@
               items.val == 0 && items.name == '报警状态'
                 ? '正常'
                 : items.val == 101 && items.name == '报警状态'
-                  ? '较低风险'
-                  : items.val == 102 && items.name == '报警状态'
-                    ? '低风险'
-                    : items.val == 103 && items.name == '报警状态'
-                      ? '中风险'
-                      : items.val == 104 && items.name == '报警状态'
-                        ? '高风险'
-                        : items.val == 201 && items.name == '报警状态'
-                          ? '报警'
-                          : items.val == 1001 && items.name == '报警状态'
-                            ? '网络断开'
-                            : items.val
+                ? '较低风险'
+                : items.val == 102 && items.name == '报警状态'
+                ? '低风险'
+                : items.val == 103 && items.name == '报警状态'
+                ? '中风险'
+                : items.val == 104 && items.name == '报警状态'
+                ? '高风险'
+                : items.val == 201 && items.name == '报警状态'
+                ? '报警'
+                : items.val == 1001 && items.name == '报警状态'
+                ? '网络断开'
+                : items.val
             }}</span
           >
         </div>
@@ -180,7 +180,7 @@
       height: 100%;
       background: var(--image-top-area) no-repeat center;
       background-size: 100% 100%;
-overflow:hidden;
+      overflow: hidden;
 
       .box-label {
         position: absolute;
@@ -203,12 +203,12 @@ overflow:hidden;
         top: 70px;
         transform: translate(-50%, 0);
         width: 84%;
-        height:185px;
+        height: 185px;
         display: flex;
         justify-content: space-between;
         align-items: center;
         flex-wrap: wrap;
-        overflow-y:auto;
+        overflow-y: auto;
 
         .value-b {
           width: calc(50% - 10px);

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.threejs.ts

@@ -148,7 +148,7 @@ export function mountedThree(sceneSelctor: string, cssSelectors: string[]) {
 
     const model3 = new FanLocalTwo(model);
     const flag = await model3.mountedThree();
-    debugger;
+
     if (flag)
       modelContextList.push({
         type: 'fanLocalTwo',