Browse Source

优化界面

hongrunxia 1 year ago
parent
commit
cee6601c78

+ 1 - 2
src/views/vent/comment/components/bottomMenu.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="bottom-btn-group">
-    <div v-for="item in navList" :key="item.pathName" class="vent-row-center btn-item" @click="setBtn('click', item)"
-      @mouseenter="setBtn('over', item)" @mouseleave="setBtn('leave', item)">
+    <div v-for="item in navList" :key="item.pathName" class="vent-row-center btn-item" @click="setBtn('click', item)">
       <dv-decoration11
         :color="isBtnActive === item.pathName ? activeColors : item.isHover ? activeColors : noActiveColors"
         style="width:200px;height:60px;">

+ 9 - 0
src/views/vent/monitorManager/comment/HandlerHistoryTable.vue

@@ -84,6 +84,15 @@
       formConfig: {
         labelAlign: 'left',
         showAdvancedButton: false,
+        baseColProps: {
+          // offset: 0.5,
+          xs: 24,
+          sm: 24,
+          md: 24,
+          lg: 9,
+          xl: 7,
+          xxl: 4,
+        },
         schemas: [
           {
             label: '时间范围',

+ 20 - 0
src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -207,6 +207,26 @@
   .history-table {
     width: 100%;
     :deep(.jeecg-basic-table-form-container) {
+      .@{ventSpace}-form {
+        padding: 0 !important;
+        border: none !important;
+        margin-bottom: 0 !important;
+        .@{ventSpace}-picker,
+        .@{ventSpace}-select-selector {
+          width: 100% !important;
+          height: 100%;
+          background: #00000017;
+          border: 1px solid #b7b7b7;
+          input,
+          .@{ventSpace}-select-selection-item,
+          .@{ventSpace}-picker-suffix {
+            color: #fff;
+          }
+          .@{ventSpace}-select-selection-placeholder {
+            color: #ffffffaa;
+          }
+        }
+      }
       .@{ventSpace}-table-title {
         min-height: 0 !important;
       }

+ 50 - 16
src/views/vent/monitorManager/deviceMonitor/index.vue

@@ -38,7 +38,6 @@
           </template>
           <div class="location-bottom-btn">
             <span @click="setLocation">提交</span>
-            <span @click="resetLocation">重置</span>
           </div>
         </div>
       </div>
@@ -74,6 +73,46 @@
                   },
                 ]" />
               </template>
+              <template #filterCell="{ column, record }">
+                <template v-if="deviceType.startsWith('gate')">
+                  <template v-if="record.frontGateOpenCtrl">
+                    <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'" color="processing">打开</a-tag>
+                  </template>
+                  <template v-else>
+                    <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 == 0 && record.frontGateClose == 1" color="default">关闭</a-tag>
+                    <a-tag v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 1 && record.frontGateClose == 0" color="default">打开</a-tag>
+                  </template>
+                  <template v-if="record.rearGateOpenCtrl">
+                    <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 0" color="red">正在打开</a-tag>
+                    <a-tag v-else-if="column.dataIndex === 'rearGateOpen'" color="processing">打开</a-tag>
+                  </template>
+                  <template v-else>
+                    <a-tag v-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 0" color="red">正在关闭</a-tag>
+                    <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 0 && record.rearGateClose == 1" color="default">关闭</a-tag>
+                    <a-tag v-else-if="column.dataIndex === 'rearGateOpen' && record.rearGateOpen == 1 && record.rearGateClose == 0" color="default">打开</a-tag>
+                  </template>
+                </template>
+                <template v-if="deviceType.startsWith('windrect')">
+                  <a-tag v-if="column.dataIndex === 'sign'" :color="record.sign == 0 ? '#95CF65' : record.sign == 1 ? '#4590EA' : '#9876AA'"> {{
+                    record.sign == 0 ? '高位' : record.sign == 1 ? '中位' : '低位'
+                  }}</a-tag>
+                  <template v-if="record && column && column.dataIndex === 'isRun' && record.isRun">
+                    <a-tag v-if="record.isRun == -2 || record.isRun == -1" :color="record.isRun == -2 ? '#95CF65' : '#ED5700'">{{
+                      record.isRun == -2 ? '空闲' : '等待'
+                    }}</a-tag>
+                    <a-tag v-else-if="record.isRun == 100" color="#4693FF">完成</a-tag>
+                    <Progress v-else :percent="Number(record.isRun)" size="small" status="active" />
+                  </template>
+                </template>
+                <a-tag v-if="column.dataIndex === 'warnFlag'" :color="record.warnFlag == 0 ? 'green' : record.warnFlag == 1 ? '#FF5812' : 'gray'"> {{
+                  record.warnFlag == 0 ? '正常' : record.warnFlag == 1 ? '报警' : record.warnFlag == 2 ? '断开' : '未监测'
+                }}</a-tag>
+                <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == 0 ? 'default' : 'green'">{{
+                  record.netStatus == 0 ? '断开' : '连接'
+                }}</a-tag>
+              </template>
             </MonitorTable>
           </template>
         </a-tab-pane>
@@ -116,7 +155,7 @@ import HistoryTable from '../comment/HistoryTable.vue';
 import HandlerHistoryTable from '../comment/HandlerHistoryTable.vue';
 import MonitorTable from '../comment/MonitorTable.vue';
 import GroupMonitorTable from '../comment/GroupMonitorTable.vue';
-import { TreeProps, message } from 'ant-design-vue';
+import { TreeProps, message, Progress } from 'ant-design-vue';
 import { TableAction } from '/@/components/Table';
 import FiberModal from './modal/fiber.modal.vue';
 import BundleModal from './modal/bundle.modal.vue'
@@ -437,12 +476,6 @@ function setLocation() {
     message.success('设置成功')
   }, 600)
 }
-/**
- * 巷道设备定位图标重置
- */
-function resetLocation() {
-  locationList.value = locationListTemp
-}
 
 onMounted(async () => {
   actions.onGlobalStateChange((newState, prev) => {
@@ -461,7 +494,7 @@ onMounted(async () => {
           const posShowData = pageObj.locationPlane
           if (posShowData) {
             locationList.value = posShowData
-            locationListTemp = posShowData
+            locationListTemp = [...posShowData]
           }
         }
       }
@@ -736,18 +769,19 @@ onUnmounted(() => {
       width: 100%;
       color: #fff;
       display: flex;
-      padding: 0 10px;
-      justify-content: space-between;
+      justify-content: flex-end;
       margin-top: 20px;
       span{
         display: inline-block;
-        padding: 2px 16px;
-        background: #007099;
-        border-radius: 4px;
-        border: 1px solid rgb(125, 230, 249);
+        width: 100%;
+        background: #00709955;
+        border-radius: 3px;
+        border: 1px solid rgba(174, 243, 255, 0.3);
+        text-align: center;
+        padding: 2px 0;
         cursor: pointer;
         &:hover{
-          background: #005574;
+          background: #00557422;
         }
       }
     }

+ 1 - 0
src/views/vent/monitorManager/nitrogen/components/nitrogenAlarmHistory.vue

@@ -13,5 +13,6 @@
     width: 100%;
     position: fixed;
     top: 80px;
+    margin-top: 20px;
   }
 </style>

+ 1 - 0
src/views/vent/monitorManager/nitrogen/components/nitrogenHandleHistory.vue

@@ -12,5 +12,6 @@
   .handle-history{
     position: fixed;
     top: 80px;
+    margin-top: 20px;
   }
 </style>

+ 1 - 0
src/views/vent/monitorManager/nitrogen/components/nitrogenHistory.vue

@@ -12,5 +12,6 @@
   .nitrogen-history{
     position: fixed;
     top: 80px;
+    margin-top: 20px;
   }
 </style>

+ 3 - 6
src/views/vent/monitorManager/nitrogen/index.vue

@@ -1,9 +1,6 @@
 <template>
   <div class="nitrogen-box">
-    <div class="nitrogen-home-header">
-      <Decoration5 class="header-icon" :dur="2" :color="['#21437F', '#2CF7FE']" style="width:500px;height:40px;" />
-      <div class="header-text">智能压风管控系统</div>
-    </div>
+    <customHeader >智能压风管控系统</customHeader>
     <nitrogenHome v-if="btnActive == 'nitrogen_page'" />
     <nitrogenEcharts v-if="btnActive == 'yfj_monitor_echarts'"/>
     <nitrogenHistory v-if="btnActive == 'yfj_history'"/>
@@ -20,7 +17,7 @@ import nitrogenEcharts from './components/nitrogenEcharts.vue'
 import nitrogenHistory from './components/nitrogenHistory.vue'
 import nitrogenHandleHistory from './components/nitrogenHandleHistory.vue'
 import nitrogenAlarmHistory from './components/nitrogenAlarmHistory.vue'
-import { Decoration5 } from '@kjgl77/datav-vue3'
+import customHeader from '/@/views/vent/comment/components/customHeader.vue';
 import BottomMenu from '/@/views/vent/comment/components/bottomMenu.vue';
 
 const btnActive = ref('nitrogen_page')
@@ -28,7 +25,7 @@ const navList = ref([
   {
     title: '监控界面',
     pathName: 'nitrogen_page',
-    isHover: true
+    isHover: false
   },
   {
     title: '实时曲线',