Pārlūkot izejas kodu

预警管控,视频墙,文件共享中心汇总报表-修改提交

lxh 8 mēneši atpakaļ
vecāks
revīzija
54eadeae13

+ 48 - 46
src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -61,7 +61,7 @@
         <template #container>
           <div class="icons-box" @mouseleave="resetScroll">
             <template v-for="(item, key) in iconsMonitor" :key="key">
-              <div class="icon-item" v-if="[0, 101, 103, 104, 201].includes(item.level)">
+              <div class="icon-item" v-if="[0, 101, 102, 103, 104, 201].includes(item.level)">
                 <div class="wrapper">
                   {{ item.text }}
                 </div>
@@ -77,20 +77,20 @@
                   'level-text-6':
                     item.level != 0 && item.level != 101 && item.level != 102 && item.level != 103 && item.level != 104 && item.level != 201,
                 }">{{
-                    item.level == 0
+                  item.level == 0
+                    ? '低风险'
+                    : item.level == 101
                       ? '低风险'
-                      : item.level == 101
-                        ? '风险'
-                        : item.level == 102
-                          ? '一般风险'
-                          : item.level == 103
+                      : item.level == 102
+                        ? '一般风险'
+                        : item.level == 103
+                          ? '较大风险'
+                          : item.level == 104
                             ? '较大风险'
-                            : item.level == 104
-                              ? '较大风险'
-                              : item.level == 201
-                                ? '报警'
-                                : '未连接'
-                  }}</div>
+                            : item.level == 201
+                              ? '报警'
+                              : '未连接'
+                }}</div>
               </div>
             </template>
           </div>
@@ -235,20 +235,20 @@
                     value5: item.value == '5',
                     value6: item.value == '6',
                   }">{{
-                      item.value == '1'
-                        ? '正常'
-                        : item.value == '2'
-                          ? '低风险'
-                          : item.value == '3'
-                            ? '一般风险'
-                            : item.value == '4'
-                              ? '较高风险'
-                              : item.value == '5'
-                                ? '高风险'
-                                : item.value == '6'
-                                  ? '报警'
-                                  : '--'
-                    }}
+                    item.value == '1'
+                      ? '正常'
+                      : item.value == '2'
+                        ? '低风险'
+                        : item.value == '3'
+                          ? '一般风险'
+                          : item.value == '4'
+                            ? '较高风险'
+                            : item.value == '5'
+                              ? '高风险'
+                              : item.value == '6'
+                                ? '报警'
+                                : '--'
+                  }}
                   </div>
                   <div class="title">预警等级</div>
                 </div>
@@ -261,20 +261,20 @@
                     value5: item.value == '5',
                     value6: item.value == '6',
                   }">{{
-                      item.value == '1'
-                        ? '氧化阶段'
-                        : item.value == '2'
-                          ? '自热阶段'
-                          : item.value == '3'
-                            ? '临界阶段'
-                            : item.value == '4'
-                              ? '热解阶段'
-                              : item.value == '5'
-                                ? '裂变阶段'
-                                : item.value == '6'
-                                  ? '燃烧阶段'
-                                  : '--'
-                    }}
+                    item.value == '1'
+                      ? '氧化阶段'
+                      : item.value == '2'
+                        ? '自热阶段'
+                        : item.value == '3'
+                          ? '临界阶段'
+                          : item.value == '4'
+                            ? '热解阶段'
+                            : item.value == '5'
+                              ? '裂变阶段'
+                              : item.value == '6'
+                                ? '燃烧阶段'
+                                : '--'
+                  }}
                   </div>
                   <div class="title">煤自燃阶段</div>
                 </div>
@@ -283,10 +283,12 @@
           </div>
           <div class="item">
             <div class="icon"></div>
-            <div class="data-box1" v-for="(item, index) in fireMonitor" :key="index">
-              <!-- <div class="value1"> {{ !item.value ? '-' : item.value == '正常' ? '低风险' : item.value }} </div> -->
-              <div class="value1"> {{ !item.value ? '低风险' : item.value == '正常' ? '低风险' : item.value }} </div>
-              <div class="title">{{ item.title }}</div>
+            <div style="width: 630px;display: flex;justify-content: space-between">
+              <div class="data-box1" v-for="(item, index) in fireMonitor" :key="index">
+                <!-- <div class="value1"> {{ !item.value ? '-' : item.value == '正常' ? '低风险' : item.value }} </div> -->
+                <div class="value1"> {{ !item.value ? '低风险' : item.value == '正常' ? '低风险' : item.value }} </div>
+                <div class="title">{{ item.title }}</div>
+              </div>
             </div>
           </div>
         </div>
@@ -876,7 +878,7 @@ onUnmounted(() => {
           .data-box1 {
             display: flex;
             flex-direction: column;
-            // margin: 0 10px;
+
             width: 118px;
             align-items: center;
 

+ 4 - 4
src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -164,8 +164,8 @@ function getSysWarnList(id, type) {
                 el.strinstallpos = el.strinstallpos.indexOf('&') == -1 ? el.strinstallpos : el.strinstallpos.substring(0, el.strinstallpos.indexOf('&'));
                 cardListWs.push({
                     label: '甲烷',
-                    // value: el.readData.gasC || '--',
-                    value: 0,
+                    value: el.readData.gasC || '--',
+                    // value: 0,
                     listR: [
                         { id: 0, label: '测点类型', value: '瓦斯' },
                         { id: 1, label: '测点位置', value: el.strinstallpos || '--' },
@@ -531,7 +531,7 @@ onUnmounted(() => {
                             top: 50px;
                             transform: translate(-50%, 0);
                             font-family: 'douyuFont';
-                            font-size: 16px;
+                            font-size: 14px;
                             color: #3df6ff;
                         }
                     }
@@ -641,7 +641,7 @@ onUnmounted(() => {
                             top: 50px;
                             transform: translate(-50%, 0);
                             font-family: 'douyuFont';
-                            font-size: 16px;
+                            font-size: 14px;
                             color: #3df6ff;
                         }
                     }

+ 4 - 4
src/views/vent/monitorManager/camera/index.vue

@@ -153,16 +153,16 @@ function onDetail(node) {
       router.push('/grout-home')
       break;
     case 'window'://自动风窗
-      router.push('/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=window')
+      router.push('/monitorChannel/monitor-window?id='+node.deviceID)
       break;
     case 'gate'://自动风门
-      router.push('/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=gate')
+      router.push('/monitorChannel/monitor-gate?id='+node.deviceID)
       break;
       case 'fanlocal'://局部风机
-      router.push('/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanlocal')
+      router.push('/monitorChannel/monitor-fanlocal?id='+node.deviceID+'&deviceType=fanlocal')
       break;
       case 'fanmain'://主风机
-      router.push('/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=fanmain')
+      router.push('/monitorChannel/monitor-fanmain?id='+node.deviceID)
       break;
       case 'forcFan'://压风机
       router.push('/forcFan/home')

+ 44 - 19
src/views/vent/performance/fileDetail/index.vue

@@ -14,14 +14,34 @@
             <treeIcon class="iconfont" :title="item.title" v-else />
           </template>
           <template #operation="{ type }">
-
-            <i class="iconfont icon-xinzeng" v-if="type == 'addDocument'"></i>
-            <i class="iconfont icon-bianji" v-if="type == 'Editable'"></i>
-            <a-popconfirm v-if="type == 'deleteNode'" title="是否确认删除!" ok-text="确定" cancel-text="取消"
+            <a-tooltip placement="top" :color="'rgba(28, 72, 105,.5)'" >
+              <template #title>
+                <span>添加</span>
+              </template>
+              <i class="iconfont icon-xinzeng" v-if="type == 'addDocument'"></i>
+            </a-tooltip>
+            <a-tooltip placement="top" :color="'rgba(28, 72, 105,.5)'" >
+              <template #title>
+                <span>编辑</span>
+              </template>
+              <i class="iconfont icon-bianji" v-if="type == 'Editable'"></i>
+            </a-tooltip>
+          
+            <a-tooltip placement="top" :color="'rgba(28, 72, 105,.5)'" >
+              <template #title>
+                <span>删除</span>
+              </template>
+              <a-popconfirm v-if="type == 'deleteNode'" title="是否确认删除!" ok-text="确定" cancel-text="取消"
               @confirm="confirmDel">
               <i class="iconfont icon-guanbi"></i>
             </a-popconfirm>
-            <i class="iconfont icon-shangchuan1" v-if="type == 'downloadNode'"></i>
+            </a-tooltip>
+            <a-tooltip placement="top" :color="'rgba(28, 72, 105,.5)'" >
+              <template #title>
+                <span>下载目录</span>
+              </template>
+              <i class="iconfont icon-shangchuan1" v-if="type == 'downloadNode'"></i>
+            </a-tooltip>
           </template>
         </fileSystem>
       </div>
@@ -40,19 +60,21 @@
           <a-button type="primary" style="float: right; margin-right: 20px" @click="openModal(true)">文件上传</a-button>
         </div>
         <div class="list">
-          <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
-            <a-tab-pane key="1" tab="全部">
-              <NormalTable :key="alive" :submitInfo="submitInfo" :selfParam="selfParam" :searchParam="searchForm"
-                :nodeParam="nodeParam" :columns="columns" :list="getTree" :deleteById="deleteById" :downLoad="downLoad"
-                designScope="file-detail" title="文件详情" />
-            </a-tab-pane>
-            <a-tab-pane key="2" tab="待审批">
-              <approvalPend :key="alive2" :selected="selected" />
-            </a-tab-pane>
-            <a-tab-pane key="3" tab="已审批">
-              <endEd :key="alive3" :selected="selected" />
-            </a-tab-pane>
-          </a-tabs>
+          <a-spin :spinning="loading">
+            <a-tabs class="tabs-box" v-model:activeKey="activeKey" @change="tabChange">
+              <a-tab-pane key="1" tab="全部">
+                <NormalTable :key="alive" :submitInfo="submitInfo" :selfParam="selfParam" :searchParam="searchForm"
+                  :nodeParam="nodeParam" :columns="columns" :list="getTree" :deleteById="deleteById"
+                  :downLoad="downLoad" designScope="file-detail" title="文件详情" />
+              </a-tab-pane>
+              <a-tab-pane key="2" tab="待审批">
+                <approvalPend :key="alive2" :selected="selected" />
+              </a-tab-pane>
+              <a-tab-pane key="3" tab="已审批">
+                <endEd :key="alive3" :selected="selected" />
+              </a-tab-pane>
+            </a-tabs>
+          </a-spin>
         </div>
       </div>
     </div>
@@ -93,6 +115,7 @@ import { ref, onMounted, reactive, nextTick, watch } from 'vue';
 import { columns } from './fileDetail.data';
 import { getTree, createFile, editMenu, delMenu, uploadApi, downLoad, deleteById, listData, getNowUserAgencyData, sumVentReport, zipdownload } from './fileDetail.api';
 
+let loading = ref(false)
 let activeKey = ref('1');
 let selfParam = reactive({
   //各矿参数
@@ -156,7 +179,7 @@ function downloadNode(data) {
 }
 // 下载公用方法
 function downFilePublic(content, fileName) {
-  const blob = new Blob([content]); // 构造一个blob对象来处理数据
+  const blob = new Blob([content], { type: 'application/zip;charset=UTF-8' }); // 构造一个blob对象来处理数据
   // 对于<a>标签,只有 Firefox 和 Chrome(内核) 支持 download 属性
   // IE10以上支持blob但是依然不支持download
   if ('download' in document.createElement('a')) {
@@ -176,9 +199,11 @@ function downFilePublic(content, fileName) {
 }
 //汇总报表
 async function reportSum() {
+  loading.value = true
   let res = await sumVentReport()
   if (res) {
     alive.value = new Date().getTime();
+    loading.value = false
   }
 }
 //上传文件