From eb0b7aa27e2b82e5640536dbe25444074e7c6da4 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 12 Oct 2023 17:01:52 +0800
Subject: [PATCH] update

---
 src/components/headerBox/header2.vue          |   2 +-
 src/router/index.ts                           |   8 +-
 src/store/moduleSocketMechanics.ts            |   3 +
 .../CrownBlock/stuffCrownBlock/index.vue      | 123 ++++++++++++++++++
 src/views/PaintShopView/View1/top.vue         |   2 +-
 .../generalEnvironmentMechanical/index.vue    |   7 +-
 .../realtimeSecurity/content/content.vue      |   2 +-
 7 files changed, 140 insertions(+), 7 deletions(-)
 create mode 100644 src/views/CrownBlock/stuffCrownBlock/index.vue

diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue
index 1b08c10..9dd6831 100644
--- a/src/components/headerBox/header2.vue
+++ b/src/components/headerBox/header2.vue
@@ -543,7 +543,7 @@ h1 {
 }
 .time {
   position: absolute;
-  width: 20rem;
+  width: 350px;
   height: 2rem;
   bottom: 30%;
   left: 4.2rem;
diff --git a/src/router/index.ts b/src/router/index.ts
index c76d233..f6d6ebf 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -281,8 +281,7 @@ const routes: Array<RouteRecordRaw> = [
             name: "MicroExhibitionChild",
             component: () => import("../views/MicroExhibition/child/index.vue"),
           },
-        ]
-        
+        ]      
         
       },
       {
@@ -295,6 +294,11 @@ const routes: Array<RouteRecordRaw> = [
         name: "Hazardous",
         component: () => import("../views/Hazardous/index.vue"),
       },
+      {
+        path: "/stuffCrownBlock",
+        name: "stuffCrownBlock",
+        component: () => import("../views/CrownBlock/stuffCrownBlock/index.vue"),
+      },
 
 
 
diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts
index bcb2b07..c1297f3 100644
--- a/src/store/moduleSocketMechanics.ts
+++ b/src/store/moduleSocketMechanics.ts
@@ -72,6 +72,9 @@ export const useSocketStore = defineStore(Names.socketMechanics, {
                     "pm10": "7"
                 }
             ],
+            pmcq: [
+                {}
+            ],
             newVerticalNum: [
                 {
                     "type": "TVOC",
diff --git a/src/views/CrownBlock/stuffCrownBlock/index.vue b/src/views/CrownBlock/stuffCrownBlock/index.vue
new file mode 100644
index 0000000..f8df6f3
--- /dev/null
+++ b/src/views/CrownBlock/stuffCrownBlock/index.vue
@@ -0,0 +1,123 @@
+<template>
+    <div class="container">
+        <div class="header">
+            <div class="title">
+                <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="'大件车间天车位置监测平台'" :titleTip="''"
+                    :typeFun="['time']" :alarmType="[]"></header2>
+            </div>
+        </div>
+        <div class="content">
+            <div class="corwn-block ">
+                <div class="content-name">
+                  <span class="name">西侧</span>
+                  <span class="name">大件车间</span>
+                  <span class="name">东侧</span>
+                </div>
+                <div class="block" :style="{right: position + 'px'}"></div>
+            </div>   
+        </div>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import {ref, onMounted, onUnmounted} from 'vue'
+import header2 from '@/components/headerBox/header2.vue'
+import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
+
+let magn = 0.18;
+let position = ref(0)
+
+/**
+ * 请求接口
+ */
+
+
+function getWebsocket(val) {
+  try {
+    let data = JSON.parse(val);
+
+    if (data.type == "ceju") {
+      position.value = data.msg.distance * magn;
+      
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+function errWebsocket(val) {
+  // console.log(val);
+}
+
+
+onMounted(() => {
+  connectWebsocket(null, null, getWebsocket, errWebsocket);
+});
+
+onUnmounted(() => {
+  closeWebsocket();
+});
+</script>
+
+<style scoped>
+.container {
+    height: 1080px;
+    width: 1920px;
+    color: #FFFFFF;
+    /* background-color: #0E0E0E; */
+    position: relative;
+
+}
+
+.header {
+    height: 100px;
+    width: 1920px;
+}
+
+.content {
+    height: 980px;
+    width: 1920px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 0 5px;
+    box-sizing: border-box;
+}
+
+
+.corwn-block {
+    position: relative;
+    width: 1746px;
+    height: 360px;
+    background-color: #666464;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.block {
+    position: absolute;
+    width: 10px;
+    height: 100%;
+    /*背景渐变 */
+    background-image: linear-gradient(to bottom, #c02525, #c14242 40%, #c14242 70%, #c02525 100%);
+    /* 透明度 */
+    opacity: 0.8;
+    top: 0;
+    /* transform: translate(-50%,0); */
+    transition: all 0.5s linear
+}
+
+.content-name {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center
+}
+.name {
+    font-size: 60px;
+    color: #bfa;
+    font-weight: 700;
+    margin: 0 10px;
+}
+</style>
diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index 9d06f5b..453a23a 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -12,7 +12,7 @@
     <el-row>
       <el-col :span="24">
         <div style="display: flex;justify-content: space-evenly; align-items: center; margin-bottom: 10px;">
-          <verticalNum ref="verticalNum3" :title="t('messages.flameDetection')"></verticalNum>
+          <!-- <verticalNum ref="verticalNum3" :title="t('messages.flameDetection')"></verticalNum> -->
           <verticalNum ref="verticalNum5" :title="t('messages.smokeDetection')"></verticalNum>
           <verticalNum ref="verticalNum4" :title="t('messages.noiseDetection')"></verticalNum>
           <verticalNum ref="verticalNum6" :title="t('messages.CH2ODetection')"></verticalNum>
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 169c476..3fffbb7 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -13,6 +13,9 @@
                     <verticalNumLoop @click="gotoTrendChart(item.value, item.unit)" :title="item.title" :icon="item.icon"
                         :limit="item.limit" :unit="item.unit" :value="item.value"></verticalNumLoop>
                 </div>
+                <!-- <div class="top-box-item" @click="gotoTrendChart(store.pmcq, 'μg/m3',{PM25:75,PM10:150})">
+                    <pm :pm10limit="150" :pm25limit="75"></pm>
+                </div> -->
                 <div class="top-box-item" @click="gotoTrendChart(store.pm, 'μg/m3',{PM25:75,PM10:150})">
                     <pm :pm10limit="150" :pm25limit="75"></pm>
                 </div>
@@ -224,8 +227,8 @@ watch(() => store.humiture, (newVal, oldVal) => {
 let pmindex = ref(0);
 
 async function getPmData() {
-    let resulttwo: any = await getPmtwoData({ deptIds: '6,7,9,10,11' })
-    let resultten: any = await getPmtenData({ deptIds: '6,7,9,10,11' })
+    let resulttwo: any = await getPmtwoData({ deptIds: '6,7,9,10,11,23' })
+    let resultten: any = await getPmtenData({ deptIds: '6,7,9,10,11,23' })
     let data = {}
     if (resulttwo) {
         resulttwo.data.forEach(ele => {
diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue
index 4d8fba8..531740a 100644
--- a/src/views/realtimeSecurity/content/content.vue
+++ b/src/views/realtimeSecurity/content/content.vue
@@ -3,7 +3,7 @@
     <!-- <div class="topTip">
     <toptip ref="toptip1"></toptip>
   </div> -->
-    <div style="display: flex;">
+    <div style="display: flex;justify-content: space-between;align-items: center;">
       <div
         style="width: 20%; height: 250px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-evenly;"
         v-for="item in store.newVerticalNum">