Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

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

@@ -204,6 +204,14 @@
                           v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0"
                           color="default">打开</a-tag>
                       </template>
+                      <template v-if="column.dataIndex === 'ndoortype'">
+                        <span
+                          v-if="record.ndoortype == 0"
+                          color="red">行车风门</span>
+                        <span
+                          v-else
+                          color="default">行人风门</span>
+                      </template>
                     </template>
                     <template v-else-if="deviceType.startsWith('windrect')">
                       <a-tag v-if="column.dataIndex === 'sign'"

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

@@ -56,17 +56,6 @@
               :dataSource="dataSource" design-scope="gate-monitor" @selectRow="getSelectRow" :scroll="{ y: scroll.y - 40 }" title="风门监测"
               :isShowPagination="true">
               <template #filterCell="{ column, record }">
-                <!-- <template v-if="column.dataIndex === 'frontGateOpen'">
-                  <a-tag
-                    v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0"
-                    color="red">正在运行</a-tag>
-                  <a-tag
-                    v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 1 && record.frontGateClose == 0"
-                    color="default">开到位</a-tag>
-                  <a-tag
-                    v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 1"
-                    color="default">关到位</a-tag>
-                </template> -->
                 <template v-if="record.frontGateOpenCtrl == 1 || record.frontGateOpenCtrl === true">
                   <a-tag
                     v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0"
@@ -101,7 +90,15 @@
                     v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0"
                     color="default">打开</a-tag>
                 </template>
-                <template v-if="column.dataIndex === 'warnLevel'">
+                <template v-if="column.dataIndex === 'ndoortype'">
+                  <span
+                    v-if="record.ndoortype == 0"
+                    color="red">行车风门</span>
+                  <span
+                    v-else
+                    color="default">行人风门</span>
+                </template>
+                <template v-else-if="column.dataIndex === 'warnLevel'">
                   <a-tag v-if="record.warnLevel == '101'" color="green">蓝色预警</a-tag>
                   <a-tag v-else-if="record.warnLevel == '102'" color="#FF5812">黄色预警</a-tag>
                   <a-tag v-else-if="record.warnLevel == '103'" color="#FF5812">橙色预警</a-tag>
@@ -111,12 +108,13 @@
                   <a-tag v-else-if="record.warnLevel == '1001'" color="default">网络中断</a-tag>
                   <a-tag v-else color="green">正常</a-tag>
                 </template>
-                <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : 'red'">{{
+                <a-tag v-else-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : 'red'">{{
                   record.warnFlag == 0 ? '正常' : '报警'
                 }}</a-tag>
-                <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == 0 ? 'default' : 'green'">{{
+                <a-tag v-else-if="column.dataIndex === 'netStatus'" :color="record.netStatus == 0 ? 'default' : 'green'">{{
                   record.netStatus == 0 ? '断开' : '连接'
                 }}</a-tag>
+                
               </template>
             </MonitorTable>
           </a-tab-pane>
@@ -236,7 +234,8 @@ const initData = {
 const selectData = reactive(lodash.cloneDeep(initData));
 
 const flvURL1 = () => {
-  return `/video/mainWind.mp4`;
+  return ''
+  // return `/video/mainWind.mp4`;
 };
 
 // 获取设备基本信息列表

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

@@ -4,50 +4,50 @@
       <a-tabs class="tabs-box" type="card" v-model:activeKey="activeKey" @change="tabChange" >
         <a-tab-pane key="1" tab="实时监测">
           <div class="box-bg table-box" style="margin-bottom: 10px">
-            <label style="color: #fff">设备类型：</label>
-            <Select
-              @change="handleSensorChange"
-              :options="deviceTypeOption"
-              :fieldNames="{ label: 'itemText', value: 'itemValue' }"
-              v-model:value="deviceKind"
-              style="width: 200px; margin-bottom: 5px"
-              placeholder="请选择设备类型"
-              :allowClear="true"
-            ></Select>
-            <MonitorTable
-              ref="SensorMonitorRef"
-              :columnsType="deviceKind+'_monitor'"
-              :dataSource="dataSource"
-              design-scope="modelsensor_monitor"
-              @select-row="getSelectRow"
-              :deviceType="deviceKind"
-              :scroll="{ y: 300 }"
-              size="''"
-              title="传感器监测"
-            >
-              <template #filterCell="{ column, record }">
-                <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : 'red'">{{
-                  record.warnFlag == 0 ? '正常' : '报警'
-                }}</a-tag>
-                <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == 0 ? 'default' : 'green'">{{
-                  record.netStatus == 0 ? '断开' : '连接'
-                }}</a-tag>
-              </template>
-            </MonitorTable>
-          </div>
-
-          <div class="charts-box box-bg">
-            <BarAndLine
-              v-if="chartsColumns.length > 0"
-              :chartsColumnsType="selectData.deviceType"
-              xAxisPropType="readTime"
-              :dataSource="detailDataSource"
-              height="300px"
-              :chartsColumns="chartsColumns"
-              chartsType="detail"
-              :option="echartsOption"
-              @refresh="refreshEchatrs"
-            />
+            <div>
+              <label style="color: #fff">设备类型：</label>
+              <Select
+                @change="handleSensorChange"
+                :options="deviceTypeOption"
+                :fieldNames="{ label: 'itemText', value: 'itemValue' }"
+                v-model:value="deviceKind"
+                style="width: 200px; margin-bottom: 5px; color: black;"
+                placeholder="请选择设备类型"
+                :allowClear="true"
+              ></Select>
+              <MonitorTable
+                ref="SensorMonitorRef"
+                :columnsType="deviceKind + '_monitor'"
+                :dataSource="dataSource"
+                design-scope="modelsensor_monitor"
+                @select-row="getSelectRow"
+                :deviceType="deviceKind"
+                :scroll="{ y: chartsColumns.length > 0 ? 300: 600 }"
+                size="''"
+                title="传感器监测"
+              >
+                <template #filterCell="{ column, record }">
+                  <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : 'red'">{{
+                    record.warnFlag == 0 ? '正常' : '报警'
+                  }}</a-tag>
+                  <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == 0 ? 'default' : 'green'">{{
+                    record.netStatus == 0 ? '断开' : '连接'
+                  }}</a-tag>
+                </template>
+              </MonitorTable>
+            </div>
+            <div class="charts-box" v-if="chartsColumns.length > 0">
+              <BarAndLine
+                :chartsColumnsType="selectData.deviceType"
+                xAxisPropType="readTime"
+                :dataSource="detailDataSource"
+                height="300px"
+                :chartsColumns="chartsColumns"
+                chartsType="detail"
+                :option="echartsOption"
+                @refresh="refreshEchatrs"
+              />
+            </div>
           </div>
         </a-tab-pane>
         <a-tab-pane key="2" tab="历史数据">
@@ -59,20 +59,20 @@
               @change="historyDataSourceChange"
               designScope="modelsensor-history"
             />
+            <div class="charts-box" v-if="chartsColumns.length > 0">
+              <BarAndLine
+                :chartsColumnsType="selectData.deviceType"
+                xAxisPropType="gcreatetime"
+                :dataSource="historyDataSource"
+                height="100%"
+                :chartsColumns="chartsColumns"
+                chartsType="history"
+                :option="echartsOption1"
+                @refresh="refreshEchatrs"
+              />
+            </div>
           </div>
-          <div class="charts-box box-bg">
-            <BarAndLine
-              v-if="chartsColumns.length > 0"
-              :chartsColumnsType="selectData.deviceType"
-              xAxisPropType="gcreatetime"
-              :dataSource="historyDataSource"
-              height="100%"
-              :chartsColumns="chartsColumns"
-              chartsType="history"
-              :option="echartsOption1"
-              @refresh="refreshEchatrs"
-            />
-          </div>
+          
         </a-tab-pane>
         <a-tab-pane key="3" tab="报警历史">
           <div class="tab-item box-bg">
@@ -308,7 +308,8 @@
       color: #fff;
     }
     .table-box {
-      height: calc(60% - 150px);
+      // height: calc(60% - 150px);
+      height: 780px;
       padding: 20px 10px;
       overflow-y: auto;
     }
@@ -411,5 +412,10 @@
         background-color: #97efff11 !important;
       }
     }
+    :deep(.vent-form){
+      .@{ventSpace}-select-dropdown {
+        color: #000000 !important;
+      }
+    }
   }
 </style>

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

@@ -211,7 +211,8 @@
 
   const dataSource = ref([]);
   const flvURL1 = () => {
-    return `/video/mainWind.mp4`;
+    return ''
+    // return `/video/mainWind.mp4`;
   };
 
   const tabChange = (activeKeyVal) => {