Browse Source

预警管控bug修改-提交

lxh 1 year ago
parent
commit
c86b795313
36 changed files with 83 additions and 104 deletions
  1. BIN
      src/assets/images/company/content-bg.png
  2. BIN
      src/assets/images/company/top-bg.png
  3. BIN
      src/assets/images/company/人员总数.png
  4. BIN
      src/assets/images/company/分区-1.png
  5. BIN
      src/assets/images/company/分区-2.png
  6. BIN
      src/assets/images/company/列表分层.png
  7. BIN
      src/assets/images/company/列表表头.png
  8. BIN
      src/assets/images/company/巷道长度.png
  9. BIN
      src/assets/images/company/底图-1.png
  10. BIN
      src/assets/images/company/底图-2.png
  11. BIN
      src/assets/images/company/底图-3.png
  12. BIN
      src/assets/images/company/底图-4.png
  13. BIN
      src/assets/images/company/待审批文件数.png
  14. BIN
      src/assets/images/company/文件共享中心.png
  15. BIN
      src/assets/images/company/文件总数.png
  16. 9 0
      src/assets/images/company/火灾.svg
  17. 11 0
      src/assets/images/company/瓦斯.svg
  18. 6 0
      src/assets/images/company/箭头-置灰.svg
  19. 4 0
      src/assets/images/company/箭头-高亮.svg
  20. 18 0
      src/assets/images/company/粉尘.svg
  21. BIN
      src/assets/images/company/组 14399.png
  22. BIN
      src/assets/images/company/组 14400.png
  23. BIN
      src/assets/images/company/组 14416.png
  24. BIN
      src/assets/images/company/组 14418.png
  25. BIN
      src/assets/images/company/组 14419.png
  26. BIN
      src/assets/images/company/组 14599.png
  27. BIN
      src/assets/images/company/组 14608.png
  28. BIN
      src/assets/images/company/组 9976.png
  29. BIN
      src/assets/images/company/车辆总数.png
  30. 9 0
      src/assets/images/company/进入矿端.svg
  31. 9 0
      src/assets/images/company/通风.svg
  32. BIN
      src/assets/images/company/风险性分析.png
  33. BIN
      src/assets/images/company/饼图.png
  34. 15 101
      src/views/vent/home/clique/index.vue
  35. 0 1
      src/views/vent/monitorManager/alarmMonitor/DetailModalFire.vue
  36. 2 2
      src/views/vent/monitorManager/alarmMonitor/index.vue

BIN
src/assets/images/company/content-bg.png


BIN
src/assets/images/company/top-bg.png


BIN
src/assets/images/company/人员总数.png


BIN
src/assets/images/company/分区-1.png


BIN
src/assets/images/company/分区-2.png


BIN
src/assets/images/company/列表分层.png


BIN
src/assets/images/company/列表表头.png


BIN
src/assets/images/company/巷道长度.png


BIN
src/assets/images/company/底图-1.png


BIN
src/assets/images/company/底图-2.png


BIN
src/assets/images/company/底图-3.png


BIN
src/assets/images/company/底图-4.png


BIN
src/assets/images/company/待审批文件数.png


BIN
src/assets/images/company/文件共享中心.png


BIN
src/assets/images/company/文件总数.png


+ 9 - 0
src/assets/images/company/火灾.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15.371" height="17.752" viewBox="0 0 15.371 17.752">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.295" x2="0.946" y2="0.843" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#befcff"/>
+      <stop offset="1" stop-color="#fff"/>
+    </linearGradient>
+  </defs>
+  <path id="路径_55877" data-name="路径 55877" d="M173.81,91.521c.82.273,1.093-.478.751-.751a2.985,2.985,0,0,1-1.23-3.347c.41-1.366,1.5-1.913,1.5-3.962a2.883,2.883,0,0,1,1.093,2.6c1.366-1.571.751-3.621.478-4.577,3.484,1.844,6.49,5.875,3.006,9.291-.41.342,0,.956.615.751,9.5-5.4,2.323-13.458,1.093-14.414a3.025,3.025,0,0,1-.342,3.211c-1.435-5.4-4.919-6.49-4.919-6.49.41,2.8-1.571,5.807-3.416,8.129a6.2,6.2,0,0,0-.683-2.937c-.137,1.981-1.708,3.621-2.118,5.67-.547,2.733.41,4.714,4.167,6.831h0Z" transform="translate(-169.501 -73.828)" fill="url(#linear-gradient)"/>
+</svg>

+ 11 - 0
src/assets/images/company/瓦斯.svg

@@ -0,0 +1,11 @@
+<svg id="图标_瓦斯预警" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15.799" height="15.261" viewBox="0 0 15.799 15.261">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.295" x2="0.946" y2="0.843" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#befcff"/>
+      <stop offset="1" stop-color="#fff"/>
+    </linearGradient>
+  </defs>
+  <path id="路径_55296" data-name="路径 55296" d="M10.734,54.289a1.942,1.942,0,0,0-.415.039A4.629,4.629,0,0,1,8.66,55.751a2.226,2.226,0,0,0-.129.731v1.007a3.476,3.476,0,1,1-6.951,0V51.85a.79.79,0,1,0-1.58,0V57.5a5.066,5.066,0,1,0,10.131-.009v-1a.618.618,0,1,1,1.235,0v2.657a.79.79,0,1,0,1.58,0V56.491A2.225,2.225,0,0,0,10.734,54.289Z" transform="translate(0 -47.298)" fill="url(#linear-gradient)"/>
+  <path id="路径_55297" data-name="路径 55297" d="M43.6,58.823a2.212,2.212,0,0,0-1.659,1.422A4.519,4.519,0,0,0,43.6,58.823Zm-4.641,1.846c-.009.109-.009.208-.009.316v1.007a.622.622,0,1,1-1.244,0V60.225a4.636,4.636,0,0,1-1.58-1.353v3.12a2.2,2.2,0,1,0,4.4-.009v-1c0-.1,0-.187.009-.286a4.977,4.977,0,0,1-1.58-.03Zm5.5-4.729v.2a4.423,4.423,0,0,1-.208,1.363,3.507,3.507,0,0,1,3.239,3.485v2.657a.8.8,0,0,0,.227.562.8.8,0,0,0,1.353-.562V60.985a5.076,5.076,0,0,0-4.612-5.045Z" transform="translate(-33.276 -51.793)" fill="url(#linear-gradient)"/>
+  <path id="路径_55298" data-name="路径 55298" d="M37.027,3.44A4.157,4.157,0,1,0,41.185,7.6,4.157,4.157,0,0,0,37.027,3.44Zm-.453,7.41.453-2.8H35.216l2.265-3.729-.453,2.794h1.811Z" transform="translate(-30.273 -3.44)" fill="url(#linear-gradient)"/>
+</svg>

+ 6 - 0
src/assets/images/company/箭头-置灰.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="17.234" height="26.489" viewBox="0 0 17.234 26.489">
+  <g id="组_10513" data-name="组 10513" opacity="0.5">
+    <path id="路径_44587" data-name="路径 44587" d="M54.509,281.65l-7.249,9.789,7.249,9.439-1.952-9.335Z" transform="translate(-37.274 -278.02)" fill="#3df6ff"/>
+    <path id="路径_44588" data-name="路径 44588" d="M57.246,281.65,47.26,295.136l9.986,13-2.689-12.86Z" transform="translate(-47.26 -281.65)" fill="#3df6ff"/>
+  </g>
+</svg>

+ 4 - 0
src/assets/images/company/箭头-高亮.svg

@@ -0,0 +1,4 @@
+<svg id="组_14578" data-name="组 14578" xmlns="http://www.w3.org/2000/svg" width="17.234" height="26.488" viewBox="0 0 17.234 26.488">
+  <path id="路径_44587" data-name="路径 44587" d="M47.26,281.65l7.249,9.789-7.249,9.439,1.952-9.335Z" transform="translate(-47.26 -278.02)" fill="#3df6ff"/>
+  <path id="路径_44588" data-name="路径 44588" d="M47.26,281.65l9.986,13.485-9.986,13,2.689-12.859Z" transform="translate(-40.011 -281.65)" fill="#3df6ff"/>
+</svg>

+ 18 - 0
src/assets/images/company/粉尘.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16.818" height="14.431" viewBox="0 0 16.818 14.431">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.295" x2="0.946" y2="0.843" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#befcff"/>
+      <stop offset="1" stop-color="#fff"/>
+    </linearGradient>
+  </defs>
+  <g id="组_14577" data-name="组 14577" transform="translate(0)">
+    <path id="路径_55460" data-name="路径 55460" d="M394.212,89.47m2.02,0a2.02,2.02,0,1,1-2.02-2.02A2.02,2.02,0,0,1,396.232,89.47Z" transform="translate(-386.201 -87.45)" fill="url(#linear-gradient)"/>
+    <path id="路径_55461" data-name="路径 55461" d="M635.98,585.6m2.021,0a2.021,2.021,0,1,1-2.021-2.021A2.021,2.021,0,0,1,638,585.6Z" transform="translate(-632.009 -575.287)" fill="url(#linear-gradient)"/>
+    <path id="路径_55462" data-name="路径 55462" d="M17.945,577.56m2.021,0a2.021,2.021,0,1,1-2.021-2.021A2.021,2.021,0,0,1,19.965,577.56Z" transform="translate(-3.647 -567.384)" stroke="rgba(0,0,0,0)" stroke-width="1" fill="url(#linear-gradient)"/>
+    <path id="路径_55463" data-name="路径 55463" d="M393.46,794.51m1.319,0a1.319,1.319,0,1,1-1.319-1.32A1.319,1.319,0,0,1,394.779,794.51Z" transform="translate(-384.747 -781.398)" fill="url(#linear-gradient)"/>
+    <path id="路径_55464" data-name="路径 55464" d="M835.931,339.239m1.319,0a1.319,1.319,0,1,1-1.319-1.319A1.319,1.319,0,0,1,837.25,339.239Z" transform="translate(-834.611 -333.734)" fill="url(#linear-gradient)"/>
+    <path id="路径_55465" data-name="路径 55465" d="M289.268,385.524m1.319,0a1.319,1.319,0,1,1-1.319-1.319A1.319,1.319,0,0,1,290.587,385.524Z" transform="translate(-278.814 -379.246)" fill="url(#linear-gradient)"/>
+    <path id="路径_55600" data-name="路径 55600" d="M288.642,384.9m.693,0a.693.693,0,1,1-.693-.693A.693.693,0,0,1,289.335,384.9Z" transform="translate(-282.568 -377.927)" fill="url(#linear-gradient)"/>
+    <path id="路径_55466" data-name="路径 55466" d="M29.582,218.612m1.319,0a1.319,1.319,0,1,1-1.319-1.319A1.319,1.319,0,0,1,30.9,218.612Z" transform="translate(-14.789 -215.123)" fill="url(#linear-gradient)"/>
+  </g>
+</svg>

BIN
src/assets/images/company/组 14399.png


BIN
src/assets/images/company/组 14400.png


BIN
src/assets/images/company/组 14416.png


BIN
src/assets/images/company/组 14418.png


BIN
src/assets/images/company/组 14419.png


BIN
src/assets/images/company/组 14599.png


BIN
src/assets/images/company/组 14608.png


BIN
src/assets/images/company/组 9976.png


BIN
src/assets/images/company/车辆总数.png


+ 9 - 0
src/assets/images/company/进入矿端.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18.493" height="16.902" viewBox="0 0 18.493 16.902">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.936" x2="0.301" y2="0.971" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#33f5ff"/>
+      <stop offset="1" stop-color="#e5fdff"/>
+    </linearGradient>
+  </defs>
+  <path id="路径_55785" data-name="路径 55785" d="M15.3,62.67H4.17a2.384,2.384,0,0,1-2.385-2.385V57.1H3.375v1.04A2.935,2.935,0,0,0,6.312,61.08h6.85A2.937,2.937,0,0,0,16.1,58.144v-6.85a2.937,2.937,0,0,0-2.936-2.936H6.312a2.935,2.935,0,0,0-2.936,2.936v.244H1.783V49.153a2.384,2.384,0,0,1,2.385-2.385H15.3a2.385,2.385,0,0,1,2.387,2.385V60.284A2.385,2.385,0,0,1,15.3,62.67ZM8.145,50.743l4.772,3.976L8.146,57.9V55.515H.194V53.129H8.145Z" transform="translate(0.306 -46.268)" stroke="rgba(0,0,0,0)" stroke-miterlimit="10" stroke-width="1" fill="url(#linear-gradient)"/>
+</svg>

+ 9 - 0
src/assets/images/company/通风.svg

@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15.784" height="13.611" viewBox="0 0 15.784 13.611">
+  <defs>
+    <linearGradient id="linear-gradient" x1="0.295" x2="0.946" y2="0.843" gradientUnits="objectBoundingBox">
+      <stop offset="0" stop-color="#befcff"/>
+      <stop offset="1" stop-color="#fff"/>
+    </linearGradient>
+  </defs>
+  <path id="路径_55871" data-name="路径 55871" d="M88.1,132.537a.387.387,0,0,1-.395-.378V131.4a.387.387,0,0,1,.395-.378H98.75a.757.757,0,1,0,0-1.512H95.2a.387.387,0,0,1-.395-.378v-.756A.387.387,0,0,1,95.2,128H98.75a2.27,2.27,0,1,1,0,4.537Zm-2.368,3.025a.387.387,0,0,1-.395-.378v-.756a.387.387,0,0,1,.395-.378H95.2a.387.387,0,0,1,.395.378v.756a.387.387,0,0,1-.395.378Zm3.946,3.025a.387.387,0,0,1-.395-.378v-.756a.387.387,0,0,1,.395-.378h2.368a.387.387,0,0,1,.395.378v.756a.387.387,0,0,1-.395.378Zm3.946-1.512h5.13a2.271,2.271,0,1,1,0,4.537H95.2a.387.387,0,0,1-.395-.378v-.756a.387.387,0,0,1,.395-.378H98.75a.757.757,0,1,0,0-1.512H93.62a.387.387,0,0,1-.395-.378v-.756a.387.387,0,0,1,.395-.378Z" transform="translate(-85.334 -128)" fill="url(#linear-gradient)"/>
+</svg>

BIN
src/assets/images/company/风险性分析.png


BIN
src/assets/images/company/饼图.png


+ 15 - 101
src/views/vent/home/clique/index.vue

@@ -1,111 +1,25 @@
 <template>
-  <div class="header">1111</div>
-  <div class="container-box">
-    <div class="left-box lr-box">
-      <div class="lr-top air-monitor">
-        <div class="column-header">
-          <div class="header-item" v-for="(item, index) in airVolumeMonitorKey" :key="index">{{ item.value }}</div>
-        </div>
-        <div class="column-container">
-          <div class="column-item" v-for="(airVolume, index) in airVolumeMonitor" :key="index">
-            <div class="item-column" v-for="(item, key) in airVolumeMonitorKey" :key="key">{{ airVolume[item.code] }}</div>
-          </div>
-        </div>
-      </div>
-      <div class="lr-bottom warning-monitor"></div>
-    </div>
-    <div class="center-box ">
-      <div class="center-container file-list"></div>
-    </div>
-    <div class="right-box lr-box">
-      <div class="lr-top scene-monitor"></div>
-      <div class="lr-bottom tunnel-statistic">
-        
-      </div>
-    </div>
-  </div>
+ <div class="company-home">
+  <div class="top-bg"></div>
+  <div class="company-content"></div>
+ </div>
 </template>
 <script lang="ts" setup>
-  import { airVolumeMonitorKey, airVolumeMonitor } from './clique.data'
+
 </script>
 <style lang="less" scoped>
-  .header{
+  .company-home{
     width: 100%;
     height: 100px;
-    background-color: #ffffff11;
-  }
-  .container-box{
-    height: calc(100% - 32px);
-    display: flex;
-    margin: 16px 10px;
-    .lr-box{
-      width: 400px;
-      height: calc(100% - 50px);
-      position: relative;
-      top: -50px;
-      background-color: #ffffff11;
-    }
-    .center-box{
-      flex: 1;
-      margin: 0 16px;
-      .center-container{
-        height: 500px;
-        position: fixed;
-        bottom: 0;
-        background-color: #ffffff11;
-      }
-    }
-    .air-monitor{
-      .column-header{
-        width: 100%;
-        display: flex;
-        justify-content: center;
-        color: aqua;
-        height: 80px;
-        line-height: 80px;
-        .header-item{
-          width: 25%;
-          text-align: center;
-        }
-      }
-      .column-container{
-        height: 400px;
-        overflow-y: auto;
-        &:hover {
-          overflow-y: auto;
-          & > .column-item{
-            animation-play-state: paused;
-            // animation: move1 2s linear;
-          }
-        }
-        .column-item{
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          color: #fff;
-          height: 60px;
-          animation: move 5s linear infinite;
-          .item-column{
-            width: 25%;
-            text-align: center;
-          }
-        }
-      }
-      @keyframes move {
-        0% {
-          transform: translateY(0px);
-        }
-        100% {
-          transform: translateY(-260px);
-        }
-      }
+   position: relative;
+   .top-bg{
+    height: 97px;
+    background: url('../../../../assets/images/company/top-bg.png') no-repeat;
+   }
+   .company-content{
+    height: calc(100% - 97px);
+    background: url('');
+   }
 
-      @keyframes move1 {
-        0% {
-          transform: translateY(0px);
-        }
-      }
-      
-    }
   }
 </style>

+ 0 - 1
src/views/vent/monitorManager/alarmMonitor/DetailModalFire.vue

@@ -76,7 +76,6 @@ async function onSubmit() {
 //内外因火灾选项切换
 function btnClick(ind) {
   activeIndex.value = ind;
-  console.log(activeIndex, '000999')
   switch (ind) {
     case 0:
       activeIndex1.value = 0;

+ 2 - 2
src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -413,12 +413,12 @@
     centerData.sb = res.info.sysInfo.synthesizeS.status;
     centerData.fc = res.info.sysInfo.dustS.status;
     Object.keys(res.info.sysInfo).forEach((v) => {
-      data.push(res.info.sysInfo[v].maxLevel);
+      data.push(res.info.sysInfo[v].maxLevel || 0);
     });
     data = data.sort((a, b) => b - a);
     centerData.levels = data[0];
     Object.keys(iconsMonitor).forEach((el) => {
-      iconsMonitor[el].level = res.info.devicekindInfo[el].maxLevel;
+      iconsMonitor[el].level = res.info.devicekindInfo[el].maxLevel || 0;
     });
     fireMonitor[0].value = res.info.sysInfo.fireS.summaryInfo.external.temperature.value;
     fireMonitor[1].value = res.info.sysInfo.fireS.summaryInfo.external.coval.value;