1. 上湾风窗按钮修改

2. 修复报警类型翻译bug

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

@@ -8,6 +8,12 @@
         <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == '0' ? '#f00' : 'green'">{{
           record.netStatus == '0' ? '断开' : '连接'
         }}</a-tag>
+        <template v-if="column.dataIndex === 'nwartype'">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+        </template>
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>
 
@@ -29,6 +35,7 @@
   import { defHttp } from '/@/utils/http/axios';
   import dayjs from 'dayjs';
   import { getAutoScrollContainer } from '/@/utils/common/compUtils';
+  import { render } from '/@/utils/common/renderUtils';
 
   const globalConfig = inject('globalConfig');
   const props = defineProps({

src/views/vent/monitorManager/comment/MonitorTable.vue

@@ -8,6 +8,12 @@
         <div></div>
       </template>
       <template #bodyCell="{ column, record }">
+        <template v-if="column.dataIndex === 'nwartype'">
+          <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+          <span :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+            {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+          </span>
+        </template>
         <slot name="filterCell" v-bind="{ column, record }"></slot>
       </template>
       <template #action="{ record }">
@@ -25,7 +31,7 @@
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
   import { findIndex } from 'lodash-es';
   import { FormProps } from '/@/components/Form';
-
+  import { render } from '/@/utils/common/renderUtils';
 
   const props = defineProps({
     columnsType: {

src/views/vent/monitorManager/deviceMonitor/components/device/index.vue

@@ -282,7 +282,7 @@
               <bundleSpyMonitorTable @locate="goLocation" :isShowAction="true"></bundleSpyMonitorTable>
             </template>
             <template v-else-if="deviceType.startsWith('dusting') && activeKey == '1'">
-              <DustingTable :dataSource="dataSource" :deviceType="deviceType" :scroll="scroll" />
+              <DustingTable :dataSource="dataSource" :deviceType="deviceType" :scroll="scroll" @locate="goLocation"/>
             </template>
             <template v-else>
               <!-- 工作面echarts图标 -->

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

@@ -43,6 +43,14 @@
               <template #form-onExportXls>
                 <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
               </template>
+              <template #bodyCell="{ column, record }">
+                <template v-if="column.dataIndex === 'nwartype'">
+                  <!-- 除了 101（蓝色预警）其他都是红色字体 -->
+                  <span :class="{ 'color-#ff3823': ['102', '103', '104', '201', '1001'].includes(record.nwartype) }">
+                    {{ render.renderDictText(record.nwartype, 'leveltype') || '-' }}
+                  </span>
+                </template>
+              </template>
             </BasicTable>
           </div>
         </div>
@@ -61,6 +69,7 @@
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
   import { getAutoScrollContainer } from '/@/utils/common/compUtils';
   import { useRouter } from 'vue-router';
+  import { render } from '/@/utils/common/renderUtils';
 
   const props = defineProps({
     formConfig: {

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

@@ -25,17 +25,19 @@
           <div v-if="hasPermission('window:showAngle')" class="button-box" @click="setAngle(2)">设定后窗角度</div>
           <div v-if="hasPermission('window:gateControl')" class="button-box" @click="playAnimation(1)">打开前门</div>
           <div v-if="hasPermission('window:gateControl')" class="button-box" @click="playAnimation(2)">关闭前门</div>
-
+          <div v-if="hasPermission('window:twoAreaControl')" class="button-box" @click="setControl('1', '窗1面积设定')">窗1面积设定</div>
+          <div v-if="hasPermission('window:twoAreaControl')" class="button-box" @click="setControl('2', '窗2面积设定')">窗2面积设定</div>
+          <div v-if="hasPermission('window:twoAngleControl')" class="button-box" @click="setControl('1', '窗1角度设定')">窗1角度设定</div>
+          <div v-if="hasPermission('window:twoAngleControl')" class="button-box" @click="setControl('2', '窗2角度设定')">窗2角度设定</div>
           <!-- 展会功能 -->
           <!-- <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(3)">自主联动控制开启</div>
           <div v-if="hasPermission('window:ldkz')" class="button-box" @click="setArea(4)">自主联动控制停止</div> -->
         </div>
-
         <div class="row" v-if="hasPermission('window:fourAreaControl')">
-          <div class="button-box" @click="setFourAngle('frontSetValue1', '前窗1开度设置')">前窗1开度</div>
-          <div class="button-box" @click="setFourAngle('frontSetValue2', '前窗2开度设置')">前窗2开度</div>
-          <div class="button-box" @click="setFourAngle('frontSetValue3', '后窗1开度设置')">后窗1开度</div>
-          <div class="button-box" @click="setFourAngle('frontSetValue4', '后窗2开度设置')">后窗2开度</div>
+          <div class="button-box" @click="setControl('frontSetValue1', '前窗1开度设置')">前窗1开度</div>
+          <div class="button-box" @click="setControl('frontSetValue2', '前窗2开度设置')">前窗2开度</div>
+          <div class="button-box" @click="setControl('frontSetValue3', '后窗1开度设置')">后窗1开度</div>
+          <div class="button-box" @click="setControl('frontSetValue4', '后窗2开度设置')">后窗2开度</div>
         </div>
         <div class="row" v-if="Number(selectData.nwindownum) == 1">
           <div v-if="hasPermission('window:AreaControl')" class="button-box" @click="setArea(1)">设定风窗面积</div>
@@ -431,14 +433,13 @@
     }
   };
 
-  const setFourAngle = (flag, title) => {
+  const setControl = (flag, title) => {
     modalType.value = flag + '';
     modalTitle.value = title;
     modalIsShow.value = true;
   };
 
   const handleOK = (passWord, handlerState, value) => {
-    debugger;
     if (!passWord && !globalConfig?.simulatedPassword) {
       message.warning('请输入密码！');
       return;