From 873baee8390e8ca1c448fb40c86aac862af5ada8 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Mon, 5 Jun 2023 10:48:25 +0800
Subject: [PATCH 01/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=92=8C=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=A4=A7=E5=B1=8F=20=E7=B2=89=E5=B0=98?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C=20=E5=9B=BA=E5=AE=9A=20?=
 =?UTF-8?q?=E7=84=8A=E6=8E=A5=EF=BC=8C=E7=B2=BE=E9=A5=B0=20=E5=A4=A7?=
 =?UTF-8?q?=E4=BB=B6=E7=B2=89=E5=B0=98=E4=BC=A0=E6=84=9F=E5=99=A8devId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/moduleSocket.ts                     |  49 ++-
 src/store/moduleSocketjixie.ts                |  20 +-
 .../generalEnvironment/content/right.vue      | 312 ++++++++++--------
 .../content/right.vue                         | 296 +++++++++--------
 4 files changed, 378 insertions(+), 299 deletions(-)

diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts
index d1f97b7..1a9d5c6 100644
--- a/src/store/moduleSocket.ts
+++ b/src/store/moduleSocket.ts
@@ -9,7 +9,7 @@
  */
 import { defineStore } from "pinia";
 import { Names } from '@/store/storeName'
-import {gettime,clacendTime} from "@/utils/time"
+import { gettime, clacendTime } from "@/utils/time"
 export const useSocketStore = defineStore(Names.socket, {
     // 使用方式
     // const Index= useIndexStore()
@@ -172,16 +172,35 @@ export const useSocketStore = defineStore(Names.socket, {
          * @函数备注: 
          */
         changePM(val) {
-            if (val.enName == 'welding') {
-                this.pm.welding.two = val.pm25
-                this.pm.welding.ten = val.pm10
-            } else if (val.enName == 'stuff') {
-                this.pm.stuff.two = val.pm25
-                this.pm.stuff.ten = val.pm10
-            } else if (val.enName == 'ornaments') {
-                this.pm.ornaments.two = val.pm25
-                this.pm.ornaments.ten = val.pm10
-            }
+            let arr = ['083e3900-3435-11ed-a7e1-fd42bca6c8c6', 'bcbfb530-88b2-11ed-a926-570995ad0254', '01336fd0-1fa0-11ed-9223-7db1174970a8']
+            
+            // if (arr.indexOf(val.devId) > -1) {
+            //     console.log(val,'这三个设备');
+                
+            // }
+
+            if (val.devId == '083e3900-3435-11ed-a7e1-fd42bca6c8c6') {
+                    this.pm.welding.two = val.pm25
+                    this.pm.welding.ten = val.pm10
+            } else if (val.devId == 'bcbfb530-88b2-11ed-a926-570995ad0254') {
+                    this.pm.ornaments.two = val.pm25
+                    this.pm.ornaments.ten = val.pm10
+            } else if (val.devId == '01336fd0-1fa0-11ed-9223-7db1174970a8') {
+                    this.pm.stuff.two = val.pm25
+                    this.pm.stuff.ten = val.pm10
+            }        
+
+
+            // if (val.enName == 'welding') {
+            //     this.pm.welding.two = val.pm25
+            //     this.pm.welding.ten = val.pm10
+            // } else if (val.enName == 'stuff') {
+            //     this.pm.stuff.two = val.pm25
+            //     this.pm.stuff.ten = val.pm10
+            // } else if (val.enName == 'ornaments') {
+            //     this.pm.ornaments.two = val.pm25
+            //     this.pm.ornaments.ten = val.pm10
+            // }
 
         },
         /**
@@ -325,17 +344,17 @@ export const useSocketStore = defineStore(Names.socket, {
                 cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.name == val.data.name)
             }
             if (cIndex != -1) {
-                if (val.data.val>this.newVerticalNum[pIndex].limit) {
-                    
+                if (val.data.val > this.newVerticalNum[pIndex].limit) {
+
                     let now = new Date().getTime()
                     if (this.newVerticalNum[pIndex].value[cIndex].date == null) {
                         this.newVerticalNum[pIndex].value[cIndex].date = gettime()
                         this.newVerticalNum[pIndex].value[cIndex].time = now
                     }
-                    
+
                     let time = this.newVerticalNum[pIndex].value[cIndex].time
 
-                    this.newVerticalNum[pIndex].value[cIndex].continuous = clacendTime(now,time)
+                    this.newVerticalNum[pIndex].value[cIndex].continuous = clacendTime(now, time)
                 } else {
                     this.newVerticalNum[pIndex].value[cIndex].date = null
                     this.newVerticalNum[pIndex].value[cIndex].time = null
diff --git a/src/store/moduleSocketjixie.ts b/src/store/moduleSocketjixie.ts
index e5e9254..a16b67e 100644
--- a/src/store/moduleSocketjixie.ts
+++ b/src/store/moduleSocketjixie.ts
@@ -172,16 +172,16 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
          * @函数备注: 
          */        
         changePM(val){
-            if(val.enName=='welding'){
-                this.pm.welding.two=val.pm25
-                this.pm.welding.ten=val.pm10
-            }else if(val.enName=='stuff'){
-                this.pm.stuff.two=val.pm25
-                this.pm.stuff.ten=val.pm10
-            }else if(val.enName=='ornaments'){
-                this.pm.ornaments.two=val.pm25
-                this.pm.ornaments.ten=val.pm10
-            }
+            if (val.devId == '083e3900-3435-11ed-a7e1-fd42bca6c8c6') {
+                this.pm.welding.two = val.pm25
+                this.pm.welding.ten = val.pm10
+        } else if (val.devId == 'bcbfb530-88b2-11ed-a926-570995ad0254') {
+                this.pm.ornaments.two = val.pm25
+                this.pm.ornaments.ten = val.pm10
+        } else if (val.devId == '01336fd0-1fa0-11ed-9223-7db1174970a8') {
+                this.pm.stuff.two = val.pm25
+                this.pm.stuff.ten = val.pm10
+        } 
             
         },
         /**
diff --git a/src/views/generalEnvironment/content/right.vue b/src/views/generalEnvironment/content/right.vue
index 773937b..c8eb618 100644
--- a/src/views/generalEnvironment/content/right.vue
+++ b/src/views/generalEnvironment/content/right.vue
@@ -1,119 +1,121 @@
 <template>
-    <div class="content-right">
-        <el-row >
-            <el-col :span="8">
-                <border2 ref="borderElectriccontrol">
-                  <template v-slot>
-                      <pm name="Electriccontrol" :title="t('messages.pmHanJie')" ref="refwelding"></pm>
-                  </template>
-              </border2>
-            </el-col>
-            <el-col :span="8">
-                <border2 ref="borderfinish">
-                  <template v-slot>
-                      <pm name="finish" :title="t('messages.pmJingShi')" ref="refornaments"></pm>
-                  </template>
-              </border2>
-            </el-col>
-            <el-col :span="8">
-                <border2 ref="borderlarge">
-                  <template v-slot>
-                      <pm name="large" :title="t('messages.pmDaJian')" ref="refstuff"></pm>
-                  </template>
-              </border2>
-            </el-col>
-        </el-row>
-        <el-row >
-            <el-col :span="24">
-            <border2 ref="borderhumiture">
-              <template v-slot>
-                <humiture ref="Refhumiture"></humiture>
-              </template>
-            </border2>
-            </el-col>
-        </el-row>
-    </div>
-  </template>
+  <div class="content-right">
+    <el-row @click="toPmData">
+      <el-col :span="8">
+        <border2 ref="borderElectriccontrol">
+          <template v-slot>
+            <pm name="Electriccontrol" :title="t('messages.pmHanJie')" ref="refwelding"></pm>
+          </template>
+        </border2>
+      </el-col>
+      <el-col :span="8">
+        <border2 ref="borderfinish">
+          <template v-slot>
+            <pm name="finish" :title="t('messages.pmJingShi')" ref="refornaments"></pm>
+          </template>
+        </border2>
+      </el-col>
+      <el-col :span="8">
+        <border2 ref="borderlarge">
+          <template v-slot>
+            <pm name="large" :title="t('messages.pmDaJian')" ref="refstuff"></pm>
+          </template>
+        </border2>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <border2 ref="borderhumiture">
+          <template v-slot>
+            <humiture ref="Refhumiture"></humiture>
+          </template>
+        </border2>
+      </el-col>
+    </el-row>
+  </div>
+</template>
   
-  <script setup lang="ts">
-  import border2 from "@/components/borderBox/border2.vue";
-  import pm from "./chart/pm.vue"
-  import humiture from './chart/humiture.vue'
-  import { calcWH } from "@/components/ts/selfAdaption";
-  import { getHumitureData,getPmtenData, getPmtwoData  } from "@/http/generalEnvironment";
-  // import { getHumitureData,getPmtenData, getPmtwoData } from "@/http/environment";
-  import {onMounted, reactive, ref, watch} from "vue"
-  import { useSocketStore } from "@/store/moduleSocket"
-  import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
-  const store = useSocketStore()
-  let props=defineProps<{
-      width:number,
-      height:number,
-      }>()
-  
-  watch(()=>props,(newVal, oldVal)=>{
-    //监听父组件宽高变化，随时重置本组件尺寸  
-    reset(newVal)
-  },{immediate:true,deep:true,flush:'post'})
-  
-  //边框dom
-let borderElectriccontrol=ref()
-let borderfinish=ref()
-let borderlarge=ref()
-let borderhumiture=ref()
+<script setup lang="ts">
+import border2 from "@/components/borderBox/border2.vue";
+import pm from "./chart/pm.vue"
+import humiture from './chart/humiture.vue'
+import { calcWH } from "@/components/ts/selfAdaption";
+import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
+// import { getHumitureData,getPmtenData, getPmtwoData } from "@/http/environment";
+import { onMounted, reactive, ref, watch } from "vue"
+import { useSocketStore } from "@/store/moduleSocket"
+import { useRouter } from "vue-router";
+import { useI18n } from 'vue-i18n'
+let { t } = useI18n();
+const store = useSocketStore()
+const router = useRouter()
+let props = defineProps<{
+  width: number,
+  height: number,
+}>()
+
+watch(() => props, (newVal, oldVal) => {
+  //监听父组件宽高变化，随时重置本组件尺寸  
+  reset(newVal)
+}, { immediate: true, deep: true, flush: 'post' })
+
+//边框dom
+let borderElectriccontrol = ref()
+let borderfinish = ref()
+let borderlarge = ref()
+let borderhumiture = ref()
 
 //内容dom
-let refwelding=ref()
-let refornaments=ref()
-let refstuff=ref()
-let Refhumiture=ref()
-  function reset(val:any){
-    //宽高为0时跳出该方法
-    if(!val.width && !val.height) return
-  
-    //重置边框尺寸
-    resetBorder()
-    //重置盒子尺寸
-    threebox(val.width,val.height)
-    onebox(val.width,val.height)
-  }
+let refwelding = ref()
+let refornaments = ref()
+let refstuff = ref()
+let Refhumiture = ref()
+function reset(val: any) {
+  //宽高为0时跳出该方法
+  if (!val.width && !val.height) return
 
-const resetBorder=()=>{
-    borderElectriccontrol.value.resetWH()
-    borderfinish.value.resetWH()
-    borderlarge.value.resetWH()
-    borderhumiture.value.resetWH()
-    }   
-
-const threebox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,3,0)
-  //修改高度
-  refwelding.value.setchartWH(a.oWidth,a.oHeight)
-  refornaments.value.setchartWH(a.oWidth,a.oHeight)
-  refstuff.value.setchartWH(a.oWidth,a.oHeight)
+  //重置边框尺寸
+  resetBorder()
+  //重置盒子尺寸
+  threebox(val.width, val.height)
+  onebox(val.width, val.height)
 }
-const onebox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,1,0)
+
+const resetBorder = () => {
+  borderElectriccontrol.value.resetWH()
+  borderfinish.value.resetWH()
+  borderlarge.value.resetWH()
+  borderhumiture.value.resetWH()
+}
+
+const threebox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 3, 0)
   //修改高度
-  Refhumiture.value.setchartWH(a.oWidth,a.oHeight*2-49)
+  refwelding.value.setchartWH(a.oWidth, a.oHeight)
+  refornaments.value.setchartWH(a.oWidth, a.oHeight)
+  refstuff.value.setchartWH(a.oWidth, a.oHeight)
+}
+const onebox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 1, 0)
+  //修改高度
+  Refhumiture.value.setchartWH(a.oWidth, a.oHeight * 2 - 49)
 }
 watch(
   () => store.humiture,
   (newVal, oldVal) => {
     //动态更新echarts
     // if(oldVal)
-    Refhumiture.value.setData(newVal,2)
+    Refhumiture.value.setData(newVal, 2)
   },
   { deep: true, flush: "post" }
 );
-async function gethumitureData(){
-  let result:any = await getHumitureData({})
- 
-  if(result.code==200){
-    Refhumiture.value.setData(result.data,1)
-    store.$patch((state)=>{
-      state.humiture=result.data
+async function gethumitureData() {
+  let result: any = await getHumitureData({})
+
+  if (result.code == 200) {
+    Refhumiture.value.setData(result.data, 1)
+    store.$patch((state) => {
+      state.humiture = result.data
     })
   }
 }
@@ -126,9 +128,9 @@ watch(
   () => store.pm,
   (newVal, oldVal) => {
     //动态更新echarts
-  refwelding.value.setData(newVal.welding,2)
-  refornaments.value.setData(newVal.ornaments,2)
-  refstuff.value.setData(newVal.stuff,2)
+    refwelding.value.setData(newVal.welding, 2)
+    refornaments.value.setData(newVal.ornaments, 2)
+    refstuff.value.setData(newVal.stuff, 2)
   },
   { deep: true, flush: "post" }
 );
@@ -137,56 +139,83 @@ watch(
  * @出口参数: 
  * @函数备注: 
  */
-async function getPmtwoDatafun(){
-   let resulttwo:any = await getPmtwoData()
-  if(resulttwo.code==200){
+async function getPmtwoDatafun() {
+  let resulttwo: any = await getPmtwoData()
+  if (resulttwo.code == 200) {
     return resulttwo
   }
   return false
 }
 
-async function getPmtenDatafun(){
-   let resultten:any = await getPmtenData()
-  if(resultten.code==200){
+async function getPmtenDatafun() {
+  let resultten: any = await getPmtenData()
+  if (resultten.code == 200) {
     return resultten
   }
   return false
 }
-async function getPmData(){
+async function getPmData() {
   // let resulttwo:any = await getPmtwoData()
   // let resultten:any = await getPmtenData()
-  let data=reactive({welding:{two:null,ten:null},stuff:{two:null,ten:null},ornaments:{two:null,ten:null}})
-  Promise.all([getPmtwoDatafun(),getPmtenDatafun()]).then((res)=>{
-    if(res){
-      res[0].data.forEach(ele=>{
-        if(data[ele.enName]){
-        data[ele.enName].two=ele.value
-      }
+
+  //焊接车间 083e3900-3435-11ed-a7e1-fd42bca6c8c6
+  //精饰车间 bcbfb530-88b2-11ed-a926-570995ad0254
+  //大件车间 01336fd0-1fa0-11ed-9223-7db1174970a8
+  let arr = ['01336fd0-1fa0-11ed-9223-7db1174970a8', '083e3900-3435-11ed-a7e1-fd42bca6c8c6', 'bcbfb530-88b2-11ed-a926-570995ad0254']
+  let data = reactive({ welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } })
+  Promise.all([getPmtwoDatafun(), getPmtenDatafun()]).then((res) => {
+    if (res) {
+      res[0].data.forEach(ele => {
+        
+        switch (ele.devId) {
+          case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
+          data.welding.two = ele.value
+            break;
+          case 'bcbfb530-88b2-11ed-a926-570995ad0254':
+          data.ornaments.two = ele.value
+            break;
+          case '01336fd0-1fa0-11ed-9223-7db1174970a8':
+          data.stuff.two = ele.value
+            break;
+          default:
+            break;
+        }
       })
     }
 
-    if(res){
-      res[1].data.forEach(ele=>{
-        if(data[ele.enName]){
-        data[ele.enName].ten=ele.value
-      }
+    if (res) {
+      res[1].data.forEach(ele => {
+        
+        switch (ele.devId) {
+          case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
+          data.welding.ten = ele.value
+            break;
+          case 'bcbfb530-88b2-11ed-a926-570995ad0254':
+          data.ornaments.ten = ele.value
+            break;
+          case '01336fd0-1fa0-11ed-9223-7db1174970a8':
+          data.stuff.ten = ele.value
+            break;
+          default:
+            break;
+        }
       })
     }
-    refwelding.value.setData(data.welding,1)
-  refornaments.value.setData(data.ornaments,1)
-  refstuff.value.setData(data.stuff,1)
+    refwelding.value.setData(data.welding, 1)
+    refornaments.value.setData(data.ornaments, 1)
+    refstuff.value.setData(data.stuff, 1)
 
-  store.$patch((state)=>{
-    state.pm=data
+    store.$patch((state) => {
+      state.pm = data
+    })
   })
-  })
-  
+
   // if(resulttwo.code==200){
   //   resulttwo.data.forEach(res=>{
   //     if(data[res.name]){
   //       data[res.name].two=res.value
   //     }
-     
+
   //   })
   // }
   // if(resultten.code==200){
@@ -196,21 +225,24 @@ async function getPmData(){
   //   }
   //   })
   // }
-  
-  
+
+
 
 }
 
-onMounted(()=>{
+function toPmData() {
+  router.push({ path: '/pmData' })
+}
+
+onMounted(() => {
   gethumitureData()
   getPmData()
 })
-  </script>
+</script>
   
-  <style scope>
-  .content-right{
-      width: 100%;
-  }
-  
-  </style>
+<style scope>
+.content-right {
+  width: 100%;
+}
+</style>
   
\ No newline at end of file
diff --git a/src/views/generalEnvironmentjixiefenchang/content/right.vue b/src/views/generalEnvironmentjixiefenchang/content/right.vue
index eb0a4d5..f274e34 100644
--- a/src/views/generalEnvironmentjixiefenchang/content/right.vue
+++ b/src/views/generalEnvironmentjixiefenchang/content/right.vue
@@ -1,120 +1,123 @@
 <template>
-    <div class="content-right">
-        <el-row >
-            <el-col :span="8">
-                <border2 ref="borderElectriccontrol">
-                  <template v-slot>
-                      <pm name="Electriccontrol" :title="t('messages.pmHanJie')" ref="refwelding"></pm>
-                  </template>
-              </border2>
-            </el-col>
-            <el-col :span="8">
-                <border2 ref="borderfinish">
-                  <template v-slot>
-                      <pm name="finish" :title="t('messages.pmJingShi')" ref="refornaments"></pm>
-                  </template>
-              </border2>
-            </el-col>
-            <el-col :span="8">
-                <border2 ref="borderlarge">
-                  <template v-slot>
-                      <pm name="large" :title="t('messages.pmDaJian')" ref="refstuff"></pm>
-                  </template>
-              </border2>
-            </el-col>
-        </el-row>
-        <el-row >
-            <el-col :span="24">
-            <border2 ref="borderhumiture">
-              <template v-slot>
-                <humiture ref="Refhumiture"></humiture>
-              </template>
-            </border2>
-            </el-col>
-        </el-row>
-    </div>
-  </template>
+  <div class="content-right">
+    <el-row  @click="toPmData">
+      <el-col :span="8">
+        <border2 ref="borderElectriccontrol">
+          <template v-slot>
+            <pm name="Electriccontrol" :title="t('messages.pmHanJie')" ref="refwelding"></pm>
+          </template>
+        </border2>
+      </el-col>
+      <el-col :span="8">
+        <border2 ref="borderfinish">
+          <template v-slot>
+            <pm name="finish" :title="t('messages.pmJingShi')" ref="refornaments"></pm>
+          </template>
+        </border2>
+      </el-col>
+      <el-col :span="8">
+        <border2 ref="borderlarge">
+          <template v-slot>
+            <pm name="large" :title="t('messages.pmDaJian')" ref="refstuff"></pm>
+          </template>
+        </border2>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <border2 ref="borderhumiture">
+          <template v-slot>
+            <humiture ref="Refhumiture"></humiture>
+          </template>
+        </border2>
+      </el-col>
+    </el-row>
+  </div>
+</template>
   
-  <script setup lang="ts">
-  import border2 from "@/components/borderBox/border2.vue";
-  import pm from "./chart/pm.vue"
-  import humiture from './chart/humiture.vue'
-  import { calcWH } from "@/components/ts/selfAdaption";
-  import { getHumitureData,getPmtenData, getPmtwoData  } from "@/http/generalEnvironment";
-  // import { getHumitureData,getPmtenData, getPmtwoData } from "@/http/environment";
-  import {onMounted, ref, watch} from "vue"
-  import { useSocketStore } from "@/store/moduleSocketjixie";
-  import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
-  const store = useSocketStore()
-  let props=defineProps<{
-      width:number,
-      height:number,
-      }>()
-  
-  watch(()=>props,(newVal, oldVal)=>{
-    //监听父组件宽高变化，随时重置本组件尺寸  
-    reset(newVal)
-  },{immediate:true,deep:true,flush:'post'})
-  
-  //边框dom
-let borderElectriccontrol=ref()
-let borderfinish=ref()
-let borderlarge=ref()
-let borderhumiture=ref()
+<script setup lang="ts">
+import border2 from "@/components/borderBox/border2.vue";
+import pm from "./chart/pm.vue"
+import humiture from './chart/humiture.vue'
+import { calcWH } from "@/components/ts/selfAdaption";
+import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
+// import { getHumitureData,getPmtenData, getPmtwoData } from "@/http/environment";
+import { onMounted, ref, watch } from "vue"
+import { useRouter } from "vue-router";
+import { useSocketStore } from "@/store/moduleSocketjixie";
+import { useI18n } from 'vue-i18n'
+let { t } = useI18n();
+
+const router = useRouter()
+const store = useSocketStore()
+let props = defineProps<{
+  width: number,
+  height: number,
+}>()
+
+watch(() => props, (newVal, oldVal) => {
+  //监听父组件宽高变化，随时重置本组件尺寸  
+  reset(newVal)
+}, { immediate: true, deep: true, flush: 'post' })
+
+//边框dom
+let borderElectriccontrol = ref()
+let borderfinish = ref()
+let borderlarge = ref()
+let borderhumiture = ref()
 
 //内容dom
-let refwelding=ref()
-let refornaments=ref()
-let refstuff=ref()
-let Refhumiture=ref()
-  function reset(val:any){
-    //宽高为0时跳出该方法
-    if(!val.width && !val.height) return
-  
-    //重置边框尺寸
-    resetBorder()
-    //重置盒子尺寸
-    threebox(val.width,val.height)
-    onebox(val.width,val.height)
-  }
+let refwelding = ref()
+let refornaments = ref()
+let refstuff = ref()
+let Refhumiture = ref()
+function reset(val: any) {
+  //宽高为0时跳出该方法
+  if (!val.width && !val.height) return
 
-const resetBorder=()=>{
-    borderElectriccontrol.value.resetWH()
-    borderfinish.value.resetWH()
-    borderlarge.value.resetWH()
-    borderhumiture.value.resetWH()
-    }   
-
-const threebox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,3,0)
-  //修改高度
-  refwelding.value.setchartWH(a.oWidth,a.oHeight)
-  refornaments.value.setchartWH(a.oWidth,a.oHeight)
-  refstuff.value.setchartWH(a.oWidth,a.oHeight)
+  //重置边框尺寸
+  resetBorder()
+  //重置盒子尺寸
+  threebox(val.width, val.height)
+  onebox(val.width, val.height)
 }
-const onebox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,1,0)
+
+const resetBorder = () => {
+  borderElectriccontrol.value.resetWH()
+  borderfinish.value.resetWH()
+  borderlarge.value.resetWH()
+  borderhumiture.value.resetWH()
+}
+
+const threebox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 3, 0)
   //修改高度
-  Refhumiture.value.setchartWH(a.oWidth,a.oHeight*2-49)
+  refwelding.value.setchartWH(a.oWidth, a.oHeight)
+  refornaments.value.setchartWH(a.oWidth, a.oHeight)
+  refstuff.value.setchartWH(a.oWidth, a.oHeight)
+}
+const onebox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 1, 0)
+  //修改高度
+  Refhumiture.value.setchartWH(a.oWidth, a.oHeight * 2 - 49)
 }
 watch(
   () => store.humiture,
   (newVal, oldVal) => {
     //动态更新echarts
     // if(oldVal)
-    Refhumiture.value.setData(newVal,2)
+    Refhumiture.value.setData(newVal, 2)
   },
   { deep: true, flush: "post" }
 );
-async function gethumitureData(){
-  let pageValue='6,7,9,10,11'
-  let result:any = await getHumitureData({deptIds:pageValue})
- 
-  if(result.code==200){
-    Refhumiture.value.setData(result.data,1)
-    store.$patch((state)=>{
-      state.humiture=result.data
+async function gethumitureData() {
+  let pageValue = '6,7,9,10,11'
+  let result: any = await getHumitureData({ deptIds: pageValue })
+
+  if (result.code == 200) {
+    Refhumiture.value.setData(result.data, 1)
+    store.$patch((state) => {
+      state.humiture = result.data
     })
   }
 }
@@ -127,9 +130,9 @@ watch(
   () => store.pm,
   (newVal, oldVal) => {
     //动态更新echarts
-  refwelding.value.setData(newVal.welding,2)
-  refornaments.value.setData(newVal.ornaments,2)
-  refstuff.value.setData(newVal.stuff,2)
+    refwelding.value.setData(newVal.welding, 2)
+    refornaments.value.setData(newVal.ornaments, 2)
+    refstuff.value.setData(newVal.stuff, 2)
   },
   { deep: true, flush: "post" }
 );
@@ -138,46 +141,71 @@ watch(
  * @出口参数: 
  * @函数备注: 
  */
-async function getPmData(){
-  let resulttwo:any = await getPmtwoData()
-  let resultten:any = await getPmtenData()
-  let data={welding:{two:null,ten:null},stuff:{two:null,ten:null},ornaments:{two:null,ten:null}}
-  if(resulttwo.code==200){
-    resulttwo.data.forEach(res=>{
-      if(data[res.enName]){
-        data[res.enName].two=res.value
+async function getPmData() {
+  let resulttwo: any = await getPmtwoData()
+  let resultten: any = await getPmtenData()
+  let data = { welding: { two: null, ten: null }, stuff: { two: null, ten: null }, ornaments: { two: null, ten: null } }
+  if (resulttwo) {
+    resulttwo.data.forEach(ele => {
+
+      switch (ele.devId) {
+        case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
+          data.welding.two = ele.value
+          break;
+        case 'bcbfb530-88b2-11ed-a926-570995ad0254':
+          data.ornaments.two = ele.value
+          break;
+        case '01336fd0-1fa0-11ed-9223-7db1174970a8':
+          data.stuff.two = ele.value
+          break;
+        default:
+          break;
       }
-     
-    })
-  }
-  if(resultten.code==200){
-    resultten.data.forEach(res=>{
-      if(data[res.enName]){
-      data[res.enName].ten=res.value
-    }
     })
   }
 
-  refwelding.value.setData(data.welding,1)
-  refornaments.value.setData(data.ornaments,1)
-  refstuff.value.setData(data.stuff,1)
+  if (resultten) {
+    resultten.data.forEach(ele => {
 
-  
-  store.$patch((state)=>{
-    state.pm=data
+      switch (ele.devId) {
+        case '083e3900-3435-11ed-a7e1-fd42bca6c8c6':
+          data.welding.ten = ele.value
+          break;
+        case 'bcbfb530-88b2-11ed-a926-570995ad0254':
+          data.ornaments.ten = ele.value
+          break;
+        case '01336fd0-1fa0-11ed-9223-7db1174970a8':
+          data.stuff.ten = ele.value
+          break;
+        default:
+          break;
+      }
+    })
+  }
+
+  refwelding.value.setData(data.welding, 1)
+  refornaments.value.setData(data.ornaments, 1)
+  refstuff.value.setData(data.stuff, 1)
+
+
+  store.$patch((state) => {
+    state.pm = data
   })
 }
 
-onMounted(()=>{
+function toPmData() {
+  router.push({ path: '/pmData' })
+}
+
+onMounted(() => {
   gethumitureData()
   getPmData()
 })
-  </script>
+</script>
   
-  <style scope>
-  .content-right{
-      width: 100%;
-  }
-  
-  </style>
+<style scope>
+.content-right {
+  width: 100%;
+}
+</style>
   
\ No newline at end of file

From 7f5777ab60785e4162f305a3af497c32af7da9bf Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Tue, 6 Jun 2023 16:57:53 +0800
Subject: [PATCH 02/29] =?UTF-8?q?1.=E6=9B=B4=E6=8D=A2=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2=202.=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/iconfont.css                   |  10 +-
 src/components/assembly/RotationTable.vue     |  13 +-
 .../headerBox/dialog/headerDialog.vue         |  97 +++
 src/components/headerBox/header2.vue          | 551 ++++++++++--------
 src/main.ts                                   |   4 +-
 src/utils/devSever.ts                         |   4 +-
 src/utils/websocket.ts                        |   6 +-
 src/views/AerialView/content/tip.vue          |  11 +-
 src/views/AerialView/content/tip2.vue         |  11 +-
 .../child/component/Details.vue               |  13 +-
 .../child/component/RotationTable.vue         |  13 +-
 .../child/component/origin.vue                |  11 +-
 .../content/chart/deviceslist.vue             |  14 +-
 src/views/MechanicalView/content/tip.vue      |  13 +-
 src/views/MechanicalView/content/tip2.vue     |  11 +-
 src/views/MechanicalViewEdit/content/tip.vue  |  11 +-
 src/views/MechanicalViewEdit/content/tip2.vue |  11 +-
 .../MechanicalView_dajian/content/tip.vue     |  11 +-
 .../MechanicalView_dajian/content/tip2.vue    |  11 +-
 .../MechanicalView_hanjie/content/tip.vue     |  11 +-
 .../MechanicalView_hanjie/content/tip2.vue    |  11 +-
 .../MechanicalView_jijia/content/tip.vue      |  11 +-
 .../MechanicalView_jijia/content/tip2.vue     |  11 +-
 .../MechanicalView_jingjia/content/tip.vue    |  11 +-
 .../MechanicalView_jingjia/content/tip2.vue   |  11 +-
 .../MechanicalView_jingshi/content/tip.vue    |  11 +-
 .../MechanicalView_jingshi/content/tip2.vue   |  11 +-
 .../Offsite/content/chart/deviceslist.vue     |  11 +-
 .../Temp/Large_Format/component/Details.vue   |  11 +-
 .../Large_Format/component/RotationTable.vue  |  13 +-
 .../Temp/Large_Format/component/origin.vue    |  11 +-
 src/views/index.vue                           |   6 +-
 .../legionProducts/chart/scrollBoard.vue      |   7 +-
 .../content/chart/verticalNum.vue             |   4 +-
 .../content/chart/verticalNumLoop.vue         |   2 +-
 .../content/chart/verticalNum.vue             |   2 +-
 .../content/chart/verticalNumLoop.vue         |   2 +-
 37 files changed, 707 insertions(+), 276 deletions(-)
 create mode 100644 src/components/headerBox/dialog/headerDialog.vue

diff --git a/src/assets/css/iconfont.css b/src/assets/css/iconfont.css
index c774f27..0c8c886 100644
--- a/src/assets/css/iconfont.css
+++ b/src/assets/css/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3879194 */
-  src: url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.woff2?t=1683879014134') format('woff2'),
-       url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.woff?t=1683879014134') format('woff'),
-       url('//at.alicdn.com/t/c/font_3879194_0vtcz1yxgvk.ttf?t=1683879014134') format('truetype');
+  src: url('//at.alicdn.com/t/c/font_3879194_xfchth53vyb.woff2?t=1686011466607') format('woff2'),
+       url('//at.alicdn.com/t/c/font_3879194_xfchth53vyb.woff?t=1686011466607') format('woff'),
+       url('//at.alicdn.com/t/c/font_3879194_xfchth53vyb.ttf?t=1686011466607') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-lishijilu:before {
+  content: "\eaf7";
+}
+
 .icon-zhongyingwen:before {
   content: "\e607";
 }
diff --git a/src/components/assembly/RotationTable.vue b/src/components/assembly/RotationTable.vue
index 8c8c8ba..bb53219 100644
--- a/src/components/assembly/RotationTable.vue
+++ b/src/components/assembly/RotationTable.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\components\assembly\RotationTable.vue
+ * @FilePath: \code\gitscreenFront\src\components\assembly\RotationTable.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 15:09:06
@@ -38,7 +38,8 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       trigger="click"
       virtual-triggering
       :virtual-ref="triggerRef"
@@ -171,4 +172,12 @@ h2 {
   color: #fff;
   font-size: 20px;
 }
+.el-popper{
+  color: #fff !important;
+}
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/headerBox/dialog/headerDialog.vue b/src/components/headerBox/dialog/headerDialog.vue
new file mode 100644
index 0000000..a3898b0
--- /dev/null
+++ b/src/components/headerBox/dialog/headerDialog.vue
@@ -0,0 +1,97 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\components\headerBox\dialog\headerDialog.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-06-06 09:23:12
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+  <div>
+    <el-dialog v-model="is_Show" title="历史报警记录" ref="" destroy-on-close>
+      <el-table :data="tableData" v-loading="dialogLoading" size="large" max-height="600px" stripe>
+        <el-table-column type="index" :index="indexMethod" label="序号"  min-width="10px" header-align="center" align="center"/>
+        <el-table-column property="context" label="报警详情"  header-align="center"/>
+      </el-table>
+      <div class=" pagination-class">
+        <el-pagination
+      v-model:current-page="searchConfig.pageNum"
+      v-model:page-size="searchConfig.pageSize"
+      :page-sizes="[5, 10, 50, 100]"
+      :small="small"
+      :disabled="disabled"
+      :background="background"
+      layout="  prev, pager, next, jumper,sizes"
+      :total="searchConfig.total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+      </div>
+      
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from "vue";
+const props = defineProps({
+  tableData: {
+    type: Array,
+    default: () => [],
+  },
+  dialogTableVisible:{
+    type: Boolean,
+    default: false,
+  },
+  dialogLoading:{
+    type: Boolean,
+    default: true,
+  },
+  type:{
+    type: String,
+    default: '',
+  },
+  total:{
+    type: Number,
+    default: 0,
+  },
+});
+//总页数、每页数量、当前页
+const searchConfig = reactive({
+  type:props.type,
+  total:props.total,
+  pageSize:10,
+  pageNum:1
+})
+let small=ref(false)
+let disabled=ref(false)
+let background=ref(false)
+const emits = defineEmits(["update:dialogTableVisible",'getDialogdatafun']);
+const indexMethod = (index: number) => {
+  return index + 1
+}
+const is_Show = computed({
+  get: () => props.dialogTableVisible,
+  set: (val) => {
+    emits("update:dialogTableVisible", val);
+  },
+})
+const handleSizeChange = (val: number) => {
+  searchConfig.pageSize=val
+  emits("getDialogdatafun", searchConfig);
+}
+const handleCurrentChange = (val: number) => {
+  searchConfig.pageNum=val
+  emits("getDialogdatafun", searchConfig);
+}
+onMounted(() => {
+
+  
+})
+</script>
+
+<style scoped>
+.pagination-class{
+  margin-top: 10px;
+}</style>
diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue
index 33a1e07..4750404 100644
--- a/src/components/headerBox/header2.vue
+++ b/src/components/headerBox/header2.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\components\headerBox\header2.vue
+ * @FilePath: \code\gitscreenFront\src\components\headerBox\header2.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 11:04:06
@@ -9,206 +9,286 @@
 -->
 
 <template>
-  <div class="header2" :style="{ width: props.width, height: props.height }" >
-    <h1 :class="langJudge()=='简体中文'?'zh-title':'en-title'">{{ props.title }}</h1>
-    <div class="slot" >
+  <div class="header2" :style="{ width: props.width, height: props.height }">
+    <h1 :class="langJudge() == '简体中文' ? 'zh-title' : 'en-title'">
+      {{ props.title }}
+    </h1>
+    <div class="slot">
       <div class="tip" style="display: flex">
         <span class="tipspan" v-for="item in props.titleTip">
-          <div class="colortip" :style="{backgroundColor: item.color}"></div>
-          <span class="tipstring">{{item.name}}</span></span>
+          <div class="colortip" :style="{ backgroundColor: item.color }"></div>
+          <span class="tipstring">{{ item.name }}</span></span
+        >
         <slot></slot>
       </div>
-     <div v-show="typeObj.comback" class="comeBack" @click="comeBackFun" >
-      <i class="iconfont icon-back"></i>
-     </div>
-     <div v-show="typeObj.AbnormalData" ref="AbnormalDataRef" class="AbnormalData"  @click="AbnormalDataFun" >
-      <dv-scroll-board class="dv-scroll-boardclass" ref="tipList" :config="listdata" style="width:30rem;height:50px" />
-      <el-badge :value="AbnormalNum" class="i-badge" :hidden="AbnormalNum==0">
-      <i :class="AbnormalNum>0?'iconfont icon-baojingxinxi Abnormal-icon-yellow':'iconfont icon-baojingxinxi'"></i>
-      </el-badge>
-     </div>
-     <div v-show="typeObj.time" class="time">
-      <p ref="Timedom">{{ timeHtml }}</p>
-     </div>
+      <div v-show="typeObj.comback" class="comeBack" @click="comeBackFun">
+        <i class="iconfont icon-back"></i>
+      </div>
+      <div
+        v-show="typeObj.AbnormalData"
+        ref="AbnormalDataRef"
+        class="AbnormalData"
+        @click="AbnormalDataFun"
+      >
+        <dv-scroll-board
+          class="dv-scroll-boardclass"
+          ref="tipList"
+          :config="listdata"
+          style="width: 30rem; height: 50px"
+        />
+        <el-badge
+          :value="AbnormalNum"
+          class="i-badge"
+          :hidden="AbnormalNum == 0"
+        >
+          <i
+            :class="
+              AbnormalNum > 0
+                ? 'iconfont icon-baojingxinxi Abnormal-icon-yellow'
+                : 'iconfont icon-baojingxinxi'
+            "
+          ></i>
+        </el-badge>
+      </div>
+      <div v-show="typeObj.time" class="time">
+        <p ref="Timedom">{{ timeHtml }}</p>
+      </div>
     </div>
     <el-popover
-    ref="popoverRef"
-    :virtual-ref="AbnormalDataRef"
-    :visible="Abnormalpopovervisible"
-    effect="dark"
-    trigger="click"
-    width="600px"
-    placement="bottom-start"
-    virtual-triggering
-   
-  >
-    <ul class="popoverBOX" ref="popoverliDom"  v-click-outside="noClickAbnormalDataFun">
-      <li v-for="item in powerlist" :key="item.deviceId" >{{item.context}}</li>
-      <li class="lookdown" v-show="onloadlist">
-      <span @click="clickNextPageAlarmList">{{ t('messages.加载更多') }}</span>
-      </li>
-    </ul>
-    
-  </el-popover>
+      ref="popoverRef"
+      :virtual-ref="AbnormalDataRef"
+      :visible="Abnormalpopovervisible"
+      trigger="click"
+      width="600px"
+      placement="bottom-start"
+      virtual-triggering
+    >
+      <ul
+        class="popoverBOX"
+        ref="popoverliDom"
+        v-click-outside="noClickAbnormalDataFun"
+      >
+        <li class="popoverHeader">
+          <!-- <span><i class="iconfont icon-lishijilu lishijilu"></i>历史记录</span> -->
+          <el-button type="primary" :icon="Clock" text @click="showDialog"
+            >历史记录</el-button
+          >
+        </li>
+        <li v-for="item in powerlist" :key="item.deviceId">
+          {{ item.context }}
+        </li>
+        <li class="lookdown" v-show="onloadlist">
+          <span @click="clickNextPageAlarmList">{{
+            t("messages.加载更多")
+          }}</span>
+        </li>
+      </ul>
+    </el-popover>
+    <HDialog
+      :tableData="dialogdata"
+      v-model:dialogTableVisible="dialogTableVisible"
+      :dialogLoading="dialogLoading"
+      @getDialogdatafun="getDialogdatafun"
+      :type="AbnormalType.type"
+      :total="dialogtotal"
+    ></HDialog>
   </div>
 </template>
 
 <script setup lang="ts">
 import useNowTime from "@/hook/nowTime";
-import { ClickOutside as vClickOutside } from 'element-plus'
-import { useRoute,useRouter } from "vue-router";
+import { ClickOutside as vClickOutside } from "element-plus";
+import { useRoute, useRouter } from "vue-router";
 import { devListType } from "@/type/InPlantProducts";
-import { getAlarmListData} from "@/http/index";
-import { onMounted, onUnmounted, reactive, ref ,unref, watch,computed } from "vue";
+import { getAlarmListData } from "@/http/index";
+import {
+  onMounted,
+  onUnmounted,
+  reactive,
+  ref,
+  unref,
+  watch,
+  computed,
+} from "vue";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { useHeaderStore } from "@/store/components/header";
-import { getStoredLanguage } from "@/utils/languageStorage"
-import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+import { getStoredLanguage } from "@/utils/languageStorage";
+import { useI18n } from "vue-i18n";
+import { Clock } from "@element-plus/icons-vue";
+import HDialog from "./dialog/headerDialog.vue";
+let { t } = useI18n();
 const storeheader = useHeaderStore();
 let { timeHtml } = useNowTime();
-const router=useRouter()
+const router = useRouter();
 //刷新数据
-let numkey=ref(0)
-let popoverkey=ref(0)
+let numkey = ref(0);
+let popoverkey = ref(0);
 //历史数据dom
-let AbnormalDataRef=ref()
-let popoverRef=ref()
-let tipList=ref()
-let popoverliDom=ref()
+let AbnormalDataRef = ref();
+let popoverRef = ref();
+let tipList = ref();
+let popoverliDom = ref();
 //历史报警数据弹窗显示
-let Abnormalpopovervisible=ref(false)
-let AbnormalpopovervisibleCtrl=ref(false)//解决点击历史报警数据弹窗外部关闭再打开问题
-let onloadlist= computed(()=>{
-  return storeheader.num>powerlist.length
-})
-const listdata = reactive<devListType>({data: [],
-  rowNum:2,
-  oddRowBGC:'#100C2A',
-  evenRowBGC:'#100C2A',
+let Abnormalpopovervisible = ref(false);
+let AbnormalpopovervisibleCtrl = ref(false); //解决点击历史报警数据弹窗外部关闭再打开问题
+//dialog
+let dialogdata = reactive([]);
+let dialogTableVisible = ref(false);
+let dialogLoading = ref(true);
+let dialogtotal=ref(0)
+let onloadlist = computed(() => {
+  return storeheader.num > powerlist.length;
+});
+const listdata = reactive<devListType>({
+  data: [],
+  rowNum: 2,
+  oddRowBGC: "#100C2A",
+  evenRowBGC: "#100C2A",
   hoverPause: true,
-  carousel:'page',
+  carousel: "page",
   waitTime: 3000,
-  align:['left']});
-let AbnormalNum=ref(0)
-  //弹窗历史数据
-let powerlist=reactive([])
+  align: ["left"],
+});
+let AbnormalNum = ref(0);
+//弹窗历史数据
+let powerlist = reactive([]);
 let props = defineProps<{
   width: string;
   height: string;
   title: string;
-  titleTip:any;
-  typeFun:any[];
-  alarmType:any[]
+  titleTip: any;
+  typeFun: any[];
+  alarmType: any[];
 }>();
-const typeObj=reactive({
-  comback:false,
-  AbnormalData:false,
-  time:false,
-})
-const AbnormalType=reactive({
-  pageSize:5,
-  pageNum:1,
-  type:''
-})
-let comeBackFun=()=>{
-  router.go(-1)
-}
+const typeObj = reactive({
+  comback: false,
+  AbnormalData: false,
+  time: false,
+});
+const AbnormalType = reactive({
+  pageSize: 5,
+  pageNum: 1,
+  type: "",
+});
+let comeBackFun = () => {
+  router.go(-1);
+};
 const changeAbnormalData = (val: any) => {
   tipList.value.updateRows(val.data, { ...val });
 };
-let AbnormalDataFun=()=>{
- //该函数执行优先级低于noClickAbnormalDataFun
- //Abnormalpopovervisibled代表弹窗是否已经显示
- // 判断弹窗是否打开如果打开就关闭 关闭就打开
-  if(Abnormalpopovervisible.value){
-    Abnormalpopovervisible.value=false
-  }else{
+let AbnormalDataFun = () => {
+  //该函数执行优先级低于noClickAbnormalDataFun
+  //Abnormalpopovervisibled代表弹窗是否已经显示
+  // 判断弹窗是否打开如果打开就关闭 关闭就打开
+  if (Abnormalpopovervisible.value) {
+    Abnormalpopovervisible.value = false;
+  } else {
     //关闭情况下判断是否点击了非弹窗位置如果是则仍然关闭 否则打开
-    if(AbnormalpopovervisibleCtrl.value){
-      Abnormalpopovervisible.value=false
-    }else{
-      Abnormalpopovervisible.value=true
+    if (AbnormalpopovervisibleCtrl.value) {
+      Abnormalpopovervisible.value = false;
+    } else {
+      Abnormalpopovervisible.value = true;
     }
-    
   }
-
-
-}
-let noClickAbnormalDataFun=()=>{
+};
+let noClickAbnormalDataFun = () => {
   //该函数执行优先级高于AbnormalDataFun
   // 判断弹窗是否打开如果打开并且我点击了非弹窗位置则ctrl为true否则为false
-  if(Abnormalpopovervisible.value){
-    AbnormalpopovervisibleCtrl.value=true
-  }else{
-    AbnormalpopovervisibleCtrl.value=false
+  if (Abnormalpopovervisible.value) {
+    AbnormalpopovervisibleCtrl.value = true;
+  } else {
+    AbnormalpopovervisibleCtrl.value = false;
   }
- 
-  Abnormalpopovervisible.value?Abnormalpopovervisible.value=false:''
 
-}
-function typeStatus(){
-  
-  
-  if(props.typeFun.length==0){
-    return
+  Abnormalpopovervisible.value ? (Abnormalpopovervisible.value = false) : "";
+};
+function typeStatus() {
+  if (props.typeFun.length == 0) {
+    return;
   }
-  props.typeFun.forEach(res=>{
-    for(let key in typeObj){
-      if(res==key){
-        typeObj[key]=true
+  props.typeFun.forEach((res) => {
+    for (let key in typeObj) {
+      if (res == key) {
+        typeObj[key] = true;
       }
     }
-  })
+  });
 }
-function langJudge(){
-  let lang = getStoredLanguage()
-  if(lang){
-    return lang
-  }else{
-    return "简体中文"
+function langJudge() {
+  let lang = getStoredLanguage();
+  if (lang) {
+    return lang;
+  } else {
+    return "简体中文";
   }
+}
+function showDialog() {
+  if (dialogTableVisible.value == false) {
+    dialogdata.length = 0;
+    getDialogdatafun({
+      type: AbnormalType.type,
+      pageSize: 10,
+      pageNum: 1,
+    });
+  }
+  Abnormalpopovervisible.value = false;
+  dialogTableVisible.value = true;
+}
+async function getDialogdatafun(config) {
+  dialogLoading.value = true;
+  let result: any = await getAlarmListData(config);
+
+  if (result.code == 200) {
+    dialogtotal.value=result.total
+    dialogdata.push(...result.rows)
+    dialogLoading.value = false;
+  }else{
+    setTimeout(() => {
+    if(dialogLoading.value){
+      dialogLoading.value = false;
+    }
+  }, 0);
+  }
+ 
+
 }
 //判断是否显示对应组件后所做操作
 watch(
   () => typeObj,
   (newVal, oldVal) => {
-    if( newVal.AbnormalData){
-      AbnormalType.type=props.alarmType.join(',')
-      getAlarmListDatafun()
+    if (newVal.AbnormalData) {
+      AbnormalType.type = props.alarmType.join(",");
+      getAlarmListDatafun();
       // connectWebsocket(null, null, getWebsocket, errWebsocket);
-      setAlarmscrollBoardList()
+      setAlarmscrollBoardList();
     }
   },
   { deep: true, flush: "post" }
 );
 //获取异常信息接口数据
-async function getAlarmListDatafun(){
+async function getAlarmListDatafun() {
   let result: any = await getAlarmListData(AbnormalType);
 
-if (result.code == 200) {
-  storeheader.setDataList(result);
-  
-}
+  if (result.code == 200) {
+    storeheader.setDataList(result);
+  }
 }
 //单机显示更多历史报警数据
-function clickNextPageAlarmList(){
-
-  
+function clickNextPageAlarmList() {
   // if(storeheader.num<=powerlist.length){
   //   onloadlist.value=false
   //   return
   // }
-  AbnormalType.pageNum++
-  getAlarmListDatafun()
+  AbnormalType.pageNum++;
+  getAlarmListDatafun();
 }
 //接受历史报警数据
 watch(
   () => storeheader.AlarmpopoverList,
   (newVal, oldVal) => {
-    newVal.forEach(res=>{
-      powerlist.push(res)
-    })
+    newVal.forEach((res) => {
+      powerlist.push(res);
+    });
   },
   { deep: true, flush: "post" }
 );
@@ -226,96 +306,99 @@ watch(
   },
   { deep: true, flush: "post" }
 );
-let AlarmscrollTime = null
+let AlarmscrollTime = null;
 //每隔15秒钟替换一次组件数据进行轮播
-function setAlarmscrollBoardList(){
-  let start=0
-  let end=4
+function setAlarmscrollBoardList() {
+  let start = 0;
+  let end = 4;
 
   let i = 0;
   setTimeout(() => {
-    storeheader.AlarmscrollBoardList.slice(0, 5).forEach(element => {
+    storeheader.AlarmscrollBoardList.slice(0, 5).forEach((element) => {
       let e = element.context.split("，");
-      listdata.data.push(...[[e[0]], [e[1]]])
-      i++
+      listdata.data.push(...[[e[0]], [e[1]]]);
+      i++;
     });
 
-    end = end + 5
-    start = i >= 5 ? 5 : storeheader.AlarmscrollBoardList.length - 1
-    start<=0?start=0:''
-  }, 1000)
+    end = end + 5;
+    start = i >= 5 ? 5 : storeheader.AlarmscrollBoardList.length - 1;
+    start <= 0 ? (start = 0) : "";
+  }, 1000);
 
-  AlarmscrollTime=setInterval(()=>{
-    
-    
-    if (i==0) {
-      listdata.data=[]
+  AlarmscrollTime = setInterval(() => {
+    if (i == 0) {
+      listdata.data = [];
     }
-    i=0
-    if(storeheader.AlarmscrollBoardList.length==0){
-      return
+    i = 0;
+    if (storeheader.AlarmscrollBoardList.length == 0) {
+      return;
     }
-    
-    if(storeheader.AlarmscrollBoardList.length-1<end){
-      end=storeheader.AlarmscrollBoardList.length-1
+
+    if (storeheader.AlarmscrollBoardList.length - 1 < end) {
+      end = storeheader.AlarmscrollBoardList.length - 1;
     }
-    for(start;start<=end;start++){
+    for (start; start <= end; start++) {
       // console.log(storeheader.AlarmscrollBoardList[start],start,end);
       // console.log(storeheader.AlarmscrollBoardList.length-1);
-     let listcontent = storeheader.AlarmscrollBoardList[start]?.context.split('，')
-     
-     
-     listdata.data.push(...[[listcontent[0]],[listcontent[1]]])
+      let listcontent =
+        storeheader.AlarmscrollBoardList[start]?.context.split("，");
+
+      listdata.data.push(...[[listcontent[0]], [listcontent[1]]]);
     }
-    changeAbnormalData(listdata)
-    numkey.value++
-    end=end+5
+    changeAbnormalData(listdata);
+    numkey.value++;
+    end = end + 5;
     //如果下次数据剩一个则只拿一条数据
-    if(start==storeheader.AlarmscrollBoardList.length-1){
+    if (start == storeheader.AlarmscrollBoardList.length - 1) {
       // console.log('进入了2');
-      start=storeheader.AlarmscrollBoardList.length-1
-      end=storeheader.AlarmscrollBoardList.length-1
+      start = storeheader.AlarmscrollBoardList.length - 1;
+      end = storeheader.AlarmscrollBoardList.length - 1;
     }
     //如果剩余数据不足5个则拿出剩余数据
-    if(end>storeheader.AlarmscrollBoardList.length-1&&start<=storeheader.AlarmscrollBoardList.length-1){
+    if (
+      end > storeheader.AlarmscrollBoardList.length - 1 &&
+      start <= storeheader.AlarmscrollBoardList.length - 1
+    ) {
       // console.log('进入了3');
-      end=storeheader.AlarmscrollBoardList.length-1
+      end = storeheader.AlarmscrollBoardList.length - 1;
     }
     // 如果全部超出则从头拿
-    if(start>storeheader.AlarmscrollBoardList.length-1&&end>storeheader.AlarmscrollBoardList.length-1){
+    if (
+      start > storeheader.AlarmscrollBoardList.length - 1 &&
+      end > storeheader.AlarmscrollBoardList.length - 1
+    ) {
       // console.log('进入了4',start,end,storeheader.AlarmscrollBoardList.length-1,storeheader.AlarmscrollBoardList);
-      start=0
-      end=4
+      start = 0;
+      end = 4;
     }
-    
-
-
-  },15000)
+  }, 15000);
 }
 //接受历史报警数据量
 watch(
   () => storeheader.num,
   (newVal, oldVal) => {
-    AbnormalNum.value=newVal
-    numkey.value++
+    AbnormalNum.value = newVal;
+    numkey.value++;
   },
   { deep: true, flush: "post" }
 );
 function HeadergetWebsocket(val) {
-  
-  
-    let data = null
-    try{
-      data = JSON.parse(val);
-    }catch(e){
-      console.log(e);
-      return
-    }
+  let data = null;
+  try {
+    data = JSON.parse(val);
+  } catch (e) {
+    console.log(e);
+    return;
+  }
 
-  if (props.alarmType.some(e=>{return e==data.type})) {
+  if (
+    props.alarmType.some((e) => {
+      return e == data.type;
+    })
+  ) {
     // console.log(props.alarmType);
     // console.log(props.alarmType.some(e=>{return e==data.type}));
-    storeheader.changeDataList(data)
+    storeheader.changeDataList(data);
   }
 }
 function HeadererrWebsocket(val) {
@@ -323,19 +406,17 @@ function HeadererrWebsocket(val) {
 }
 onMounted(() => {
   //判断需要显示出来的数据
-  typeStatus()
-  
-})
+  typeStatus();
+});
 onUnmounted(() => {
   // closeWebsocket();
-  storeheader.resetData()
-  AlarmscrollTime?clearInterval(AlarmscrollTime):''
-  
-})
+  storeheader.resetData();
+  AlarmscrollTime ? clearInterval(AlarmscrollTime) : "";
+});
 defineExpose({
   changeAbnormalData,
   HeadergetWebsocket,
-  HeadererrWebsocket
+  HeadererrWebsocket,
 });
 </script>
 
@@ -359,16 +440,14 @@ defineExpose({
   width: 100%;
 }
 h1 {
-  
   position: absolute;
   top: 10px;
-  
 }
-.zh-title{
+.zh-title {
   margin-top: 6px;
   font-size: 2.5rem;
 }
-.en-title{
+.en-title {
   font-size: 2rem;
   max-width: 600px;
   height: 80px;
@@ -376,7 +455,6 @@ h1 {
   align-items: center;
   overflow: hidden;
   /* line-height: 80px; */
-
 }
 /* .header2 p {
   position: absolute;
@@ -406,7 +484,7 @@ h1 {
   font-size: 20px;
   color: #fff;
 }
-.tip{
+.tip {
   margin-top: 15px;
 }
 .tipspan {
@@ -414,7 +492,7 @@ h1 {
   margin-left: 10px;
   align-items: center;
 }
-.comeBack{
+.comeBack {
   position: absolute;
   /* width: 2rem;
   height: 2rem; */
@@ -423,10 +501,10 @@ h1 {
   font-size: 3rem;
   color: #fff;
 }
-.comeBack>i{
+.comeBack > i {
   font-size: 3rem;
 }
-.AbnormalData{
+.AbnormalData {
   position: absolute;
   display: flex;
   align-items: center;
@@ -437,30 +515,30 @@ h1 {
   font-size: 3rem;
   color: #fff;
 }
-.AbnormalData:hover{
-  cursor:pointer;
+.AbnormalData:hover {
+  cursor: pointer;
 }
-.AbnormalData>span{
+.AbnormalData > span {
   font-size: 1rem;
 }
-.popoverBOX{
+.popoverBOX {
   max-height: 15rem;
   font-size: 18px;
   overflow-y: auto;
 }
-.popoverBOX li{
-padding: 10px 0 10px 0;
+.popoverBOX li {
+  padding: 10px 0 10px 0;
 }
-.lookdown{
+.lookdown {
   width: 100%;
   height: 100%;
   display: flex;
   align-items: center;
   justify-content: center;
-  color: #1C78C2;
+  color: #1c78c2;
 }
-.lookdown:hover{
-  cursor:pointer;
+.lookdown:hover {
+  cursor: pointer;
 }
 .time {
   position: absolute;
@@ -470,29 +548,48 @@ padding: 10px 0 10px 0;
   left: 4.2rem;
   font-size: 25px;
 }
-.i-badge{
+.i-badge {
   width: 3rem;
   height: 3rem;
 }
-.i-badge>i{
+.i-badge > i {
   font-size: 3rem;
   position: relative;
   top: -5px;
 }
- /* .dv-scroll-board /deep/ .ceil {
+/* .dv-scroll-board /deep/ .ceil {
     font-size: 1.2rem;
-} */  
+} */
 .dv-scroll-boardclass :deep(.ceil) {
   font-size: 20px;
 }
-.el-popper.is-dark:deep(){
+.el-popper.is-dark:deep() {
   background: #14274b !important;
 }
-.el-popover.el-popper:deep(){
+.el-popover.el-popper:deep() {
   background: #14274b !important;
 }
-.Abnormal-icon-yellow{
-  color: #DDB14F;
+.Abnormal-icon-yellow {
+  color: #ddb14f;
+}
+.lishijilu {
+  font-size: 2rem;
+  color: #fff;
+}
+.popoverHeader {
+  padding: 0 !important;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  line-height: 1.5rem;
+}
+.popoverHeader span {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 5px;
+  /* border-radius: 50px;
+  background: linear-gradient(315deg, #404040, #4c4c4c); */
+  /* box-shadow: -20px -20px 60px #3c3c3c, 20px 20px 60px #525252; */
 }
-
 </style>
diff --git a/src/main.ts b/src/main.ts
index 90c0ae3..17be6fe 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \screenFront\src\main.ts
+ * @FilePath: \code\gitscreenFront\src\main.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-01-29 15:16:36
@@ -11,7 +11,7 @@ import { createApp } from 'vue'
 import App from './App.vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
-
+import 'element-plus/theme-chalk/dark/css-vars.css'
 // import echarts from '@/utils/echarts.js'
 import echarts from '@/utils/echarts'
 import {createPinia} from 'pinia'
diff --git a/src/utils/devSever.ts b/src/utils/devSever.ts
index 99d6906..26da8af 100644
--- a/src/utils/devSever.ts
+++ b/src/utils/devSever.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \screenFront\src\utils\devSever.ts
+ * @FilePath: \gitscreenFront\src\utils\devSever.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-03-03 08:59:37
@@ -9,7 +9,7 @@
  */
 
 // export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.3.97:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
-export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
+export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.110.238:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
 export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
 //拼接图片url路径
 export function imgurlAddXhr(img){
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index d501aa6..f72a1af 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \daping\src\utils\websocket.ts
+ * @FilePath: \gitscreenFront\src\utils\websocket.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-24 13:14:26
@@ -58,7 +58,7 @@ export const closeWebsocket = () => {
   if (wsObj) {
     writeToScreen('手动关闭websocket')
     wsObj.close() // 关闭websocket
-    // wsObj.onclose() // 关闭websocket(如果上面的关闭不生效就加上这一条)
+    wsObj.onclose() // 关闭websocket(如果上面的关闭不生效就加上这一条)
     // 关闭重连
     lockReconnect = true
     wsCreateHandler && clearTimeout(wsCreateHandler)
@@ -153,6 +153,8 @@ const onWsClose = (event) => {
 }
 const onWsError = (event) => {
 //   writeToScreen('onWsError: ', event.data)
+console.log(event);
+
   errorCallback()
 }
  
diff --git a/src/views/AerialView/content/tip.vue b/src/views/AerialView/content/tip.vue
index 6831499..3d9619a 100644
--- a/src/views/AerialView/content/tip.vue
+++ b/src/views/AerialView/content/tip.vue
@@ -11,9 +11,10 @@
   <div class="tip-box-logo" :key="keynum">
     <el-tooltip
       class="box-item"
+      popper-class="tooltip-class"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/AerialView/content/tip2.vue b/src/views/AerialView/content/tip2.vue
index edfa5b2..4a88de4 100644
--- a/src/views/AerialView/content/tip2.vue
+++ b/src/views/AerialView/content/tip2.vue
@@ -16,8 +16,9 @@
         <el-tooltip
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
+          popper-class="tooltip-class"
           raw-content
-          effect="dark"
+          effect="light"
           placement="top-start"
         >
           <i
@@ -95,6 +96,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -116,3 +120,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/InPlantProducts/child/component/Details.vue b/src/views/InPlantProducts/child/component/Details.vue
index 91a9de1..435e982 100644
--- a/src/views/InPlantProducts/child/component/Details.vue
+++ b/src/views/InPlantProducts/child/component/Details.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\component\Details.vue
+ * @FilePath: \code\gitscreenFront\src\views\InPlantProducts\child\component\Details.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 11:51:32
@@ -37,7 +37,8 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class" 
       trigger="click"
       virtual-triggering
       :virtual-ref="triggerRef"
@@ -186,6 +187,9 @@ p {
     justify-content: center;
     align-items: center;
 }
+.el-popper{
+  color: #fff !important;
+}
 /* .dv-scroll-board :deep(.row-item) {
   line-height: normal !important;
   align-items: center;
@@ -194,3 +198,8 @@ p {
     margin:0px 50px 0px 50px
 } */
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/InPlantProducts/child/component/RotationTable.vue b/src/views/InPlantProducts/child/component/RotationTable.vue
index 2d23a45..d8e28de 100644
--- a/src/views/InPlantProducts/child/component/RotationTable.vue
+++ b/src/views/InPlantProducts/child/component/RotationTable.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\component\RotationTable.vue
+ * @FilePath: \code\gitscreenFront\src\views\InPlantProducts\child\component\RotationTable.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 15:09:06
@@ -38,7 +38,8 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       trigger="click"
       virtual-triggering
       :virtual-ref="triggerRef"
@@ -168,4 +169,12 @@ defineExpose({
 h2 {
   color: #fff;
 }
+.el-popper{
+  color: #fff !important;
+}
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/InPlantProducts/child/component/origin.vue b/src/views/InPlantProducts/child/component/origin.vue
index 7ed5c30..806cc89 100644
--- a/src/views/InPlantProducts/child/component/origin.vue
+++ b/src/views/InPlantProducts/child/component/origin.vue
@@ -31,7 +31,8 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       trigger="click"
       virtual-triggering
       :virtual-ref="triggerRef"
@@ -219,4 +220,12 @@ p {
   justify-content: center;
   align-items: center;
 }
+.el-popper{
+  color: #fff !important;
+}
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/InPlantProducts/content/chart/deviceslist.vue b/src/views/InPlantProducts/content/chart/deviceslist.vue
index c73f0f0..f5aff9a 100644
--- a/src/views/InPlantProducts/content/chart/deviceslist.vue
+++ b/src/views/InPlantProducts/content/chart/deviceslist.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\InPlantProducts\content\chart\deviceslist.vue
+ * @FilePath: \code\gitscreenFront\src\views\InPlantProducts\content\chart\deviceslist.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 15:09:06
@@ -30,7 +30,8 @@
           v-model:visible="visible"
           :content="tipcontent"
           placement="top"
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           trigger="click"
           virtual-triggering
           :virtual-ref="triggerRef"
@@ -200,10 +201,19 @@ defineExpose({
 h2 {
   color: #fff;
 }
+.el-popper{
+  color: #fff !important;
+}
 .dv-scroll-board :deep(.ceil) {
   font-size: 1.2rem;
 }
 .dv-scroll-board :deep(.header-item) {
   font-size: 1.2rem;
 }
+
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView/content/tip.vue b/src/views/MechanicalView/content/tip.vue
index 6831499..6255f88 100644
--- a/src/views/MechanicalView/content/tip.vue
+++ b/src/views/MechanicalView/content/tip.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\AerialView\content\tip.vue
+ * @FilePath: \code\gitscreenFront\src\views\MechanicalView\content\tip.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-03-20 09:12:05
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView/content/tip2.vue b/src/views/MechanicalView/content/tip2.vue
index c730a4c..d37fa95 100644
--- a/src/views/MechanicalView/content/tip2.vue
+++ b/src/views/MechanicalView/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -95,6 +96,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -116,3 +120,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalViewEdit/content/tip.vue b/src/views/MechanicalViewEdit/content/tip.vue
index 6831499..c2e9e16 100644
--- a/src/views/MechanicalViewEdit/content/tip.vue
+++ b/src/views/MechanicalViewEdit/content/tip.vue
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalViewEdit/content/tip2.vue b/src/views/MechanicalViewEdit/content/tip2.vue
index e13e39a..e0a06ab 100644
--- a/src/views/MechanicalViewEdit/content/tip2.vue
+++ b/src/views/MechanicalViewEdit/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -94,6 +95,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -115,3 +119,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_dajian/content/tip.vue b/src/views/MechanicalView_dajian/content/tip.vue
index 6831499..c2e9e16 100644
--- a/src/views/MechanicalView_dajian/content/tip.vue
+++ b/src/views/MechanicalView_dajian/content/tip.vue
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_dajian/content/tip2.vue b/src/views/MechanicalView_dajian/content/tip2.vue
index 57ba61a..0bc4dd4 100644
--- a/src/views/MechanicalView_dajian/content/tip2.vue
+++ b/src/views/MechanicalView_dajian/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ?  t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -95,6 +96,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -116,3 +120,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_hanjie/content/tip.vue b/src/views/MechanicalView_hanjie/content/tip.vue
index 6831499..c2e9e16 100644
--- a/src/views/MechanicalView_hanjie/content/tip.vue
+++ b/src/views/MechanicalView_hanjie/content/tip.vue
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_hanjie/content/tip2.vue b/src/views/MechanicalView_hanjie/content/tip2.vue
index a247f41..e968179 100644
--- a/src/views/MechanicalView_hanjie/content/tip2.vue
+++ b/src/views/MechanicalView_hanjie/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -95,6 +96,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -116,3 +120,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_jijia/content/tip.vue b/src/views/MechanicalView_jijia/content/tip.vue
index 4e80834..c7ea754 100644
--- a/src/views/MechanicalView_jijia/content/tip.vue
+++ b/src/views/MechanicalView_jijia/content/tip.vue
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -90,6 +91,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -115,3 +119,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_jijia/content/tip2.vue b/src/views/MechanicalView_jijia/content/tip2.vue
index 9550968..4af2054 100644
--- a/src/views/MechanicalView_jijia/content/tip2.vue
+++ b/src/views/MechanicalView_jijia/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -95,6 +96,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -116,3 +120,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_jingjia/content/tip.vue b/src/views/MechanicalView_jingjia/content/tip.vue
index 6831499..c2e9e16 100644
--- a/src/views/MechanicalView_jingjia/content/tip.vue
+++ b/src/views/MechanicalView_jingjia/content/tip.vue
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_jingjia/content/tip2.vue b/src/views/MechanicalView_jingjia/content/tip2.vue
index df007eb..25aed01 100644
--- a/src/views/MechanicalView_jingjia/content/tip2.vue
+++ b/src/views/MechanicalView_jingjia/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -94,6 +95,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -115,3 +119,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_jingshi/content/tip.vue b/src/views/MechanicalView_jingshi/content/tip.vue
index 6831499..c2e9e16 100644
--- a/src/views/MechanicalView_jingshi/content/tip.vue
+++ b/src/views/MechanicalView_jingshi/content/tip.vue
@@ -13,7 +13,8 @@
       class="box-item"
       :content="content"
       raw-content
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       placement="top-start"
     >
       <!-- <template #content> {{ props.val.tiptext}} </template> -->
@@ -88,6 +89,9 @@ onMounted(() => {
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
     0% {
         
@@ -113,3 +117,8 @@ onMounted(() => {
       }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/MechanicalView_jingshi/content/tip2.vue b/src/views/MechanicalView_jingshi/content/tip2.vue
index b1f74c9..bafd45e 100644
--- a/src/views/MechanicalView_jingshi/content/tip2.vue
+++ b/src/views/MechanicalView_jingshi/content/tip2.vue
@@ -17,7 +17,8 @@
           class="box-item"
           :content="`${item.name}:${JSON.parse(item.status) ? t('messages.onLine') : t('messages.offline')}`"
           raw-content
-          effect="dark"
+          effect="light"
+          popper-class="tooltip-class"
           placement="top-start"
         >
           <i
@@ -94,6 +95,9 @@ onMounted(() => {});
   /* position: relative; */
   /* top: -15px; */
 }
+.el-popper{
+  color: #fff !important;
+}
 @keyframes redstart {
   0% {
   }
@@ -115,3 +119,8 @@ onMounted(() => {});
   }
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Offsite/content/chart/deviceslist.vue b/src/views/Offsite/content/chart/deviceslist.vue
index 68a2c77..809f55f 100644
--- a/src/views/Offsite/content/chart/deviceslist.vue
+++ b/src/views/Offsite/content/chart/deviceslist.vue
@@ -32,7 +32,8 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light" 
+      popper-class="tooltip-class"
       trigger="click"
       virtual-triggering
       :virtual-ref="triggerRef"
@@ -229,6 +230,9 @@ h2 {
   color: #fff;
   font-size: 20px;
 }
+.el-popper{
+  color: #fff !important;
+}
 .dv-scroll-board :deep(.ceil) {
   font-size: 1rem;
 }
@@ -236,3 +240,8 @@ h2 {
   font-size: 1rem;
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Temp/Large_Format/component/Details.vue b/src/views/Temp/Large_Format/component/Details.vue
index 1131c69..559e671 100644
--- a/src/views/Temp/Large_Format/component/Details.vue
+++ b/src/views/Temp/Large_Format/component/Details.vue
@@ -38,8 +38,9 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
       trigger="click"
+      popper-class="tooltip-class"
       virtual-triggering
       :virtual-ref="triggerRef"
     />
@@ -187,6 +188,9 @@ p {
     justify-content: center;
     align-items: center;
 }
+.el-popper{
+  color: #fff !important;
+}
 /* .dv-scroll-board :deep(.row-item) {
   line-height: normal !important;
   align-items: center;
@@ -195,3 +199,8 @@ p {
     margin:0px 50px 0px 50px
 } */
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Temp/Large_Format/component/RotationTable.vue b/src/views/Temp/Large_Format/component/RotationTable.vue
index 2d23a45..661cb0f 100644
--- a/src/views/Temp/Large_Format/component/RotationTable.vue
+++ b/src/views/Temp/Large_Format/component/RotationTable.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\InPlantProducts\child\component\RotationTable.vue
+ * @FilePath: \code\gitscreenFront\src\views\Temp\Large_Format\component\RotationTable.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-16 15:09:06
@@ -38,7 +38,8 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
+      popper-class="tooltip-class"
       trigger="click"
       virtual-triggering
       :virtual-ref="triggerRef"
@@ -168,4 +169,12 @@ defineExpose({
 h2 {
   color: #fff;
 }
+.el-popper{
+  color: #fff !important;
+}
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Temp/Large_Format/component/origin.vue b/src/views/Temp/Large_Format/component/origin.vue
index 4f60a32..03f3b3f 100644
--- a/src/views/Temp/Large_Format/component/origin.vue
+++ b/src/views/Temp/Large_Format/component/origin.vue
@@ -32,8 +32,9 @@
       v-model:visible="visible"
       :content="tipcontent"
       placement="top"
-      effect="dark"
+      effect="light"
       trigger="click"
+      popper-class="tooltip-class"
       virtual-triggering
       :virtual-ref="triggerRef"
     />
@@ -221,4 +222,12 @@ p {
   justify-content: center;
   align-items: center;
 }
+.el-popper{
+  color: #fff !important;
+}
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/index.vue b/src/views/index.vue
index 4979976..f1ded6b 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wwwd:\code\screenFront\src\views\index.vue
+ * @FilePath: \code\gitscreenFront\src\views\index.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-01-29 15:34:48
@@ -11,7 +11,7 @@
 <template>
   <div :class="$style['container']" ref="appRef">
     <div class="navbar">
-      <el-dropdown effect="dark" @command="changelang" >
+      <el-dropdown @command="changelang" >
     <span class="el-dropdown-link">
       <!-- <img src="../assets/svg/gateway.svg" alt="" class="langimg" height="20px" width="20px"> -->
       <i class="iconfont icon-zhongyingwen langimg"></i>
@@ -23,7 +23,7 @@
       </el-dropdown-menu>
     </template>
   </el-dropdown>
-      <!-- <el-select class="m-2" v-model="lang" effect="dark" placeholder="Select" size="large" @change="changelang">
+      <!-- <el-select class="m-2" v-model="lang"  placeholder="Select" size="large" @change="changelang">
         <el-option
           :label="'简体中文'"
           :value="'简体中文'"
diff --git a/src/views/legionProducts/chart/scrollBoard.vue b/src/views/legionProducts/chart/scrollBoard.vue
index 05f02d7..dd162ec 100644
--- a/src/views/legionProducts/chart/scrollBoard.vue
+++ b/src/views/legionProducts/chart/scrollBoard.vue
@@ -7,7 +7,7 @@
                         width: '100%',
                         height: '100%',
                     }" />
-            <el-tooltip v-model:visible="visible" :content="tipcontent" placement="top" effect="dark" trigger="click"
+            <el-tooltip v-model:visible="visible" :content="tipcontent" placement="top" effect="light" trigger="click" popper-class="tooltip-class"
                 virtual-triggering :virtual-ref="triggerRef" />
         </div>
     </div>
@@ -107,3 +107,8 @@ const dvClick = (value) => {
     text-overflow: none
 }
 </style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/realtimeSecurity/content/chart/verticalNum.vue b/src/views/realtimeSecurity/content/chart/verticalNum.vue
index 70dd5fd..53d2c14 100644
--- a/src/views/realtimeSecurity/content/chart/verticalNum.vue
+++ b/src/views/realtimeSecurity/content/chart/verticalNum.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \gitscreenFront\src\views\realtimeSecurity\content\chart\verticalNum.vue
+ * @FilePath: \code\gitscreenFront\src\views\realtimeSecurity\content\chart\verticalNum.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 08:22:35
@@ -15,7 +15,7 @@
           <!-- <div class="contentbox"> -->
           <div class="icontip">
             <div v-for="item in value" style="margin: auto 5px;">
-              <el-popover placement="bottom" :width="220" trigger="hover" effect="dark"
+              <el-popover placement="bottom" :width="220" trigger="hover" 
                 :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
                 <ul class="icontipBox">
                   <li>
diff --git a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
index 575da97..6d94fcb 100644
--- a/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
+++ b/src/views/realtimeSecurity/content/chart/verticalNumLoop.vue
@@ -5,7 +5,7 @@
         <div class="box" ref="classBox1">
           <div class="icontip">
             <div v-for="items in value" style="margin: auto 5px;" v-show="(+items.val > +limit)&&items.status">
-              <el-popover placement="bottom" :width="250" trigger="hover" effect="dark"
+              <el-popover placement="bottom" :width="250" trigger="hover" 
                 :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
                 <ul class="icontipBox">
                   <li>
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
index a862e1a..c8407f9 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNum.vue
@@ -15,7 +15,7 @@
           <div class="box" ref="classBox1">
           <div class="icontip">
             <div v-for="items in value.data" style="margin: auto 5px;" v-show="(+items.val > +value.quota)&&items.status">
-              <el-popover placement="bottom" :width="250" trigger="hover" effect="dark"
+              <el-popover placement="bottom" :width="250" trigger="hover" 
                 :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
                 <ul class="icontipBox">
                   <li>
diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
index 4c605ab..dc47feb 100644
--- a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
+++ b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue
@@ -5,7 +5,7 @@
         <div class="box" ref="classBox1">
           <div class="icontip">
             <div v-for="items in value" style="margin: auto 5px;" v-show="+items.val > +limit">
-              <el-popover placement="bottom" :width="250" trigger="hover" effect="dark"
+              <el-popover placement="bottom" :width="250" trigger="hover" 
                 :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
                 <ul class="icontipBox">
                   <li>

From 06519920b9ce59008731732a08451506a3e81620 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Tue, 6 Jun 2023 16:58:46 +0800
Subject: [PATCH 03/29] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/index.html b/public/index.html
index 401cd52..be4fbb0 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="">
+<html lang="" class="dark">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">

From 8410121fc91baaf1995131f161a7ff357b09610f Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Tue, 6 Jun 2023 18:07:59 +0800
Subject: [PATCH 04/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A03D=E6=8B=93=E6=89=91?=
 =?UTF-8?q?=E5=9B=BE=E9=A1=B5=20=E4=BF=AE=E6=94=B93D=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=9B=BEWIFI=E5=A4=A7=E5=B0=8F=20=E5=BC=80=E5=8F=91=E4=BC=A0?=
 =?UTF-8?q?=E6=84=9F=E5=99=A8=E8=B6=8B=E5=8A=BF=E5=9B=BE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E5=A4=A7=E5=B1=8F=20?=
 =?UTF-8?q?=E5=92=8C=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E5=AE=89=E5=85=A8?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   13 +
 src/router/index.ts                           |   16 +
 src/store/moduleSocket.ts                     |    2 +-
 src/store/moduleSocketjixie.ts                |    5 +-
 src/views/FactoryView/threeMap.vue            |   24 +-
 src/views/FactoryViewTopo/index.vue           |  138 ++
 src/views/FactoryViewTopo/statusBar.vue       |  188 +++
 src/views/FactoryViewTopo/threeMap.vue        | 1264 +++++++++++++++++
 src/views/TrendChart/index.vue                |   98 ++
 src/views/TrendChart/lineChart.vue            |  128 ++
 src/views/realtimeSecurity/index.vue          |   14 +-
 .../realtimeSecurityJixiefenchang/index.vue   |   18 +-
 12 files changed, 1879 insertions(+), 29 deletions(-)
 create mode 100644 src/views/FactoryViewTopo/index.vue
 create mode 100644 src/views/FactoryViewTopo/statusBar.vue
 create mode 100644 src/views/FactoryViewTopo/threeMap.vue
 create mode 100644 src/views/TrendChart/index.vue
 create mode 100644 src/views/TrendChart/lineChart.vue

diff --git a/src/App.vue b/src/App.vue
index b75b8ad..23529b3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -45,4 +45,17 @@ nav a {
 nav a.router-link-exact-active {
   color: #42b983;
 }
+body {
+
+/* --content:calc(100vh - var(--header)) */
+overflow: hidden !important;
+-ms-overflow-style: none;
+/* IE + Edge */
+scrollbar-width: none;
+/* Firefox */
+}
+
+::-webkit-scrollbar {
+display: none;
+}
 </style>
diff --git a/src/router/index.ts b/src/router/index.ts
index ee35d88..bec05ce 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -160,6 +160,11 @@ const routes: Array<RouteRecordRaw> = [
         name: "FactoryView",
         component: () => import("../views/FactoryView/index.vue"),
       },
+      {
+        path: "/FactoryViewTopo",
+        name: "FactoryViewTopo",
+        component: () => import("../views/FactoryViewTopo/index.vue"),
+      },
       {
         path: "/FactoryView/:type",
         name: "FactoryViewEdit",
@@ -231,6 +236,17 @@ const routes: Array<RouteRecordRaw> = [
         name: "OffsiteDevList",
         component: () => import("../views/Temp/OffsiteDevList/index.vue"),
       },
+      {
+        path: "/TrendChart",
+        name: "TrendChart",
+        component: () => import("../views/TrendChart/index.vue"),
+      },
+
+
+
+
+
+
       //理论二级
       {
         path: "/Mechanics/:id",
diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts
index 1a9d5c6..9e83ebe 100644
--- a/src/store/moduleSocket.ts
+++ b/src/store/moduleSocket.ts
@@ -341,7 +341,7 @@ export const useSocketStore = defineStore(Names.socket, {
             let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type)
             let cIndex = null
             if (pIndex != -1) {
-                cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.name == val.data.name)
+                cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.devId == val.data.devId)
             }
             if (cIndex != -1) {
                 if (val.data.val > this.newVerticalNum[pIndex].limit) {
diff --git a/src/store/moduleSocketjixie.ts b/src/store/moduleSocketjixie.ts
index a16b67e..f5772d7 100644
--- a/src/store/moduleSocketjixie.ts
+++ b/src/store/moduleSocketjixie.ts
@@ -320,11 +320,13 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
         },
         //更新 新的安全检测数据
         changeNewVerticalNum(val) {
+            console.log(val);
+            
             //{"type":"Smoke","data":{"name":"精饰车间烟雾传感器","val":"100"}}
             let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type)
             let cIndex = null
             if (pIndex != -1) {
-                cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.name == val.data.name)
+                cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.devId == val.data.devId)
             }
             if (cIndex != -1) {
                 if (val.data.val>this.newVerticalNum[pIndex].limit) {
@@ -343,6 +345,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
                     this.newVerticalNum[pIndex].value[cIndex].time = null
                 }
                 this.newVerticalNum[pIndex].value[cIndex].val = val.data.val
+                this.newVerticalNum[pIndex].value[cIndex].status = true
             }
         }
     }   
diff --git a/src/views/FactoryView/threeMap.vue b/src/views/FactoryView/threeMap.vue
index b3327af..c33f7f5 100644
--- a/src/views/FactoryView/threeMap.vue
+++ b/src/views/FactoryView/threeMap.vue
@@ -414,22 +414,22 @@ const init = () => {
 
     /*创建wifi */
     //机加
-    createWifi({ x: -46.96, y: 2, z: 156.57 })
+    createWifi({ x: -46.96, y: 3, z: 156.57 })
     //大件
-    createWifi({ x: 52.60, y: 2, z: 96.44 })
-    createWifi({ x: 52.60, y: 2, z: 157.07 })
+    createWifi({ x: 52.60, y: 3, z: 96.44 })
+    createWifi({ x: 52.60, y: 3, z: 157.07 })
     //精饰
-    createWifi({ x: 133.14, y: 2, z: 107.43 })
-    createWifi({ x: 133.14, y: 2, z: 156.25 })
+    createWifi({ x: 133.14, y: 3, z: 107.43 })
+    createWifi({ x: 133.14, y: 3, z: 156.25 })
     //焊接
-    createWifi({ x: 305.73, y: 2, z: 110.45 })
-    createWifi({ x: 305.73, y: 2, z: 238.67 })
+    createWifi({ x: 305.73, y: 3, z: 110.45 })
+    createWifi({ x: 305.73, y: 3, z: 238.67 })
     //服装
     createWifi({ x: -89.13, y: 4, z: -245.33 })
-    createWifi({ x: -132.07, y: 2, z: -245.33 })
-    createWifi({ x: -222.31, y: 2, z: -245.33 })
-    createWifi({ x: -119.3, y: 2, z: -114.15 })
-    createWifi({ x: -176.45, y: 2, z: -114.40 })
+    createWifi({ x: -132.07, y: 3, z: -245.33 })
+    createWifi({ x: -222.31, y: 3, z: -245.33 })
+    createWifi({ x: -119.3, y: 3, z: -114.15 })
+    createWifi({ x: -176.45, y: 3, z: -114.40 })
 
     //家纺 医防
     createWifi({ x: 140.83, y: 2, z: -197.34 })
@@ -771,7 +771,7 @@ function createWifi(position: positionType) {
     loader.load('/models/glb/tothefuture_wifi.glb', function (gltf) {
         const mesh = gltf.scene.children[0];
 
-        const s = 0.3;
+        const s = 0.5;
         mesh.scale.set(s, s, s);
         mesh.position.set(position.x, position.y, position.z);
         // mesh.rotation.x = THREE.MathUtils.degToRad(270)
diff --git a/src/views/FactoryViewTopo/index.vue b/src/views/FactoryViewTopo/index.vue
new file mode 100644
index 0000000..df70c1f
--- /dev/null
+++ b/src/views/FactoryViewTopo/index.vue
@@ -0,0 +1,138 @@
+<template>
+  <div :class="$style['container']"  ref="Acontent">
+    <threeMap  ref="mapdomref"/>
+    <!-- <statusBar :width="size.oWidth" :height="size.oHeight" :iconList="store.iconList" :devList="store.devList"></statusBar> -->
+  </div>
+  
+</template>
+
+<script setup lang='ts'>
+import {ref,reactive,onMounted,onUnmounted} from 'vue'
+import { calcWH } from "@/components/ts/selfAdaption";
+import threeMap from './threeMap.vue';
+import { getSensorInfodata , deviceDistributeInMachineryFactorydata} from "@/http/AerialView";
+import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
+import { useFactoryStore } from '@/store/module/Factory';
+
+import statusBar from './statusBar.vue';
+
+const store = useFactoryStore();
+let Acontent = ref();
+let mapdomref=ref()
+let size = reactive({
+  oWidth: 0,
+  oHeight: 0,
+});
+let timer = null
+
+function WH(div: HTMLElement) {
+  let a = calcWH(div.offsetHeight, div.offsetWidth, 1, 5, 0);
+  size.oWidth = a.oWidth;
+  size.oHeight = a.oHeight;
+  
+  if(mapdomref.value){
+    mapdomref.value.reset({oWidth:size.oWidth*5,oHeight:size.oHeight})
+  }
+ 
+}
+
+
+//获取传感器列表
+async function getSensorInfodatafun() {
+  let result: any = await getSensorInfodata();
+
+  if (result.code == 200) {
+    store.setDataList(result.data);
+   
+  }
+}
+//获取设备列表
+async function deviceDistributeInMachineryFactorydatafun() {
+  let result: any = await deviceDistributeInMachineryFactorydata();
+
+  if (result.code == 200) {
+    
+    store.setdevList(result.data);
+  }
+}
+
+function getWebsocket(val) {
+  // try{
+    let data = null
+    try{
+      data = JSON.parse(val);
+    }catch(e){
+      console.log(e);
+      
+      return
+    }
+ 
+  if (data.type == "SensorInfo") {
+    // console.log(data.msg,"传感器数据");
+    
+    store.updateSensorList(data.msg);
+    // store.changedevList(data.msg)
+
+
+    // store.changepaintingGas(data.msg);
+  }
+  // }catch(err){
+  //   console.log(err,"报错了大哥");
+
+  // }
+}
+
+
+// getSensorInfodatafun()
+// deviceDistributeInMachineryFactorydatafun()
+function errWebsocket(val) {
+  // console.log(val);
+}
+onMounted(()=>{
+  // // todo 屏幕适应
+  // windowDraw()
+  // calcRate()
+  let contentBox = Acontent.value;
+  // let Timedombox=Timedom.value
+  window.document.title = "传感器分布图";
+  WH(contentBox);
+  window.addEventListener("resize", () => {
+    if (timer) {
+      clearTimeout(timer);
+      timer = null;
+    }
+    timer = setTimeout(() => {
+      WH(contentBox);
+    }, 1000);
+  });
+
+  // connectWebsocket(null, null, getWebsocket, errWebsocket);
+})
+onUnmounted(()=>{// todo 屏幕适应
+  // unWindowDraw()
+  clearTimeout(timer)
+  closeWebsocket();
+})
+
+</script>
+<style module>
+.container {
+  height: 1080px;
+  width: 1920px;
+  color: #20aec5;
+  background-color: #100c2a;
+}
+</style>
+<style  scoped></style>
+<style>
+body {
+  
+  /* --content:calc(100vh - var(--header)) */
+  overflow: hidden !important;
+  -ms-overflow-style:none; /* IE + Edge */
+  scrollbar-width: none; /* Firefox */
+}
+::-webkit-scrollbar {
+  display: none;
+}
+</style>
diff --git a/src/views/FactoryViewTopo/statusBar.vue b/src/views/FactoryViewTopo/statusBar.vue
new file mode 100644
index 0000000..0216a91
--- /dev/null
+++ b/src/views/FactoryViewTopo/statusBar.vue
@@ -0,0 +1,188 @@
+<!--
+ * @FilePath: \screenFront\src\views\FactoryView\statusBar.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-04-04 08:11:07
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+   <div ref="statusbarref" :key="numkey">
+      <div class="tip-box-border" :class="{show}" @click="rtract" :style="{width: mapSize.width+'px',height:mapSize.height+'px'}" >
+        <!-- <div class="DirectionalSign">
+          
+        </div> -->
+        <div class="iconTip">
+          <ul>
+            <li v-for="item in prop.iconList" :key="item.id" >
+              <i :class="'iconfont ' + item.name + ' icon-logo'"></i
+              >{{ "&nbsp&nbsp&nbsp" + item.value }}
+              <div>{{ `&nbsp${item.counts}/${item.allnum}` }}</div>
+            </li>
+            <li v-for="item in prop.devList" :key="item.id" >
+              <i :class="'iconfont ' + item.name + ' icon-logo SSCBar'"></i
+              >{{ "&nbsp&nbsp&nbsp" + item.value }}
+              <div>{{ `&nbsp${item.counts}/${item.allnum}` }}</div>
+            </li>
+            <li>
+              <i class="iconfont icon-WIFI icon-logo"></i> &nbsp;&nbsp;&nbsp;
+              WIFI
+              <div> &nbsp; 16/16</div>
+            </li>
+            <li>
+              <i class="iconfont icon-guangmao icon-logo"></i> &nbsp;&nbsp;&nbsp;
+              光猫
+              <div> &nbsp; 9/9</div>
+            </li>
+            <li>
+              <i class="iconfont icon-zhongduananquanjierukongzhiqi icon-logo"></i> &nbsp;&nbsp;&nbsp;
+              AC
+              <div> &nbsp; 3/3</div>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { number } from "echarts/core";
+import {reactive, ref, watch,defineProps} from "vue"
+const prop = defineProps({
+  iconList: {
+    type: Object,
+    default: {},
+  },
+  devList: {
+    type: Object,
+    default: {},
+  },  
+  width: {
+    type: Number,
+    default: 0,
+  },
+  height: {
+    type: Number,
+    default: 0,
+  },
+});
+
+
+const afterDisplay = ref("none")
+const beforeDisplay = ref("block")
+const show = ref(true)
+let numkey=ref(0)
+let statusbarref=ref()
+let mapSize = reactive({
+  width: 0,
+  height: 0,
+});
+
+
+function rtract() {
+  show.value = !show.value;
+  if (show.value) {
+    afterDisplay.value = "none";
+    beforeDisplay.value = "block";
+  } else {
+    afterDisplay.value = "block";
+    beforeDisplay.value = "none";
+  }
+}
+watch(
+  () => prop,
+  (newVal, oldVal) => {
+    //监听父组件宽高变化，随时重置本组件尺寸
+    reset(newVal);
+    
+  },
+  { immediate: true, deep: true, flush: "post" }
+);
+function reset(val: any) {
+  //宽高为0时跳出该方法
+
+  if (!val.width && !val.height) return;
+  mapSize.width=val.width
+  mapSize.height=val.height
+  numkey.value++
+//   statusbarref.value.style.width=val.width
+//   statusbarref.value.style.height=val.height
+  //重置盒子尺寸
+}
+</script>
+
+<style scoped>
+@import url("@/assets/css/iconfont.css");
+@import url("@/assets/css/newicon/iconfont.css");
+.tip-box-border{
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  height: 97%;
+  width: 99%;
+  padding-top: 100px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  z-index: 999;
+  background-color:rgba(0,0,0,0.5);
+  transition: transform 0.5s;
+} 
+.show {
+  transform: translateX(-90%);
+}
+.tip-box-border::after{
+  content: "\e84f";
+  position: absolute;
+  top: 50%;
+  right: 0;
+  font-size: 24px;
+  font-family: 'iconfont' !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  display: v-bind(afterDisplay);
+  color: #fff;
+  box-sizing: border-box;
+}
+.tip-box-border::before{
+  content: '\e84e';
+  /* content: "\e84e"; */
+  position: absolute;
+  top: 50%;
+  right: 0;
+  font-size: 24px;
+  font-family: 'iconfont' !important;
+  font-style: normal;
+  display: v-bind(beforeDisplay);
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  color: #fff;
+  box-sizing: border-box;
+}
+.DirectionalSign{
+  width: 60%;
+  height: 20%;
+  background-image: url(@/assets/img/AerialView/direction.png);
+  background-size: 100% 100%;
+}
+.iconTip{
+  width: 100%;
+  height: 80%;
+  }
+.iconTip>ul>li{
+  padding-left: 10%;
+  margin-top: 10px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  font-size: 1.5rem;
+  color: #fff;
+}
+.iconTip>ul>li>i{
+  font-size: 1.5rem;
+}
+</style>
diff --git a/src/views/FactoryViewTopo/threeMap.vue b/src/views/FactoryViewTopo/threeMap.vue
new file mode 100644
index 0000000..23577f9
--- /dev/null
+++ b/src/views/FactoryViewTopo/threeMap.vue
@@ -0,0 +1,1264 @@
+<template>
+    <div class="container" ref="container"></div>
+</template>
+
+<script setup lang='ts'>
+import { ref, onMounted, defineExpose } from 'vue';
+import * as THREE from 'three';
+import * as TWEEN from '@tweenjs/tween.js';
+import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
+import * as SceneUtils from 'three/examples/jsm/utils/SceneUtils.js';
+import { CSS2DRenderer, CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
+import { DragControls } from "@/utils/DragControls";
+import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
+import { Line2 } from 'three/examples/jsm/lines/Line2'
+import { LineGeometry } from 'three/examples/jsm/lines/LineGeometry'
+import { LineMaterial } from 'three/examples/jsm/lines/LineMaterial'
+import { useFactoryStore } from "@/store/module/Factory"
+import { useRouter } from 'vue-router';
+import { updateCoordinateByPoint } from "@/http/AerialView/index"
+import { ElNotification } from 'element-plus'
+import { useI18n } from 'vue-i18n'
+import { useRoute } from 'vue-router';
+let { t } = useI18n();
+let route = useRoute();
+let edit = false;
+let type = route.params?.type;
+if (type == 'edit') {
+    edit = true;
+}
+const store = useFactoryStore();
+const router = useRouter();
+
+const container = ref();
+let iw = 1920;
+let ih = 1080;
+const boxObjects: any = ref([]);
+let scene: any = null; //场景
+let camera: any = null; //相机
+let canvas: any = null; //用作渲染的canvas
+let renderer: any = null; //渲染器
+let controls: any = null; //控制器
+let labelRenderer: any = null; //2D渲染器
+let labelControls: any = null; //2D控制器
+const group = new THREE.Group();//用于将建筑物的各个零件组合起来
+let timer: any = null;
+let dragControls: any = null;
+let cssRender: any = null;
+let saveTipDom: any = null;
+const requires = {
+    '粉尘': require('@/assets/img/Factory/fenchen.jpg'),
+    '烟雾': require('@/assets/img/Factory/yanwu.jpg'),
+    'TVOC/甲醛': require('@/assets/img/Factory/tvoc.jpg'),
+    '噪音': require('@/assets/img/Factory/shengyin.jpg'),
+    '火花': require('@/assets/img/Factory/huohua.jpg'),
+    '电力': require('@/assets/img/Factory/dianlu.jpg'),
+    '气压': require('@/assets/img/Factory/qiya.jpg'),
+    '水压': require('@/assets/img/Factory/shuiya.jpg'),
+    '温湿度': require('@/assets/img/Factory/wendu.jpg'),
+    '网关': require('@/assets/img/Factory/wangguan.jpg'),
+    '燃气': require('@/assets/img/Factory/ranqi.jpg'),
+    '设备': require('@/assets/img/Factory/shebei.jpg'),
+    'ny': require("@/assets/img/Factory/ny.jpg"),
+    'wood': require("@/assets/img/Factory/wood4.jpg"),
+    // 'wall1': require("@/assets/img/Factory/floor1.jpeg"),
+    'wall1': require("@/assets/img/Factory/wall1.jpg"),
+    'tile': require("@/assets/img/Factory/tile.jpg"),
+    'door': require("@/assets/img/Factory/door.jpg"),
+    'sky': require("@/assets/img/Factory/sky.jpg"),
+    'titleFloor': require("@/assets/img/Factory/screen_title.png"),
+    'guangmao': require("@/assets/img/Factory/guangmao.jpg"),
+    'ac': require("@/assets/img/Factory/ac.jpg"),
+}
+
+const workerShopRoute = {
+    '大件车间地板': '/MechanicalViewDajian',
+    '焊接车间地板': '/MechanicalViewHanjie',
+    '机加车间地板': '/MechanicalViewJijia',
+    '精加车间地板': '/MechanicalViewJingjia',
+    '精饰车间地板': '/MechanicalViewJingshi',
+}
+let getSensorDataTimer = null;
+let getDevDataTimer = null;
+
+
+const normal_size = { baseWidth: 10, baseHeght: 10, baseLength: 10 };//正常大小
+const small_size = { baseWidth: 8, baseHeght: 8, baseLength: 8 };//缩小的大小
+
+const coordinate = {}
+/**
+ * @函数功能:
+ * @param {*} val 重置画布宽高值
+ * @出口参数:
+ * @函数备注:
+ */
+function reset(val: any) {
+    //宽高为0时跳出该方法
+
+    if (!val.oWidth && !val.oHeight) return;
+    // mapSize.width=val.width
+    // mapSize.height=val.height
+    // 更新修改相机比例
+    container.value.style.width = val.oWidth;
+    container.value.style.height = val.oHeight;
+    camera.aspect = val.oWidth / val.oHeight;
+    // 更新摄像机的投影矩阵
+    camera.updateProjectionMatrix();
+
+    //处理返回操作时dom层数变多问题
+    if (document.getElementsByClassName("cssrender").length > 1) {
+        document.getElementsByClassName("cssrender")[1].remove();
+    }
+    // 更新画布大小
+    renderer.setSize(
+        val.oWidth, // 宽度
+        val.oHeight // 高度
+    );
+    labelRenderer.setSize(
+        val.oWidth, // 宽度
+        val.oHeight // 高度
+    );
+    // 更新画布像素比
+    renderer.setPixelRatio(container.value.devicePixelRatio);
+
+    //重置盒子尺寸
+}
+defineExpose({
+    reset,
+});
+const init = () => {
+    canvas = container.value;
+    //创建场景
+    scene = new THREE.Scene();
+    //创建一个透视相机
+    camera = new THREE.PerspectiveCamera(45, iw / ih, 1, 3000);
+
+    // 创建渲染器
+    renderer = new THREE.WebGLRenderer();
+    // 设置渲染器的初始颜色
+    renderer.setClearColor(new THREE.Color(0xeeeeee));
+    // 设置输出canvas画面的大小
+    renderer.setSize(iw, ih)
+    // 设置渲染物体阴影
+    renderer.shadowMap.enabled = true;
+
+    //设置2D渲染器
+    labelRenderer = new CSS2DRenderer();
+    labelRenderer.setSize(iw, ih);
+    labelRenderer.domElement.style.position = 'absolute';
+    labelRenderer.domElement.style.top = 0;
+    labelRenderer.domElement.style.outline = "none";
+    canvas.appendChild(labelRenderer.domElement);
+
+
+
+
+    //创建环境光
+    const hjLight = new THREE.AmbientLight(0xffffff);
+    //添加环境光至场景
+    scene.add(hjLight);
+    // 定位相机，并且指向场景中心
+    camera.position.x = 0;
+    camera.position.y = 880; //650
+    camera.position.z = 0; //600
+
+
+
+    camera.lookAt(scene.position)
+
+
+    renderer.render(scene, camera)
+    // 将渲染器输出添加html元素中
+    canvas.appendChild(renderer.domElement);
+    //添加房子的group到场景中
+    scene.add(group);
+
+    // 创建controls对象;
+    controls = new OrbitControls(camera, labelRenderer.domElement)
+    // labelControls = new OrbitControls(camera, labelRenderer.domElement)
+
+    // 监听控制器的鼠标事件，执行渲染内容
+    controls.addEventListener('change', () => {
+        clearInterval(timer)
+        renderer.render(scene, camera)
+        labelRenderer.render(scene, camera)
+    })
+    /**-------------------------------结束后注释------------------------------------------------- */
+    controls.mouseButtons = {
+        LEFT: THREE.MOUSE.PAN,
+        MIDDLE: THREE.MOUSE.DOLLY,
+        // RIGHT: 
+    };
+
+
+
+
+
+
+    //创建地面
+    createGround()
+    //创建仓库1
+    createHouse(`${t('messages.store')}1`, { baseWidth: 262, baseHeght: 30, baseLength: 53 }, { x: -322, y: 0, z: -304 })
+    //创建仓库2
+    createHouse(`${t('messages.store')}2`, { baseWidth: 262, baseHeght: 30, baseLength: 53 }, { x: 183, y: 0, z: -304 })
+    //创建综合楼 baseWidth: 114, baseHeght: 50, baseLength: 353  x: -397, y: 0, z: 11
+    createHouse(t('messages.SynthesizeRoom'), { baseWidth: 114, baseHeght: 50, baseLength: 353 }, { x: -397, y: 0, z: -11 })
+    /**
+     * 创建综合楼里的墙
+     */
+    createUseWall('综合楼的墙1', { baseWidth: 1, baseHeght: 50, baseLength: 159 }, { x: -413, y: 0, z: -26.5 })
+    createUseWall('综合楼的墙2', { baseWidth: 41, baseHeght: 50, baseLength: 1 }, { x: -413, y: 0, z: -26.5 })
+
+    createUseWall('综合楼的墙3', { baseWidth: 1, baseHeght: 50, baseLength: 159 }, { x: -382, y: 0, z: -26.5 })
+    createUseWall('综合楼的墙4', { baseWidth: 41, baseHeght: 50, baseLength: 1 }, { x: -341, y: 0, z: -26.5 })
+
+    createUseWall('综合楼的墙3', { baseWidth: 45, baseHeght: 50, baseLength: 1 }, { x: -410, y: 0, z: 30 })
+    createUseWall('综合楼的墙4', { baseWidth: 45, baseHeght: 50, baseLength: 1 }, { x: -341, y: 0, z: 30 })
+    createUseWall('综合楼的墙5', { baseWidth: 45, baseHeght: 50, baseLength: 1 }, { x: -410, y: 0, z: 87.5 })
+    createUseWall('综合楼的墙6', { baseWidth: 45, baseHeght: 50, baseLength: 1 }, { x: -341, y: 0, z: 79.5 })
+
+    createUseWall('综合楼的墙7', { baseWidth: 1, baseHeght: 50, baseLength: 57 }, { x: -410, y: 0, z: 87 })
+    createUseWall('综合楼的墙8', { baseWidth: 1, baseHeght: 50, baseLength: 69 }, { x: -385, y: 0, z: 99 })
+    createUseWall('综合楼的墙9', { baseWidth: 1, baseHeght: 50, baseLength: 63 }, { x: -435, y: 0, z: 150 })
+    createUseWall('综合楼的墙10', { baseWidth: 1, baseHeght: 50, baseLength: 63 }, { x: -435, y: 0, z: 150 })
+    createUseWall('综合楼的墙11', { baseWidth: 1, baseHeght: 50, baseLength: 40 }, { x: -421, y: 0, z: 138.5 })
+    createUseWall('综合楼的墙12', { baseWidth: 36, baseHeght: 50, baseLength: 1 }, { x: -385, y: 0, z: 99.5 })
+    createUseWall('综合楼的墙13', { baseWidth: 36, baseHeght: 50, baseLength: 1 }, { x: -385, y: 0, z: 139.5 })
+    createUseWall('综合楼的墙14', { baseWidth: 44, baseHeght: 50, baseLength: 1 }, { x: -410, y: 0, z: 150.5 })
+
+    createUseWall('综合楼的墙15', { baseWidth: 1, baseHeght: 50, baseLength: 16 }, { x: -409, y: 0, z: 165.5 })
+    createUseWall('综合楼的墙16', { baseWidth: 1, baseHeght: 50, baseLength: 27 }, { x: -384, y: 0, z: 165.5 })
+    //汽车部地板
+    const mesh_qcb = createFloor(t('messages.ExternalWork'), 42, 160, { x: -362, y: 0, z: -105 })
+
+    createLableObj(mesh_qcb, t('messages.ExternalWork'), { x: 0, y: 0, z: 0 })
+
+    //创建产学研 baseWidth: 21, baseHeght: 25, baseLength: 32  x: -495, y: 0, z: -102.5
+    createHouse(t('messages.WaterRoom'), { baseWidth: 21, baseHeght: 25, baseLength: 32 }, { x: -495, y: 0, z: -102.5 })
+    createHouse(t('messages.SecurityRoom'), { baseWidth: 21, baseHeght: 25, baseLength: 32 }, { x: -495, y: 0, z: -70.5 })
+
+
+    //创建盈瑞安办公区 baseWidth: 90, baseHeght: 30, baseLength: 159  x: -399, y: 0, z: 245
+    createHouse(t('messages.productStudyDevelopment'), { baseWidth: 90, baseHeght: 30, baseLength: 159 }, { x: -399, y: 0, z: 245 })
+    /**盈瑞安办公区里的墙 */
+    createUseWall('盈瑞安办公区的墙1', { baseWidth: 90, baseHeght: 30, baseLength: 1 }, { x: -354.5, y: 0, z: 195.5 })
+    createUseWall('盈瑞安办公区的墙2', { baseWidth: 90, baseHeght: 30, baseLength: 1 }, { x: -354.5, y: 0, z: 246.5 })
+    createUseWall('盈瑞安办公区的墙3', { baseWidth: 90, baseHeght: 30, baseLength: 1 }, { x: -354.5, y: 0, z: 271.5 })
+
+
+
+    //创建车间1 baseWidth: 573, baseHeght: 30, baseLength: 238  x: -17.5, y: 0, z: -137.5
+    createHouse('车间1', { baseWidth: 620, baseHeght: 30, baseLength: 238 }, { x: 6, y: 0, z: -137.5 }, false)
+    /**车间一内的墙 */
+    createUseWall('车间1的墙1', { baseWidth: 1, baseHeght: 30, baseLength: 238 }, { x: -228, y: 0, z: -18.5 })
+    createUseWall('车间1的墙2', { baseWidth: 1, baseHeght: 30, baseLength: 238 }, { x: -37, y: 0, z: -18.5 })
+    createUseWall('车间1的墙3', { baseWidth: 1, baseHeght: 30, baseLength: 238 }, { x: 37, y: 0, z: -18.5 })
+    createUseWall('车间1的墙4', { baseWidth: 1, baseHeght: 30, baseLength: 238 }, { x: 73, y: 0, z: -18.5 })
+    createUseWall('车间1的墙5', { baseWidth: 76, baseHeght: 30, baseLength: 1 }, { x: -228, y: 0, z: -95.5 })
+    createUseWall('车间1的墙5', { baseWidth: 192, baseHeght: 30, baseLength: 1 }, { x: -37, y: 0, z: -194.5 })
+    createUseWall('车间1的墙5', { baseWidth: 40, baseHeght: 30, baseLength: 1 }, { x: 2, y: 0, z: -105.5 })
+    createUseWall('车间1的墙5', { baseWidth: 40, baseHeght: 30, baseLength: 1 }, { x: 2, y: 0, z: -62.5 })
+
+
+    //机械设计及行政办公区
+    const mesh_hr = createFloor(t('messages.machineDesign'), 45, 120, { x: -431, y: 0, z: 102 })
+    createLableObj(mesh_hr, t('messages.machineDesign'), { x: 0, y: 60, z: 0 })
+
+    const mesh_serve = createFloor('', 45, 48, { x: -364.5, y: 0, z: 58 })
+    createLableObj(mesh_serve, t('messages.服务器机房'), { x: 0, y: 60, z: 0 })
+
+
+
+    //电控车间
+    const mesh_dkcj = createFloor(t('messages.ControllerRoom'), 76.5, 237, { x: -266, y: 0, z: -138.5 })
+    createLableObj(mesh_dkcj, t('messages.ControllerRoom'), { x: 0, y: 60, z: 0 })
+
+    //服装军团
+    const mesh_fzjt = createFloor(t('messages.FuZhuangLegion'), 192, 236.5, { x: -133, y: 0, z: -138 })
+    createLableObj(mesh_fzjt, t('messages.FuZhuangLegion'), { x: 0, y: 60, z: 0 })
+    //配套车间
+    const mesh_ptcj = createFloor(t('messages.BigPeiTao'), 110, 236.5, { x: 18.5, y: 0, z: -138 })
+    createLableObj(mesh_ptcj, t('messages.BigPeiTao'), { x: 0, y: 60, z: 0 })
+    //家纺军团
+    const mesh_jfjt = createFloor(t('messages.JiaFangLegion'), 247, 118, { x: 192, y: 0, z: -197 })
+    createLableObj(mesh_jfjt, t('messages.JiaFangLegion'), { x: 0, y: 60, z: 0 })
+    //医防军团
+    const mesh_yfjt = createFloor(t('messages.YiFangLegion'), 247, 119, { x: 192, y: 0, z: -78 })
+    createLableObj(mesh_yfjt, `${t('messages.twoLou')}-${t('messages.YiFangLegion')}`, { x: 0, y: 60, z: 0 })
+
+
+
+
+    createHouse('配套车间办公室', { baseWidth: 26, baseHeght: 25, baseLength: 54 }, { x: 24, y: 0, z: -80.5 }, false)
+
+
+
+
+
+    //创建车间2-1 baseWidth: 147, baseHeght: 30, baseLength: 263  x: -230.5, y: 0, z: 176
+    createHouse('车间2-1', { baseWidth: 147, baseHeght: 30, baseLength: 263 }, { x: -230.5, y: 0, z: 176 }, false)
+
+    createUseWall('车间2-1的墙1', { baseWidth: 1, baseHeght: 30, baseLength: 227 }, { x: -237, y: 0, z: 269.5 })
+
+    createUseWall('车间2-1的墙2', { baseWidth: 32, baseHeght: 30, baseLength: 1 }, { x: -207, y: 0, z: 147.5 })
+    createUseWall('车间2-1的墙3', { baseWidth: 27, baseHeght: 30, baseLength: 1 }, { x: -158, y: 0, z: 147.5 })
+
+    createUseWall('车间2-1的墙4', { baseWidth: 32, baseHeght: 30, baseLength: 1 }, { x: -207, y: 0, z: 183.5 })
+    createUseWall('车间2-1的墙5', { baseWidth: 27, baseHeght: 30, baseLength: 1 }, { x: -158, y: 0, z: 183.5 })
+
+
+    //汽车军团
+    const mesh_qcjt = createFloor(t('messages.QiCheLegion'), 67, 263, { x: -270.5, y: 0, z: 176 })
+    createLableObj(mesh_qcjt, t('messages.QiCheLegion'), { x: 0, y: 60, z: 0 })
+    //精加车间
+    const mesh_jjcj = createFloor('精加车间', 82, 263, { x: -198, y: 0, z: 176 })
+    createLableObj(mesh_jjcj, t('messages.JingJiaRoom'), { x: 0, y: 60, z: 0 })
+
+    //创建车间2-2 baseWidth: 95, baseHeght: 30, baseLength: 263  x: -84.5, y: 0, z: 176
+    createHouse(t('messages.JiJiaRoom'), { baseWidth: 95, baseHeght: 30, baseLength: 263 }, { x: -84.5, y: 0, z: 176 })
+    //创建精饰车间 baseWidth: 161, baseHeght: 30, baseLength: 263  x: 65.5, y: 0, z: 176
+    createHouse('车间2-3', { baseWidth: 161, baseHeght: 30, baseLength: 263 }, { x: 65.5, y: 0, z: 176 }, false)
+    createUseWall('车间2-3的墙1', { baseWidth: 1, baseHeght: 30, baseLength: 263 }, { x: 60, y: 0, z: 307 })
+
+
+    //大件车间
+    const mesh_djcj = createFloor('大件车间', 75, 263, { x: 22, y: 0, z: 176 })
+    createLableObj(mesh_djcj, t('messages.DaJianRoom'), { x: 0, y: 60, z: 0 })
+    //精饰车间
+    const mesh_jscj = createFloor('精饰车间', 88, 263, { x: 101.5, y: 0, z: 176 })
+    createLableObj(mesh_jscj, t('messages.JingShiRoom'), { x: 0, y: 60, z: 0 })
+    // //料场
+    // createHouse('料场', { baseWidth: 82, baseHeght: 30, baseLength: 263 }, { x: 187, y: 0, z: 176 }, false)
+    // createUseWall('料场中间的墙', { baseWidth: 82, baseHeght: 30, baseLength: 1 }, { x: 228, y: 0, z: 183.5 })
+    createUseWall('料场后面的墙', { baseWidth: 82, baseHeght: 30, baseLength: 1 }, { x: 228, y: 0, z: 308 })
+    const mesh_lc = createFloor('料场', 84, 131, { x: 188, y: 0, z: 110 })
+    createLableObj(mesh_lc, t('messages.料场'), { x: 0, y: 60, z: 0 })
+
+    const mesh_wfzcq = createFloor('料场', 84, 132, { x: 188, y: 0, z: 242 })
+    createLableObj(mesh_wfzcq, t('messages.危废暂存间'), { x: 0, y: 60, z: 0 })
+
+
+
+    //精饰车间内的房子
+    createHouse(t('messages.ManualSandblastingRoom'), { baseWidth: 26, baseHeght: 30, baseLength: 28 }, { x: 73.62, y: 0, z: 59.15 })
+    createHouse(`${t('messages.DryingRoom')}B`, { baseWidth: 28, baseHeght: 30, baseLength: 46 }, { x: 130.77, y: 0, z: 67.69 })
+    createHouse(t('messages.GrindingRoom'), { baseWidth: 24, baseHeght: 30, baseLength: 42 }, { x: 132.77, y: 0, z: 141.03 })
+
+
+    createHouse('冷冻式空气干燥机', { baseWidth: 14, baseHeght: 20, baseLength: 18 }, { x: 66.69, y: 0, z: 123.32 }, false)
+    createHouse('喷砂罐', { baseWidth: 14, baseHeght: 20, baseLength: 18 }, { x: 66.69, y: 0, z: 158.41 }, false)
+    createHouse('抛丸机', { baseWidth: 19, baseHeght: 20, baseLength: 74 }, { x: 83.84, y: 0, z: 144.21 }, false)
+    createHouse(t('messages.PowderSprayingRoom'), { baseWidth: 32, baseHeght: 20, baseLength: 65 }, { x: 75.94, y: 0, z: 235.64 })
+    createHouse(t('messages.DaJianPaintingRoom'), { baseWidth: 27, baseHeght: 20, baseLength: 44 }, { x: 132.10, y: 0, z: 220.20 })
+
+
+
+    //创建焊接车间 baseWidth: 85, baseHeght: 30, baseLength: 263  x: 224, y: 0, z: 176
+    createHouse(t('messages.HanJieRoom'), { baseWidth: 85, baseHeght: 30, baseLength: 263 }, { x: 271, y: 0, z: 176 })
+
+    createHouse(t('messages.boilerRoom'), { baseWidth: 25, baseHeght: 20, baseLength: 30 }, { x: 299.30, y: 0, z: 60.87 })
+
+    //创建食堂 baseWidth: 71, baseHeght: 30, baseLength: 124  x: 312.5, y: 0, z: 221.5
+    createHouse(t('messages.canteen'), { baseWidth: 71, baseHeght: 30, baseLength: 124 }, { x: 359.5, y: 0, z: 221.5 })
+    //创建宿舍楼3 baseWidth: 56, baseHeght: 30, baseLength: 216  x: 393, y: 0, z: -147
+    createHouse(`${t('messages.EmployeeApartment')}-9`, { baseWidth: 56, baseHeght: 30, baseLength: 216 }, { x: 440, y: 0, z: -147 })
+    //创建宿舍楼1 baseWidth: 56, baseHeght: 30, baseLength: 132  x: 389, y: 0, z: 106.5
+    createHouse(`${t('messages.EmployeeApartment')}-10`, { baseWidth: 56, baseHeght: 30, baseLength: 132 }, { x: 440, y: 0, z: 106.5 })
+    //创建宿舍楼2 baseWidth: 56, baseHeght: 30, baseLength: 132  x: 389, y: 0, z: 106.5
+    createHouse(`${t('messages.EmployeeApartment')}-11`, { baseWidth: 56, baseHeght: 30, baseLength: 132 }, { x: 440, y: 0, z: 243.5 })
+    //创建围墙 baseWidth: 966, baseHeght: 5, baseLength: 677  x: 24, y: 0, z: 0
+    createHouse('围墙', { baseWidth: 1013, baseHeght: 15, baseLength: 677 }, { x: 0, y: 0, z: 0 }, false)
+    //创建东气泵房 baseWidth: 23, baseHeght: 30, baseLength: 16  x: -119.5, y: 0, z: 313.5
+    createHouse(t('messages.eastAirPumpRoom'), { baseWidth: 23, baseHeght: 25, baseLength: 16 }, { x: -119.5, y: 0, z: 316.5 })
+
+
+    createTitleFloor('', 464, 45, { x: 0, y: 0, z: 15 })
+    //放置服务器
+    createGlb()
+    /*放置光猫************/
+    //汽车军团
+    createSwitch({ x: -287.44, y: 0, z: 19.24 })
+    //精加车间
+    createSwitch({ x: -158.01, y: 0, z: 107.47 })
+    createSwitch({ x: -208.35, y: 0, z: 107.47 })
+    //机加车间
+    createSwitch({ x: -40.22, y: 0, z: 19.90 })
+    //电控分厂
+    createSwitch({ x: -232.96, y: 0, z: -64.48 })
+    //大配套中心
+    createSwitch({ x: 29.01, y: 0, z: -60.75 })
+    //大件车间
+    createSwitch({ x: 5.29, y: 0, z: 19.00 })
+    //家纺 医防
+    createSwitch({ x: 88.55, y: 0, z: -214.89 })
+    //二道岗
+    createSwitch({ x: 306.5, y: 0, z: 5.43 })
+    /*光猫结束********************************* */
+
+
+    /**创建ac */
+    createAc({ x: 52.56, y: 0, z: 52.24 })
+    //服装军团
+    createAc({ x: -88.39, y: 0, z: -249.36 })
+    createAc({ x: 82.99, y: 0, z: -170.17 })
+
+    /**创建AC结束 */
+
+
+    /*创建wifi */
+    //机加
+    createWifi({ x: -46.96, y: 3, z: 156.57 })
+    //大件
+    createWifi({ x: 52.60, y: 3, z: 96.44 })
+    createWifi({ x: 52.60, y: 3, z: 157.07 })
+    //精饰
+    createWifi({ x: 133.14, y: 3, z: 107.43 })
+    createWifi({ x: 133.14, y: 3, z: 156.25 })
+    //焊接
+    createWifi({ x: 305.73, y: 3, z: 110.45 })
+    createWifi({ x: 305.73, y: 3, z: 238.67 })
+    //服装
+    createWifi({ x: -89.13, y: 4, z: -245.33 })
+    createWifi({ x: -132.07, y: 3, z: -245.33 })
+    createWifi({ x: -222.31, y: 3, z: -245.33 })
+    createWifi({ x: -119.3, y: 3, z: -114.15 })
+    createWifi({ x: -176.45, y: 3, z: -114.40 })
+
+    //家纺 医防
+    createWifi({ x: 140.83, y: 2, z: -197.34 })
+    createWifi({ x: 259.37, y: 2, z: -197.34 })
+    createWifi({ x: 140.83, y: 2, z: -111.84 })
+    createWifi({ x: 259.50, y: 2, z: -111.81 })
+
+
+
+    /*创建第一条线******************/
+    let garyLine = 0x595959;
+    let whiteColor = 0xffffff;
+    createLine(whiteColor, [{ x: -346.00, y: 23.6, z: 59.40 }, { x: -160.50, y: 2, z: 142.08 }], 2)
+    //服装
+    createLine(whiteColor, [
+        { x: -345.65, y: 2, z: 36.40 },
+        { x: 22.67, y: 2, z: 36.40 },
+        { x: 22.67, y: 2, z: -25.70 },
+    ], 2)
+    createLine(garyLine, [
+        { x: 22.67, y: 2, z: -25.70 },
+        { x: -47.67, y: 2, z: -25.70 },
+        { x: -47.67, y: 2, z: -248.85 },
+        { x: -221.76, y: 2, z: -248.85 }
+    ])
+
+
+    createLine(garyLine, [{ x: -88.73, y: 2, z: -249.01 }, { x: -88.73, y: 2, z: -117.33 }, { x: -174.65, y: 2, z: -117.33 }])
+    //汽车军团
+    createLine(whiteColor, [{ x: -293.44, y: 2, z: 52.52 }, { x: -293.44, y: 2, z: 36.40 }, { x: -235.84, y: 2, z: -30.87 }], 2)
+    //机加
+    createLine(whiteColor, [
+        { x: -114.64, y: 2, z: 36.40 },
+        { x: -114.64, y: 2, z: 52.42 },
+        { x: -46.13, y: 2, z: 52.90 },
+    ], 2)
+
+    createLine(garyLine, [
+        { x: -46.13, y: 2, z: 52.90 },
+        { x: -46.13, y: 2, z: 153.05 }
+    ])
+    //家纺医防
+    createLine(garyLine, [
+        { x: 27.47, y: 2, z: -26.11 },
+        { x: 27.47, y: 2, z: -248.85 },
+        { x: 69.26, y: 2, z: -248.85 },
+        { x: 69.26, y: 2, z: -180.29 },
+        { x: 85.51, y: 2, z: -180.29 },
+        { x: 141.66, y: 2, z: -200.86 },
+        { x: 260.42, y: 2, z: -200.86 },
+        { x: 260.42, y: 2, z: -115.33 },
+        { x: 141.66, y: 2, z: -115.33 },
+        { x: 141.66, y: 2, z: -200.86 },
+    ])
+
+
+    //创建第二条线
+    //横线 主干道
+    createLine(whiteColor, [
+        { x: -341.87, y: 2, z: 30.98 },
+        { x: 111.97, y: 2, z: 30.98 },
+        { x: 111.97, y: 2, z: 175.55 },
+        { x: 294.54, y: 2, z: 175.55 },
+        { x: 294.54, y: 2, z: 40.43 },
+        { x: 306.56, y: 2, z: 40.43 }
+    ], 2)
+    createLine(garyLine, [
+        { x: 306.56, y: 2, z: 40.43 },
+        { x: 306.56, y: 2, z: 235.28 }
+    ])
+    //精加
+    createLine(whiteColor, [
+        { x: -164.26, y: 2, z: 30.98 },
+        { x: -164.26, y: 2, z: 140.05 }
+
+    ], 2)
+    createLine(garyLine, [
+        { x: -164.26, y: 2, z: 140.05 },
+        { x: -214.35, y: 2, z: 140.05 }
+
+    ])
+    //大件 总---精饰
+    createLine(garyLine, [
+        { x: 26.61, y: 2, z: -27.08 },
+        { x: 26.61, y: 2, z: 39.27 },
+        { x: -0.90, y: 2, z: 39.27 },
+        { x: -0.90, y: 2, z: 52.24 },
+        { x: 133.97, y: 2, z: 53.16 },
+        { x: 133.97, y: 2, z: 154.31 }
+    ])
+    //大件 分
+    createLine(garyLine, [
+        { x: 53.43, y: 2, z: 53.16 },
+        { x: 53.43, y: 2, z: 154.31 }
+    ])
+    /**
+     * 
+            { x: 26.61, y: 2, z: -27.08 },
+            { x: 26.61, y: 2, z: 39.27 },
+            { x: -0.90, y: 2, z: 39.27 },
+            { x: 53.43, y: 2, z: 154.31 }
+     */
+    //电控
+    createLine(whiteColor, [
+        { x: -292.24, y: 2, z: 30.98 },
+        { x: -242.61, y: 2, z: -30.90 }
+    ], 2)
+    //家纺 医防
+    createLine(whiteColor, [
+        { x: 18.30, y: 2, z: 30.98 },
+        { x: 18.30, y: 2, z: -28.94 }
+    ], 2)
+    //家纺 医防
+    createLine(garyLine, [
+        { x: 18.30, y: 2, z: -28.94 },
+        { x: 25.64, y: 2, z: -28.94 },
+        { x: 25.64, y: 2, z: -251.40 },
+        { x: 71.44, y: 2, z: -251.40 },
+        { x: 71.44, y: 2, z: -183.05 },
+        { x: 83.96, y: 2, z: -183.05 }
+    ])
+    createLine(whiteColor, [
+        { x: 18.30, y: 2, z: 30.98 },
+        { x: 18.30, y: 2, z: -28.94 }
+    ], 2)
+
+    setTipDom()
+    sethoveMesh()
+
+
+
+
+
+    //创建综合楼
+    //创建天空盒
+    createSkyBox()
+
+
+
+    const raycaster = new THREE.Raycaster();
+    const pointer = new THREE.Vector2();
+
+    function onPointerMove(event: any) {
+        // 将鼠标位置归一化为设备坐标。x 和 y 方向的取值范围是 (-1 to +1)
+        pointer.x = (event.clientX / iw) * 2 - 1;
+        pointer.y = -(event.clientY / ih) * 2 + 1;
+    }
+
+    //animate()
+
+
+    //鼠标在canvas画布上点击事件
+    labelRenderer.domElement.addEventListener('mouseup', function (event: any) {
+        clearInterval(timer)
+        // .offsetY、.offsetX以canvas画布左上角为坐标原点,单位px
+        const px = event.offsetX;
+        const py = event.offsetY;
+        //屏幕坐标px、py转WebGL标准设备坐标x、y
+        //width、height表示canvas画布宽高度
+        const x = (px / iw) * 2 - 1;
+        const y = -(py / ih) * 2 + 1;
+        // console.log("鼠标点击位置", "x:" + x, "y:" + y);
+        // console.log("鼠标点击位置", "px:" + px, "py:" + py);
+
+
+        //创建一个射线投射器`Raycaster`
+        const raycaster = new THREE.Raycaster();
+        //.setFromCamera()计算射线投射器`Raycaster`的射线属性.ray
+        // 形象点说就是在点击位置创建一条射线，射线穿过的模型代表选中
+        raycaster.setFromCamera(new THREE.Vector2(x, y), camera);
+        //.intersectObjects([mesh1, mesh2, mesh3])对参数中的网格模型对象进行射线交叉计算
+        // 未选中对象返回空数组[],选中一个对象，数组1个元素，选中两个对象，数组两个元素
+        const intersects = raycaster.intersectObjects(scene.children);
+        if (intersects.length > 0) {
+            var selected = intersects[0]; //取第一个物体
+            console.log("坐标", "{x:" + selected.point.x.toFixed(2) + ",y:" + (selected.point.y.toFixed(2) - 1) + ",z:" + selected.point.z.toFixed(2) + "}", selected.object.name);
+            // console.log("非正常坐标", "{x:" + (+selected.point.x - 0.83).toFixed(2) + ",y:2 ,z:" + (selected.point.z + 3.52).toFixed(2) + "}");
+            let workerShop = intersects[0]?.object?.name
+
+
+        }
+
+        // console.log("点击了", intersects[0]?.object?.name);
+        // intersects.length大于0说明，说明选中了模型
+        // if (intersects.length > 0) {
+        //   // 选中模型的第一个模型，设置为红色
+        //   intersects[0].object.material.color.set(0xff0000);
+        // }
+        renderer.render(scene, camera)
+    })
+
+    controls.target = new THREE.Vector3(0, 0, 0)
+
+
+
+
+
+    //定制渲染函数
+    let T0 = +new Date() //设置时间差
+    function render() {
+        let T1 = +new Date()
+        // let t = T1 - T0 //获取时间间隔
+        renderer.render(scene, camera)
+        //旋转立方体,每次绕y轴旋转0.01弧度，每一秒渲染0.001弧度
+        //box.rotateY(0.001 * t)
+        // if (t >= 2000) {
+        //     return
+        // }
+        boxObjects.value.forEach((element: any) => {
+            let color1 = 0x88e76a
+            let color2 = 0xff0000
+            //判断是否是更新的传感器数据
+            if (store.updateSensorData.hasOwnProperty(element.sensor_id)) {
+                // console.log(store.updateSensorData,'store.updateSensorData');
+                // console.log(element,'element');
+
+                let color = store.updateSensorData[element.sensor_id].status ? color1 : color2
+                element.devStatus = store.updateSensorData[element.sensor_id].status
+                element.material.color = new THREE.Color(color)
+
+            }
+            // reader(element)
+        });
+        TWEEN.update()
+        controls.update()
+        labelRenderer.render(scene, camera)
+        store.clearupdateSensorData()
+        // reader(mesh_qcjt)
+        window.requestAnimationFrame(render) //避免掉帧，就是一帧接一帧，逐帧，预备加载下一帧
+    }
+    render()
+}
+
+
+
+//创建线
+function createLine(color: number, pointsList: any, width: number = 4) {
+    // const material = new THREE.LineBasicMaterial({ color: color });
+    // const points = [];
+    // pointsList.forEach(element => {
+    //     points.push(new THREE.Vector3(element.x, element.y, element.z));
+    // });
+
+    // const geometry = new THREE.BufferGeometry().setFromPoints(points);
+    // const line = new THREE.Line(geometry, material);
+    // scene.add(line);
+    // renderer.render(scene, camera);
+
+    const geometry = new LineGeometry()
+    let pointList = []
+    pointsList.forEach(element => {
+        let { x, y, z } = element
+        let arr = [x, y, z]
+        pointList.push(...arr)
+    });
+    geometry.setPositions(pointList)
+
+    const material = new LineMaterial({
+        color: color,
+        transparent: true,
+        // opacity: 0.5,
+        dashed: width !== 2 ? true : false,
+        dashScale: 1,
+        dashSize: 3,
+        gapSize: 1,
+        linewidth: width
+    })
+    //console.log(material,'material');
+
+    material.resolution.set(iw, ih)
+    // 5. 创建 Line2
+    var line = new Line2(geometry, material);
+    // 6. 计算下线条长度
+    line.computeLineDistances();
+    // 7. 添加到场景
+    scene.add(line)
+}
+
+//创建wifi
+function createWifi(position: positionType) {
+    const loader = new GLTFLoader();
+
+    loader.load('/models/glb/tothefuture_wifi.glb', function (gltf) {
+        const mesh = gltf.scene.children[0];
+
+        const s = 0.5;
+        mesh.scale.set(s, s, s);
+        mesh.position.set(position.x, position.y, position.z);
+        // mesh.rotation.x = THREE.MathUtils.degToRad(270)
+        mesh.castShadow = true;
+        mesh.receiveShadow = true;
+        scene.add(mesh);
+
+    }, undefined, function (error) {
+
+        console.error(error);
+
+    });
+}
+
+//创建交换机
+// function createSwitch(position: positionType, scale: number = 0.2) {
+//     const loader = new GLTFLoader();
+
+//     loader.load('/models/gltf/scene.gltf', function (gltf) {
+//         const mesh = gltf.scene.children[0];
+
+//         const s = scale;
+//         mesh.scale.set(s, s, 0.5);
+//         mesh.position.set(position.x-12.75, position.y, position.z+66.22);
+//         mesh.rotation.z = THREE.MathUtils.degToRad(180)
+//         // mesh.rotation.y = THREE.MathUtils.degToRad(90)
+//         // mesh.rotation.x = THREE.MathUtils.degToRad(45)
+//         mesh.castShadow = true;
+//         mesh.receiveShadow = true;
+//         scene.add(mesh);
+
+//     }, undefined, function (error) {
+
+//         console.error(error);
+
+//     });
+// }
+
+const createSwitch = (boxposition: positionType, shadow: boolean = true): object => {
+
+    const wallTexture = new THREE.TextureLoader().load(requires.guangmao);
+    const wall = new THREE.BoxGeometry(15, 5, 10);
+    const wallMaterial = new THREE.MeshPhongMaterial({
+        map: wallTexture,
+        color: 0xe7e7e7,
+        transparent: true,
+    });
+    //墙体的网格
+    const wallMesh = new THREE.Mesh(wall, wallMaterial);
+    // 物体移动位置
+    // wallMesh.position.set((-size.baseWidth / 2 + boxposition.x + 1), size.baseHeght / 2 + boxposition.y, -size.baseLength / 2 + boxposition.z);
+    wallMesh.position.set(boxposition.x - 6, 5 + boxposition.y, boxposition.z + 33.73);
+    // 将立方体添加到场景中
+    group.add(wallMesh)
+    return wallMesh
+}
+
+const createAc = (boxposition: positionType, shadow: boolean = true): object => {
+
+    const wallTexture = new THREE.TextureLoader().load(requires.ac);
+    const wall = new THREE.BoxGeometry(15, 5, 10);
+    const wallMaterial = new THREE.MeshPhongMaterial({
+        map: wallTexture,
+        color: 0xe7e7e7,
+        transparent: true,
+    });
+    //墙体的网格
+    const wallMesh = new THREE.Mesh(wall, wallMaterial);
+    // 物体移动位置
+    // wallMesh.position.set((-size.baseWidth / 2 + boxposition.x + 1), size.baseHeght / 2 + boxposition.y, -size.baseLength / 2 + boxposition.z);
+    wallMesh.position.set(boxposition.x, 5 + boxposition.y, boxposition.z);
+    // 将立方体添加到场景中
+    group.add(wallMesh)
+    return wallMesh
+}
+
+
+
+
+//创建服务器
+function createGlb() {
+    const loader = new GLTFLoader();
+
+    loader.load('/models/glb/server.glb', function (gltf) {
+        const mesh = gltf.scene.children[0];
+
+        const s = 0.12;
+        mesh.scale.set(s, s, s);
+        mesh.position.set(-346, 0, 51);
+        mesh.castShadow = true;
+        mesh.receiveShadow = true;
+        scene.add(mesh);
+    }, undefined, function (error) {
+
+        console.error(error);
+
+    });
+}
+
+
+
+type positionType = {
+    x: number,
+    y: number,
+    z: number
+}
+//创建房子
+function createHouse(houseName: string, size = { baseWidth: 40, baseHeght: 4, baseLength: 60 }, position: positionType = { x: 80, y: 1, z: 0 }, isFloor = true) {
+
+    const { baseWidth, baseHeght, baseLength } = size
+    const { x, y, z } = position;
+    const faWallPosition = [-baseWidth / 2 + x, 0, -baseLength / 2 + z]
+    if (isFloor) {
+        //创建地板
+        if (houseName == t('messages.JiJiaRoom')) {
+            const mesh = createFloor('机加车间', baseWidth, baseLength, position)
+            createLableObj(mesh, t('messages.JiJiaRoom'), { x: 0, y: 60, z: 0 })
+        } else if (houseName == t('messages.HanJieRoom')) {
+            const mesh = createFloor('焊接车间', baseWidth, baseLength, position)
+            createLableObj(mesh, t('messages.HanJieRoom'), { x: 0, y: 60, z: 0 })
+        } else {
+            const mesh = createFloor(houseName, baseWidth, baseLength, position)
+            createLableObj(mesh, houseName, { x: 0, y: 60, z: 0 })
+        }
+    }
+
+    //创建左右墙
+    let leftWall = createWall(1, baseHeght, baseLength)
+    leftWall.name = houseName + '左侧的墙'
+    leftWall.rotateY(Math.PI / 2);
+    leftWall.position.set((-baseWidth / 2 + x + 1), baseHeght / 2 + y, z);
+    group.add(leftWall)
+
+    const rightWall = leftWall.clone();
+    rightWall.position.set((baseWidth / 2 + x), baseHeght / 2 + y, z);
+    rightWall.name = houseName + "右侧的墙";
+    group.add(rightWall);
+    //创建前后墙
+    const frontWall = createWall(1, baseHeght, baseWidth)
+    frontWall.position.set((1 / 2 + x), baseHeght / 2 + y, (baseLength / 2 + z));
+    frontWall.name = houseName + "前方的墙";
+    group.add(frontWall);
+
+    const rearWall = frontWall.clone();
+    rearWall.position.set((1 / 2 + x), baseHeght / 2 + y, (-baseLength / 2 + z));
+    rearWall.name = houseName + "后方的墙";
+    group.add(rearWall);
+
+
+    // //不带门的墙
+    // createNoDoorWall(baseWidth,baseHeght,baseLength,position)
+    // //创建带门的墙
+    // createDoorWall(baseWidth,baseHeght,baseLength,position)
+
+    // let { roof, width } = createRoof(baseWidth,baseHeght,baseLength,position);
+    // let leftRoof = roof.clone();
+    // leftRoof.rotateX(THREE.MathUtils.degToRad(30));
+    // leftRoof.position.set(-baseWidth / 3 + 1+x, baseHeght+2+y, z);
+    // leftRoof.name = "左屋顶";
+    // group.add(leftRoof);
+
+    // //创建门
+    // createDoor(baseWidth,baseLength,position)
+}
+
+
+// 新建2D标签
+function createLableObj(mesh: any, text: string, vector: positionType) {
+    let laberDiv = document.createElement('div');//创建div容器
+    laberDiv.className = 'laber_name';
+    laberDiv.textContent = text;
+    let pointLabel = new CSS2DObject(laberDiv);
+    pointLabel.position.set(vector.x, vector.y, vector.z);
+
+    mesh.add(pointLabel);
+}
+type sizeType = {
+    baseWidth: number,
+    baseHeght: number,
+    baseLength: number
+}
+//创建能用的墙
+function createUseWall(name: string, size: sizeType, position: positionType, issensor: boolean = false): void {
+    let Wall = createWall(size.baseWidth, size.baseHeght, size.baseLength)
+    Wall.name = name
+    Wall.rotateY(Math.PI / 2);
+    Wall.position.set((-size.baseWidth / 2 + position.x + 1), size.baseHeght / 2 + position.y, -size.baseLength / 2 + position.z);
+    group.add(Wall)
+    return Wall
+}
+
+/**
+   * 创建立方体 用作传感器
+   * @param size    立方体的长宽高
+   * @param boxposition 立方体的位置
+   * @param boxcolor     立方体的颜色
+   * @param shadow     是否渲染到阴影贴图当中
+   */
+const createBox = (size: sizeType, boxposition: positionType, boxcolor: number, shadow: boolean = true, result: any = {}, icon: string): object => {
+
+    const wallTexture = new THREE.TextureLoader().load(requires[icon]);
+    const wall = new THREE.BoxGeometry(size.baseWidth, size.baseHeght, size.baseLength);
+    const wallMaterial = new THREE.MeshPhongMaterial({
+        map: wallTexture,
+        color: boxcolor,
+        transparent: true,
+    });
+    //墙体的网格
+    const wallMesh = new THREE.Mesh(wall, wallMaterial);
+    // 绑定自定义数据 添加标签
+    wallMesh.name = result.name
+    wallMesh.devStatus = result.status
+    wallMesh.direction = 'up'
+    wallMesh.startVal = 1
+    //用于更新状态判断
+    wallMesh.sensor_id = result.id
+    // 物体移动位置
+    // wallMesh.position.set((-size.baseWidth / 2 + boxposition.x + 1), size.baseHeght / 2 + boxposition.y, -size.baseLength / 2 + boxposition.z);
+    wallMesh.position.set(boxposition.x, size.baseHeght / 2 + boxposition.y, boxposition.z);
+    // 对象是否渲染到阴影贴图当中
+    wallMesh.castShadow = shadow;
+    // 将立方体添加到场景中
+    group.add(wallMesh)
+
+    boxObjects.value.push(wallMesh)
+    return wallMesh
+}
+
+
+
+
+//创建地面
+function createGround() {
+    //require('@/assets/img/Factory/cao.png')
+    //导入材质
+    const groundTexture = new THREE.TextureLoader().load(requires.ny);
+    groundTexture.wrapS = groundTexture.wrapT = THREE.RepeatWrapping;
+    groundTexture.repeat.set(100, 100);
+    const ground = new THREE.PlaneGeometry(1014, 681);
+    const groundMaterial = new THREE.MeshBasicMaterial({
+        side: THREE.DoubleSide,
+        map: groundTexture,
+        // color: 0x00ff00,
+        // transparent: true,
+        // opacity: 0.2,
+    });
+
+    const groundMesh = new THREE.Mesh(ground, groundMaterial);
+    groundMesh.name = "地面";//设置name属性
+    groundMesh.rotateX(-Math.PI / 2);//旋转用于呈现一个水平的地面
+
+    scene.add(groundMesh);
+}
+
+//创建标题地板
+function createTitleFloor(houseName: string, baseWidth: number, baseLength: number, position: positionType) {
+    const texture = new THREE.TextureLoader().load(requires.titleFloor);
+    //设置地板大小，由于后面将要生成墙体存在设置为1的厚度，因此这里对地板的x，z均-2
+    const floor = new THREE.BoxGeometry(baseWidth - 2, 1, baseLength);
+    const material = new THREE.MeshPhongMaterial({ map: texture, transparent: true });
+    const mesh = new THREE.Mesh(floor, material);
+    const { x, y, z } = position
+    mesh.position.set(x, y + 1 / 2, z);
+    mesh.name = houseName + "地板";
+    group.add(mesh);
+    return mesh;
+}
+
+//创建地板，可以理解为地基
+function createFloor(houseName: string, baseWidth: number, baseLength: number, position: positionType) {
+    const texture = new THREE.TextureLoader().load(requires.wood);
+    //设置地板大小，由于后面将要生成墙体存在设置为1的厚度，因此这里对地板的x，z均-2
+    const floor = new THREE.BoxGeometry(baseWidth - 2, 1, baseLength);
+    const material = new THREE.MeshPhongMaterial({ map: texture, transparent: true });
+    const mesh = new THREE.Mesh(floor, material);
+    const { x, y, z } = position
+    mesh.position.set(x, y + 1 / 2, z);
+    mesh.name = houseName + "地板";
+    group.add(mesh);
+    return mesh;
+}
+
+//创建左右两边墙体
+function createWall(baseWidth: number = 10, baseHeght: number, baseLength: number) {
+    const wallTexture = new THREE.TextureLoader().load(requires.wall1);
+    const wall = new THREE.BoxGeometry(baseLength, baseHeght, baseWidth);
+    const wallMaterial = new THREE.MeshPhongMaterial({
+        map: wallTexture,
+        color: 0xffffff,
+        transparent: true,
+    });
+    //墙体的网格
+    const wallMesh = new THREE.Mesh(wall, wallMaterial);
+    return wallMesh;
+}
+
+//不规则墙体
+function genwallShape(baseWidth: number, baseHeght: number, baseLength: number) {
+    const shape = new THREE.Shape();
+    let height = baseHeght;//墙的高度
+    shape.moveTo(0, 0); //起点
+    shape.lineTo(0, height); //墙体高度
+    shape.lineTo(baseWidth / 2 - 1, height + 5); //墙体顶点
+    shape.lineTo(baseWidth / 2 - 1, height + 6); //墙体顶点
+    shape.lineTo(baseWidth / 2 + 1, height + 6); //墙体顶点
+    shape.lineTo(baseWidth / 2 + 1, height + 5); //墙体顶点
+    shape.lineTo(baseWidth, height);
+    shape.lineTo(baseWidth, 0);
+    shape.lineTo(0, 0);
+    return { shape };
+}
+
+//创建不规则墙体
+function createIrregularWall(shape: any, position: any) {
+    const extrudeSettings = {
+        depth: 1,//定义深度，由于挤压几何体的点位都是x，y坐标组成的二位平面，这个参数定义向z轴的延展长度，即为墙的厚度
+        bevelEnabled: false,
+    };
+    const wallTexture = new THREE.TextureLoader().load(requires.wall1);
+    const geometry = new THREE.ExtrudeGeometry(shape, extrudeSettings);
+    wallTexture.wrapS = wallTexture.wrapT = THREE.RepeatWrapping;
+    wallTexture.repeat.set(0.05, 0.05);
+    const material = new THREE.MeshPhongMaterial({ map: wallTexture });
+    const mesh = new THREE.Mesh(geometry, material);
+    mesh.position.set(...position);
+    group.add(mesh);
+    return mesh;
+}
+
+//创建不带门的不规则墙体
+function createNoDoorWall(baseWidth: number, baseHeght: number, baseLength: number, position: positionType) {
+    const { x, y, z } = position
+    let { shape } = genwallShape(baseWidth, baseHeght, baseLength);
+    let mesh = createIrregularWall(shape, [-baseWidth / 2 + x, 0, -baseLength / 2 + z]);
+    mesh.name = "带门的墙对面的墙";
+}
+
+
+//带门的墙体
+function createDoorWall(baseWidth: number, baseHeght: number, baseLength: number, position: positionType) {
+    const { x, y, z } = position
+    const shape = new THREE.Shape();
+    const door = new THREE.Path();
+    //门的位置
+    door.moveTo(baseWidth / 2 + 5, 0);
+    door.lineTo(baseWidth / 2 + 5, 5);
+    door.lineTo(baseWidth / 2 - 5, 6);
+    door.lineTo(baseWidth / 2 - 5, 0);
+    door.lineTo(baseWidth / 2 + 5, 0);
+    // 形状上的孔洞
+    shape.holes.push(door);
+    let mesh = createIrregularWall(shape, [
+        -baseWidth / 2 + x,
+        y,
+        baseLength / 2 - 1 + z,
+    ]);
+    mesh.name = "带门的墙";
+}
+
+
+//创建屋顶
+function createRoof(baseWidth: number, baseHeght: number, baseLength: number, position: positionType) {
+    const { x, y, z } = position
+    //屋顶宽
+    let width = Math.sqrt((baseWidth / 2) ** 2 + 5 ** 2) + 5;//+5让有一点屋檐的效果
+    const geometry = new THREE.BoxGeometry(baseLength / 2, width, 1);
+    const texture = new THREE.TextureLoader().load(requires.tile);
+    texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
+    texture.repeat.set(2, 2);
+    const material = new THREE.MeshPhongMaterial({ map: texture });
+    const mesh = new THREE.Mesh(geometry, material);
+    mesh.rotateZ(THREE.MathUtils.degToRad(75));
+    mesh.rotateY(-Math.PI / 2);
+    mesh.position.set(baseWidth / 3 - 1 + x, baseHeght + 2 + y, 0 + z);
+    mesh.name = "右屋顶";
+    group.add(mesh);
+    return { roof: mesh, width };
+
+}
+
+//创建门
+function createDoor(baseWidth: number, baseLength: number, position: positionType) {
+    const { x, y, z } = position;
+    const texture = new THREE.TextureLoader().load(requires.door);
+    const door = new THREE.BoxGeometry(3, 5, 0.5);
+    const material = new THREE.MeshPhongMaterial({
+        map: texture,
+        transparent: true,
+        opacity: 1,
+    });
+    const doorMesh = new THREE.Mesh(door, material);
+    // doorMesh.rotateY(Math.PI / 2);
+    // doorMesh.position.set(-baseLength / 2, 7, 0);
+
+    doorMesh.name = "门";
+
+    //以下代码做出了更改
+    const doorGroup = new THREE.Group();//添加一个门的父级
+    doorGroup.name = "门的包裹";
+    doorGroup.position.set(-5 + x, 8 + y, baseLength / 2 + z);//通过父级来改变门的旋转轴
+    //现在这个是相对于父级
+    doorMesh.position.x = 5;
+    doorGroup.add(doorMesh);
+    group.add(doorGroup);
+    return doorGroup;
+}
+
+
+//天空盒
+function createSkyBox() {
+    const texture = new THREE.TextureLoader().load(requires.sky);
+    texture.wrapS = texture.wrapT = THREE.RepeatWrapping;
+    // texture.repeat.set(1, 1);
+    const skyBox = new THREE.SphereGeometry(900, 100, 100);
+    const material = new THREE.MeshPhongMaterial({
+        map: texture,
+        side: THREE.BackSide,
+    });
+    const skyBoxMesh = new THREE.Mesh(skyBox, material);
+    scene.add(skyBoxMesh);
+}
+
+function setTipDom() {
+    const domTag = document.createElement("div");
+    domTag.setAttribute("id2", "tipId");
+    // domTag.innerText='电流'
+    domTag.style.fontSize = "14px";
+    domTag.style.backgroundColor = "rgba(0,0,0,.5)";
+    domTag.style.padding = "5px";
+    domTag.style.borderRadius = "2px";
+    domTag.style.color = "#fff";
+    domTag.style.visibility = "hidden";
+    // domTag.innerText = mesh.name;
+    const iTagDomCss3 = new CSS2DObject(domTag);
+    iTagDomCss3.position.z = 2;
+    iTagDomCss3.position.y = 0;
+    scene.add(iTagDomCss3);
+    saveTipDom = iTagDomCss3;
+}
+
+//3D标签初始化
+// function initCss3DScene() {
+//     cssRender = new CSS3DRenderer();
+//     cssRender.setSize(iw, ih);
+//     cssRender.domElement.style.position = "absolute";
+//     cssRender.domElement.style.top = '0';
+//     cssRender.domElement.style.outline = "none";
+//     cssRender.domElement.className = "cssrender";
+//     canvas.appendChild(cssRender.domElement);
+// }
+
+function sethoveMesh() {
+
+    dragControls = new DragControls(
+        boxObjects.value,
+        camera,
+        labelRenderer.domElement
+    );
+
+    if (!edit) {
+        dragControls.deactivate();
+    }
+    dragControls.addEventListener("hoveron", function (event: any) {
+        saveTipDom.element.innerHTML = `${event.object.name}:${event.object.devStatus ? t('messages.onLine') : t('messages.offline')
+            }`;
+        saveTipDom.element.style.visibility = "visible";
+        saveTipDom.position.x = event.object.position.x;
+        saveTipDom.position.y = event.object.position.y + 5;
+        saveTipDom.position.z = event.object.position.z - 20;
+        saveTipDom.visible = true;
+
+    });
+
+    dragControls.addEventListener("hoveroff", function (event: any) {
+        saveTipDom.element.style.visibility = "hidden";
+        saveTipDom.position.x = 0;
+        saveTipDom.position.y = 9999;
+        saveTipDom.visible = false;
+    });
+
+    dragControls.addEventListener("dragend", function (event: any) {
+        let data = { 'id': event.object.sensor_id, 'x': event.object.position.x.toFixed(2), 'y': event.object.position.z.toFixed(2) }
+        updateCoordinateByPoint(data).then((res: any) => {
+            if (res.code == 200) {
+                ElNotification({
+                    message: '移动位置成功',
+                    duration: 2000,
+                    type: 'success'
+                })
+            }
+
+
+        })
+
+    });
+
+}
+
+onMounted(() => {
+    // console.log(container.value.offsetWidth,'container');
+
+    //初始化场景
+    init()
+    /**创建传感器 */
+    getSensorDataTimer = setInterval(() => {
+        if (store.sensorList.length > 0) {
+            store.sensorList.forEach((element: any) => {
+                let state = element.status ? 0x88e76a : 0xff0000;
+                let wallMesh = createBox(small_size, { x: element.x, y: 0, z: element.y }, state, true, element, element.icon)
+
+            });
+            clearInterval(getSensorDataTimer)
+        }
+    }, 100)
+
+    getDevDataTimer = setInterval(() => {
+        if (store.devdataList.length > 0) {
+
+            store.devdataList.forEach((element: any) => {
+                let state = element.status ? 0x88e76a : 0xff0000;
+                let wallMesh = createBox(small_size, { x: element.x, y: 0, z: element.y }, state, false, element, element.icon)
+            });
+            clearInterval(getDevDataTimer)
+        }
+    }, 100)
+
+
+
+    // const length = store.result.length
+    // //获取store中的数据长度
+    // setInterval(() => {
+    //     //获得一个随机整数
+    //     const random = Math.floor(Math.random() * length)
+    //     const tempdata: any = store.result[random]
+    //     tempdata.status = !store.result[random]?.status
+    //     store.updateResult(tempdata)
+
+    // }, 5000)
+
+
+})
+</script>
+
+<style>
+/* @import url("@/assets/iconfont.css"); */
+
+.laber_name {
+    color: #FFF;
+    font-family: sans-serif;
+    padding: 2px;
+    background: rgba(0, 0, 0, 0.6);
+}
+</style>
diff --git a/src/views/TrendChart/index.vue b/src/views/TrendChart/index.vue
new file mode 100644
index 0000000..6aef3b0
--- /dev/null
+++ b/src/views/TrendChart/index.vue
@@ -0,0 +1,98 @@
+<template>
+  <div :class="$style['container']">
+    <div class="header">
+      <div class="title">
+        <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="'传感器24H趋势图'" :titleTip="[]" :typeFun="['time']"
+          :alarmType="[]"></header2>
+      </div>
+    </div>
+    <div class="content">
+      <lineChart v-for="(calc, index) in calcArr" :style="{width:width+'px',height:height+'px','min-width':'calc(25% - 20px)'}" :calc="calc">
+      </lineChart>
+    </div>
+  </div>
+</template>
+
+<script setup lang='ts'>
+import { ref, reactive, onMounted, onUnmounted } from "vue"
+import Header2 from "@/components/headerBox/header2.vue"
+import lineChart from "./lineChart.vue";
+type calcType = {
+  name: string,
+  type: string,
+  max: number,
+  min: number,
+  avg: number,
+  data: any[]
+}
+let calcArr = ref<calcType[]>()
+let width = ref(1500)
+let height = ref(700)
+function ajax() {
+  setTimeout(() => {
+    let data = []
+    let length = 2
+    let element = {
+        name: '甲醛',
+        type: 'CH2O',
+        max: 0.1,
+        min: 0.01,
+        avg: 0.05,
+        data: [
+          ['2021-06-01 00:00:00', 10],
+          ['2021-06-01 00:00:10', 20],
+          ['2021-06-01 00:00:40', 50],
+          ['2021-06-01 00:01:20', 90],
+          ['2021-06-01 00:01:30', 100],
+          ['2021-06-01 00:01:40', 110],
+          ['2021-06-01 00:01:50', 120],
+          ['2021-06-01 00:02:30', 160],
+          ['2021-06-01 00:02:40', 170],
+          ['2021-06-01 00:03:10', 200],
+          ['2021-06-01 00:03:20', 210],
+          ['2021-06-01 00:03:30', 220],
+          ['2021-06-01 00:04:20', 270]
+        ]
+      }
+    for (let index = 0; index < length; index++) {
+      data.push(element)
+      
+    }
+    calcArr.value = data
+    if (data.length<=4) {
+      width.value = 1900 / data.length-(data.length-1)*20;
+    } else if (data.length>4&&data.length<=8) {
+      width.value = width.value / 4-3*20;
+      height.value = 950 / 2-40;
+    } else {
+      width.value = width.value / 4-3*20;
+      height.value = 950 / 3-60;
+    }
+  })
+}
+onMounted(() => {
+  ajax()
+})
+</script>
+<style module>
+.container {
+  height: 1080px;
+  width: 1920px;
+  color: #20aec5;
+  background-color: #100c2a;
+  box-sizing: border-box;
+}
+</style>
+<style scoped>
+.content {
+  height: 980px;
+  width: 1920px;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  flex-wrap: wrap;
+  box-sizing: border-box;
+  padding: 5px;
+}
+</style>
+
diff --git a/src/views/TrendChart/lineChart.vue b/src/views/TrendChart/lineChart.vue
new file mode 100644
index 0000000..5af3e3a
--- /dev/null
+++ b/src/views/TrendChart/lineChart.vue
@@ -0,0 +1,128 @@
+<template>
+    <div class="container">
+        <div class="chart" ref="chart"></div>
+        <ul>
+            <li><text class="key">最大值</text><text>{{ calc.max }}</text></li>
+            <li><text class="key">最小值</text><text>{{ calc.min }}</text></li>
+            <li><text class="key">平均值</text><text>{{ calc.avg }}</text></li>
+        </ul>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { ref, onMounted, onUpdated, getCurrentInstance, watch } from "vue"
+const prop = defineProps<{
+    calc: {
+        name: string,
+        type: string,
+        max: number,
+        min: number,
+        avg: number,
+        data: number[]
+    }
+}>()
+const { proxy } = getCurrentInstance() as any
+const chart = ref()
+let myChart = null
+let data = prop.calc.data
+function init() {
+    myChart = proxy.$echarts.init(chart.value, 'dark');
+    const option = {
+        title: {
+            text: prop.calc.name,
+            top: "5%",
+            left: "5%"
+        },
+        tooltip: {
+            trigger: 'axis',
+        },
+        grid: {
+            top: "15%",
+            left: "5%",
+            right: "5%",
+            bottom: "5%",
+            containLabel: true,
+        },
+        xAxis: {
+            type: 'time',
+            splitLine: {
+                show: false
+            }
+        },
+        yAxis: {
+            type: 'value',
+        },
+        series: [
+            {
+                name: prop.calc.type,
+                type: 'line',
+                showSymbol: false,
+                data: data,
+                smooth: true,
+            }
+        ]
+    };
+    myChart.setOption(option);
+}
+
+watch(() => prop.calc.data, (newVal) => {
+    data = newVal
+    myChart.setOption({
+        series: [
+            {
+                data: data
+            }
+        ]
+    })
+})
+
+onMounted(() => {
+    init()
+})
+
+</script>
+
+<style scoped>
+.container {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+    font-size: 16px;
+    color: #fff;
+    box-shadow: rgb(2, 106, 181) 0px 8px 8px;
+}
+.container:hover {
+    box-shadow: rgb(2, 106, 181) 0px 8px 16px;
+}
+
+.chart {
+    height: calc(100% - 60px);
+    width: 100%;
+}
+
+ul {
+    height: 60px;
+    width: 100%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+
+ul li {
+    height: 100%;
+    width: 33%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+
+ul>li:nth-child(2) {
+
+    border-right: 1px solid #fff;
+    border-left: 1px solid #fff;
+}
+
+.key {
+    color: #ff6e40;
+}
+</style>
diff --git a/src/views/realtimeSecurity/index.vue b/src/views/realtimeSecurity/index.vue
index d9355fe..06156ab 100644
--- a/src/views/realtimeSecurity/index.vue
+++ b/src/views/realtimeSecurity/index.vue
@@ -77,7 +77,7 @@ function getWebsocket(val) {
   //精饰车间燃气监测
   if (data.type == "paintingGas") {
     store.changepaintingGas(data.msg);
-    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
     
   }
@@ -85,7 +85,7 @@ function getWebsocket(val) {
   if (data.type == "boilerGas") {
     // store.changePM(data.msg)
     store.changeboilerGas(data.msg.boilerGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
     
   }
@@ -93,15 +93,15 @@ function getWebsocket(val) {
   if (data.type == "canteenGas") {
     // store.changeHumiture(data.msg)
     store.changecanteenGas(data.msg.canteenGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
   }
   //甲醛TVOC
   if (data.type == "TVOC_CH2O") {    
     store.changeTVOC_CH2O(data.msg);
-    let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value}
+    let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId}
     store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC})
-    let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value}
+    let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId}
     store.changeNewVerticalNum({type:'CH2O',data:verticalData_CH2O})
     
   }
@@ -109,7 +109,7 @@ function getWebsocket(val) {
   if (data.type == "flame") {
     // store.changeHumiture(data.msg)
     store.changeflame(data.msg.flame);
-    let verticalData = {name:data.msg.devName,val:data.msg.flame.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.flame.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'FIRE',data:verticalData})
     
     
@@ -119,7 +119,7 @@ function getWebsocket(val) {
     // store.changeHumiture(data.msg)
     // store.changepaintingGas(data.msg)
     store.changesmoke(data.msg.smoke);
-    let verticalData = {name:data.msg.devName,val:data.msg.smoke.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.smoke.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Smoke',data:verticalData})
     // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器");
   }
diff --git a/src/views/realtimeSecurityJixiefenchang/index.vue b/src/views/realtimeSecurityJixiefenchang/index.vue
index 9c34fda..2d2e99f 100644
--- a/src/views/realtimeSecurityJixiefenchang/index.vue
+++ b/src/views/realtimeSecurityJixiefenchang/index.vue
@@ -77,7 +77,7 @@ function getWebsocket(val) {
   //精饰车间燃气监测
   if (data.type == "paintingGas") {
     store.changepaintingGas(data.msg);
-    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
     
   }
@@ -85,7 +85,7 @@ function getWebsocket(val) {
   if (data.type == "boilerGas") {
     // store.changePM(data.msg)
     store.changeboilerGas(data.msg.boilerGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.boilerGas.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
     
   }
@@ -93,15 +93,17 @@ function getWebsocket(val) {
   if (data.type == "canteenGas") {
     // store.changeHumiture(data.msg)
     store.changecanteenGas(data.msg.canteenGas);
-    let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.canteenGas.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Methane',data:verticalData})
   }
   //甲醛TVOC
-  if (data.type == "TVOC_CH2O") {    
+  if (data.type == "TVOC_CH2O") {
+    console.log(data.msg,"TVOC_CH2O");
+    
     store.changeTVOC_CH2O(data.msg);
-    let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value}
+    let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId}
     store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC})
-    let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value}
+    let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId}
     store.changeNewVerticalNum({type:'CH2O',data:verticalData_CH2O})
     
   }
@@ -109,7 +111,7 @@ function getWebsocket(val) {
   if (data.type == "flame") {
     // store.changeHumiture(data.msg)
     store.changeflame(data.msg.flame);
-    let verticalData = {name:data.msg.devName,val:data.msg.flame.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.flame.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'FIRE',data:verticalData})
     
     
@@ -119,7 +121,7 @@ function getWebsocket(val) {
     // store.changeHumiture(data.msg)
     // store.changepaintingGas(data.msg)
     store.changesmoke(data.msg.smoke);
-    let verticalData = {name:data.msg.devName,val:data.msg.smoke.value}
+    let verticalData = {name:data.msg.devName,val:data.msg.smoke.value,devId:data.msg.devId}
     store.changeNewVerticalNum({type:'Smoke',data:verticalData})
     // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器");
   }

From a7b66baa44438fc1eb2f646fb2ba70043c2b7c52 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 7 Jun 2023 14:18:06 +0800
Subject: [PATCH 05/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BC=E5=8A=A8?=
 =?UTF-8?q?=E7=8E=87=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/water_house_bg.jpg       | Bin 0 -> 46168 bytes
 src/utils/devSever.ts                   |   2 +-
 src/views/Mechanics/child/son/index.vue |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/img/water_house_bg.jpg

diff --git a/src/assets/img/water_house_bg.jpg b/src/assets/img/water_house_bg.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..430cdf437f116903aa2e91a6a933d5c8b589cc66
GIT binary patch
literal 46168
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

literal 0
HcmV?d00001

diff --git a/src/utils/devSever.ts b/src/utils/devSever.ts
index 26da8af..8cd0b4f 100644
--- a/src/utils/devSever.ts
+++ b/src/utils/devSever.ts
@@ -9,7 +9,7 @@
  */
 
 // export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.3.97:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
-export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://192.168.110.238:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
+export const development={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
 export const production={xhr:process.env.VUE_APP_BASE_API,ws:"ws://8.130.165.100:9018/",imgxhr:process.env.VUE_APP_BASE_API+"/image/"}
 //拼接图片url路径
 export function imgurlAddXhr(img){
diff --git a/src/views/Mechanics/child/son/index.vue b/src/views/Mechanics/child/son/index.vue
index d9e1aae..bf7597e 100644
--- a/src/views/Mechanics/child/son/index.vue
+++ b/src/views/Mechanics/child/son/index.vue
@@ -127,7 +127,7 @@ let data={
     stoptime:val.stoptime,//急停时长
     data:'2020-05-06',//采购日期
     src:imgurlAddXhr(val.data),//设备图片
-    timeguagu:95,//时间稼动率
+    timeguagu:Math.abs((val.ontime)/(val.ontime+val.offtime)*100).toFixed(1),//时间稼动率
     MTBF:2724,//MTBF
     MTTR:169,//MTTR
     MTTF:2555,//MTTF

From 75b1a1595784b287bbb2f703646c7dff6d914516 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 7 Jun 2023 14:31:49 +0800
Subject: [PATCH 06/29] =?UTF-8?q?=E4=BC=A0=E6=84=9F=E5=99=A8=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/verticalNumLoop.vue            | 231 ++++++++++++++++++
 1 file changed, 231 insertions(+)
 create mode 100644 src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue

diff --git a/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue b/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
new file mode 100644
index 0000000..6d94fcb
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
@@ -0,0 +1,231 @@
+<template>
+  <div ref="numBox1" :key="keynum" :style="{ height: '100%', width: '97%' }">
+    <border6 ref="refborder3" :color="borderColor">
+      <template v-slot>
+        <div class="box" ref="classBox1">
+          <div class="icontip">
+            <div v-for="items in value" style="margin: auto 5px;" v-show="(+items.val > +limit)&&items.status">
+              <el-popover placement="bottom" :width="250" trigger="hover" 
+                :popper-style="{ 'background-color': 'rgba(0,0,0,.8)' }">
+                <ul class="icontipBox">
+                  <li>
+                    <p class="t-right">{{t('messages.position')}}：</p>
+                    <p>{{ items.name }}</p>
+                  </li>
+                  <li>
+                    <p class="t-right">{{t('messages.NormalRange')}}：</p>
+                    <p>{{ limit }} {{unit}}</p>
+                  </li>
+                  <li>
+                    <p class="t-right">{{t('messages.CurrentValue')}}：</p>
+                    <p>{{ items.val }} {{unit}}</p>
+                  </li>
+                  <li>
+                    <p class="t-right">{{t('messages.AlarmTime')}}：</p>
+                    <p>{{ items.date }}</p>
+                  </li>
+                  <li>
+                    <p class="t-right">{{t('messages.duration')}}：</p>
+                    <p>{{ items.continuous }}</p>
+                  </li>
+                </ul>
+                <template #reference>
+                  <i :class="+items.val > +limit
+                      ? 'iconfont ' + icon + ' icon-red iconsmall-size'
+                      : 'iconfont ' + icon + ' icon-blue iconsmall-size'
+                    "></i>
+                </template>
+              </el-popover>
+            </div>
+          </div>
+          <!-- <h2>{{ `${t(item.i18n[0])}${t(item.i18n[1])}`}}</h2> -->
+          <h2>{{ item.name}}</h2>
+            <i :class="['iconfont',icon,iconcolor,'iconbig-size']"></i>
+            <p class="unit" v-if="unit&&item.status">
+              <p class="num">{{item.val}}</p>
+              <span>{{ unit }}</span>
+            </p>
+
+            
+          <!-- <p  class="unit"><p v-show="value.data&&value.unit"  :class="'num'">{{value.data}}</p><span>{{value.unit}}</span></p> -->
+          <!-- </div> -->
+        </div>
+      </template>
+    </border6>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref, watch,onUnmounted } from "vue";
+// import border3 from "@/components/borderBox/border3.vue";
+import border6 from "@/components/borderBox/border6.vue";
+import { useI18n } from 'vue-i18n'
+let {t} = useI18n();
+let i =ref(0)
+let timer = null;
+let item:any = computed(() => {
+  return props.value[i.value];
+});
+let iconcolor = computed(() => {  
+  return props.value[i.value].status?props.value[i.value].val > props.limit ? "icon-red" : "icon-blue":"icon-grey";
+});
+let borderColor = computed(() => {
+  let type = props.value.find((items: any) => {
+    if (+items.val > +props.limit&&items.status) {
+      return true;
+    }
+  });
+
+  return type ? ["#E43961","#E43961"] : [];
+});
+let props = defineProps<{
+  title: string;
+  icon: string;
+  limit: string | number;
+  unit: string|null;
+  value: Array<any>;
+}>();
+let keynum = ref(0);
+
+let refborder3 = ref();
+let numBox1 = ref();
+const classBox1 = ref();
+onMounted(() => {
+  timer = setInterval(() => {
+    i.value++;
+    if (i.value >= props.value.length) {
+      i.value = 0;
+    }
+  }, 5000);
+ });
+ onUnmounted(() => {
+  clearInterval(timer);
+ })
+const boxSize = reactive({
+  height: "",
+  width: "",
+});
+</script>
+
+<style scoped>
+@import "@/assets/css/iconfont.css";
+
+.box {
+  height: 50%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+}
+
+/* .contentbox{
+  height: 100%;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+} */
+h2 {
+  color: #fff;
+}
+
+p {
+  color: #fff;
+}
+
+.iconbig-size {
+  font-size: 70px;
+}
+
+.iconsmall-size {
+  font-size: 20px;
+}
+
+.icon-red {
+  color: #e43961;
+  animation: redstart 2s infinite;
+  /* position: relative; */
+  /* top: -15px; */
+}
+
+.icon-grey {
+  color: rgb(167, 166, 189);
+  /* position: relative; */
+  /* top: -15px; */
+}
+.icon-blue {
+  color: #20aec5;
+  /* position: relative; */
+  /* top: -15px; */
+}
+
+/* .icon-red, .icon-blue { */
+/* margin-bottom: 20%; */
+/* } */
+.num {
+  font-size: 16px;
+}
+
+.unit {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  vertical-align: top;
+  font-size: 16px;
+  height: 0;
+  width: 100px;
+}
+
+.icontip {
+  display: flex;
+  margin-top: -60px;
+  width: 100px;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: center;
+  height: 60px;
+}
+
+.icontipBox li {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+  margin-bottom: 5px;
+}
+
+.icontipBox li p:nth-child(1) {
+  width: 40%;
+  text-align: left;
+}
+.icontipBox li p:nth-child(2) {
+  flex: 1;
+}
+
+
+.t-center {
+  text-align: center;
+}
+
+.t-left {
+  text-align: left;
+}
+
+/* .icontipBox li p:nth-child(1) {
+  min-width:80px;
+  display: flex;
+  font-size: 18px;
+}
+.icontipBox li:nth-child(2) {
+} */
+@keyframes redstart {
+  0% {}
+
+  50% {
+    text-shadow: #fff 1px 0 10px;
+  }
+
+  100% {}
+}
+</style>

From 5a7375fb91e969f9eedde6c1d69d73979754d307 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 7 Jun 2023 15:57:04 +0800
Subject: [PATCH 07/29] =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E4=B8=89=E5=90=88=E4=B8=80=E7=8E=AF=E5=A2=83=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BC=A0=E6=84=9F=E5=99=A8=E7=9B=91=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generalEnvironmentMechanical/index.vue    | 208 ++++++++++++++++++
 1 file changed, 208 insertions(+)
 create mode 100644 src/views/generalEnvironmentMechanical/index.vue

diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
new file mode 100644
index 0000000..b90194a
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -0,0 +1,208 @@
+<template>
+    <div :class="$style['container']">
+        <div class="header">
+            <div class="title">
+                <header2 ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.generalEnvironment')"
+                    :titleTip="titleTip" :typeFun="['AbnormalData', 'time']"
+                    :alarmType="['noiseAlarm', 'temphuim', 'dustAlarm', 'saving']"></header2>
+            </div>
+        </div>
+        <div class="content" ref="Acontent">
+            <div class="top-box">
+                <div style="width: 12%; height: 250px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-evenly;"
+                    v-for="item in store.newVerticalNum">
+                    <verticalNumLoop :title="item.title" :icon="item.icon" :limit="item.limit" :unit="item.unit"
+                        :value="item.value"></verticalNumLoop>
+                </div>
+
+            </div>
+            <div class="bottom-box"></div>
+        </div>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { onMounted, onUnmounted, reactive, ref } from 'vue'
+import header2 from '@/components/headerBox/header2.vue'
+import verticalNumLoop from './components/verticalNumLoop.vue'
+import { getSafeWarningData, getpipeData } from "@/http/realtimeSecurity";
+import { getnoiseData } from "@/http/generalEnvironment";
+import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
+import { getPowerData } from "@/http/energyConsume";
+import { useSocketStore } from "@/store/moduleSocketMechanics";
+import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
+import { gettime, clacendTime } from "@/utils/time"
+
+import { useI18n } from 'vue-i18n'
+let { t } = useI18n();
+const store = useSocketStore();
+let deptIds = '6,7,9,10,11'
+let titleTip = [
+    {
+        color: "#E43961",
+        name: t('messages.abnormal'),
+    },
+    {
+        color: "#20AEC5",
+        name: t('messages.NoAbnormal'),
+    },
+    {
+        color: "#A7A6BD",
+        name: t('messages.disconnection'),
+    },
+];
+const verticalType = {
+    'TVOC': { icon: 'icon-TVOC-Outlined', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
+    'Smoke': { icon: 'icon-yanwubaojingqi', title: t('messages.smokeDetection'), unit: "ppm" },
+    'Methane': { icon: 'icon-ranqi', title: t('messages.gasDetection'), unit: null },
+    'CH2O': { icon: 'icon-app_icons--', title: t('messages.CH2ODetection'), unit: 'mg/m³' },
+    'FIRE': { icon: 'icon-weibiaoti1', title: t('messages.flameDetection'), unit: null },
+    'noise': { icon: 'icon-shengyin', title: t('messages.noiseDetection'), unit: 'dB' },
+}
+
+let headerref=ref()
+let verticalList: any[] = reactive([])
+async function getSensorData() {
+    let list = []
+    const res: any = await Promise.all([
+        getnoiseData({ deptIds }),
+        getSafeWarningData({ deptIds }),
+    ])
+    let noiseData = {
+        limit: res[0].data.top.value,
+        type: 'noise',
+        value: res[0].data.listData.map((item: any) => {
+            return {
+                devId: item.devId,
+                name: item.name + '噪音监测',
+                type: 'noise',
+                status: true,
+                val: item.value,
+            }
+        })
+    }
+    list.push(noiseData);
+    list.push(...res[1].data)
+
+    let datetime = new Date().getTime();
+    let handle_vertical = list.map((item: any) => {
+        item.value.forEach(element => {
+            if (element.name.includes("TVOC")) {
+                element.name = element.name.split('TVOC')[0] + verticalType[item.type].title
+            }
+
+            if (element.val > item.limit) {
+                element.date = gettime(element.ts),
+                    element.time = element.ts || datetime
+                element.continuous = clacendTime(datetime, element.ts || datetime)
+            } else {
+                element.date = null
+                element.time = null
+                element.continuous = null
+            }
+        });
+        return {
+            type: item.type,
+            icon: verticalType[item.type].icon,
+            title: verticalType[item.type].title,
+            limit: item.limit,
+            unit: verticalType[item.type].unit,
+            value: item.value
+        }
+    })
+
+    store.setNewVerticalNum(handle_vertical)
+}
+
+function getWebsocket(val) {
+  headerref.value.HeadergetWebsocket(val)
+  try{
+  let data = JSON.parse(val);
+
+  //精饰车间燃气监测
+  if (data.type == "paintingGas") {
+    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId}
+    store.changeNewVerticalNum({type:'Methane',data:verticalData})
+    
+  }
+  //甲醛TVOC
+  if (data.type == "TVOC_CH2O") {
+    let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId}
+    store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC})
+    let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId}
+    store.changeNewVerticalNum({type:'CH2O',data:verticalData_CH2O})
+    
+  }
+  //火焰传感器？
+  if (data.type == "flame") {
+    let verticalData = {name:data.msg.devName,val:data.msg.flame.value,devId:data.msg.devId}
+    store.changeNewVerticalNum({type:'FIRE',data:verticalData})
+    
+  }
+  //精饰车间烟雾传感器
+  if (data.type == "smoke") {
+    let verticalData = {name:data.msg.devName,val:data.msg.smoke.value,devId:data.msg.devId}
+    store.changeNewVerticalNum({type:'Smoke',data:verticalData})
+    // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器");
+  }
+//   if (data.type == "airPressure") {
+//     store.changePressure(data.msg);
+//   }
+//   if (data.type == "waterPressure") {
+//     store.changePipe(data.msg);
+//   }
+
+  }catch(err){
+    console.log(err,"报错了大哥",console.log(val)
+    );
+
+  }
+}
+function errWebsocket(val) {
+  headerref.value?headerref.value.HeadererrWebsocket(val):''
+  // console.log(val);
+}
+
+
+onMounted(() => {
+    getSensorData()
+    
+  connectWebsocket(null, null, getWebsocket, errWebsocket);
+})
+</script>
+
+<style module>
+.container {
+    height: 1080px;
+    width: 1920px;
+    color: #20aec5;
+    background-color: #100c2a;
+}
+</style>
+<style scoped>
+.content {
+    width: 1920px;
+    height: 980px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.top-box {
+    width: 1920px;
+    height: 300px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.bottom-box {
+    width: 1920px;
+    height: 670px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    /* background-color: #afb; */
+}
+</style>

From b6521ac9086788950b5ca059c541af7a8a809a4e Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 7 Jun 2023 16:54:18 +0800
Subject: [PATCH 08/29] update

---
 .../generalEnvironmentMechanical/index.vue    | 165 +++++++++++++-----
 1 file changed, 117 insertions(+), 48 deletions(-)

diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index b90194a..bd0273d 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -16,7 +16,15 @@
                 </div>
 
             </div>
-            <div class="bottom-box"></div>
+            <div class="bottom-box">
+                <power style="width: 33%;height: 100%;box-sizing: border-box;" :title="powerTitle" :series="powerSeries"
+                    :listName="listName">
+                </power>
+                <div style="width: 33%;height: 100%;background: #bfb;">
+                </div>
+                <div style="width: 33%;height: 100%;background: #bfc;">
+                </div>
+            </div>
         </div>
     </div>
 </template>
@@ -25,6 +33,7 @@
 import { onMounted, onUnmounted, reactive, ref } from 'vue'
 import header2 from '@/components/headerBox/header2.vue'
 import verticalNumLoop from './components/verticalNumLoop.vue'
+import power from './components/power.vue';
 import { getSafeWarningData, getpipeData } from "@/http/realtimeSecurity";
 import { getnoiseData } from "@/http/generalEnvironment";
 import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
@@ -59,9 +68,15 @@ const verticalType = {
     'FIRE': { icon: 'icon-weibiaoti1', title: t('messages.flameDetection'), unit: null },
     'noise': { icon: 'icon-shengyin', title: t('messages.noiseDetection'), unit: 'dB' },
 }
+/**用电量 */
+let listName = ref<string[]>()
+let powerTitle = t('messages.Powerto2023')
+let powerSeries = ref()
 
-let headerref=ref()
+
+let headerref = ref()
 let verticalList: any[] = reactive([])
+//获取传感器实时数据
 async function getSensorData() {
     let list = []
     const res: any = await Promise.all([
@@ -114,60 +129,113 @@ async function getSensorData() {
     store.setNewVerticalNum(handle_vertical)
 }
 
+async function getPower_data() {
+    const { data }: any = await getPowerData({ time: 1 })
+    listName.value = data.name
+
+
+    let series = []
+    data.listData.forEach(res => {
+        if (res.years == 2023) {
+            for (let key in res.month) {
+                series.push({
+                    name: key + '月',
+                    type: 'bar',
+                    stack: res.years,
+                    emphasis: {
+                        focus: 'coordinateSystem',
+                        label: {
+                            show: true,
+                            formatter: function (value, index) {
+                                return value.value.toLocaleString()
+                            }
+                        }
+                    },
+                    data: res.month[key]
+                })
+            }
+        }
+    })
+    //data0用于初始化计算的数据
+    let data0 = []
+
+    for (let i = 1; i <= data.name.length; i++) {
+        data0.push(0)
+    }
+
+    series.push(
+        {
+            name: '',
+            type: 'bar',
+            data: data0,
+            color: '#bbf',
+            stack: data.listData[1].years,
+            // barWidth: 30,
+            label: {
+                show: true,
+                position: 'right',
+                color: '#fff'
+            }
+        }
+    )
+    powerSeries.value = series
+
+}
+
 function getWebsocket(val) {
-  headerref.value.HeadergetWebsocket(val)
-  try{
-  let data = JSON.parse(val);
+    headerref.value.HeadergetWebsocket(val)
+    try {
+        let data = JSON.parse(val);
 
-  //精饰车间燃气监测
-  if (data.type == "paintingGas") {
-    let verticalData = {name:data.msg.devName,val:data.msg.paintingGas.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'Methane',data:verticalData})
-    
-  }
-  //甲醛TVOC
-  if (data.type == "TVOC_CH2O") {
-    let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value,devId:data.msg.TVOC.devId}
-    store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC})
-    let verticalData_CH2O = {name:data.msg.CH2O.name,val:data.msg.CH2O.value,devId:data.msg.CH2O.devId}
-    store.changeNewVerticalNum({type:'CH2O',data:verticalData_CH2O})
-    
-  }
-  //火焰传感器？
-  if (data.type == "flame") {
-    let verticalData = {name:data.msg.devName,val:data.msg.flame.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'FIRE',data:verticalData})
-    
-  }
-  //精饰车间烟雾传感器
-  if (data.type == "smoke") {
-    let verticalData = {name:data.msg.devName,val:data.msg.smoke.value,devId:data.msg.devId}
-    store.changeNewVerticalNum({type:'Smoke',data:verticalData})
-    // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器");
-  }
-//   if (data.type == "airPressure") {
-//     store.changePressure(data.msg);
-//   }
-//   if (data.type == "waterPressure") {
-//     store.changePipe(data.msg);
-//   }
+        //精饰车间燃气监测
+        if (data.type == "paintingGas") {
+            let verticalData = { name: data.msg.devName, val: data.msg.paintingGas.value, devId: data.msg.devId }
+            store.changeNewVerticalNum({ type: 'Methane', data: verticalData })
 
-  }catch(err){
-    console.log(err,"报错了大哥",console.log(val)
-    );
+        }
+        //甲醛TVOC
+        if (data.type == "TVOC_CH2O") {
+            let verticalData_TVOC = { name: data.msg.TVOC.name, val: data.msg.TVOC.value, devId: data.msg.TVOC.devId }
+            store.changeNewVerticalNum({ type: 'TVOC', data: verticalData_TVOC })
+            let verticalData_CH2O = { name: data.msg.CH2O.name, val: data.msg.CH2O.value, devId: data.msg.CH2O.devId }
+            store.changeNewVerticalNum({ type: 'CH2O', data: verticalData_CH2O })
 
-  }
+        }
+        //火焰传感器？
+        if (data.type == "flame") {
+            let verticalData = { name: data.msg.devName, val: data.msg.flame.value, devId: data.msg.devId }
+            store.changeNewVerticalNum({ type: 'FIRE', data: verticalData })
+
+        }
+        //精饰车间烟雾传感器
+        if (data.type == "smoke") {
+            let verticalData = { name: data.msg.devName, val: data.msg.smoke.value, devId: data.msg.devId }
+            store.changeNewVerticalNum({ type: 'Smoke', data: verticalData })
+            // console.log(JSON.stringify({type:'Smoke',data:verticalData}),"烟雾传感器");
+        }
+        //   if (data.type == "airPressure") {
+        //     store.changePressure(data.msg);
+        //   }
+        //   if (data.type == "waterPressure") {
+        //     store.changePipe(data.msg);
+        //   }
+
+    } catch (err) {
+        console.log(err, "报错了大哥", console.log(val)
+        );
+
+    }
 }
 function errWebsocket(val) {
-  headerref.value?headerref.value.HeadererrWebsocket(val):''
-  // console.log(val);
+    headerref.value ? headerref.value.HeadererrWebsocket(val) : ''
+    // console.log(val);
 }
 
 
 onMounted(() => {
     getSensorData()
-    
-  connectWebsocket(null, null, getWebsocket, errWebsocket);
+    getPower_data()
+    connectWebsocket(null, null, getWebsocket, errWebsocket);
 })
 </script>
 
@@ -177,12 +245,13 @@ onMounted(() => {
     width: 1920px;
     color: #20aec5;
     background-color: #100c2a;
+    box-sizing: border-box;
 }
 </style>
 <style scoped>
 .content {
     width: 1920px;
-    height: 980px;
+    height: 930px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
@@ -191,7 +260,7 @@ onMounted(() => {
 
 .top-box {
     width: 1920px;
-    height: 300px;
+    height: 290px;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -199,7 +268,7 @@ onMounted(() => {
 
 .bottom-box {
     width: 1920px;
-    height: 670px;
+    height: 630px;
     display: flex;
     justify-content: space-between;
     align-items: center;

From 268d56686523b699ac7467ec442bde08ff13150c Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 7 Jun 2023 17:00:51 +0800
Subject: [PATCH 09/29] update

---
 src/router/index.ts                |   6 ++
 src/store/moduleSocketMechanics.ts | 154 +++++++++++++++++++++++++++++
 src/store/moduleSocketjixie.ts     |   4 +-
 3 files changed, 161 insertions(+), 3 deletions(-)
 create mode 100644 src/store/moduleSocketMechanics.ts

diff --git a/src/router/index.ts b/src/router/index.ts
index bec05ce..fe1407d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -155,6 +155,12 @@ const routes: Array<RouteRecordRaw> = [
         component: () =>
           import("../views/generalEnvironmentjixiefenchang/index.vue"),
       },
+      {
+        path: "/generalEnvironmentMechanical",
+        name: "generalEnvironmentMechanical",
+        component: () =>
+          import("../views/generalEnvironmentMechanical/index.vue"),
+      },
       {
         path: "/FactoryView",
         name: "FactoryView",
diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts
new file mode 100644
index 0000000..884c91f
--- /dev/null
+++ b/src/store/moduleSocketMechanics.ts
@@ -0,0 +1,154 @@
+/*
+ * @FilePath: \wwwd:\code\screenFront\src\store\moduleSocketjixie.ts
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-06 15:58:13
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+ */
+import { defineStore } from "pinia";
+import {Names} from '@/store/storeName'
+import {gettime,clacendTime} from "@/utils/time"
+export const useSocketStore = defineStore(Names.socketjixiefenchang,{
+    // 使用方式
+    // const Index= useIndexStore()
+    // 1、Index.{数据}++
+    // 2、Index.$patch({数据:??})
+    // 3、Index.$patch((state)=>{ state.数据=??})
+    // 4、通过action修改
+    state:()=>{
+        return{
+            newVerticalNum: [
+                {
+                    "type": "TVOC",
+                    "icon": "icon-TVOC-Outlined",
+                    "title": "TVOC检测",
+                    "limit": "0.5",
+                    "unit": "mg/m³",
+                    "value": [
+                        {
+                            "name": "精饰车间TVOC/甲醛监测传感器",
+                            "val": null,
+                            "type": "TVOC_CH2O",
+                            "field": "TVOC"
+                        }
+                    ]
+                },
+                {
+                    "type": "Smoke",
+                    "icon": "icon-yanwubaojingqi",
+                    "title": "烟雾检测",
+                    "limit": "100",
+                    "unit": null,
+                    "value": [
+                        {
+                            "name": "精饰车间烟雾传感器",
+                            "val": null,
+                            "type": "Smoke",
+                            "field": "Smoke_Reg"
+                        }
+                    ]
+                },
+                {
+                    "type": "Methane",
+                    "icon": "icon-ranqi",
+                    "title": "燃气检测",
+                    "limit": "0",
+                    "unit": null,
+                    "value": [
+                        {
+                            "name": "精饰车间燃气监测",
+                            "val": null,
+                            "type": "Methane",
+                            "field": "Methane_Reg"
+                        },
+                        {
+                            "name": "食堂燃气监测",
+                            "val": null,
+                            "type": "Methane",
+                            "field": "Methane_Reg"
+                        },
+                        {
+                            "name": "锅炉房燃气监测",
+                            "val": null,
+                            "type": "Methane",
+                            "field": "Methane_Reg"
+                        }
+                    ]
+                },
+                {
+                    "type": "CH2O",
+                    "icon": "icon-app_icons--",
+                    "title": "甲醛检测",
+                    "limit": "0.08",
+                    "unit": "mg/m³",
+                    "value": [
+                        {
+                            "name": "精饰车间TVOC/甲醛监测传感器",
+                            "val": null,
+                            "type": "TVOC_CH2O",
+                            "field": "CH2O"
+                        }
+                    ]
+                },
+                {
+                    "type": "FIRE",
+                    "icon": "icon-weibiaoti1",
+                    "title": "明火检测",
+                    "limit": "0",
+                    "unit": null,
+                    "value": [
+                        {
+                            "name": "精饰车间火花传感器",
+                            "val": null,
+                            "type": "FIRE",
+                            "field": "Fire_Reg"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    //computed 修改一些值
+    //需要使用return将数据抛出
+    //getters内可相互使用计算结果
+    //使用时可直接放入标签内<div>Index.方法()</div>
+    getters:{
+
+    },
+    actions:{
+        //设置新的安全检测数据
+        setNewVerticalNum(val) {
+            this.newVerticalNum = val
+        },
+        //更新 新的安全检测数据
+        changeNewVerticalNum(val) {            
+            //{"type":"Smoke","data":{"name":"精饰车间烟雾传感器","val":"100"}}
+            let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type)
+            let cIndex = null
+            if (pIndex != -1) {
+                cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.devId == val.data.devId)
+            }
+            if (cIndex != -1) {
+                if (val.data.val>this.newVerticalNum[pIndex].limit) {
+                    
+                    let now = new Date().getTime()
+                    if (this.newVerticalNum[pIndex].value[cIndex].date == null) {
+                        this.newVerticalNum[pIndex].value[cIndex].date = gettime()
+                        this.newVerticalNum[pIndex].value[cIndex].time = now
+                    }
+                    
+                    let time = this.newVerticalNum[pIndex].value[cIndex].time
+
+                    this.newVerticalNum[pIndex].value[cIndex].continuous = clacendTime(now,time)
+                } else {
+                    this.newVerticalNum[pIndex].value[cIndex].date = null
+                    this.newVerticalNum[pIndex].value[cIndex].time = null
+                }
+                this.newVerticalNum[pIndex].value[cIndex].val = val.data.val
+                this.newVerticalNum[pIndex].value[cIndex].status = true
+            }
+        }
+    }   
+})
\ No newline at end of file
diff --git a/src/store/moduleSocketjixie.ts b/src/store/moduleSocketjixie.ts
index f5772d7..5c9933c 100644
--- a/src/store/moduleSocketjixie.ts
+++ b/src/store/moduleSocketjixie.ts
@@ -319,9 +319,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
             this.newVerticalNum = val
         },
         //更新 新的安全检测数据
-        changeNewVerticalNum(val) {
-            console.log(val);
-            
+        changeNewVerticalNum(val) {            
             //{"type":"Smoke","data":{"name":"精饰车间烟雾传感器","val":"100"}}
             let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type)
             let cIndex = null

From d679ed797853014008e45112bcf73d01496352d5 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Wed, 7 Jun 2023 17:43:19 +0800
Subject: [PATCH 10/29] =?UTF-8?q?1.=E5=90=88=E5=B9=B6=E6=9C=BA=E6=A2=B0?=
 =?UTF-8?q?=E5=88=86=E5=8E=82=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/gas.vue                        | 164 ++++++++++
 .../components/pipe.vue                       | 289 ++++++++++++++++++
 .../components/power2023.vue                  | 278 +++++++++++++++++
 .../generalEnvironmentMechanical/index.vue    | 149 +++++----
 4 files changed, 826 insertions(+), 54 deletions(-)
 create mode 100644 src/views/generalEnvironmentMechanical/components/gas.vue
 create mode 100644 src/views/generalEnvironmentMechanical/components/pipe.vue
 create mode 100644 src/views/generalEnvironmentMechanical/components/power2023.vue

diff --git a/src/views/generalEnvironmentMechanical/components/gas.vue b/src/views/generalEnvironmentMechanical/components/gas.vue
new file mode 100644
index 0000000..6ebd7c6
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/gas.vue
@@ -0,0 +1,164 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\generalEnvironmentMechanical\components\gas.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-14 13:24:12
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+
+<template>
+        <!-- <h1>{{props.title}}</h1> -->
+        <div ref="gas" class="gas-echarts-class"></div>
+</template>
+
+<script setup lang="ts">
+import {getCurrentInstance, onMounted, onUpdated, reactive, ref, watch} from "vue"
+import {EDataPerson,EDataPersonItem} from '@/type/energyConsume'
+import 'echarts-liquidfill'
+const { proxy } = getCurrentInstance() as any;
+let props=defineProps<{
+      title:string,
+      value:any;
+      }>()
+let gas=ref()
+
+let refborder4=ref()
+
+const echartsData = reactive<EDataPerson>({
+    gas:{
+      div:null,
+      data:null,
+      title:'',
+      box:null
+  },
+})
+
+const setData=()=>{
+  
+  echartsData.gas!.div=gas.value
+  echartsData.gas!.title=props.title
+  echartsData.gas!.data=({
+          title: {
+            // 标题
+            text: echartsData.gas!.title,
+            textStyle:{
+          color:'#fff',
+          fontSize:20
+            },
+            top:'2%'
+          },
+           series: [{
+    type: 'liquidFill',
+    radius: '80%', //水球大小
+    shape:'rect',
+    center: ['50%', '50%'],
+    waveAnimation: true,
+    color: [
+      {
+        type: 'linear',
+        x: 0,
+        y: 0,
+        x2: 0,
+        y2: 1,
+        colorStops: [
+          {
+            offset: 0,
+            color: '#186945',
+          },
+          {
+            offset: 1,
+            color: '#1b7a4f',
+          },
+        ],
+        globalCoord: false,
+      },
+    ],
+    data: [0.7,0.7], // data个数代表波浪数
+    amplitude: 10, //振幅
+    backgroundStyle: {
+      borderWidth: 2, //边框大小
+      borderColor:'rgba(8, 206, 120, 0.8)',//边框颜色
+      color: 'rgba(8, 206, 120, 0.4)',
+    },
+    label: {
+      normal: {
+        textStyle: {
+          fontSize: 24,
+          fontWeight: 'bold',
+          color: '#fff',
+        },
+        formatter:function(params){
+          return props.value
+        }
+      },
+      
+    },
+    outline: {
+      borderDistance: 0,
+      itemStyle: {
+        borderWidth: 4,
+        borderColor: 'transparent',
+      },
+    },
+            }],
+        })
+
+change(echartsData.gas)
+}
+
+const change = (item:EDataPersonItem) => {
+  let Ebox;
+  if (!item.box) {
+    Ebox = proxy.$echarts.init(item.div, "dark");
+  } else {
+    Ebox = item.box;
+  }
+  Ebox.setOption(item.data);
+  item.box = Ebox;
+};
+
+onUpdated(() => {
+  console.log('数据更新');
+  
+  setData()
+})
+// watch(() => props.value, (val) => {
+//   console.log(val);
+  
+//   setData()
+// }, { deep: true })
+
+onMounted(() => {
+  setData()
+})
+
+
+</script>
+
+<style scoped>
+.gasBox{
+    /* border-radius: 50%; */
+    background-color: #8CE78D;
+    color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 20px;
+    font-size: 20px;
+}
+.gasborder{
+    position: relative;
+}
+.gasborder h1{
+    position: absolute;
+    top: 20px;
+    left:20px;
+    color: #fff;
+}
+.gas-echarts-class{
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/generalEnvironmentMechanical/components/pipe.vue b/src/views/generalEnvironmentMechanical/components/pipe.vue
new file mode 100644
index 0000000..2efa2c2
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/pipe.vue
@@ -0,0 +1,289 @@
+<template>
+  <div ref="pipe" class="pipebox"></div>
+</template>
+
+<script setup lang="ts">
+import { getCurrentInstance, nextTick, onMounted, onUpdated, reactive, ref, watch } from "vue";
+import { EDataPerson, EDataPersonItem } from "@/type/realtimeSecurity";
+
+import border6 from "@/components/borderBox/border6.vue";
+import { useI18n } from "vue-i18n";
+let { t } = useI18n();
+const { proxy } = getCurrentInstance() as any;
+let props = defineProps<{
+  title: string;
+  value: any;
+}>();
+let pipe = ref();
+
+let refborder3 = ref();
+
+const echartsData = reactive<EDataPerson>({
+  pipe: {
+    div: null,
+    data: null,
+    title: "",
+    box: null,
+  },
+});
+
+const setData = () => {
+  let x = [];
+  let y = [];
+  let sumx = [];
+  console.log(props.value,"ddd");
+  
+  props.value.listData.forEach((res) => {
+    
+    x.push(res.name);
+  });
+  let newx = [...new Set(x)];
+  newx.forEach((ele) => {
+    let count = 0;
+    props.value.listData.forEach((res) => {
+      if (ele == res.name) {
+        count++;
+      }
+    });
+    sumx.push({ name: ele, val: 1, sum: count });
+    count = 0;
+  });
+
+  sumx.forEach((ele) => {
+    props.value.listData.forEach((res) => {
+      let color1 = rgb();
+      if (ele.name == res.name)
+        y.push({
+          name: res.devName,
+          value: [
+            newx.map((item) => item).indexOf(res.name),
+            0,
+            res.value,
+            ele.val++,
+            ele.sum,
+          ],
+        });
+    });
+  });
+
+  echartsData.pipe!.div = pipe.value;
+  echartsData.pipe!.title = props.title;
+  echartsData.pipe!.data = {
+    title: {
+      text: echartsData.pipe!.title,
+      show: true,
+      textStyle: {
+        color: "#fff",
+        fontSize: 20,
+      },
+      top: "1%",
+    },
+    grid: {
+      top: "15%",
+      left: "3%",
+      right: "4%",
+      bottom: "3%",
+      containLabel: true,
+    },
+    tooltip: {
+      trigger: "item",
+      axisPointer: {
+        type: "shadow",
+      },
+    },
+    legend: {
+      top: "5%",
+    },
+    xAxis: {
+      type: "category",
+      data: newx,
+    },
+    yAxis: {
+      type: "value",
+      // axisLabel: {
+      //   formatter: "{value} mpa",
+      // },
+    },
+    //   dataset:{
+    //   dimensions: x,
+    //   source: y
+    // },
+    // series:server
+    series: [
+      {
+        type: "custom",
+        renderItem: renderItem1,
+        itemStyle: {
+          color: function (params) {
+            var index_color = params.value[2];
+            if (index_color >= props.value.top.value) {
+              return "#FF6E76";
+            } else {
+              return "#4992FF";
+            }
+          },
+        },
+        label: {
+          show: true,
+          normal: {
+            formatter: function (params) {
+              return params.value[2];
+            },
+            show: true,
+            position: "top",
+            textStyle: {
+              color: "rgb(255,255,255,0.9)",
+            },
+          },
+        },
+        tooltip: {
+          trigger: "item",
+          axisPointer: {
+            type: "shadow",
+          },
+          formatter: function (params) {
+            return !(params.value[2] == "0.0")
+              ? params.name + ":" + params.value[2] + "Mpa"
+              : "";
+          },
+        },
+        // labelLayout: (params, api) => {
+        //   console.log(params, api);
+
+        //   return {
+        //     x: params.rect.x ,
+        //     y: params.rect.y + params.rect.height / 2,
+        //     verticalAlign: "middle",
+        //     align: "left",
+        //     text:'1'
+        //   };
+        // },
+        // itemStyle: { normal: { opacity: 0.8 } },
+        encode: {
+          y: 2,
+          x: 0,
+          tooltip: [0, 1, 2], //映射到提示框中的维度
+          itemName: 3,
+        },
+        data: y,
+      },
+      {
+        type: "bar",
+        name: `${t("messages.normal_Tip")}(0mpa - ` + props.value.top.value + "mpa)",
+        color: "#4992FF",
+      },
+      {
+        type: "bar",
+        name: `${t("messages.abnormal_Tip")}(${props.value.top.value}mpa ${t(
+          "messages.abnormal_Tip_yishang"
+        )})`,
+        color: "#FF6E76",
+      },
+    ],
+  };
+  change(echartsData.pipe);
+};
+
+let renderItem1 = (params, api) => {
+  // console.log(params,"?????????????????");
+
+  let categoryIndex = api.value(0);
+  let start = api.coord([categoryIndex, api.value(1)]);
+  let end = api.coord([categoryIndex, api.value(2)]);
+  let width = api.size([0, api.value(4)])[0] * 0.6;
+
+  const num = api.value(4); // 每个系列柱子数
+  const currentIndex = api.value(3);
+  const isOdd = num % 2 === 0;
+  const midN = isOdd ? num / 2 : (num + 1) / 2;
+
+  var rect = null;
+
+  width = width / num;
+
+  let rectX = start[0] - width / 2;
+
+  const FIXED_WIDTH = 2; // 柱子间距
+
+  // 数据处理，结构为 { itemStyle: { normal: { color: 'lightgreen' } }, name: '2011', value: [0, 0, 150, 2, 5] }
+  // 其中value 分为五个维度，分别为{系列项}（从0开始）、y轴起始值(均为0)、实际值、同系列中索引值（从1开始）、同系列数据项总数
+
+  if (num > 1) {
+    if (isOdd) {
+      if (currentIndex <= midN) {
+        // 中位数左侧
+        rectX =
+          start[0] -
+          width / 2 -
+          width / 2 +
+          (currentIndex - midN) * width -
+          FIXED_WIDTH * (midN + 1 - currentIndex);
+      } else {
+        // 中位数右侧
+        rectX =
+          start[0] -
+          width / 2 +
+          width / 2 +
+          (currentIndex - midN - 1) * width +
+          FIXED_WIDTH * (currentIndex - midN);
+      }
+    } else {
+      rectX =
+        start[0] - width / 2 + (currentIndex - midN) * (width + FIXED_WIDTH);
+    }
+  }
+
+  rect = {
+    type: "rect",
+    shape: proxy.$echarts.graphic.clipRectByRect(
+      { x: rectX, y: end[1], width: width, height: start[1] - end[1] },
+      {
+        x: params.coordSys.x,
+        y: params.coordSys.y,
+        width: params.coordSys.width,
+        height: params.coordSys.height,
+      }
+    ),
+    style: api.style(),
+  };
+
+  return rect;
+};
+function rgb() {
+  //rgb颜色随机
+  const r = Math.floor(Math.random() * 256);
+  const g = Math.floor(Math.random() * 256);
+  const b = Math.floor(Math.random() * 256);
+  return `rgb(${r},${g},${b})`;
+}
+
+const change = (item: EDataPersonItem) => {
+  let Ebox;
+  if (!item.box) {
+    Ebox = proxy.$echarts.init(item.div, "dark");
+  } else {
+    Ebox = item.box;
+  }
+  Ebox.setOption(item.data);
+  item.box = Ebox;
+};
+onUpdated(() => {
+  setData()
+})
+watch(() => props.value, (val) => {
+
+  setData()
+}, { deep: true })
+onMounted(() => {
+  setData()
+});
+
+// return{setchartWH}
+</script>
+
+<style scoped>
+.pipebox {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/generalEnvironmentMechanical/components/power2023.vue b/src/views/generalEnvironmentMechanical/components/power2023.vue
new file mode 100644
index 0000000..4c33b67
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/power2023.vue
@@ -0,0 +1,278 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\generalEnvironmentMechanical\components\power2023.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-13 15:04:23
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+  <div ref="power" class="power-class"></div>
+</template>
+
+<script setup lang="ts">
+import { getCurrentInstance, onMounted, onUpdated, reactive, ref } from "vue";
+import { EDataPerson, EDataPersonItem } from "@/type/energyConsume";
+import { accAdd } from "@/utils/precision";
+import border4 from "@/components/borderBox/border6.vue";
+const { proxy } = getCurrentInstance() as any;
+let props = defineProps<{
+  title: string;
+  seriesVal: any[];
+  httpValue: any;
+}>();
+let power = ref();
+
+let refborder4 = ref();
+
+const echartsData = reactive<EDataPerson>({
+  power: {
+    div: null,
+    data: null,
+    title: "",
+    box: null,
+  },
+});
+
+const initEchart = () => {
+  if (props.httpValue.listData) {
+    console.log('zhixingle');
+    
+    let series = [];
+    props.httpValue.listData.forEach((res) => {
+      if (res.years == 2023) {
+        for (let key in res.month) {
+          series.push({
+            name: key + "月",
+            type: "bar",
+            stack: res.years,
+            emphasis: {
+              focus: "coordinateSystem",
+              label: {
+                show: true,
+                formatter: function (value, index) {
+                  return value.value.toLocaleString();
+                },
+              },
+            },
+            data: res.month[key],
+          });
+        }
+      }
+    });
+    //data0用于初始化计算的数据
+    let data0 = [];
+
+    for (let i = 1; i <= props.httpValue.name.length; i++) {
+      data0.push(0);
+    }
+
+    series.push({
+      name: "",
+      type: "bar",
+      data: data0,
+      color: "#bbf",
+      stack: props.httpValue.listData[1].years,
+      // barWidth: 30,
+      label: {
+        show: true,
+
+        position: "right",
+        color: "#fff",
+      },
+    });
+  }
+
+  echartsData.power!.div = power.value;
+  echartsData.power!.title = props.title;
+  echartsData.power!.data = {
+    title: {
+      text: echartsData.power!.title,
+      show: true,
+      textStyle: {
+        color: "#fff",
+        fontSize: 20,
+      },
+      top: "3%",
+    },
+    tooltip: {
+      trigger: "item",
+      axisPointer: {
+        // Use axis to trigger tooltip
+        type: "shadow", // 'shadow' as default; can also be 'line' or 'shadow',
+        axis: "auto",
+      },
+    },
+    // color:color,
+    legend: {
+      type: "scroll",
+      // width:400,
+      // right:20,
+      top: "11%",
+      // itemStyle:{
+      //     data:yue
+      //   },
+    },
+    grid: {
+      top: "20%",
+      left: "3%",
+      right: "10%",
+      bottom: "3%",
+      containLabel: true,
+    },
+    xAxis: {
+      type: "value",
+      splitLine: {
+        show: false,
+      },
+    },
+    yAxis: {
+      type: "category",
+      data: props.httpValue?.name,
+    },
+    series: props.seriesVal,
+  };
+
+  change(echartsData.power, props.httpValue);
+};
+const change = (item: EDataPersonItem, value: any) => {
+  let Ebox;
+  if (!item.box) {
+    Ebox = proxy.$echarts.init(item.div, "dark");
+  } else {
+    Ebox = item.box;
+  }
+  clacChartsSum(item.data, value);
+  Ebox.setOption(item.data);
+  item.box = Ebox;
+  changeecharts(item.data, value);
+};
+
+/**
+ * @函数功能: 修改用电量总数数值的标签
+ * @param {*} option echarts数据
+ * @param {*} value api接收数据
+ * @出口参数:
+ * @函数备注:
+ */
+const clacChartsSum = (option: any, value: any) => {
+  var series = option.series;
+  // function getSum1 (params) {
+  //     let stack=value.listData[0].years
+  //       var datavalue = 0
+  //       for (var i = 0; i < series.length; i++) {
+  //         if(series[i].stack==stack){
+  //           // datavalue += series[i].data[params.dataIndex]
+  //           datavalue=accAdd(datavalue,series[i].data[params.dataIndex])
+  //         }
+
+  //       }
+  //       return datavalue ? stack+'年/'+ datavalue+'kw.h' : null
+  //     }
+  function getSum2(params) {
+    let stack = value.listData[1].years;
+    var datavalue = 0;
+    for (var i = 0; i < series.length; i++) {
+      if (series[i].stack == stack) {
+        // datavalue += series[i].data[params.dataIndex]
+        datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
+      }
+    }
+    return datavalue ? datavalue.toLocaleString() : null;
+  }
+  console.log(series);
+
+  if (series.length) {
+    series[series.length - 1].label.formatter = getSum2;
+  }
+
+  // series[series.length - 2].label.formatter = getSum1
+};
+
+/**
+ * @函数功能: 修改用电量总数数值的标签
+ * @param {*} option echarts数据
+ * @param {*} value api接收数据
+ * @出口参数:
+ * @函数备注:
+ */
+const changeecharts = (option: any, value: any) => {
+  var series = option.series;
+
+  echartsData.power.box.on("legendselectchanged", (obj) => {
+    //重新计算今年年数据
+    function getSum2(params) {
+      let stack = value.listData[1].years;
+      var datavalue = 0;
+      for (var i = 0; i < series.length; i++) {
+        if (obj.selected[series[i].name]) {
+          if (series[i].stack == stack) {
+            // datavalue += series[i].data[params.dataIndex]
+            datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
+          }
+        }
+      }
+      return datavalue ? datavalue.toLocaleString() : null;
+    }
+    if(series.length){
+      series[series.length - 1].label.formatter = getSum2;
+    }
+
+    // series[series.length - 2].label.formatter = getSum1
+    echartsData.power.box.setOption(option);
+  });
+
+  function getSum2(params) {
+    let stack = value.listData[1].years;
+    var datavalue = 0;
+    for (var i = 0; i < series.length; i++) {
+      if (series[i].stack == stack) {
+        // datavalue += series[i].data[params.dataIndex]
+        datavalue = accAdd(datavalue, series[i].data[params.dataIndex]);
+      }
+    }
+    return datavalue ? datavalue.toLocaleString() : null;
+  }
+
+  if (series.length) {
+    series[series.length - 1].label.formatter = getSum2;
+  }
+
+  // series[series.length - 2].label.formatter = getSum1
+};
+let boxWH = reactive({
+  width: "0px",
+  height: "0px",
+});
+function setchartWH(width: any, height: any) {
+  echartsData.power!.div = power.value;
+  power.value.style.height = height + "px";
+  power.value.style.width = width + "px";
+  boxWH.height = height + 30 + "px";
+  boxWH.width = width + "px";
+  refborder4.value.resetWH();
+  if (echartsData.power.box) {
+    echartsData.power.box.resize();
+  }
+}
+
+onUpdated(() => {
+  initEchart();
+});
+onMounted(() => {
+  initEchart();
+});
+
+// return{setchartWH}
+defineExpose({
+  setchartWH,
+});
+</script>
+
+<style scoped>
+.power-class {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index bd0273d..5ff4e07 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -17,12 +17,20 @@
 
             </div>
             <div class="bottom-box">
-                <power style="width: 33%;height: 100%;box-sizing: border-box;" :title="powerTitle" :series="powerSeries"
-                    :listName="listName">
-                </power>
-                <div style="width: 33%;height: 100%;background: #bfb;">
+                <div style="width: 33%;height: 100%;">
+                    <border13>
+                        <power :title="powerData.title" :seriesVal="powerData.seriesVal" :httpValue="powerData.value"></power>
+                    </border13>
                 </div>
-                <div style="width: 33%;height: 100%;background: #bfc;">
+                <div style="width: 33%;height: 100%;">
+                    <border13>
+                        <pipe :title="t('messages.PipelinePressure_Mpa')" :value="pipeData"></pipe>
+                    </border13>
+                </div>
+                <div style="width: 33%;height: 100%;">
+                    <border13>
+                        <gas :title="t('messages.gashistory')" :value="gasData"></gas>
+                    </border13>
                 </div>
             </div>
         </div>
@@ -33,11 +41,14 @@
 import { onMounted, onUnmounted, reactive, ref } from 'vue'
 import header2 from '@/components/headerBox/header2.vue'
 import verticalNumLoop from './components/verticalNumLoop.vue'
-import power from './components/power.vue';
+import power from './components/power2023.vue';
+import gas from './components/gas.vue'
+import pipe from './components/pipe.vue'
+import border13 from '@/components/border/Border13.vue'
 import { getSafeWarningData, getpipeData } from "@/http/realtimeSecurity";
 import { getnoiseData } from "@/http/generalEnvironment";
 import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
-import { getPowerData } from "@/http/energyConsume";
+import { getPowerData,getconsumeDetail } from "@/http/energyConsume";
 import { useSocketStore } from "@/store/moduleSocketMechanics";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { gettime, clacendTime } from "@/utils/time"
@@ -69,10 +80,11 @@ const verticalType = {
     'noise': { icon: 'icon-shengyin', title: t('messages.noiseDetection'), unit: 'dB' },
 }
 /**用电量 */
-let listName = ref<string[]>()
-let powerTitle = t('messages.Powerto2023')
-let powerSeries = ref()
+let powerData=ref({value:{name:[]},seriesVal:[],title:t('messages.Powerto2023')})
 
+let gasData=ref(0)
+
+let pipeData=ref({listData:[],top:0})
 
 let headerref = ref()
 let verticalList: any[] = reactive([])
@@ -130,56 +142,80 @@ async function getSensorData() {
 }
 
 async function getPower_data() {
-    const { data }: any = await getPowerData({ time: 1 })
-    listName.value = data.name
+  let result: any = await getPowerData({ time: 1 });
 
+  if (result.code == 200) {
+    let series = [];
+    result.data.listData.forEach((res) => {
+    if (res.years == 2023) {
+      for (let key in res.month) {
+        series.push({
+          name: key + "月",
+          type: "bar",
+          stack: res.years,
+          emphasis: {
+            focus: "coordinateSystem",
+            label: {
+              show: true,
+              formatter: function (value, index) {
+                return value.value.toLocaleString();
+              },
+            },
+          },
+          data: res.month[key],
+        });
+      }
+    }
+  });
+  //data0用于初始化计算的数据
+  let data0 = [];
 
-    let series = []
-    data.listData.forEach(res => {
-        if (res.years == 2023) {
-            for (let key in res.month) {
-                series.push({
-                    name: key + '月',
-                    type: 'bar',
-                    stack: res.years,
-                    emphasis: {
-                        focus: 'coordinateSystem',
-                        label: {
-                            show: true,
-                            formatter: function (value, index) {
-                                return value.value.toLocaleString()
-                            }
-                        }
-                    },
-                    data: res.month[key]
-                })
-            }
+  for (let i = 1; i <= result.data.name.length; i++) {
+    data0.push(0);
+  }
+
+  series.push({
+    name: "",
+    type: "bar",
+    data: data0,
+    color: "#bbf",
+    stack: result.data.listData[1].years,
+    // barWidth: 30,
+    label: {
+      show: true,
+
+      position: "right",
+      color: "#fff",
+    },
+  });
+
+    powerData.value.value=result.data
+    powerData.value.seriesVal=series
+    powerData.value.title='机械分厂用电量'
+  }
+}
+async function getconsumeDetailfun(){
+  let result:any = await getconsumeDetail()
+  console.log(gasData.value);
+  if(result.code==200){
+    result.data.forEach(res=>{
+        if(res.deptName=='喷漆车间' && res.type=='GasDetail'){
+            gasData.value=res.usageNum
         }
     })
-    //data0用于初始化计算的数据
-    let data0 = []
 
-    for (let i = 1; i <= data.name.length; i++) {
-        data0.push(0)
-    }
-
-    series.push(
-        {
-            name: '',
-            type: 'bar',
-            data: data0,
-            color: '#bbf',
-            stack: data.listData[1].years,
-            // barWidth: 30,
-            label: {
-                show: true,
-                position: 'right',
-                color: '#fff'
-            }
-        }
-    )
-    powerSeries.value = series
+    console.log(gasData.value);
+    
+  }
+}
+async function getpipeDatafun() {
+  let pageValue = '6,7,9,10,11'
+  let result: any = await getpipeData({ deptIds: pageValue })
 
+  if (result.code == 200) {
+    pipeData.value.listData=result.data.listData
+    pipeData.value.top=result.data.top
+  }
 }
 
 function getWebsocket(val) {
@@ -235,8 +271,13 @@ function errWebsocket(val) {
 onMounted(() => {
     getSensorData()
     getPower_data()
+    getpipeDatafun()
+    getconsumeDetailfun()
     connectWebsocket(null, null, getWebsocket, errWebsocket);
 })
+onUnmounted(() => {
+    closeWebsocket();
+})
 </script>
 
 <style module>

From 2e98600815ce953d80910537069f62769ded269b Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Wed, 7 Jun 2023 17:47:28 +0800
Subject: [PATCH 11/29] =?UTF-8?q?1.=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6(?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F)=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../headerBox/dialog/headerDialog.vue         | 198 +++++++++++++-----
 src/components/headerBox/header2.vue          |  12 +-
 src/http/index.ts                             |   6 +-
 src/main.ts                                   |   4 +-
 src/utils/time.ts                             |  17 +-
 5 files changed, 175 insertions(+), 62 deletions(-)

diff --git a/src/components/headerBox/dialog/headerDialog.vue b/src/components/headerBox/dialog/headerDialog.vue
index a3898b0..7ba3e4b 100644
--- a/src/components/headerBox/dialog/headerDialog.vue
+++ b/src/components/headerBox/dialog/headerDialog.vue
@@ -10,88 +10,186 @@
 <template>
   <div>
     <el-dialog v-model="is_Show" title="历史报警记录" ref="" destroy-on-close>
-      <el-table :data="tableData" v-loading="dialogLoading" size="large" max-height="600px" stripe>
-        <el-table-column type="index" :index="indexMethod" label="序号"  min-width="10px" header-align="center" align="center"/>
-        <el-table-column property="context" label="报警详情"  header-align="center"/>
-      </el-table>
-      <div class=" pagination-class">
-        <el-pagination
-      v-model:current-page="searchConfig.pageNum"
-      v-model:page-size="searchConfig.pageSize"
-      :page-sizes="[5, 10, 50, 100]"
-      :small="small"
-      :disabled="disabled"
-      :background="background"
-      layout="  prev, pager, next, jumper,sizes"
-      :total="searchConfig.total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+      <div style="margin-bottom: 20px;">
+        <el-row :gutter="20">
+        <el-col :span="15">
+          <span style="margin-right: 10px;">日期：</span>
+          <el-date-picker
+            v-model="selectTime"
+            type="datetimerange"
+            :shortcuts="shortcuts"
+            range-separator="至"
+            format="YYYY/MM/DD HH:mm:ss"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+          />
+        </el-col>
+        <el-col :span="6">
+         
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="18">
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" plain @click="searchpartData">搜索</el-button>
+        </el-col>
+      </el-row>
       </div>
       
+      <el-table
+        :data="tableData"
+        v-loading="dialogLoading"
+        size="large"
+        max-height="600px"
+        stripe
+      >
+        <el-table-column
+          type="index"
+          :index="(searchConfig.pageNum - 1) * searchConfig.pageSize + 1"
+          label="序号"
+          min-width="10px"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column
+          property="context"
+          label="报警详情"
+          header-align="center"
+        />
+      </el-table>
+      <div class="pagination-class">
+        <el-pagination
+          v-model:current-page="searchConfig.pageNum"
+          v-model:page-size="searchConfig.pageSize"
+          :page-sizes="[5, 10, 50, 100]"
+          :small="small"
+          :disabled="disabled"
+          :background="background"
+          layout="  prev, pager, next, jumper,sizes"
+          :total="props.total"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
     </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref, watch } from "vue";
+import { gettime } from "@/utils/time";
 const props = defineProps({
   tableData: {
     type: Array,
     default: () => [],
   },
-  dialogTableVisible:{
+  dialogTableVisible: {
     type: Boolean,
     default: false,
   },
-  dialogLoading:{
+  dialogLoading: {
     type: Boolean,
     default: true,
   },
-  type:{
+  type: {
     type: String,
-    default: '',
+    default: "",
   },
-  total:{
+  total: {
     type: Number,
     default: 0,
   },
 });
 //总页数、每页数量、当前页
 const searchConfig = reactive({
-  type:props.type,
-  total:props.total,
-  pageSize:10,
-  pageNum:1
-})
-let small=ref(false)
-let disabled=ref(false)
-let background=ref(false)
-const emits = defineEmits(["update:dialogTableVisible",'getDialogdatafun']);
-const indexMethod = (index: number) => {
-  return index + 1
-}
+  type: props.type,
+  startTime: "",
+  endTime: "",
+  pageSize: 10,
+  pageNum: 1,
+});
+const selectTime = ref("");
+let small = ref(false);
+let disabled = ref(false);
+let background = ref(false);
+const emits = defineEmits(["update:dialogTableVisible", "getDialogdatafun"]);
 const is_Show = computed({
   get: () => props.dialogTableVisible,
   set: (val) => {
     emits("update:dialogTableVisible", val);
   },
-})
-const handleSizeChange = (val: number) => {
-  searchConfig.pageSize=val
-  emits("getDialogdatafun", searchConfig);
-}
-const handleCurrentChange = (val: number) => {
-  searchConfig.pageNum=val
-  emits("getDialogdatafun", searchConfig);
-}
-onMounted(() => {
+});
+computed({
+  get: () => props.type,
+  set: (val) => {
+    searchConfig.type = val;
+  },
+});
+watch(
+  () => selectTime,
+  (newVal, oldVal) => {
+    //监听父组件宽高变化，随时重置本组件尺寸
+    console.log(newVal.value);
+    
+    if (newVal.value) {
+      searchConfig.startTime = gettime(newVal.value[0], 2);
+      searchConfig.endTime = gettime(newVal.value[1], 2);
+    } else {
+      searchConfig.startTime = null;
+      searchConfig.endTime = null;
+    }
+  },
+  { immediate: true, deep: true }
+);
 
-  
-})
+const handleSizeChange = (val: number) => {
+  searchConfig.pageSize = val;
+
+  emits("getDialogdatafun", searchConfig);
+};
+const handleCurrentChange = (val: number) => {
+  searchConfig.pageNum = val;
+  emits("getDialogdatafun", searchConfig);
+};
+
+const shortcuts = [
+  {
+    text: "最近一周",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近一个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+      return [start, end];
+    },
+  },
+  {
+    text: "最近三个月",
+    value: () => {
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      return [start, end];
+    },
+  },
+];
+function searchpartData(){
+  emits("getDialogdatafun", searchConfig);
+}
+onMounted(() => {});
 </script>
 
 <style scoped>
-.pagination-class{
-  margin-top: 10px;
-}</style>
+.pagination-class {
+  margin-top: 20px;
+}
+</style>
diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue
index 4750404..616495b 100644
--- a/src/components/headerBox/header2.vue
+++ b/src/components/headerBox/header2.vue
@@ -100,7 +100,7 @@ import useNowTime from "@/hook/nowTime";
 import { ClickOutside as vClickOutside } from "element-plus";
 import { useRoute, useRouter } from "vue-router";
 import { devListType } from "@/type/InPlantProducts";
-import { getAlarmListData } from "@/http/index";
+import { getAlarmListData,getAlarmListHistoryData } from "@/http/index";
 import {
   onMounted,
   onUnmounted,
@@ -132,7 +132,7 @@ let popoverliDom = ref();
 let Abnormalpopovervisible = ref(false);
 let AbnormalpopovervisibleCtrl = ref(false); //解决点击历史报警数据弹窗外部关闭再打开问题
 //dialog
-let dialogdata = reactive([]);
+let dialogdata = ref([]);
 let dialogTableVisible = ref(false);
 let dialogLoading = ref(true);
 let dialogtotal=ref(0)
@@ -224,7 +224,7 @@ function langJudge() {
 }
 function showDialog() {
   if (dialogTableVisible.value == false) {
-    dialogdata.length = 0;
+    
     getDialogdatafun({
       type: AbnormalType.type,
       pageSize: 10,
@@ -235,12 +235,13 @@ function showDialog() {
   dialogTableVisible.value = true;
 }
 async function getDialogdatafun(config) {
+  // dialogdata.length = 0;
   dialogLoading.value = true;
-  let result: any = await getAlarmListData(config);
+  let result: any = await getAlarmListHistoryData(config);
 
   if (result.code == 200) {
     dialogtotal.value=result.total
-    dialogdata.push(...result.rows)
+    dialogdata.value=result.rows
     dialogLoading.value = false;
   }else{
     setTimeout(() => {
@@ -249,6 +250,7 @@ async function getDialogdatafun(config) {
     }
   }, 0);
   }
+ console.log(dialogdata);
  
 
 }
diff --git a/src/http/index.ts b/src/http/index.ts
index 11590ad..1a18726 100644
--- a/src/http/index.ts
+++ b/src/http/index.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \wwwd:\code\screenFront\src\http\index.ts
+ * @FilePath: \code\gitscreenFront\src\http\index.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-03-14 11:14:41
@@ -12,4 +12,8 @@ import {get,post} from "@/utils/http"
 //报警数据
 export function getAlarmListData(data:any){
     return get('/alarm/getAlarmList',data)
+}
+//报警历史数据查询
+export function getAlarmListHistoryData(data:any){
+    return get('/alarm/getAlarmListHistory',data)
 }
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 17be6fe..91ddfbc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -12,6 +12,8 @@ import App from './App.vue'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import 'element-plus/theme-chalk/dark/css-vars.css'
+import 'dayjs/locale/zh-cn'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 // import echarts from '@/utils/echarts.js'
 import echarts from '@/utils/echarts'
 import {createPinia} from 'pinia'
@@ -26,4 +28,4 @@ const store = createPinia()
 app.config.globalProperties.$echarts = echarts;//vue3的挂载方式
 app.use(store)
 app.use(i18n)
-app.use(router).use(ElementPlus).use(dataV).mount('#app')
\ No newline at end of file
+app.use(router).use(ElementPlus, {locale: zhCn,}).use(dataV).mount('#app')
\ No newline at end of file
diff --git a/src/utils/time.ts b/src/utils/time.ts
index 42824d4..698b05a 100644
--- a/src/utils/time.ts
+++ b/src/utils/time.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \daping\src\utils\time.ts
+ * @FilePath: \code\gitscreenFront\src\utils\time.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-07 13:43:31
@@ -9,10 +9,10 @@
  */
 
 import { getStoredLanguage } from "../utils/languageStorage";
-export function gettime(data = null) {
+export function gettime(data = null,type = 1) {
         var time
         if (data) {
-                time = new Date(data);
+                data instanceof Date? time=data : time = new Date(data);
         } else {
                 time = new Date();
         }
@@ -38,7 +38,14 @@ export function gettime(data = null) {
         if (minutes < 10) minutes = "0" + minutes;
         if (seconds < 10) seconds = "0" + seconds;
 
-        return year + "-" + month + "-" + dates + " " + hours + ':' + minutes + ':' + seconds + ' ' + arr[day];
+        if(type==1){
+                return year + "-" + month + "-" + dates + " " + hours + ':' + minutes + ':' + seconds + ' ' + arr[day];
+        }else if (type == 2){
+                return year + "-" + month + "-" + dates + " " + hours + ':' + minutes + ':' + seconds;
+        }else{
+                return year + "-" + month + "-" + dates + " " + hours + ':' + minutes + ':' + seconds + ' ' + arr[day];
+        }
+       
 }
 export function clacendTime(endtime, nowtime) {
         let newDate = Math.abs(endtime - nowtime)
@@ -47,4 +54,4 @@ export function clacendTime(endtime, nowtime) {
         var m = Math.floor(newDate / 1000 / 60 % 60)
         var s = Math.floor(newDate / 1000 % 60)
         return day + '天' + h + '时' + m + '分' + s + '秒'
-}
\ No newline at end of file
+}

From c52c841f2f64d5444a94ee0d3df59af9ff39b7f3 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 7 Jun 2023 19:02:08 +0800
Subject: [PATCH 12/29] =?UTF-8?q?=E5=B0=86=E6=9C=BA=E6=A2=B0=E5=88=86?=
 =?UTF-8?q?=E5=8E=82=20=E5=AE=89=E5=85=A8,=E5=B8=B8=E8=A7=84,=E8=83=BD?=
 =?UTF-8?q?=E8=80=97=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E5=88=B0=E4=B8=80=E4=B8=AA=E5=B1=8F=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/en.ts                        |   1 +
 src/locales/lang/zh.ts                        |   1 +
 src/store/moduleSocketMechanics.ts            |  42 ++--
 src/views/Mechanics/child/son/index.vue       |   2 +-
 .../components/humidity.vue                   | 202 ++++++++++++++++++
 .../components/pm.vue                         | 190 ++++++++++++++++
 .../components/power.vue                      |  92 ++++++++
 .../components/power2023.vue                  |   2 +-
 .../generalEnvironmentMechanical/index.vue    |  96 ++++++++-
 9 files changed, 607 insertions(+), 21 deletions(-)
 create mode 100644 src/views/generalEnvironmentMechanical/components/humidity.vue
 create mode 100644 src/views/generalEnvironmentMechanical/components/pm.vue
 create mode 100644 src/views/generalEnvironmentMechanical/components/power.vue

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index e72daba..e679f15 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -271,5 +271,6 @@ export default {
         '料场':'Raw Material Area',
         '危废暂存间':'dangerous waste temporary storage room',
         '历史数据':'Historical Data',
+        '环境 实时监测系统':'环境 实时监测系统',
       }
   }
\ No newline at end of file
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index ea47a71..8caca04 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -271,5 +271,6 @@ export default {
         '料场':'料场',
         '危废暂存间':'危废暂存间',
         '历史数据':'历史数据',
+        '环境 实时监测系统':'环境 实时监测系统',
       }
   }
\ No newline at end of file
diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts
index 884c91f..e9d1f63 100644
--- a/src/store/moduleSocketMechanics.ts
+++ b/src/store/moduleSocketMechanics.ts
@@ -8,17 +8,33 @@
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
  */
 import { defineStore } from "pinia";
-import {Names} from '@/store/storeName'
-import {gettime,clacendTime} from "@/utils/time"
-export const useSocketStore = defineStore(Names.socketjixiefenchang,{
+import { Names } from '@/store/storeName'
+import { gettime, clacendTime } from "@/utils/time"
+export const useSocketStore = defineStore(Names.socketjixiefenchang, {
     // 使用方式
     // const Index= useIndexStore()
     // 1、Index.{数据}++
     // 2、Index.$patch({数据:??})
     // 3、Index.$patch((state)=>{ state.数据=??})
     // 4、通过action修改
-    state:()=>{
-        return{
+    state: () => {
+        return {
+            humiture: [
+                { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" },
+                { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" },
+                { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" },
+                { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" },
+                { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" }
+            ],
+            pm: [
+                { "devId": "01336fd0-1fa0-11ed-9223-7db1174970a8", "name": "大件车间粉尘", "pm2": "26", "pm10": "33" }, 
+                { "devId": "083e3900-3435-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间粉尘", "pm2": "46", "pm10": "59" }, 
+                { "devId": "270e1500-eee1-11ed-b2ee-2d727e0cafab", "name": "精加车间粉尘", "pm2": "131", "pm10": "155" }, 
+                { "devId": "54058c30-eee3-11ed-b2ee-2d727e0cafab", "name": "机加车间粉尘", "pm2": "38", "pm10": "44" }, 
+                { "devId": "76efb040-eee3-11ed-b2ee-2d727e0cafab", "name": "大件车间粉尘", "pm2": "52", "pm10": "67" }, 
+                { "devId": "a6020310-eee3-11ed-b2ee-2d727e0cafab", "name": "大件车间粉尘", "pm2": "42", "pm10": "52" }, 
+                { "devId": "bcbfb530-88b2-11ed-a926-570995ad0254", "name": "精饰车间粉尘", "pm2": "9", "pm10": "12" }
+            ],
             newVerticalNum: [
                 {
                     "type": "TVOC",
@@ -114,16 +130,16 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
     //需要使用return将数据抛出
     //getters内可相互使用计算结果
     //使用时可直接放入标签内<div>Index.方法()</div>
-    getters:{
+    getters: {
 
     },
-    actions:{
+    actions: {
         //设置新的安全检测数据
         setNewVerticalNum(val) {
             this.newVerticalNum = val
         },
         //更新 新的安全检测数据
-        changeNewVerticalNum(val) {            
+        changeNewVerticalNum(val) {
             //{"type":"Smoke","data":{"name":"精饰车间烟雾传感器","val":"100"}}
             let pIndex = this.newVerticalNum.findIndex(item => item.type == val.type)
             let cIndex = null
@@ -131,17 +147,17 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
                 cIndex = this.newVerticalNum[pIndex].value.findIndex(item => item.devId == val.data.devId)
             }
             if (cIndex != -1) {
-                if (val.data.val>this.newVerticalNum[pIndex].limit) {
-                    
+                if (val.data.val > this.newVerticalNum[pIndex].limit) {
+
                     let now = new Date().getTime()
                     if (this.newVerticalNum[pIndex].value[cIndex].date == null) {
                         this.newVerticalNum[pIndex].value[cIndex].date = gettime()
                         this.newVerticalNum[pIndex].value[cIndex].time = now
                     }
-                    
+
                     let time = this.newVerticalNum[pIndex].value[cIndex].time
 
-                    this.newVerticalNum[pIndex].value[cIndex].continuous = clacendTime(now,time)
+                    this.newVerticalNum[pIndex].value[cIndex].continuous = clacendTime(now, time)
                 } else {
                     this.newVerticalNum[pIndex].value[cIndex].date = null
                     this.newVerticalNum[pIndex].value[cIndex].time = null
@@ -150,5 +166,5 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
                 this.newVerticalNum[pIndex].value[cIndex].status = true
             }
         }
-    }   
+    }
 })
\ No newline at end of file
diff --git a/src/views/Mechanics/child/son/index.vue b/src/views/Mechanics/child/son/index.vue
index bf7597e..7484a56 100644
--- a/src/views/Mechanics/child/son/index.vue
+++ b/src/views/Mechanics/child/son/index.vue
@@ -127,7 +127,7 @@ let data={
     stoptime:val.stoptime,//急停时长
     data:'2020-05-06',//采购日期
     src:imgurlAddXhr(val.data),//设备图片
-    timeguagu:Math.abs((val.ontime)/(val.ontime+val.offtime)*100).toFixed(1),//时间稼动率
+    timeguagu:Math.abs((val.ontime)/(val.ontime+val.offtime)*100).toFixed(1)||0,//时间稼动率
     MTBF:2724,//MTBF
     MTTR:169,//MTTR
     MTTF:2555,//MTTF
diff --git a/src/views/generalEnvironmentMechanical/components/humidity.vue b/src/views/generalEnvironmentMechanical/components/humidity.vue
new file mode 100644
index 0000000..ce462aa
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/humidity.vue
@@ -0,0 +1,202 @@
+<template>
+  <div class="container" ref="humiture">
+  </div>
+</template>
+  
+<script setup lang='ts'>
+import { getCurrentInstance, markRaw, onMounted, reactive, ref, watch } from "vue";
+const { proxy } = getCurrentInstance() as any;
+const props = defineProps<{
+  title: String;
+  value: any;
+}>();
+let humiture = ref();
+let chart = null
+watch(props, (newVal) => {
+  init()
+}, { deep: true, })
+function init() {
+
+  const chart = proxy.$echarts.init(humiture.value, 'dark');
+  let option = {
+    title: {
+      text: props.title,
+      show: true,
+      textStyle: {
+        color: "#fff",
+        fontSize: 20,
+      },
+      top: 5
+    },
+    grid: {
+      // 让图表占满容器
+      top: "0px",
+      left: "0px",
+      right: "0px",
+      bottom: "0px",
+    },
+    series: [
+      {
+        type: "gauge",
+        center: ["50%", "85%"],
+        startAngle: 190,
+        endAngle: -10,
+        radius: "50%",
+        min: -30,
+        max: 70,
+        splitNumber: 10,
+        progress: {
+          show: false,
+          width: 5
+        },
+        pointer: {
+          itemStyle: {
+            color: 'inherit'
+          }
+        },
+        //刻度轴宽
+        axisLine: {
+          lineStyle: {
+            width: 10,
+            color: [
+              [0.15, '#FF6E76'],
+              [0.75, '#7CFFB2'],
+              [1, '#FF6E76']
+            ]
+          }
+        },
+        //刻度线
+        axisTick: {
+          show: false,
+          distance: -5,
+          splitNumber: 5,
+          lineStyle: {
+            width: 2,
+            color: '#999'
+          }
+        },
+        //刻度线
+        splitLine: {
+          distance: 5,
+          length: 3,
+          lineStyle: {
+            width: 3,
+            color: '#999'
+          }
+        },
+        //表刻度值
+        axisLabel: {
+          distance: 15,
+          color: '#999',
+          fontSize: 10
+        },
+        anchor: {
+          show: false
+        },
+        title: {
+          show: false
+        },
+        detail: {
+          valueAnimation: true,
+          // width: '10%',
+          // lineHeight: 5,
+          // borderRadius: 8,
+          offsetCenter: [0, '25%'],
+          fontSize: 15,
+          // fontWeight: 'bolder',
+          formatter: '{value} °C',
+          color: 'inherit'
+        },
+        data: [
+          {
+            value: props.value.c
+          }
+        ]
+      },
+      {
+        type: "gauge",
+        center: ["50%", "50%"],
+        startAngle: 200,
+        endAngle: -20,
+        min: 0,
+        max: 100,
+        progress: {
+          show: false,
+          width: 5
+        },
+        pointer: {
+          itemStyle: {
+            color: 'inherit'
+          }
+        },
+        //刻度轴宽
+        axisLine: {
+          lineStyle: {
+            width: 10,
+            color: [
+              [0.15, '#FF6E76'],
+              [0.75, '#7CFFB2'],
+              [1, '#FF6E76']
+            ]
+          }
+        },
+        //刻度线
+        axisTick: {
+          distance: 0,
+          splitNumber: 5,
+          lineStyle: {
+            width: 2,
+            color: '#999'
+          }
+        },
+        //刻度线
+        splitLine: {
+          distance: 5,
+          length: 3,
+          lineStyle: {
+            width: 3,
+            color: '#999'
+          }
+        },
+        axisLabel: {
+          distance: 15,
+          color: '#999',
+          fontSize: 12
+        },
+        anchor: {
+          show: false
+        },
+        title: {
+          show: false
+        },
+        detail: {
+          valueAnimation: true,
+          offsetCenter: [0, '15%'],
+          fontSize: 20,
+          formatter: '{value} %RH',
+          color: 'inherit'
+        },
+        data: [
+          {
+            value: props.value.h
+          }
+        ]
+      },
+    ],
+  };
+
+  chart.setOption(option);
+}
+
+onMounted(() => {
+  init();
+});
+</script>
+  
+<style scoped>
+.container {
+  width: 100%;
+  height: 100%;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/generalEnvironmentMechanical/components/pm.vue b/src/views/generalEnvironmentMechanical/components/pm.vue
new file mode 100644
index 0000000..2c5b850
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/pm.vue
@@ -0,0 +1,190 @@
+<template>
+  <div class="container" ref="dust">
+  </div>
+</template>
+
+<script setup lang='ts'>
+import { getCurrentInstance, markRaw, onMounted, reactive, ref, watch } from "vue";
+const { proxy } = getCurrentInstance() as any;
+const props = defineProps<{
+  title: String;
+  value: any;
+}>();
+let dust = ref();
+let chart = ref(null)
+watch(props,(newVal)=>{
+  init()
+}, { deep: true,})
+function init() {
+  if (!chart.value) {
+  chart.value = proxy.$echarts.init(dust.value, 'dark');    
+  }
+  let option = {
+    title: {
+      text: props.title,
+      show: true,
+      textStyle: {
+        color: "#fff",
+        fontSize: 18,
+      },
+      top: '2%'
+    },
+    grid: {
+      // 让图表占满容器
+      top: "0px",
+      left: "0px",
+      right: "0px",
+      bottom: "0px",
+    },
+    series: [
+      {
+        type: "gauge",
+        center: ["50%", "90%"],
+        startAngle: 190,
+        endAngle: -10,
+        radius: "50%",
+        min: 0,
+        max: 100,
+        splitNumber: 10,
+        pointer: {
+          icon: "path://M12.8,0.7l12,40.1H0.7L12.8,0.7z",
+          length: "12%",
+          width: 10,
+          offsetCenter: [0, "-40%"],
+          itemStyle: {
+            color: "inherit",
+          },
+        },
+        axisLine: {
+          lineStyle: {
+            width: 8,
+            color: [
+              [0.35, "#7CFFB2"],
+              [0.75, "#FDDD60"],
+              [1, "#FF6E76"],
+            ],
+          },
+        },
+        axisTick: {
+          distance: 0,
+          splitNumber: 5,
+          lineStyle: {
+            width: 2,
+            color: "#999",
+          },
+        },
+        splitLine: {
+          distance: 5,
+          length: 8,
+          lineStyle: {
+            width: 3,
+            color: "#999",
+          },
+        },
+        axisLabel: {
+          distance: 12,
+          color: "#999",
+          fontSize: 10,
+        },
+        anchor: {
+          show: false,
+        },
+        detail: {
+          valueAnimation: true,
+          width: "60%",
+          lineHeight: 20,
+          borderRadius: 8,
+          offsetCenter: [0, "20%"],
+          fontSize: 15,
+          fontWeight: "bolder",
+          formatter: "{value} μg/m3",
+          color: "inherit",
+        },
+        title: {
+          // show: false,
+          offsetCenter: [0, "-20%"],
+        },
+        data: [
+          {
+            value: props.value.two,
+            name: "PM2.5",
+          },
+        ],
+      },
+      {
+        type: "gauge",
+        center: ["50%", "50%"],
+        startAngle: 200,
+        endAngle: -20,
+        min: 0,
+        max: 200,
+        axisLine: {
+          lineStyle: {
+            width: 10,
+            color: [
+              [0.35, "#7CFFB2"],
+              [0.75, "#FDDD60"],
+              [1, "#FF6E76"],
+            ],
+          },
+        },
+        pointer: {
+          itemStyle: {
+            color: "inherit",
+          },
+        },
+        axisTick: {
+          distance: -10,
+          length: 6,
+          lineStyle: {
+            color: "#fff",
+            width: 2,
+          },
+        },
+        splitLine: {
+          distance: -10,
+          length: 10,
+          lineStyle: {
+            color: "#fff",
+            width: 4,
+          },
+        },
+        axisLabel: {
+          color: "inherit",
+          distance: 20,
+          fontSize: 10,
+        },
+        detail: {
+          valueAnimation: true,
+          offsetCenter: [0, "20%"],
+          fontSize: 20,
+          formatter: "{value} μg/m3",
+          color: "inherit",
+        },
+        title: {
+          offsetCenter: [0, "-50%"],
+        },
+        data: [
+          {
+            value: props.value.ten,
+            name: "PM10",
+          },
+        ],
+      },
+    ],
+  };
+
+  chart.value.setOption(option);
+}
+
+onMounted(() => {
+  init();
+});
+</script>
+
+<style scoped>
+.container {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/generalEnvironmentMechanical/components/power.vue b/src/views/generalEnvironmentMechanical/components/power.vue
new file mode 100644
index 0000000..2273ff4
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/power.vue
@@ -0,0 +1,92 @@
+<template>
+    <div class="container">
+        <border4 ref="refborder4">
+            <template v-slot>
+                <div ref="power"></div>
+            </template>
+        </border4>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { getCurrentInstance, onMounted, reactive, ref,watch,onUpdated } from "vue"
+import border4 from "@/components/borderBox/border6.vue"
+const { proxy } = getCurrentInstance() as any;
+let props = defineProps<{
+    title: string,
+    series: any,
+    listName:string[]
+}>()
+
+let power = ref()
+let Ebox = null
+function init() {
+    Ebox = proxy.$echarts.init(power.value, "dark");
+    let option = {
+        title: {
+            text: props.title,
+            show: true,
+            textStyle: {
+                color: '#fff',
+                fontSize: 20
+            },
+            top: '3%',
+        },
+        tooltip: {
+            trigger: 'item',
+            axisPointer: {
+                // Use axis to trigger tooltip
+                type: 'shadow', // 'shadow' as default; can also be 'line' or 'shadow',
+                axis: 'auto',
+
+            },
+        },
+        // color:color,
+        legend: {
+            type: 'scroll',
+            // width:400,
+            // right:20,
+            top: '11%',
+            // itemStyle:{
+            //     data:yue
+            //   },
+        },
+        grid: {
+            top: "20%",
+            left: "3%",
+            right: "10%",
+            bottom: "3%",
+            containLabel: true,
+        },
+        xAxis: {
+            type: 'value',
+            splitLine: {
+                show: false
+            }
+        },
+        yAxis: {
+            type: 'category',
+            data: props.listName
+        },
+        series: props.series
+    };
+    Ebox.setOption(option)
+}
+
+watch(props,(newVal)=>{
+    
+},{deep:true})
+
+onMounted(()=>{
+    init()
+})
+
+</script>
+
+<style scoped>
+.container {
+    width: 100%;
+    height: 100%;
+    box-sizing: border-box;
+}
+</style>
diff --git a/src/views/generalEnvironmentMechanical/components/power2023.vue b/src/views/generalEnvironmentMechanical/components/power2023.vue
index 4c33b67..de3b942 100644
--- a/src/views/generalEnvironmentMechanical/components/power2023.vue
+++ b/src/views/generalEnvironmentMechanical/components/power2023.vue
@@ -74,7 +74,7 @@ const initEchart = () => {
       data: data0,
       color: "#bbf",
       stack: props.httpValue.listData[1].years,
-      // barWidth: 30,
+      barWidth: 40,
       label: {
         show: true,
 
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 5ff4e07..925207e 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -2,7 +2,7 @@
     <div :class="$style['container']">
         <div class="header">
             <div class="title">
-                <header2 ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.generalEnvironment')"
+                <header2 ref="headerref" :width="'100%'" :height="'150px'" :title="t('messages.环境 实时监测系统')"
                     :titleTip="titleTip" :typeFun="['AbnormalData', 'time']"
                     :alarmType="['noiseAlarm', 'temphuim', 'dustAlarm', 'saving']"></header2>
             </div>
@@ -14,7 +14,20 @@
                     <verticalNumLoop :title="item.title" :icon="item.icon" :limit="item.limit" :unit="item.unit"
                         :value="item.value"></verticalNumLoop>
                 </div>
-
+                <div style="width: 12%;height: 250px;margin-bottom: 10px;">
+                    <border13>
+                        <template v-slot>
+                            <pm :value="{two:store.pm[pmindex].pm10,ten:store.pm[pmindex].pm2}" :title="store.pm[pmindex].name"></pm>
+                        </template>
+                    </border13>
+                </div>
+                <div style="width: 12%;height: 250px;margin-bottom: 10px;">
+                    <border13>
+                        <template v-slot>
+                            <humidity :value="{c:store.humiture[humitureindex].temp,h:store.humiture[humitureindex].humidity}" :title="store.humiture[humitureindex].name+'温湿度'"></humidity>
+                        </template>
+                    </border13>
+                </div>
             </div>
             <div class="bottom-box">
                 <div style="width: 33%;height: 100%;">
@@ -42,6 +55,8 @@ import { onMounted, onUnmounted, reactive, ref } from 'vue'
 import header2 from '@/components/headerBox/header2.vue'
 import verticalNumLoop from './components/verticalNumLoop.vue'
 import power from './components/power2023.vue';
+import pm from './components/pm.vue';
+import humidity from './components/humidity.vue';
 import gas from './components/gas.vue'
 import pipe from './components/pipe.vue'
 import border13 from '@/components/border/Border13.vue'
@@ -88,6 +103,10 @@ let pipeData=ref({listData:[],top:0})
 
 let headerref = ref()
 let verticalList: any[] = reactive([])
+let pmtimer = null
+let humittimer = null
+
+
 //获取传感器实时数据
 async function getSensorData() {
     let list = []
@@ -140,7 +159,73 @@ async function getSensorData() {
 
     store.setNewVerticalNum(handle_vertical)
 }
+//获取温湿度数据
+let humitureindex = ref(0);
+async function gethumitureData() {
+  let result: any = await getHumitureData({ deptIds })
 
+  if (result.code == 200) {
+    store.$patch((state) => {
+      state.humiture = result.data.Humiture
+    })
+  }
+
+  humittimer = setInterval(()=>{
+    humitureindex.value++
+    if(humitureindex.value>=store.humiture.length){
+        humitureindex.value=0
+    }
+  },5000)
+}
+
+//获取粉尘数据
+let pmindex = ref(0);
+async function getPmData() {
+let resulttwo: any = await getPmtwoData()
+  let resultten: any = await getPmtenData()
+  let arr = [
+    '01336fd0-1fa0-11ed-9223-7db1174970a8',
+    '083e3900-3435-11ed-a7e1-fd42bca6c8c6',
+    '270e1500-eee1-11ed-b2ee-2d727e0cafab',
+    '54058c30-eee3-11ed-b2ee-2d727e0cafab',
+    '76efb040-eee3-11ed-b2ee-2d727e0cafab',
+    'a6020310-eee3-11ed-b2ee-2d727e0cafab',
+    'bcbfb530-88b2-11ed-a926-570995ad0254'
+  ]
+  let data = {}
+  if (resulttwo) {
+    resulttwo.data.forEach(ele => {
+        if (arr.indexOf(ele.devId) >-1 ) {
+            data[ele.devId] = {
+                devId: ele.devId,
+                name: ele.name + '粉尘',
+                pm2: ele.value,
+                pm10: null
+            }
+        }  
+    })
+  }
+
+  if (resultten) {
+    resultten.data.forEach(ele => {
+        if (data.hasOwnProperty(ele.devId)) {
+            data[ele.devId].pm10 = ele.value
+        }
+        
+    })
+  }
+  store.$patch((state) => {
+    state.pm = Object.values(data)
+  })
+  pmtimer = setInterval(()=>{
+    pmindex.value++
+    if(pmindex.value>=store.pm.length){
+      pmindex.value=0
+    }
+  },5000)
+
+}
+//获取用电量数据
 async function getPower_data() {
   let result: any = await getPowerData({ time: 1 });
 
@@ -180,7 +265,7 @@ async function getPower_data() {
     data: data0,
     color: "#bbf",
     stack: result.data.listData[1].years,
-    // barWidth: 30,
+    barWidth: 40,
     label: {
       show: true,
 
@@ -196,15 +281,12 @@ async function getPower_data() {
 }
 async function getconsumeDetailfun(){
   let result:any = await getconsumeDetail()
-  console.log(gasData.value);
   if(result.code==200){
     result.data.forEach(res=>{
         if(res.deptName=='喷漆车间' && res.type=='GasDetail'){
             gasData.value=res.usageNum
         }
     })
-
-    console.log(gasData.value);
     
   }
 }
@@ -273,6 +355,8 @@ onMounted(() => {
     getPower_data()
     getpipeDatafun()
     getconsumeDetailfun()
+    gethumitureData()
+    getPmData()
     connectWebsocket(null, null, getWebsocket, errWebsocket);
 })
 onUnmounted(() => {

From 9b27dae485ed854611912fcce5859cbe22678fdc Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 8 Jun 2023 10:43:27 +0800
Subject: [PATCH 13/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8E=AF=E5=A2=83=20?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E7=9B=91=E6=B5=8B=E7=B3=BB=E7=BB=9F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=B8=83=E5=B1=80=20=20=E9=A6=96=E9=A1=B5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../indexImg/generalEnvironmentMechanical.png | Bin 0 -> 83068 bytes
 src/store/moduleSocketMechanics.ts            |  42 ++-
 src/views/InPlantProducts/index.vue           |   4 +-
 .../components/gas.vue                        |   4 +-
 .../components/humidityBar.vue                | 198 +++++++++++++
 .../components/pipe.vue                       |   1 -
 .../components/power2023.vue                  |   2 -
 .../generalEnvironmentMechanical/index.vue    | 266 +++++++++---------
 src/views/index.vue                           |   7 +
 vue.config.js                                 |   4 +-
 10 files changed, 383 insertions(+), 145 deletions(-)
 create mode 100644 src/assets/indexImg/generalEnvironmentMechanical.png
 create mode 100644 src/views/generalEnvironmentMechanical/components/humidityBar.vue

diff --git a/src/assets/indexImg/generalEnvironmentMechanical.png b/src/assets/indexImg/generalEnvironmentMechanical.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a9da28804ac31f1fd5ecdf49a1c20b9ecab39fb
GIT binary patch
literal 83068
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
JPDHLkV1nZ)IVS)B

literal 0
HcmV?d00001

diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts
index e9d1f63..0e4a717 100644
--- a/src/store/moduleSocketMechanics.ts
+++ b/src/store/moduleSocketMechanics.ts
@@ -19,13 +19,15 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang, {
     // 4、通过action修改
     state: () => {
         return {
-            humiture: [
-                { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" },
-                { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" },
-                { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" },
-                { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" },
-                { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" }
-            ],
+            // humiture: [
+            //     { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" },
+            //     { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" },
+            //     { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" },
+            //     { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" },
+            //     { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" }
+            // ],
+            
+            humiture:{Humiture:[],bottom:{humidity:null,temp:null,name:null},top:{humidity:null,temp:null,name:null}}, //温湿度
             pm: [
                 { "devId": "01336fd0-1fa0-11ed-9223-7db1174970a8", "name": "大件车间粉尘", "pm2": "26", "pm10": "33" }, 
                 { "devId": "083e3900-3435-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间粉尘", "pm2": "46", "pm10": "59" }, 
@@ -165,6 +167,30 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang, {
                 this.newVerticalNum[pIndex].value[cIndex].val = val.data.val
                 this.newVerticalNum[pIndex].value[cIndex].status = true
             }
-        }
+        },
+        /**
+         * @函数功能: 
+         * @param {*} val 温湿度数据
+         * @出口参数: 
+         * @函数备注: 
+         */        
+        changeHumiture(val){
+            // console.log(this.humiture.Humiture);
+            
+            if(this.humiture.Humiture.length==0){
+                this.humiture=val
+            }else{
+                val.Humiture.forEach(res=>{
+                    this.humiture.Humiture.forEach(ele=>{
+                        if(res.name==ele.name){
+                            ele.humidity=res.humidity
+                            ele.temp=res.temp
+                        }
+                    })
+                })
+            }
+
+        },
     }
+    
 })
\ No newline at end of file
diff --git a/src/views/InPlantProducts/index.vue b/src/views/InPlantProducts/index.vue
index df5999c..fc2ca66 100644
--- a/src/views/InPlantProducts/index.vue
+++ b/src/views/InPlantProducts/index.vue
@@ -8,8 +8,8 @@
           :height="'150px'"
           :title="t('messages.InPlantProducts')"
           :titleTip="titleTip"
-          :typeFun="['AbnormalData','time']"
-          :alarmType="['inplant']"
+          :typeFun="['time']"
+          :alarmType="[]"
         ></header2>
         <!-- <div class="tip" style="display: flex;"> 
             <span class="tipspan"><div class="red"></div><span class="tipstring">网关离线</span></span>
diff --git a/src/views/generalEnvironmentMechanical/components/gas.vue b/src/views/generalEnvironmentMechanical/components/gas.vue
index 6ebd7c6..59ebec5 100644
--- a/src/views/generalEnvironmentMechanical/components/gas.vue
+++ b/src/views/generalEnvironmentMechanical/components/gas.vue
@@ -119,9 +119,7 @@ const change = (item:EDataPersonItem) => {
   item.box = Ebox;
 };
 
-onUpdated(() => {
-  console.log('数据更新');
-  
+onUpdated(() => {  
   setData()
 })
 // watch(() => props.value, (val) => {
diff --git a/src/views/generalEnvironmentMechanical/components/humidityBar.vue b/src/views/generalEnvironmentMechanical/components/humidityBar.vue
new file mode 100644
index 0000000..f34a32c
--- /dev/null
+++ b/src/views/generalEnvironmentMechanical/components/humidityBar.vue
@@ -0,0 +1,198 @@
+<template>
+    <div class="content-big" ref="humiture"></div>
+</template>
+
+<script setup lang='ts'>
+import { getCurrentInstance, onMounted, reactive, ref, watch } from "vue";
+import { useI18n } from 'vue-i18n'
+let { t } = useI18n();
+const { proxy } = getCurrentInstance() as any;
+const props = defineProps<{
+    title: any;
+    data: any;
+    bottom: any;
+    top: any;
+}>();
+let humiture = ref();
+let chart = null
+watch(() => props, (val) => {
+    init()
+}, { deep: true })
+
+function init() {
+    if (!chart) {
+        chart = proxy.$echarts.init(humiture.value, "dark");
+    }
+    let option = {
+        title: {
+            text: props.title,
+            top: '2%'
+        },
+        tooltip: {
+            trigger: "axis",
+            axisPointer: {
+                type: "shadow",
+            },
+
+        },
+        legend: {
+            // bottom: "3%",
+            top: '6%'
+        },
+        grid: {
+            top: "15%",
+            left: "3%",
+            right: "4%",
+            bottom: "3%",
+            containLabel: true,
+        },
+        color: ["#4992FF", "#7CFFB2", "#FF6E76"],
+        xAxis: {
+            type: "category",
+            data: props.data.list,
+            axisLabel: {
+                interval: 0
+            }
+        },
+        yAxis: {
+            type: "value",
+            boundaryGap: [0, 0.01],
+            axisLabel: {
+                formatter: "{value} (°C/%RH)",
+            },
+        },
+        series: [
+            {
+                name: `${t('messages.TemperatureRange')}(°C)(${t('messages.fanwei')}：${props.bottom.temp}°C - ${props.top.temp}°C)`,
+                type: "bar",
+                data: props.data.temp,
+                barWidth: '30%',
+                itemStyle: {
+                    color: function (params) {
+                        var index_color = params.value;
+                        if (
+                            index_color <= props.bottom.temp ||
+                            index_color >= props.top.temp
+                        ) {
+                            return "#FF6E76";
+                        } else {
+                            return "#4992FF";
+                        }
+                    },
+                },
+                label: {
+                    formatter: "{c} °C",
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                        color: "rgb(255,255,255,0.9)",
+                    },
+                },
+                markLine: {
+                    // 设置最大值和最小值
+                    silent: true, //基线显示 隐藏
+                    symbol: "none", // 不显示箭头和圆点
+                    data: [
+                        {
+                            name: t('messages.TemperatureRange'),
+                            yAxis: props.bottom.temp,
+                            label: {
+                                formatter: `${t('messages.TemperatureRange')}${t('messages.TemperatureRange_down')}： ${props.bottom.temp} °C`,
+                                position: "middle",
+                            },
+                            lineStyle: {
+                                color: "yellow", // 这儿设置安全基线颜色
+                            },
+                        },
+                        {
+                            name: t('messages.TemperatureRange'),
+                            yAxis: props.top.temp,
+                            label: {
+                                formatter: `${t('messages.TemperatureRange')}${t('messages.TemperatureRange_up')}：${props.top.temp} °C`,
+                                position: "middle",
+                            },
+                            lineStyle: {
+                                color: "yellow", // 这儿设置安全基线颜色
+                            },
+                        },
+                    ],
+                },
+            },
+            {
+                name: `${t('messages.HumidityRange')}(%RH)(${t('messages.fanwei')}：${props.bottom.humidity}%RH - ${props.top.humidity}%RH)`,
+                type: "bar",
+                data: props.data.humidity,
+                barWidth: '30%',
+                itemStyle: {
+                    color: function (params) {
+                        var index_color = params.value;
+
+                        if (
+                            index_color <= props.bottom.humidity ||
+                            index_color >= props.top.humidity
+                        ) {
+                            return "#FF6E76";
+                        } else {
+                            return "#7CFFB2";
+                        }
+                    },
+                },
+                label: {
+                    formatter: "{c} %RH",
+                    show: true,
+                    position: "top",
+                    textStyle: {
+                        color: "rgb(255,255,255,0.9)",
+                    },
+                },
+                markLine: {
+                    // 设置最大值和最小值
+                    silent: true, //基线显示 隐藏
+                    symbol: "none", // 不显示箭头和圆点
+                    data: [
+                        {
+                            name: "湿度",
+                            yAxis: props.bottom.humidity,
+                            label: {
+                                formatter: `${t('messages.HumidityRange')}${t('messages.TemperatureRange_down')}：` + props.bottom.humidity + "%RH",
+                                position: "middle",
+                            },
+                            lineStyle: {
+                                color: "red", // 这儿设置安全基线颜色
+                            },
+                        },
+                        {
+                            name: "湿度",
+                            yAxis: props.top.humidity,
+                            label: {
+                                formatter: `${t('messages.HumidityRange')}${t('messages.TemperatureRange_up')}：` + props.top.humidity + "%RH",
+                                position: "middle",
+                            },
+                            lineStyle: {
+                                color: "red", // 这儿设置安全基线颜色
+                            },
+                        },
+                    ],
+                },
+            },
+            {
+                name: t('messages.TemperatureHumidityexceeded'),
+                type: "bar",
+                color: '#FF6E76'
+            }
+        ],
+    };
+    chart.setOption(option);
+}
+
+onMounted(() => {
+    // init()
+})
+</script>
+
+<style scoped>
+.content-big {
+    width: 100%;
+    height: 100%;
+}
+</style>
diff --git a/src/views/generalEnvironmentMechanical/components/pipe.vue b/src/views/generalEnvironmentMechanical/components/pipe.vue
index 2efa2c2..d308e4b 100644
--- a/src/views/generalEnvironmentMechanical/components/pipe.vue
+++ b/src/views/generalEnvironmentMechanical/components/pipe.vue
@@ -31,7 +31,6 @@ const setData = () => {
   let x = [];
   let y = [];
   let sumx = [];
-  console.log(props.value,"ddd");
   
   props.value.listData.forEach((res) => {
     
diff --git a/src/views/generalEnvironmentMechanical/components/power2023.vue b/src/views/generalEnvironmentMechanical/components/power2023.vue
index de3b942..fd32e2a 100644
--- a/src/views/generalEnvironmentMechanical/components/power2023.vue
+++ b/src/views/generalEnvironmentMechanical/components/power2023.vue
@@ -37,7 +37,6 @@ const echartsData = reactive<EDataPerson>({
 
 const initEchart = () => {
   if (props.httpValue.listData) {
-    console.log('zhixingle');
     
     let series = [];
     props.httpValue.listData.forEach((res) => {
@@ -181,7 +180,6 @@ const clacChartsSum = (option: any, value: any) => {
     }
     return datavalue ? datavalue.toLocaleString() : null;
   }
-  console.log(series);
 
   if (series.length) {
     series[series.length - 1].label.formatter = getSum2;
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 925207e..c6f44ff 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -17,14 +17,15 @@
                 <div style="width: 12%;height: 250px;margin-bottom: 10px;">
                     <border13>
                         <template v-slot>
-                            <pm :value="{two:store.pm[pmindex].pm10,ten:store.pm[pmindex].pm2}" :title="store.pm[pmindex].name"></pm>
+                            <pm :value="{ two: store.pm[pmindex].pm10, ten: store.pm[pmindex].pm2 }"
+                                :title="store.pm[pmindex].name"></pm>
                         </template>
                     </border13>
                 </div>
                 <div style="width: 12%;height: 250px;margin-bottom: 10px;">
                     <border13>
                         <template v-slot>
-                            <humidity :value="{c:store.humiture[humitureindex].temp,h:store.humiture[humitureindex].humidity}" :title="store.humiture[humitureindex].name+'温湿度'"></humidity>
+                            <gas :title="t('messages.gashistory')" :value="gasData"></gas>
                         </template>
                     </border13>
                 </div>
@@ -32,7 +33,8 @@
             <div class="bottom-box">
                 <div style="width: 33%;height: 100%;">
                     <border13>
-                        <power :title="powerData.title" :seriesVal="powerData.seriesVal" :httpValue="powerData.value"></power>
+                        <power :title="powerData.title" :seriesVal="powerData.seriesVal" :httpValue="powerData.value">
+                        </power>
                     </border13>
                 </div>
                 <div style="width: 33%;height: 100%;">
@@ -42,7 +44,8 @@
                 </div>
                 <div style="width: 33%;height: 100%;">
                     <border13>
-                        <gas :title="t('messages.gashistory')" :value="gasData"></gas>
+                        <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
+                        </humidityBar>
                     </border13>
                 </div>
             </div>
@@ -51,19 +54,19 @@
 </template>
 
 <script setup lang='ts'>
-import { onMounted, onUnmounted, reactive, ref } from 'vue'
+import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
 import header2 from '@/components/headerBox/header2.vue'
 import verticalNumLoop from './components/verticalNumLoop.vue'
 import power from './components/power2023.vue';
 import pm from './components/pm.vue';
-import humidity from './components/humidity.vue';
+import humidityBar from './components/humidityBar.vue';
 import gas from './components/gas.vue'
 import pipe from './components/pipe.vue'
 import border13 from '@/components/border/Border13.vue'
 import { getSafeWarningData, getpipeData } from "@/http/realtimeSecurity";
 import { getnoiseData } from "@/http/generalEnvironment";
 import { getHumitureData, getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
-import { getPowerData,getconsumeDetail } from "@/http/energyConsume";
+import { getPowerData, getconsumeDetail } from "@/http/energyConsume";
 import { useSocketStore } from "@/store/moduleSocketMechanics";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { gettime, clacendTime } from "@/utils/time"
@@ -95,11 +98,11 @@ const verticalType = {
     'noise': { icon: 'icon-shengyin', title: t('messages.noiseDetection'), unit: 'dB' },
 }
 /**用电量 */
-let powerData=ref({value:{name:[]},seriesVal:[],title:t('messages.Powerto2023')})
+let powerData = ref({ value: { name: [] }, seriesVal: [], title: t('messages.Powerto2023') })
 
-let gasData=ref(0)
+let gasData = ref(0)
 
-let pipeData=ref({listData:[],top:0})
+let pipeData = ref({ listData: [], top: 0 })
 
 let headerref = ref()
 let verticalList: any[] = reactive([])
@@ -160,144 +163,150 @@ async function getSensorData() {
     store.setNewVerticalNum(handle_vertical)
 }
 //获取温湿度数据
-let humitureindex = ref(0);
 async function gethumitureData() {
-  let result: any = await getHumitureData({ deptIds })
+    let result: any = await getHumitureData({ deptIds })
 
-  if (result.code == 200) {
-    store.$patch((state) => {
-      state.humiture = result.data.Humiture
-    })
-  }
-
-  humittimer = setInterval(()=>{
-    humitureindex.value++
-    if(humitureindex.value>=store.humiture.length){
-        humitureindex.value=0
+    if (result.code == 200) {
+        store.$patch((state) => {
+            state.humiture = result.data
+        })
     }
-  },5000)
 }
+let humidityData = ref({})
+let humidityBottom = ref({})
+let humidityTop = ref({})
+watch(() => store.humiture, (newVal, oldVal) => {
+    let data = { list: [], temp: [], humidity: [] }
+    newVal.Humiture.forEach((res) => {
+        data.list.push(res.name);
+        data.temp.push(res.temp);
+        data.humidity.push(res.humidity);
+    });
+    humidityData.value = data;
+    humidityBottom.value = newVal.bottom;
+    humidityTop.value = newVal.top;
+}, { deep: true, immediate: true })
 
 //获取粉尘数据
 let pmindex = ref(0);
 async function getPmData() {
-let resulttwo: any = await getPmtwoData()
-  let resultten: any = await getPmtenData()
-  let arr = [
-    '01336fd0-1fa0-11ed-9223-7db1174970a8',
-    '083e3900-3435-11ed-a7e1-fd42bca6c8c6',
-    '270e1500-eee1-11ed-b2ee-2d727e0cafab',
-    '54058c30-eee3-11ed-b2ee-2d727e0cafab',
-    '76efb040-eee3-11ed-b2ee-2d727e0cafab',
-    'a6020310-eee3-11ed-b2ee-2d727e0cafab',
-    'bcbfb530-88b2-11ed-a926-570995ad0254'
-  ]
-  let data = {}
-  if (resulttwo) {
-    resulttwo.data.forEach(ele => {
-        if (arr.indexOf(ele.devId) >-1 ) {
-            data[ele.devId] = {
-                devId: ele.devId,
-                name: ele.name + '粉尘',
-                pm2: ele.value,
-                pm10: null
+    let resulttwo: any = await getPmtwoData()
+    let resultten: any = await getPmtenData()
+    let arr = [
+        '01336fd0-1fa0-11ed-9223-7db1174970a8',
+        '083e3900-3435-11ed-a7e1-fd42bca6c8c6',
+        '270e1500-eee1-11ed-b2ee-2d727e0cafab',
+        '54058c30-eee3-11ed-b2ee-2d727e0cafab',
+        '76efb040-eee3-11ed-b2ee-2d727e0cafab',
+        'a6020310-eee3-11ed-b2ee-2d727e0cafab',
+        'bcbfb530-88b2-11ed-a926-570995ad0254'
+    ]
+    let data = {}
+    if (resulttwo) {
+        resulttwo.data.forEach(ele => {
+            if (arr.indexOf(ele.devId) > -1) {
+                data[ele.devId] = {
+                    devId: ele.devId,
+                    name: ele.name + '粉尘',
+                    pm2: ele.value,
+                    pm10: null
+                }
             }
-        }  
-    })
-  }
-
-  if (resultten) {
-    resultten.data.forEach(ele => {
-        if (data.hasOwnProperty(ele.devId)) {
-            data[ele.devId].pm10 = ele.value
-        }
-        
-    })
-  }
-  store.$patch((state) => {
-    state.pm = Object.values(data)
-  })
-  pmtimer = setInterval(()=>{
-    pmindex.value++
-    if(pmindex.value>=store.pm.length){
-      pmindex.value=0
+        })
     }
-  },5000)
+
+    if (resultten) {
+        resultten.data.forEach(ele => {
+            if (data.hasOwnProperty(ele.devId)) {
+                data[ele.devId].pm10 = ele.value
+            }
+
+        })
+    }
+    store.$patch((state) => {
+        state.pm = Object.values(data)
+    })
+    pmtimer = setInterval(() => {
+        pmindex.value++
+        if (pmindex.value >= store.pm.length) {
+            pmindex.value = 0
+        }
+    }, 5000)
 
 }
 //获取用电量数据
 async function getPower_data() {
-  let result: any = await getPowerData({ time: 1 });
+    let result: any = await getPowerData({ time: 1 });
 
-  if (result.code == 200) {
-    let series = [];
-    result.data.listData.forEach((res) => {
-    if (res.years == 2023) {
-      for (let key in res.month) {
-        series.push({
-          name: key + "月",
-          type: "bar",
-          stack: res.years,
-          emphasis: {
-            focus: "coordinateSystem",
-            label: {
-              show: true,
-              formatter: function (value, index) {
-                return value.value.toLocaleString();
-              },
-            },
-          },
-          data: res.month[key],
+    if (result.code == 200) {
+        let series = [];
+        result.data.listData.forEach((res) => {
+            if (res.years == 2023) {
+                for (let key in res.month) {
+                    series.push({
+                        name: key + "月",
+                        type: "bar",
+                        stack: res.years,
+                        emphasis: {
+                            focus: "coordinateSystem",
+                            label: {
+                                show: true,
+                                formatter: function (value, index) {
+                                    return value.value.toLocaleString();
+                                },
+                            },
+                        },
+                        data: res.month[key],
+                    });
+                }
+            }
         });
-      }
-    }
-  });
-  //data0用于初始化计算的数据
-  let data0 = [];
+        //data0用于初始化计算的数据
+        let data0 = [];
 
-  for (let i = 1; i <= result.data.name.length; i++) {
-    data0.push(0);
-  }
-
-  series.push({
-    name: "",
-    type: "bar",
-    data: data0,
-    color: "#bbf",
-    stack: result.data.listData[1].years,
-    barWidth: 40,
-    label: {
-      show: true,
-
-      position: "right",
-      color: "#fff",
-    },
-  });
-
-    powerData.value.value=result.data
-    powerData.value.seriesVal=series
-    powerData.value.title='机械分厂用电量'
-  }
-}
-async function getconsumeDetailfun(){
-  let result:any = await getconsumeDetail()
-  if(result.code==200){
-    result.data.forEach(res=>{
-        if(res.deptName=='喷漆车间' && res.type=='GasDetail'){
-            gasData.value=res.usageNum
+        for (let i = 1; i <= result.data.name.length; i++) {
+            data0.push(0);
         }
-    })
-    
-  }
+
+        series.push({
+            name: "",
+            type: "bar",
+            data: data0,
+            color: "#bbf",
+            stack: result.data.listData[1].years,
+            barWidth: 40,
+            label: {
+                show: true,
+
+                position: "right",
+                color: "#fff",
+            },
+        });
+
+        powerData.value.value = result.data
+        powerData.value.seriesVal = series
+        powerData.value.title = '机械分厂用电量'
+    }
+}
+async function getconsumeDetailfun() {
+    let result: any = await getconsumeDetail()
+    if (result.code == 200) {
+        result.data.forEach(res => {
+            if (res.deptName == '喷漆车间' && res.type == 'GasDetail') {
+                gasData.value = res.usageNum
+            }
+        })
+
+    }
 }
 async function getpipeDatafun() {
-  let pageValue = '6,7,9,10,11'
-  let result: any = await getpipeData({ deptIds: pageValue })
+    let pageValue = '6,7,9,10,11'
+    let result: any = await getpipeData({ deptIds: pageValue })
 
-  if (result.code == 200) {
-    pipeData.value.listData=result.data.listData
-    pipeData.value.top=result.data.top
-  }
+    if (result.code == 200) {
+        pipeData.value.listData = result.data.listData
+        pipeData.value.top = result.data.top
+    }
 }
 
 function getWebsocket(val) {
@@ -337,6 +346,9 @@ function getWebsocket(val) {
         //   if (data.type == "waterPressure") {
         //     store.changePipe(data.msg);
         //   }
+        if (data.type == "humiture") {
+            store.changeHumiture(data.msg);
+        }
 
     } catch (err) {
         console.log(err, "报错了大哥", console.log(val)
diff --git a/src/views/index.vue b/src/views/index.vue
index f1ded6b..610a715 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -218,6 +218,13 @@ let routerList = [
     title: t("messages.generalEnvironmentjixiefenchang"),
     url: require("../assets/indexImg/generalEnvironment.png"),
   },
+  {
+    id: 31,
+    isLink: false,
+    path: "/generalEnvironmentMechanical",
+    title: t("messages.环境 实时监测系统"),
+    url: require("../assets/indexImg/generalEnvironmentMechanical.png"),
+  },
   {
     id: 24,
     isLink: false,
diff --git a/vue.config.js b/vue.config.js
index c9db7e9..47048b6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \daping\vue.config.js
+ * @FilePath: \screenFront\vue.config.js
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-01-29 15:16:36
@@ -14,7 +14,7 @@ module.exports = defineConfig(
     devServer: {
       proxy: {
         [process.env.VUE_APP_BASE_API]: {
-          // target: 'http://192.168.2.125:2222',          // 想要请求的url地址
+          // target: 'http://192.168.3.175:9015',          // 想要请求的url地址
           target: 'http://8.130.165.100:9015',
           // target: 'http://192.168.110.238:9015',
           ws: true,                 // 是否要开启代理

From 644dc8a06edad690acd609e417737c9b00dbcd10 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 8 Jun 2023 15:58:40 +0800
Subject: [PATCH 14/29] =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=9B=BE=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/headerBox/header2.vue          |   1 +
 src/http/Trend/index.ts                       |  15 ++
 src/locales/lang/en.ts                        |   1 +
 src/locales/lang/zh.ts                        |   1 +
 src/views/TrendChart/index.vue                | 136 +++++++----
 src/views/TrendChart/lineChart.vue            |  69 +++---
 .../generalEnvironmentMechanical/index.vue    |  32 ++-
 .../realtimeSecurity/content/content.vue      | 216 ++++++++++--------
 8 files changed, 296 insertions(+), 175 deletions(-)
 create mode 100644 src/http/Trend/index.ts

diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue
index 616495b..1b00108 100644
--- a/src/components/headerBox/header2.vue
+++ b/src/components/headerBox/header2.vue
@@ -502,6 +502,7 @@ h1 {
   left: 1.5rem;
   font-size: 3rem;
   color: #fff;
+  cursor: pointer;
 }
 .comeBack > i {
   font-size: 3rem;
diff --git a/src/http/Trend/index.ts b/src/http/Trend/index.ts
new file mode 100644
index 0000000..cec1269
--- /dev/null
+++ b/src/http/Trend/index.ts
@@ -0,0 +1,15 @@
+/*
+ * @FilePath: \wwwd:\code\screenFront\src\http\realtimeSecurity\index.ts
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-14 08:45:45
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+ */
+import {get,post} from "@/utils/http"
+
+//气压
+export function getCurrent24Trend(id:string){
+    return get('/dataTrend/getCurrent24Trend',{id})
+}
\ No newline at end of file
diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index e679f15..4a12262 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -272,5 +272,6 @@ export default {
         '危废暂存间':'dangerous waste temporary storage room',
         '历史数据':'Historical Data',
         '环境 实时监测系统':'环境 实时监测系统',
+        '传感器监测走势图':'传感器监测走势图',
       }
   }
\ No newline at end of file
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 8caca04..88f954e 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -272,5 +272,6 @@ export default {
         '危废暂存间':'危废暂存间',
         '历史数据':'历史数据',
         '环境 实时监测系统':'环境 实时监测系统',
+        '传感器监测走势图':'传感器监测走势图',
       }
   }
\ No newline at end of file
diff --git a/src/views/TrendChart/index.vue b/src/views/TrendChart/index.vue
index 6aef3b0..8d912eb 100644
--- a/src/views/TrendChart/index.vue
+++ b/src/views/TrendChart/index.vue
@@ -2,12 +2,13 @@
   <div :class="$style['container']">
     <div class="header">
       <div class="title">
-        <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="'传感器24H趋势图'" :titleTip="[]" :typeFun="['time']"
-          :alarmType="[]"></header2>
+        <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="t('messages.传感器监测走势图')" :titleTip="[]"
+          :typeFun="['comback', 'time']" :alarmType="[]"></header2>
       </div>
     </div>
     <div class="content">
-      <lineChart v-for="(calc, index) in calcArr" :style="{width:width+'px',height:height+'px','min-width':'calc(25% - 20px)'}" :calc="calc">
+      <lineChart v-for="(calc, index) in calcArr"
+        :style="{ width: width + 'px', height: height + 'px', 'min-width': 'calc(25% - 20px)' }" :calc="calc">
       </lineChart>
     </div>
   </div>
@@ -17,61 +18,108 @@
 import { ref, reactive, onMounted, onUnmounted } from "vue"
 import Header2 from "@/components/headerBox/header2.vue"
 import lineChart from "./lineChart.vue";
+import { getCurrent24Trend } from '@/http/Trend/index'
+import { useRoute } from "vue-router";
+import { useI18n } from 'vue-i18n'
+let { t } = useI18n();
+let route = useRoute()
+let ids = route.query.ids as string
+let unit = route.query.unit as string
+let timer = null
 type calcType = {
   name: string,
-  type: string,
-  max: number,
-  min: number,
-  avg: number,
+  math: {
+            key: string,
+            value: {
+                max: number,
+                min: number,
+                avg: number,
+                data: any[]
+            }
+        }[],
   data: any[]
 }
 let calcArr = ref<calcType[]>()
 let width = ref(1500)
 let height = ref(700)
-function ajax() {
-  setTimeout(() => {
-    let data = []
-    let length = 2
-    let element = {
-        name: '甲醛',
-        type: 'CH2O',
-        max: 0.1,
-        min: 0.01,
-        avg: 0.05,
-        data: [
-          ['2021-06-01 00:00:00', 10],
-          ['2021-06-01 00:00:10', 20],
-          ['2021-06-01 00:00:40', 50],
-          ['2021-06-01 00:01:20', 90],
-          ['2021-06-01 00:01:30', 100],
-          ['2021-06-01 00:01:40', 110],
-          ['2021-06-01 00:01:50', 120],
-          ['2021-06-01 00:02:30', 160],
-          ['2021-06-01 00:02:40', 170],
-          ['2021-06-01 00:03:10', 200],
-          ['2021-06-01 00:03:20', 210],
-          ['2021-06-01 00:03:30', 220],
-          ['2021-06-01 00:04:20', 270]
-        ]
+async function ajax() {
+  const res: any = await getCurrent24Trend(ids);
+  let data = []
+  if (res.code == 200) {
+    // data = res.data.map((item: any) => {
+    //   if (unit) {
+    //     item.name = item.name + '(' + unit + ')'
+    //   }
+    //   return {
+    //     name: item.name,
+    //     type: item.type,
+    //     max: item.max,
+    //     min: item.min,
+    //     avg: item.avg,
+    //     data: item.date.map((key, value) => [key, item.value[value]])
+    //   }
+    // })
+
+    let tempData = {}
+    res.data.forEach((item: any) => {
+      if (tempData.hasOwnProperty(item.id)) {
+        tempData[item.id].data.push({
+          name: item.type,
+          type: 'line',
+          showSymbol: false,
+          data: item.date.map((key, value) => [key, item.value[value]]),
+          smooth: true,
+        })
+        tempData[item.id].math.push({
+          key: item.type,
+          value: {
+            max: item.max,
+            min: item.min,
+            avg: item.avg
+          }
+        })
+      } else {
+        tempData[item.id] = {
+          name: item.name,
+          data: [{
+            name: item.type,
+            type: 'line',
+            showSymbol: false,
+            data: item.date.map((key, value) => [key, item.value[value]]),
+            smooth: true,
+          }],
+          math: [{
+            key: item.type,
+            value: {
+              max: item.max,
+              min: item.min,
+              avg: item.avg
+            }
+          }]
+        }
       }
-    for (let index = 0; index < length; index++) {
-      data.push(element)
-      
-    }
+    })
+    data = Object.values(tempData)
     calcArr.value = data
-    if (data.length<=4) {
-      width.value = 1900 / data.length-(data.length-1)*20;
-    } else if (data.length>4&&data.length<=8) {
-      width.value = width.value / 4-3*20;
-      height.value = 950 / 2-40;
+    if (data.length <= 4) {
+      width.value = 1900 / data.length - (data.length - 1) * 20;
+    } else if (data.length > 4 && data.length <= 8) {
+      width.value = width.value / 4 - 3 * 20;
+      height.value = 950 / 2 - 40;
     } else {
-      width.value = width.value / 4-3*20;
-      height.value = 950 / 3-60;
+      width.value = width.value / 4 - 3 * 20;
+      height.value = 950 / 3 - 60;
     }
-  })
+  }
 }
 onMounted(() => {
   ajax()
+  timer = setInterval(() => {
+    ajax()
+  }, 1000 * 60 * 10)
+})
+onUnmounted(() => {
+  clearInterval(timer)
 })
 </script>
 <style module>
diff --git a/src/views/TrendChart/lineChart.vue b/src/views/TrendChart/lineChart.vue
index 5af3e3a..87bad6d 100644
--- a/src/views/TrendChart/lineChart.vue
+++ b/src/views/TrendChart/lineChart.vue
@@ -1,11 +1,21 @@
 <template>
     <div class="container">
         <div class="chart" ref="chart"></div>
-        <ul>
-            <li><text class="key">最大值</text><text>{{ calc.max }}</text></li>
-            <li><text class="key">最小值</text><text>{{ calc.min }}</text></li>
-            <li><text class="key">平均值</text><text>{{ calc.avg }}</text></li>
-        </ul>
+        <div class="math-box">
+            <div class="math-content">
+                <div style="height: 25%;"> </div>
+                <div class="key">最大值</div>
+                <div class="key">最小值</div>
+                <div class="key">平均值</div>
+            </div>
+            <div class="math-content" v-for="(item,index) in calc.math">
+                <div :style="{color:color[index]}">{{ item.key }}</div>
+                <div>{{ item.value.max }}</div>
+                <div>{{ item.value.min }}</div>
+                <div>{{ item.value.avg }}</div>
+            </div>
+        </div>
+        
     </div>
 </template>
 
@@ -14,17 +24,23 @@ import { ref, onMounted, onUpdated, getCurrentInstance, watch } from "vue"
 const prop = defineProps<{
     calc: {
         name: string,
-        type: string,
-        max: number,
-        min: number,
-        avg: number,
-        data: number[]
+        math: {
+            key: string,
+            value: {
+                max: number,
+                min: number,
+                avg: number,
+                data: any[]
+            }
+        }[],
+        data: any
     }
 }>()
 const { proxy } = getCurrentInstance() as any
 const chart = ref()
 let myChart = null
 let data = prop.calc.data
+let color = ['#4281E5','#78F7AE','#FF6E40']
 function init() {
     myChart = proxy.$echarts.init(chart.value, 'dark');
     const option = {
@@ -33,6 +49,7 @@ function init() {
             top: "5%",
             left: "5%"
         },
+        color: color,
         tooltip: {
             trigger: 'axis',
         },
@@ -52,15 +69,7 @@ function init() {
         yAxis: {
             type: 'value',
         },
-        series: [
-            {
-                name: prop.calc.type,
-                type: 'line',
-                showSymbol: false,
-                data: data,
-                smooth: true,
-            }
-        ]
+        series: data
     };
     myChart.setOption(option);
 }
@@ -96,32 +105,24 @@ onMounted(() => {
 }
 
 .chart {
-    height: calc(100% - 60px);
+    height: calc(100% - 90px);
     width: 100%;
 }
-
-ul {
-    height: 60px;
+.math-box {
+    height: 90px;
     width: 100%;
     display: flex;
-    justify-content: space-around;
+    justify-content: end;
     align-items: center;
 }
-
-ul li {
+.math-content {
+    width: 100%;
     height: 100%;
-    width: 33%;
     display: flex;
+    flex-direction: column;
     justify-content: space-around;
     align-items: center;
 }
-
-ul>li:nth-child(2) {
-
-    border-right: 1px solid #fff;
-    border-left: 1px solid #fff;
-}
-
 .key {
     color: #ff6e40;
 }
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index c6f44ff..0f3aad0 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -11,10 +11,10 @@
             <div class="top-box">
                 <div style="width: 12%; height: 250px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-evenly;"
                     v-for="item in store.newVerticalNum">
-                    <verticalNumLoop :title="item.title" :icon="item.icon" :limit="item.limit" :unit="item.unit"
+                    <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 style="width: 12%;height: 250px;margin-bottom: 10px;">
+                <div style="width: 12%;height: 250px;margin-bottom: 10px;" @click="gotoTrendChart(store.pm, 'μg/m3')">
                     <border13>
                         <template v-slot>
                             <pm :value="{ two: store.pm[pmindex].pm10, ten: store.pm[pmindex].pm2 }"
@@ -54,6 +54,7 @@
 </template>
 
 <script setup lang='ts'>
+import { ElMessage, ElMessageBox } from 'element-plus'
 import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'
 import header2 from '@/components/headerBox/header2.vue'
 import verticalNumLoop from './components/verticalNumLoop.vue'
@@ -70,9 +71,10 @@ import { getPowerData, getconsumeDetail } from "@/http/energyConsume";
 import { useSocketStore } from "@/store/moduleSocketMechanics";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { gettime, clacendTime } from "@/utils/time"
-
+import {useRouter} from 'vue-router'
 import { useI18n } from 'vue-i18n'
 let { t } = useI18n();
+let router = useRouter()
 const store = useSocketStore();
 let deptIds = '6,7,9,10,11'
 let titleTip = [
@@ -109,6 +111,29 @@ let verticalList: any[] = reactive([])
 let pmtimer = null
 let humittimer = null
 
+/**
+ * 跳转到趋势图
+ */
+ function gotoTrendChart(value, unit) {
+  let ids = value.map((item) => item.devId).toString();
+  ElMessageBox.confirm(
+    '即将跳转到传感器监测走势图页面，是否继续？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'info',
+    }
+  )
+    .then(() => {
+      router.push({ path: '/TrendChart', query: { ids: ids, unit: unit } })
+    })
+    .catch(() => {
+
+    })
+
+}
+
 
 //获取传感器实时数据
 async function getSensorData() {
@@ -373,6 +398,7 @@ onMounted(() => {
 })
 onUnmounted(() => {
     closeWebsocket();
+    clearInterval(pmtimer)
 })
 </script>
 
diff --git a/src/views/realtimeSecurity/content/content.vue b/src/views/realtimeSecurity/content/content.vue
index 67e3a13..4d8fba8 100644
--- a/src/views/realtimeSecurity/content/content.vue
+++ b/src/views/realtimeSecurity/content/content.vue
@@ -1,96 +1,125 @@
 <template>
-<div>
-  <!-- <div class="topTip">
+  <div>
+    <!-- <div class="topTip">
     <toptip ref="toptip1"></toptip>
   </div> -->
-  <div  style="display: flex;">
-    <div style="width: 20%; height: 250px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-evenly;" v-for="item in store.newVerticalNum">
-      <verticalNumLoop :title="item.title"  :icon="item.icon" :limit="item.limit" :unit="item.unit" :value="item.value"></verticalNumLoop>
+    <div style="display: flex;">
+      <div
+        style="width: 20%; height: 250px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-evenly;"
+        v-for="item in store.newVerticalNum">
+        <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>
+    <div>
+      <el-row>
+        <el-col :span="6">
+          <pressure ref="perssure1" name="east" :title="t('messages.EastPumpPressure_Mpa')"></pressure>
+        </el-col>
+        <el-col :span="6">
+          <pressure ref="perssure2" name="west" :title="t('messages.WestPumpPressure_Mpa')"></pressure>
+        </el-col>
+        <el-col :span="12">
+          <pipe ref="pipe1" :title="t('messages.PipelinePressure_Mpa')"></pipe>
+        </el-col>
+      </el-row>
     </div>
-  </div>
-  <div>
-    <el-row>
-    <el-col :span="6">
-        <pressure ref="perssure1" name="east" :title="t('messages.EastPumpPressure_Mpa')"></pressure>
-    </el-col>
-    <el-col :span="6">
-        <pressure ref="perssure2" name="west" :title="t('messages.WestPumpPressure_Mpa')"></pressure>
-    </el-col>
-    <el-col :span="12">
-       <pipe ref="pipe1" :title="t('messages.PipelinePressure_Mpa')"></pipe>
-    </el-col>
-</el-row>
-  </div>
 
-</div>
+  </div>
 </template>
 
 <script setup lang="ts">
+import { ElMessage, ElMessageBox } from 'element-plus'
 import pressure from "./chart/pressure.vue"
 import pipe from "./chart/pipe.vue"
 // import toptip from "./chart/toptip.vue"
-import {onMounted, reactive, ref, watch} from "vue"
+import { onMounted, reactive, ref, watch } from "vue"
 import { calcWH } from "@/components/ts/selfAdaption";
 import verticalNumLoop from './chart/verticalNumLoop.vue'
 // import { getPressureData,getSafeWarningData } from "@/http/environment";
-import { getPressureData,getSafeWarningData,getpipeData } from "@/http/realtimeSecurity";
+import { getPressureData, getSafeWarningData, getpipeData } from "@/http/realtimeSecurity";
 import { useSocketStore } from "@/store/moduleSocket"
-import {gettime,clacendTime} from "@/utils/time"
+import { useRouter } from "vue-router"
+import { gettime, clacendTime } from "@/utils/time"
 import { useI18n } from 'vue-i18n'
-let {t} = useI18n();
+let { t } = useI18n();
+let router = useRouter()
 const store = useSocketStore()
-let props=defineProps<{
-    width:number,
-    height:number,
-    }>()
-watch(()=>props,(newVal, oldVal)=>{
+let props = defineProps<{
+  width: number,
+  height: number,
+}>()
+watch(() => props, (newVal, oldVal) => {
   //监听父组件宽高变化，随时重置本组件尺寸  
-  
+
   reset(newVal)
-},{immediate:true,deep:true,flush:'post'})
+}, { immediate: true, deep: true, flush: 'post' })
 
 // let toptip1=ref()
-let perssure1=ref()
-let perssure2=ref()
-let pipe1=ref()
+let perssure1 = ref()
+let perssure2 = ref()
+let pipe1 = ref()
 
 const verticalType = {
-  'TVOC': {icon: 'icon-TVOC-Outlined',title:t('messages.TVOCDetection'), unit: 'mg/m³'},
-  'Smoke': {icon: 'icon-yanwubaojingqi',title:t('messages.smokeDetection'), unit: "ppm"},
-  'Methane': {icon: 'icon-ranqi',title:t('messages.gasDetection'), unit: null},
-  'CH2O': {icon: 'icon-app_icons--',title:t('messages.CH2ODetection'), unit: 'mg/m³'},
-  'FIRE': {icon: 'icon-weibiaoti1',title:t('messages.flameDetection'), unit: null},
+  'TVOC': { icon: 'icon-TVOC-Outlined', title: t('messages.TVOCDetection'), unit: 'mg/m³' },
+  'Smoke': { icon: 'icon-yanwubaojingqi', title: t('messages.smokeDetection'), unit: "ppm" },
+  'Methane': { icon: 'icon-ranqi', title: t('messages.gasDetection'), unit: null },
+  'CH2O': { icon: 'icon-app_icons--', title: t('messages.CH2ODetection'), unit: 'mg/m³' },
+  'FIRE': { icon: 'icon-weibiaoti1', title: t('messages.flameDetection'), unit: null },
+}
+
+/**
+ * 跳转到趋势图
+ */
+function gotoTrendChart(value, unit) {
+  let ids = value.map((item) => item.devId).toString();
+  ElMessageBox.confirm(
+    '即将跳转到趋势图页面，是否继续？',
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'info',
+    }
+  )
+    .then(() => {
+      router.push({ path: '/TrendChart', query: { ids: ids, unit: unit } })
+    })
+    .catch(() => {
+
+    })
+
 }
 
 
-function reset(val:any){
+function reset(val: any) {
   //宽高为0时跳出该方法
-  
-  if(!val.width && !val.height) return
+
+  if (!val.width && !val.height) return
 
   //重置盒子尺寸
-  PressureBox(val.width,val.height)
-  pipeBox(val.width,val.height)
-  verticalNumBox(val.width,val.height)
+  PressureBox(val.width, val.height)
+  pipeBox(val.width, val.height)
+  verticalNumBox(val.width, val.height)
   // toptip1.value.setchartWH()
 }
-const PressureBox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,4,0)
+const PressureBox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 4, 0)
   //修改高度
-  perssure1.value.setchartWH(a.oWidth-50,a.oHeight*2)
-  perssure2.value.setchartWH(a.oWidth-50,a.oHeight*2)
+  perssure1.value.setchartWH(a.oWidth - 50, a.oHeight * 2)
+  perssure2.value.setchartWH(a.oWidth - 50, a.oHeight * 2)
 }
 
-const pipeBox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,2,0)
+const pipeBox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 2, 0)
   //修改高度
   // pipe1.value.setchartWH(a.oWidth-50,a.oHeight*2)
-  pipe1.value.setchartWH(a.oWidth-50,a.oHeight*2)
+  pipe1.value.setchartWH(a.oWidth - 50, a.oHeight * 2)
 }
 
-const verticalNumBox=(width:any,height:any)=>{
-  let a=calcWH(height,width,3,5,0)
-  a.oHeight=a.oHeight-40
+const verticalNumBox = (width: any, height: any) => {
+  let a = calcWH(height, width, 3, 5, 0)
+  a.oHeight = a.oHeight - 40
 }
 
 watch(
@@ -98,35 +127,35 @@ watch(
   (newVal, oldVal) => {
     //动态更新echarts
     //泵房气压
-    perssure1.value.setData(newVal.east,2)
-    perssure2.value.setData(newVal.west,2)
+    perssure1.value.setData(newVal.east, 2)
+    perssure2.value.setData(newVal.west, 2)
   },
   { deep: true, flush: "post" }
 );
-async function getPressureDatafun(){
-  let result:any = await getPressureData()
- 
-  if(result.code==200){
-    perssure1.value.setData(result.data.east,1)
-    perssure2.value.setData(result.data.west,1)
-    store.changePressure({east: result.data.east, west: result.data.west})
+async function getPressureDatafun() {
+  let result: any = await getPressureData()
+
+  if (result.code == 200) {
+    perssure1.value.setData(result.data.east, 1)
+    perssure2.value.setData(result.data.west, 1)
+    store.changePressure({ east: result.data.east, west: result.data.west })
   }
 }
-let vertical= reactive([]) 
-async function getSafeWarningDatafun(){
-  let result:any = await getSafeWarningData()
-  if(result.code==200){
-    let datetime = new Date().getTime();  
-    let handle_vertical = result.data.map((item:any)=>{
+let vertical = reactive([])
+async function getSafeWarningDatafun() {
+  let result: any = await getSafeWarningData()
+  if (result.code == 200) {
+    let datetime = new Date().getTime();
+    let handle_vertical = result.data.map((item: any) => {
       item.value.forEach(element => {
         if (element.name.includes("TVOC")) {
           element.name = element.name.split('TVOC')[0] + verticalType[item.type].title
         }
-        
-        if (element.val>item.limit) {          
+
+        if (element.val > item.limit) {
           element.date = gettime(element.ts),
-          element.time = element.ts||datetime
-          element.continuous = clacendTime(datetime,element.ts||datetime)
+            element.time = element.ts || datetime
+          element.continuous = clacendTime(datetime, element.ts || datetime)
         } else {
           element.date = null
           element.time = null
@@ -134,15 +163,15 @@ async function getSafeWarningDatafun(){
         }
       });
       return {
-        type:item.type,
-        icon:verticalType[item.type].icon,
-        title:verticalType[item.type].title,
-        limit:item.limit,
-        unit:verticalType[item.type].unit,
-        value:item.value
+        type: item.type,
+        icon: verticalType[item.type].icon,
+        title: verticalType[item.type].title,
+        limit: item.limit,
+        unit: verticalType[item.type].unit,
+        value: item.value
       }
     })
-    
+
     //console.log(result.data,'安全预警----------');
     store.setNewVerticalNum(handle_vertical)
   }
@@ -152,23 +181,23 @@ watch(
   (newVal, oldVal) => {
     //动态更新echarts
     //泵房气压
-    pipe1.value.setData(newVal,2)
+    pipe1.value.setData(newVal, 2)
   },
   { deep: true, flush: "post" }
 );
-async function getpipeDatafun(){
-  let result:any = await getpipeData({})
- 
-  if(result.code==200){
+async function getpipeDatafun() {
+  let result: any = await getpipeData({})
+
+  if (result.code == 200) {
     //设置组件样式
-    pipe1.value.setData({listData:result.data.listData,top:result.data.top},1)
+    pipe1.value.setData({ listData: result.data.listData, top: result.data.top }, 1)
 
     //将数据存入pinia
-    store.changePipe({listData:result.data.listData,top:result.data.top})
+    store.changePipe({ listData: result.data.listData, top: result.data.top })
   }
 }
 
-onMounted(()=>{
+onMounted(() => {
   getPressureDatafun()
   getSafeWarningDatafun()
   getpipeDatafun()
@@ -177,8 +206,7 @@ onMounted(()=>{
 </script>
 
 <style scoped>
-.topTip{
-  width:100%;
-  height:150px;
-}
-</style>
+.topTip {
+  width: 100%;
+  height: 150px;
+}</style>

From 7a9efc72a8baf3c85bf62ac6222433b095f7704a Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 8 Jun 2023 16:12:49 +0800
Subject: [PATCH 15/29] =?UTF-8?q?=E8=B6=8B=E5=8A=BF=E5=9B=BE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TrendChart/index.vue     | 3 +++
 src/views/TrendChart/lineChart.vue | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/views/TrendChart/index.vue b/src/views/TrendChart/index.vue
index 8d912eb..d32d3f4 100644
--- a/src/views/TrendChart/index.vue
+++ b/src/views/TrendChart/index.vue
@@ -62,6 +62,9 @@ async function ajax() {
 
     let tempData = {}
     res.data.forEach((item: any) => {
+        if (unit) {
+        item.name = item.name + '(' + unit + ')'
+      }
       if (tempData.hasOwnProperty(item.id)) {
         tempData[item.id].data.push({
           name: item.type,
diff --git a/src/views/TrendChart/lineChart.vue b/src/views/TrendChart/lineChart.vue
index 87bad6d..33fbaa4 100644
--- a/src/views/TrendChart/lineChart.vue
+++ b/src/views/TrendChart/lineChart.vue
@@ -77,11 +77,7 @@ function init() {
 watch(() => prop.calc.data, (newVal) => {
     data = newVal
     myChart.setOption({
-        series: [
-            {
-                data: data
-            }
-        ]
+        series: data
     })
 })
 

From 05f7321cc2b00371013ef5034d1bc46febace8f3 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Thu, 8 Jun 2023 16:15:41 +0800
Subject: [PATCH 16/29] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E7=B1=BB=E5=9E=8B=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../headerBox/dialog/headerDialog.vue         | 144 ++++++++++++++----
 src/components/headerBox/header2.vue          |   4 -
 2 files changed, 115 insertions(+), 33 deletions(-)

diff --git a/src/components/headerBox/dialog/headerDialog.vue b/src/components/headerBox/dialog/headerDialog.vue
index 7ba3e4b..7b220af 100644
--- a/src/components/headerBox/dialog/headerDialog.vue
+++ b/src/components/headerBox/dialog/headerDialog.vue
@@ -10,33 +10,52 @@
 <template>
   <div>
     <el-dialog v-model="is_Show" title="历史报警记录" ref="" destroy-on-close>
-      <div style="margin-bottom: 20px;">
+      <div style="margin-bottom: 20px">
         <el-row :gutter="20">
-        <el-col :span="15">
-          <span style="margin-right: 10px;">日期：</span>
-          <el-date-picker
-            v-model="selectTime"
-            type="datetimerange"
-            :shortcuts="shortcuts"
-            range-separator="至"
-            format="YYYY/MM/DD HH:mm:ss"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-          />
-        </el-col>
-        <el-col :span="6">
-         
-        </el-col>
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="18">
-        </el-col>
-        <el-col :span="6">
-          <el-button type="primary" plain @click="searchpartData">搜索</el-button>
-        </el-col>
-      </el-row>
+          <el-col :span="13">
+            <span style="margin-right: 10px">日期：</span>
+            <el-date-picker
+              v-model="selectTime"
+              type="datetimerange"
+              :shortcuts="shortcuts"
+              range-separator="至"
+              format="YYYY/MM/DD HH:mm:ss"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            />
+          </el-col>
+          <el-col :span="7">
+            <span style="margin-right: 10px">类型：</span>
+            <el-select v-model="searchConfig.alarmType" clearable placeholder="请选择报警类型">
+              <el-option
+                v-for="item in alarmTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" plain @click="searchpartData"
+              >搜索</el-button
+            >
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" plain @click="searchpartReset"
+              >重置</el-button
+            >
+          </el-col>
+        </el-row>
+        <!-- <el-row :gutter="20">
+          <el-col :span="18"> </el-col>
+          <el-col :span="6">
+            <el-button type="primary" plain @click="searchpartData"
+              >搜索</el-button
+            >
+          </el-col>
+        </el-row> -->
       </div>
-      
+
       <el-table
         :data="tableData"
         v-loading="dialogLoading"
@@ -103,6 +122,7 @@ const props = defineProps({
 });
 //总页数、每页数量、当前页
 const searchConfig = reactive({
+  alarmType:'',
   type: props.type,
   startTime: "",
   endTime: "",
@@ -113,6 +133,57 @@ const selectTime = ref("");
 let small = ref(false);
 let disabled = ref(false);
 let background = ref(false);
+//类型选项
+const alarmTypeOptions = [
+  {
+    value: 'pm25',
+    label: '粉尘pm2.5超标报警',
+  },
+  {
+    value: 'pm10',
+    label: '粉尘pm10超标报警',
+  },
+  {
+    value: 'flame',
+    label: '明火报警',
+  },
+  {
+    value: 'TVOC',
+    label: 'tvoc报警',
+  },
+  {
+    value: 'CH2O',
+    label: 'CH2O甲醛报警',
+  },
+  {
+    value: 'smoke',
+    label: '烟雾报警',
+  },
+  {
+    value: 'methane',
+    label: '燃气报警',
+  },
+  {
+    value: 'pressure',
+    label: '管道压力报警',
+  },
+  {
+    value: 'noise',
+    label: '噪音报警',
+  },
+  {
+    value: 'huim',
+    label: '湿度报警',
+  },
+  {
+    value: 'temp',
+    label: '温度报警',
+  },
+  {
+    value: 'offline',
+    label: '离线提醒',
+  },
+]
 const emits = defineEmits(["update:dialogTableVisible", "getDialogdatafun"]);
 const is_Show = computed({
   get: () => props.dialogTableVisible,
@@ -126,12 +197,14 @@ computed({
     searchConfig.type = val;
   },
 });
+watch(()=>props.type,
+(newVal, oldVal)=>{
+  searchConfig.type=newVal
+}, { immediate: true, deep: true })
 watch(
   () => selectTime,
   (newVal, oldVal) => {
-    //监听父组件宽高变化，随时重置本组件尺寸
-    console.log(newVal.value);
-    
+    //监听日期数据
     if (newVal.value) {
       searchConfig.startTime = gettime(newVal.value[0], 2);
       searchConfig.endTime = gettime(newVal.value[1], 2);
@@ -182,7 +255,20 @@ const shortcuts = [
     },
   },
 ];
-function searchpartData(){
+//搜索
+function searchpartData() {
+  console.log(searchConfig,'search');
+  
+  emits("getDialogdatafun", searchConfig);
+}
+//重置
+function searchpartReset(){
+  searchConfig.alarmType=''
+  selectTime.value=''
+  //需要重置startTime、endTime，因监听重置有延迟
+  searchConfig.startTime = null;
+  searchConfig.endTime = null;
+  console.log(searchConfig,'reset');
   emits("getDialogdatafun", searchConfig);
 }
 onMounted(() => {});
diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue
index 1b00108..1dde50f 100644
--- a/src/components/headerBox/header2.vue
+++ b/src/components/headerBox/header2.vue
@@ -235,7 +235,6 @@ function showDialog() {
   dialogTableVisible.value = true;
 }
 async function getDialogdatafun(config) {
-  // dialogdata.length = 0;
   dialogLoading.value = true;
   let result: any = await getAlarmListHistoryData(config);
 
@@ -250,9 +249,6 @@ async function getDialogdatafun(config) {
     }
   }, 0);
   }
- console.log(dialogdata);
- 
-
 }
 //判断是否显示对应组件后所做操作
 watch(

From ec097a587e4daabb11743628af51273c3da17aa6 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Thu, 8 Jun 2023 17:28:05 +0800
Subject: [PATCH 17/29] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E5=AD=97=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../headerBox/dialog/headerDialog.vue         | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/components/headerBox/dialog/headerDialog.vue b/src/components/headerBox/dialog/headerDialog.vue
index 7b220af..0bd7fb8 100644
--- a/src/components/headerBox/dialog/headerDialog.vue
+++ b/src/components/headerBox/dialog/headerDialog.vue
@@ -9,11 +9,11 @@
 -->
 <template>
   <div>
-    <el-dialog v-model="is_Show" title="历史报警记录" ref="" destroy-on-close>
+    <el-dialog title="历史报警记录" v-model="is_Show" ref="" destroy-on-close >
       <div style="margin-bottom: 20px">
         <el-row :gutter="20">
-          <el-col :span="13">
-            <span style="margin-right: 10px">日期：</span>
+          <el-col :span="15">
+            <span style="margin-right: 10px; font-size: 18px;">日期：</span>
             <el-date-picker
               v-model="selectTime"
               type="datetimerange"
@@ -22,11 +22,13 @@
               format="YYYY/MM/DD HH:mm:ss"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
+              size="large"
+              style="font-size: 18px;" 
             />
           </el-col>
-          <el-col :span="7">
-            <span style="margin-right: 10px">类型：</span>
-            <el-select v-model="searchConfig.alarmType" clearable placeholder="请选择报警类型">
+          <el-col :span="9">
+            <span style="margin-right: 10px; font-size: 18px;" >类型：</span>
+            <el-select v-model="searchConfig.alarmType" clearable placeholder="请选择报警类型" style="font-size: 18px;" size="large">
               <el-option
                 v-for="item in alarmTypeOptions"
                 :key="item.value"
@@ -35,33 +37,29 @@
               />
             </el-select>
           </el-col>
-          <el-col :span="2">
-            <el-button type="primary" plain @click="searchpartData"
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="18"> </el-col>
+          <el-col :span="6">
+            <el-button type="primary" plain @click="searchpartData"  size="large"
               >搜索</el-button
             >
-          </el-col>
-          <el-col :span="2">
-            <el-button type="primary" plain @click="searchpartReset"
+            <el-button type="primary" plain @click="searchpartReset"  size="large"
               >重置</el-button
             >
           </el-col>
+
         </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="18"> </el-col>
-          <el-col :span="6">
-            <el-button type="primary" plain @click="searchpartData"
-              >搜索</el-button
-            >
-          </el-col>
-        </el-row> -->
       </div>
 
       <el-table
         :data="tableData"
         v-loading="dialogLoading"
         size="large"
-        max-height="600px"
+        max-height="650px"
         stripe
+        style="font-size: 18px;"
       >
         <el-table-column
           type="index"
@@ -87,6 +85,8 @@
           :background="background"
           layout="  prev, pager, next, jumper,sizes"
           :total="props.total"
+          size="large"
+          style="font-size: 18px;"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         />
@@ -257,8 +257,6 @@ const shortcuts = [
 ];
 //搜索
 function searchpartData() {
-  console.log(searchConfig,'search');
-  
   emits("getDialogdatafun", searchConfig);
 }
 //重置
@@ -268,7 +266,6 @@ function searchpartReset(){
   //需要重置startTime、endTime，因监听重置有延迟
   searchConfig.startTime = null;
   searchConfig.endTime = null;
-  console.log(searchConfig,'reset');
   emits("getDialogdatafun", searchConfig);
 }
 onMounted(() => {});
@@ -278,4 +275,10 @@ onMounted(() => {});
 .pagination-class {
   margin-top: 20px;
 }
+:deep(.el-dialog__title){
+  font-size: 25px ; 
+}
+.el-row {
+  margin-bottom: 20px;
+}
 </style>

From 13fd2805cbb5f15693a918fff3fde109051e1bc4 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 8 Jun 2023 18:07:29 +0800
Subject: [PATCH 18/29] =?UTF-8?q?=E6=B7=BB=E5=8A=A0title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/TrendChart/index.vue                   | 1 +
 src/views/generalEnvironmentMechanical/index.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/TrendChart/index.vue b/src/views/TrendChart/index.vue
index d32d3f4..db26d17 100644
--- a/src/views/TrendChart/index.vue
+++ b/src/views/TrendChart/index.vue
@@ -26,6 +26,7 @@ let route = useRoute()
 let ids = route.query.ids as string
 let unit = route.query.unit as string
 let timer = null
+document.title = t('messages.传感器监测走势图')
 type calcType = {
   name: string,
   math: {
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 0f3aad0..a39fae9 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -77,6 +77,7 @@ let { t } = useI18n();
 let router = useRouter()
 const store = useSocketStore();
 let deptIds = '6,7,9,10,11'
+document.title = t('messages.环境 实时监测系统')
 let titleTip = [
     {
         color: "#E43961",

From d79c179fce51154bf8151a9717981456dd2f55e7 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Fri, 9 Jun 2023 17:23:05 +0800
Subject: [PATCH 19/29] =?UTF-8?q?1.=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E8=83=BD=E8=80=97=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=B0=B4=E9=87=8F?=
 =?UTF-8?q?=202.=E7=B2=BE=E9=A5=B0=E8=BD=A6=E9=97=B4=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=B0=94=E3=80=81=E7=94=A8=E6=B0=B4?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PaintShopView/View1/bottom.vue      | 64 +++++++++++-------
 src/views/PaintShopView/View1/index.vue       | 11 ++++
 .../content/chart/water.vue                   | 65 ++++++++++---------
 .../content/top.vue                           | 36 ++++++++--
 4 files changed, 113 insertions(+), 63 deletions(-)

diff --git a/src/views/PaintShopView/View1/bottom.vue b/src/views/PaintShopView/View1/bottom.vue
index 3c3f404..dc201fa 100644
--- a/src/views/PaintShopView/View1/bottom.vue
+++ b/src/views/PaintShopView/View1/bottom.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \gitscreenFront\src\views\PaintShopView\View1\bottom.vue
+ * @FilePath: \code\gitscreenFront\src\views\PaintShopView\View1\bottom.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 14:43:28
@@ -12,8 +12,9 @@
     <el-row>
       <el-col :span="24">
         <div style="display: flex;justify-content: space-evenly; align-items: center; margin-bottom: 10px;">
-          <chart :title="powerOption.title" :option="powerOption.option" ref="powerref"></chart>
+            <chart :title="powerOption.title" :option="powerOption.option" ref="powerref"></chart>
           <chart :title="powerOption.title" :option="powerOption.option" ref="Productionref"></chart>
+
           <div>
             <border6 ref="borderref">
               <template v-slot>
@@ -21,6 +22,12 @@
               </template>
             </border6>
           </div>
+          <div>
+            <gas ref="gasref" :title="t('messages.gasto2023')"></gas>
+            <!-- 调整高度间距div -->
+            <div style="width: 100%;height: 10px;"></div>
+            <water ref="waterref" :title="t('messages.waterto2023')"></water>
+          </div>
         </div>
       </el-col>
     </el-row>
@@ -37,6 +44,8 @@ import border3 from "@/components/borderBox/border3.vue";
 import pm from "./../components/pm.vue";
 import power from "./chart/power2023.vue";
 import chart from "@/components/assembly/chart2.vue";
+import gas from "./chart/gas.vue";
+import water from "./chart/water.vue";
 import { useRoute, useRouter } from "vue-router";
 import { useEnergyConsumeStore } from "@/store/module/energyConsume";
 import { useI18n } from 'vue-i18n'
@@ -49,6 +58,9 @@ let Productionref = ref();
 let borderref = ref()
 let pmref = ref()
 let pm_timer = null
+
+let gasref = ref();
+let waterref = ref();
 let props = defineProps<{
   width: number;
   height: number;
@@ -72,12 +84,13 @@ function reset(val: any) {
 }
 
 const powerBox = (width: any, height: any) => {
-  let a = calcWH(height, width, 1, 3, 0);
+  let a = calcWH(height, width, 1, 24, 0);
   //修改高度
-  powerref.value.setchartWH(a.oWidth - 20, a.oHeight - 20);
-  Productionref.value.setchartWH(a.oWidth - 20, a.oHeight - 20);
-  pmref.value.setchartWH(a.oWidth - 40, a.oHeight - 40)
-  //   yields.value.setchartWH(a.oWidth, a.oHeight - 30);
+  powerref.value.setchartWH(a.oWidth*7 - 20, a.oHeight - 20);
+  Productionref.value.setchartWH(a.oWidth*7 - 20, a.oHeight - 20);
+  pmref.value.setchartWH(a.oWidth*7 - 40, a.oHeight - 40)
+  gasref.value.setchartWH(a.oWidth*3-20, a.oHeight/2 - 20);
+  waterref.value.setchartWH(a.oWidth*3-20, a.oHeight/2 - 20);
 };
 let powerOption = reactive({
   title: "",
@@ -103,9 +116,9 @@ let powerOption = reactive({
       right: 20,
     },
     grid: {
-      top: "8%",
+      top: "13%",
       left: "3%",
-      right: "0%",
+      right: "5%",
       bottom: "3%",
       containLabel: true,
     },
@@ -146,9 +159,9 @@ let ProductionOption = reactive({
       right: 20,
     },
     grid: {
-      top: "8%",
+      top: "13%",
       left: "3%",
-      right: "0%",
+      right: "5%",
       bottom: "3%",
       containLabel: true,
     },
@@ -166,20 +179,6 @@ let ProductionOption = reactive({
   },
 });
 let Data = { power: { "1月": 11, "2月": 22, "3月": 11, "4月": 22 }, Production: { "1月": 11, "2月": 22, "3月": 11, "4月": 22 } }
-//   async function getpower() {
-//     let result: any = await getPowerData({ time: 1 });
-
-//     if (result.code == 200) {
-//       result.data.name = result.data.name.reverse();
-//       result.data.listData.forEach((res) => {
-//         for (let key in res.month) {
-//           res.month[key] = res.month[key].reverse();
-//         }
-//       });
-//       power1.value.setData(result.data);
-//       // yields.value.setData(result.data);
-//     }
-//   }
 let pm_index = 0
 function setcontentData(val) {
   clearInterval(pm_timer)
@@ -279,6 +278,20 @@ function setcontentData(val) {
       }
     }, 3000)
   }
+
+  
+}
+  // 用水量用气量
+function setWaterGas(val:any){
+console.log(val);
+val.forEach(res=>{
+  if(res.deptName=='喷漆车间' && res.type=='GasDetail'){
+    gasref.value.setData(res.usageNum);
+  }
+  if(res.deptName=='生产区' && res.type=='WaterDetail'){
+    waterref.value.setData(res.usageNum);
+  }
+})
 }
 onMounted(() => {
 });
@@ -287,6 +300,7 @@ onUnmounted(() => {
 });
 defineExpose({
   setcontentData,
+  setWaterGas
 });
 </script>
 
diff --git a/src/views/PaintShopView/View1/index.vue b/src/views/PaintShopView/View1/index.vue
index 08edab6..3b9d4e6 100644
--- a/src/views/PaintShopView/View1/index.vue
+++ b/src/views/PaintShopView/View1/index.vue
@@ -36,6 +36,7 @@ import { calcWH } from '@/components/ts/selfAdaption'
 import { Offsite } from "@/store/module/offsite";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { getSensorByDept } from "@/http/PaintShopView/index";
+import {getconsumeDetail} from '@/http/energyConsume'
 import bottom from "./bottom.vue"
 import top from "./top.vue"
 import { useI18n } from 'vue-i18n'
@@ -77,6 +78,15 @@ async function getSensorByDeptfun() {
     bottomref.value.setcontentData(result.data)
   }
 }
+
+async function getconsumeDetailfun(){
+  let result:any = await getconsumeDetail()
+ 
+  if(result.code==200){
+    bottomref.value.setWaterGas(result.data)
+  }
+}
+
 function getWebsocket(val) {
   // headerref.value.HeadergetWebsocket(val)
   try {
@@ -108,6 +118,7 @@ onMounted(() => {
     }, 1000);
   })
   getSensorByDeptfun()
+  getconsumeDetailfun()
   connectWebsocket(null, null, getWebsocket, errWebsocket);
 })
 onUnmounted(() => {
diff --git a/src/views/energyConsumeJixiefenchang/content/chart/water.vue b/src/views/energyConsumeJixiefenchang/content/chart/water.vue
index 7046975..ee400c6 100644
--- a/src/views/energyConsumeJixiefenchang/content/chart/water.vue
+++ b/src/views/energyConsumeJixiefenchang/content/chart/water.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \wang-vue-worke:\demo\daping\src\views\energyConsume\content\chart\water.vue
+ * @FilePath: \code\gitscreenFront\src\views\energyConsumeJixiefenchang\content\chart\water.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-14 13:24:12
@@ -9,13 +9,13 @@
 -->
 
 <template>
-    <div class="waterborder">
-  <border4 ref="refborder4">
+    <div class="gasborder">
+  <border6 ref="refborder4">
       <template v-slot>
         <!-- <h1>{{props.title}}</h1> -->
-        <div ref="water"></div>
+        <div ref="gas" ></div>
       </template>
-  </border4>
+  </border6>
   </div>
 </template>
 
@@ -23,19 +23,17 @@
 import {getCurrentInstance, onMounted, reactive, ref} from "vue"
 import {EDataPerson,EDataPersonItem} from '@/type/energyConsume'
 import 'echarts-liquidfill'
-
-import border4 from "@/components/borderBox/border4.vue"
+import border6 from "@/components/borderBox/border6.vue";
 const { proxy } = getCurrentInstance() as any;
 let props=defineProps<{
       title:string,
-      data:any
       }>()
-let water=ref()
+let gas=ref()
 
 let refborder4=ref()
 
 const echartsData = reactive<EDataPerson>({
-    water:{
+    gas:{
       div:null,
       data:null,
       title:'',
@@ -43,22 +41,24 @@ const echartsData = reactive<EDataPerson>({
   },
 })
 
-const setData=()=>{
-
-    echartsData.water!.div=water.value
-  echartsData.water!.title=props.title
-  echartsData.water!.data=({
+const setData=(value:any)=>{
+  
+  echartsData.gas!.div=gas.value
+  echartsData.gas!.title=props.title
+  echartsData.gas!.data=({
           title: {
             // 标题
-            text: echartsData.water!.title,
+            text: echartsData.gas!.title,
             textStyle:{
           color:'#fff',
           fontSize:20
-            }
+            },
+            top:'2%'
           },
            series: [{
     type: 'liquidFill',
     radius: '80%', //水球大小
+    shape:'rect',
     center: ['50%', '50%'],
     waveAnimation: true,
     color: [
@@ -95,7 +95,9 @@ const setData=()=>{
           fontWeight: 'bold',
           color: '#fff',
         },
-        formatter:props.data
+        formatter:function(params){
+          return value
+        }
       },
       
     },
@@ -109,8 +111,7 @@ const setData=()=>{
             }],
         })
 
-
-change(echartsData.water)
+change(echartsData.gas)
 }
 
 const change = (item:EDataPersonItem) => {
@@ -123,32 +124,32 @@ item.box = Ebox
 };
 
 function setchartWH(width:any,height:any){
-    echartsData.water!.div=water.value
-    water.value.style.height=height+'px'
-    water.value.style.width=width+'px'
+    // echartsData.water!.div=water.value
+    gas.value.style.height=height-20+'px'
+    gas.value.style.width=width+'px'
   
   refborder4.value.resetWH()
-if(echartsData.water.box){
-  echartsData.water.box.resize()
+if(echartsData.gas.box){
+  echartsData.gas.box.resize()
 }
 
 }
 onMounted(() => {
-    setData()
+  // setData()
 })
 
 // return{setchartWH}
 defineExpose({
   setchartWH,
-//   setData
+  setData
 })
 
 </script>
 
 <style scoped>
-.waterBox{
-    border-radius: 50%;
-    background-color: #526DC1;
+.gasBox{
+    /* border-radius: 50%; */
+    background-color: #8CE78D;
     color: #fff;
     display: flex;
     justify-content: center;
@@ -156,10 +157,10 @@ defineExpose({
     margin: 20px;
     font-size: 20px;
 }
-.waterborder{
+.gasborder{
     position: relative;
 }
-.waterborder h1{
+.gasborder h1{
     position: absolute;
     top: 20px;
     left:20px;
diff --git a/src/views/energyConsumeJixiefenchang/content/top.vue b/src/views/energyConsumeJixiefenchang/content/top.vue
index d6aaa98..eec05a3 100644
--- a/src/views/energyConsumeJixiefenchang/content/top.vue
+++ b/src/views/energyConsumeJixiefenchang/content/top.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \gitscreenFront\src\views\energyConsumeJixiefenchang\content\top.vue
+ * @FilePath: \code\gitscreenFront\src\views\energyConsumeJixiefenchang\content\top.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-13 14:43:28
@@ -23,7 +23,8 @@
             :option="gasOption.option"
             ref="ratio"
           ></chart>
-          <gas ref="gasref" :title="t('messages.GasConsumption_2023JiXie')"></gas>
+          <gas ref="gasref" :title="t('messages.gasto2023')"></gas>
+          <water ref="waterref" :title="t('messages.waterto2023')"></water>
         </div>
       </el-col>
     </el-row>
@@ -40,6 +41,7 @@ import chart from "./chart/chartRatio.vue";
 import { useRoute, useRouter } from "vue-router";
 import { useEnergyConsumeStore } from "@/store/module/energyConsume";
 import gas from "./chart/gas.vue";
+import water from "./chart/water.vue";
 import { useI18n } from 'vue-i18n'
 let {t} = useI18n();
 const store = useEnergyConsumeStore();
@@ -47,6 +49,7 @@ const router = useRouter();
 
 let ratio = ref();
 let gasref = ref();
+let waterref = ref();
 
 let props = defineProps<{
   width: number;
@@ -155,8 +158,9 @@ function reset(val: any) {
 const powerBox = (width: any, height: any) => {
   let a = calcWH(height, width, 1, 4, 0);
   //修改高度
-  ratio.value.setchartWH(a.oWidth * 3, a.oHeight);
+  ratio.value.setchartWH(a.oWidth * 2, a.oHeight);
   gasref.value.setchartWH(a.oWidth-20, a.oHeight);
+  waterref.value.setchartWH(a.oWidth-20, a.oHeight);
 };
 const clickPowerChart = () => {
   router.push({
@@ -301,9 +305,29 @@ function changeGas(val) {
     }
     
   });
-//   gasOption.option.xAxis.data=x
-//   gasOption.option.series[0].data=y
-//   gas1.value.changeData(gasOption.option)
+}
+  watch(
+  () => store.nowYearWater,
+  (newVal, oldVal) => {
+    if (!newVal) {
+      return;
+    } else {
+      if (newVal.length == 0) {
+        return;
+      }
+    }
+    changeWater(newVal);
+  },
+  { deep: true, flush: "post" }
+);
+function changeWater(val) {
+  val.forEach((res) => {
+    if(res.deptName=='生产区'){
+      waterref.value.setData(res.usageNum);
+    }
+    
+  });
+ 
 }
 onMounted(() => {
  

From f323611ffe37f44ce64ada6e8869dfb14099dfb4 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Fri, 9 Jun 2023 17:53:19 +0800
Subject: [PATCH 20/29] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=B2=BE=E9=A5=B0?=
 =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=94=A8=E6=B0=94=E9=87=8F=E7=94=A8=E6=B0=B4?=
 =?UTF-8?q?=E9=87=8F=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PaintShopView/View1/chart/gas.vue   | 169 ++++++++++++++++++
 src/views/PaintShopView/View1/chart/water.vue | 169 ++++++++++++++++++
 2 files changed, 338 insertions(+)
 create mode 100644 src/views/PaintShopView/View1/chart/gas.vue
 create mode 100644 src/views/PaintShopView/View1/chart/water.vue

diff --git a/src/views/PaintShopView/View1/chart/gas.vue b/src/views/PaintShopView/View1/chart/gas.vue
new file mode 100644
index 0000000..808d62f
--- /dev/null
+++ b/src/views/PaintShopView/View1/chart/gas.vue
@@ -0,0 +1,169 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\PaintShopView\View1\chart\gas.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-14 13:24:12
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+
+<template>
+    <div class="gasborder">
+  <border6 ref="refborder4">
+      <template v-slot>
+        <!-- <h1>{{props.title}}</h1> -->
+        <div ref="gas" ></div>
+      </template>
+  </border6>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {getCurrentInstance, onMounted, reactive, ref} from "vue"
+import {EDataPerson,EDataPersonItem} from '@/type/energyConsume'
+import 'echarts-liquidfill'
+import border6 from "@/components/borderBox/border6.vue";
+const { proxy } = getCurrentInstance() as any;
+let props=defineProps<{
+      title:string,
+      }>()
+let gas=ref()
+
+let refborder4=ref()
+
+const echartsData = reactive<EDataPerson>({
+    gas:{
+      div:null,
+      data:null,
+      title:'',
+      box:null
+  },
+})
+
+const setData=(value:any)=>{
+  
+  echartsData.gas!.div=gas.value
+  echartsData.gas!.title=props.title
+  echartsData.gas!.data=({
+          title: {
+            // 标题
+            text: echartsData.gas!.title,
+            textStyle:{
+          color:'#fff',
+          fontSize:20
+            },
+            top:'2%'
+          },
+           series: [{
+    type: 'liquidFill',
+    radius: '80%', //水球大小
+    shape:'rect',
+    center: ['50%', '55%'],
+    waveAnimation: true,
+    color: [
+      {
+        type: 'linear',
+        x: 0,
+        y: 0,
+        x2: 0,
+        y2: 1,
+        colorStops: [
+          {
+            offset: 0,
+            color: '#186945',
+          },
+          {
+            offset: 1,
+            color: '#1b7a4f',
+          },
+        ],
+        globalCoord: false,
+      },
+    ],
+    data: [0.7,0.7], // data个数代表波浪数
+    amplitude: 10, //振幅
+    backgroundStyle: {
+      borderWidth: 2, //边框大小
+      borderColor:'rgba(8, 206, 120, 0.8)',//边框颜色
+      color: 'rgba(8, 206, 120, 0.4)',
+    },
+    label: {
+      normal: {
+        textStyle: {
+          fontSize: 24,
+          fontWeight: 'bold',
+          color: '#fff',
+        },
+        formatter:function(params){
+          return value
+        }
+      },
+      
+    },
+    outline: {
+      borderDistance: 0,
+      itemStyle: {
+        borderWidth: 4,
+        borderColor: 'transparent',
+      },
+    },
+            }],
+        })
+
+change(echartsData.gas)
+}
+
+const change = (item:EDataPersonItem) => {
+  let Ebox=proxy.$echarts.init(
+  item.div,
+  "dark"
+);
+Ebox.setOption(item.data);
+item.box = Ebox
+};
+
+function setchartWH(width:any,height:any){
+    // echartsData.water!.div=water.value
+    gas.value.style.height=height-20+'px'
+    gas.value.style.width=width+'px'
+  
+  refborder4.value.resetWH()
+if(echartsData.gas.box){
+  echartsData.gas.box.resize()
+}
+
+}
+onMounted(() => {
+  // setData()
+})
+
+// return{setchartWH}
+defineExpose({
+  setchartWH,
+  setData
+})
+
+</script>
+
+<style scoped>
+.gasBox{
+    /* border-radius: 50%; */
+    background-color: #8CE78D;
+    color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 20px;
+    font-size: 20px;
+}
+.gasborder{
+    position: relative;
+}
+.gasborder h1{
+    position: absolute;
+    top: 20px;
+    left:20px;
+    color: #fff;
+}
+</style>
diff --git a/src/views/PaintShopView/View1/chart/water.vue b/src/views/PaintShopView/View1/chart/water.vue
new file mode 100644
index 0000000..5db7248
--- /dev/null
+++ b/src/views/PaintShopView/View1/chart/water.vue
@@ -0,0 +1,169 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\PaintShopView\View1\chart\water.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-14 13:24:12
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+
+<template>
+    <div class="gasborder">
+  <border6 ref="refborder4">
+      <template v-slot>
+        <!-- <h1>{{props.title}}</h1> -->
+        <div ref="gas" ></div>
+      </template>
+  </border6>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {getCurrentInstance, onMounted, reactive, ref} from "vue"
+import {EDataPerson,EDataPersonItem} from '@/type/energyConsume'
+import 'echarts-liquidfill'
+import border6 from "@/components/borderBox/border6.vue";
+const { proxy } = getCurrentInstance() as any;
+let props=defineProps<{
+      title:string,
+      }>()
+let gas=ref()
+
+let refborder4=ref()
+
+const echartsData = reactive<EDataPerson>({
+    gas:{
+      div:null,
+      data:null,
+      title:'',
+      box:null
+  },
+})
+
+const setData=(value:any)=>{
+  
+  echartsData.gas!.div=gas.value
+  echartsData.gas!.title=props.title
+  echartsData.gas!.data=({
+          title: {
+            // 标题
+            text: echartsData.gas!.title,
+            textStyle:{
+          color:'#fff',
+          fontSize:20
+            },
+            top:'2%'
+          },
+           series: [{
+    type: 'liquidFill',
+    radius: '80%', //水球大小
+    shape:'rect',
+    center: ['50%', '55%'],
+    waveAnimation: true,
+    color: [
+      {
+        type: 'linear',
+        x: 0,
+        y: 0,
+        x2: 0,
+        y2: 1,
+        colorStops: [
+          {
+            offset: 0,
+            color: '#138FE2',
+          },
+          {
+            offset: 1,
+            color: '#126ABC',
+          },
+        ],
+        globalCoord: false,
+      },
+    ],
+    data: [0.7,0.7], // data个数代表波浪数
+    amplitude: 10, //振幅
+    backgroundStyle: {
+      borderWidth: 2, //边框大小
+      borderColor:'rgba(17, 94, 176, 0.8)',//边框颜色
+      color: 'rgba(17, 94, 176, 0.4)',
+    },
+    label: {
+      normal: {
+        textStyle: {
+          fontSize: 24,
+          fontWeight: 'bold',
+          color: '#fff',
+        },
+        formatter:function(params){
+          return value
+        }
+      },
+      
+    },
+    outline: {
+      borderDistance: 0,
+      itemStyle: {
+        borderWidth: 4,
+        borderColor: 'transparent',
+      },
+    },
+            }],
+        })
+
+change(echartsData.gas)
+}
+
+const change = (item:EDataPersonItem) => {
+  let Ebox=proxy.$echarts.init(
+  item.div,
+  "dark"
+);
+Ebox.setOption(item.data);
+item.box = Ebox
+};
+
+function setchartWH(width:any,height:any){
+    // echartsData.water!.div=water.value
+    gas.value.style.height=height-20+'px'
+    gas.value.style.width=width+'px'
+  
+  refborder4.value.resetWH()
+if(echartsData.gas.box){
+  echartsData.gas.box.resize()
+}
+
+}
+onMounted(() => {
+  // setData()
+})
+
+// return{setchartWH}
+defineExpose({
+  setchartWH,
+  setData
+})
+
+</script>
+
+<style scoped>
+.gasBox{
+    /* border-radius: 50%; */
+    background-color: #8CE78D;
+    color: #fff;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 20px;
+    font-size: 20px;
+}
+.gasborder{
+    position: relative;
+}
+.gasborder h1{
+    position: absolute;
+    top: 20px;
+    left:20px;
+    color: #fff;
+}
+</style>

From 9307cc4bcea0721cce1740616c5db39146c592cb Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Fri, 9 Jun 2023 17:55:46 +0800
Subject: [PATCH 21/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=A2=B0?=
 =?UTF-8?q?=E5=88=86=E5=8E=82=E7=8E=AF=E5=A2=83=E5=A4=A7=E5=B1=8F=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B8=A9=E6=B9=BF=E5=BA=A6=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=B0=94=E9=87=8F=E4=BD=8D=E7=BD=AE=20=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E7=BA=A2=E8=89=B2=E5=9B=BE=E6=A0=87=E6=94=B9=E4=B8=BA=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA=20=E7=B2=89=E5=B0=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8A=A5=E8=AD=A6=E6=A1=86=E5=B9=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E7=94=A8?=
 =?UTF-8?q?=E6=B0=B4=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/moduleSocketMechanics.ts            | 107 +++++++++----
 src/store/storeName.ts                        |   1 +
 .../components/gas.vue                        |  14 +-
 .../components/humidity.vue                   |  90 +++++++++--
 .../components/pm.vue                         |  96 ++++++++++--
 .../components/verticalNumLoop.vue            |  15 +-
 .../generalEnvironmentMechanical/index.vue    | 142 ++++++++++--------
 7 files changed, 338 insertions(+), 127 deletions(-)

diff --git a/src/store/moduleSocketMechanics.ts b/src/store/moduleSocketMechanics.ts
index 0e4a717..c0f9f1f 100644
--- a/src/store/moduleSocketMechanics.ts
+++ b/src/store/moduleSocketMechanics.ts
@@ -10,7 +10,7 @@
 import { defineStore } from "pinia";
 import { Names } from '@/store/storeName'
 import { gettime, clacendTime } from "@/utils/time"
-export const useSocketStore = defineStore(Names.socketjixiefenchang, {
+export const useSocketStore = defineStore(Names.socketMechanics, {
     // 使用方式
     // const Index= useIndexStore()
     // 1、Index.{数据}++
@@ -19,23 +19,58 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang, {
     // 4、通过action修改
     state: () => {
         return {
-            // humiture: [
-            //     { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" },
-            //     { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" },
-            //     { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" },
-            //     { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" },
-            //     { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" }
-            // ],
-            
-            humiture:{Humiture:[],bottom:{humidity:null,temp:null,name:null},top:{humidity:null,temp:null,name:null}}, //温湿度
+            humiture: [
+                { "devId": "c6f036c0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "精饰车间", "temp": "33.4", "humidity": "30.9" },
+                { "devId": "c651b930-3b15-11ed-b6af-15994988a6b3", "name": "精加车间", "temp": "26.1", "humidity": "47" },
+                { "devId": "9c4be1e0-33fb-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间", "temp": "29.3", "humidity": "37.6" },
+                { "devId": "0e77f0b0-33fc-11ed-a7e1-fd42bca6c8c6", "name": "大件车间", "temp": "28.6", "humidity": "38.4" },
+                { "devId": "91f6d000-33fc-11ed-a7e1-fd42bca6c8c6", "name": "机加车间", "temp": "29.9", "humidity": "36.2" }
+            ],
+
+            // humiture:{Humiture:[],bottom:{humidity:null,temp:null,name:null},top:{humidity:null,temp:null,name:null}}, //温湿度
             pm: [
-                { "devId": "01336fd0-1fa0-11ed-9223-7db1174970a8", "name": "大件车间粉尘", "pm2": "26", "pm10": "33" }, 
-                { "devId": "083e3900-3435-11ed-a7e1-fd42bca6c8c6", "name": "焊接车间粉尘", "pm2": "46", "pm10": "59" }, 
-                { "devId": "270e1500-eee1-11ed-b2ee-2d727e0cafab", "name": "精加车间粉尘", "pm2": "131", "pm10": "155" }, 
-                { "devId": "54058c30-eee3-11ed-b2ee-2d727e0cafab", "name": "机加车间粉尘", "pm2": "38", "pm10": "44" }, 
-                { "devId": "76efb040-eee3-11ed-b2ee-2d727e0cafab", "name": "大件车间粉尘", "pm2": "52", "pm10": "67" }, 
-                { "devId": "a6020310-eee3-11ed-b2ee-2d727e0cafab", "name": "大件车间粉尘", "pm2": "42", "pm10": "52" }, 
-                { "devId": "bcbfb530-88b2-11ed-a926-570995ad0254", "name": "精饰车间粉尘", "pm2": "9", "pm10": "12" }
+                {
+                    "devId": "01336fd0-1fa0-11ed-9223-7db1174970a8",
+                    "name": "大件车间中部粉尘",
+                    "pm25": "45",
+                    "pm10": "53"
+                },
+                {
+                    "devId": "083e3900-3435-11ed-a7e1-fd42bca6c8c6",
+                    "name": "焊接车间粉尘",
+                    "pm25": "30",
+                    "pm10": "36"
+                },
+                {
+                    "devId": "270e1500-eee1-11ed-b2ee-2d727e0cafab",
+                    "name": "精加车间粉尘",
+                    "pm25": "71",
+                    "pm10": "84"
+                },
+                {
+                    "devId": "54058c30-eee3-11ed-b2ee-2d727e0cafab",
+                    "name": "机加车间粉尘",
+                    "pm25": "22",
+                    "pm10": "26"
+                },
+                {
+                    "devId": "76efb040-eee3-11ed-b2ee-2d727e0cafab",
+                    "name": "大件车间东部粉尘",
+                    "pm25": "53",
+                    "pm10": "60"
+                },
+                {
+                    "devId": "a6020310-eee3-11ed-b2ee-2d727e0cafab",
+                    "name": "大件车间西部粉尘",
+                    "pm25": "66",
+                    "pm10": "75"
+                },
+                {
+                    "devId": "bcbfb530-88b2-11ed-a926-570995ad0254",
+                    "name": "精饰车间粉尘",
+                    "pm25": "6",
+                    "pm10": "7"
+                }
             ],
             newVerticalNum: [
                 {
@@ -173,24 +208,32 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang, {
          * @param {*} val 温湿度数据
          * @出口参数: 
          * @函数备注: 
-         */        
-        changeHumiture(val){
+         */
+        changeHumiture(val) {
             // console.log(this.humiture.Humiture);
-            
-            if(this.humiture.Humiture.length==0){
-                this.humiture=val
-            }else{
-                val.Humiture.forEach(res=>{
-                    this.humiture.Humiture.forEach(ele=>{
-                        if(res.name==ele.name){
-                            ele.humidity=res.humidity
-                            ele.temp=res.temp
-                        }
-                    })
+
+
+            val.Humiture.forEach(res => {
+                this.humiture.forEach(ele => {
+                    if (res.devId == ele.devId) {
+                        ele.humidity = res.humidity
+                        ele.temp = res.temp
+                    }
                 })
-            }
+            })
 
         },
+        /**
+         * 更新粉尘数据
+         */
+        changeDust(val) {
+            this.pm.forEach(res => {
+                if (res.devId == val.devId) {
+                    res.pm25 = val.pm25
+                    res.pm10 = val.pm10
+                }
+            })
+        }
     }
-    
+
 })
\ No newline at end of file
diff --git a/src/store/storeName.ts b/src/store/storeName.ts
index c479e52..97ae740 100644
--- a/src/store/storeName.ts
+++ b/src/store/storeName.ts
@@ -27,4 +27,5 @@ export const enum Names{
     MechanicalViewJijia="MechanicalViewJijia",
     MechanicalViewJingjia="MechanicalViewJingjia",
     MechanicalViewJingshi="MechanicalViewJingshi",
+    socketMechanics='socketMechanics',
 }
\ No newline at end of file
diff --git a/src/views/generalEnvironmentMechanical/components/gas.vue b/src/views/generalEnvironmentMechanical/components/gas.vue
index 59ebec5..136cd0c 100644
--- a/src/views/generalEnvironmentMechanical/components/gas.vue
+++ b/src/views/generalEnvironmentMechanical/components/gas.vue
@@ -21,6 +21,12 @@ const { proxy } = getCurrentInstance() as any;
 let props=defineProps<{
       title:string,
       value:any;
+      color:{
+        step0:string,
+        step1:string,
+        border:string
+        color:string
+      };
       }>()
 let gas=ref()
 
@@ -65,11 +71,11 @@ const setData=()=>{
         colorStops: [
           {
             offset: 0,
-            color: '#186945',
+            color: props.color.step0,
           },
           {
             offset: 1,
-            color: '#1b7a4f',
+            color: props.color.step1,
           },
         ],
         globalCoord: false,
@@ -79,8 +85,8 @@ const setData=()=>{
     amplitude: 10, //振幅
     backgroundStyle: {
       borderWidth: 2, //边框大小
-      borderColor:'rgba(8, 206, 120, 0.8)',//边框颜色
-      color: 'rgba(8, 206, 120, 0.4)',
+      borderColor:props.color.border,//边框颜色
+      color: props.color.color, //背景色
     },
     label: {
       normal: {
diff --git a/src/views/generalEnvironmentMechanical/components/humidity.vue b/src/views/generalEnvironmentMechanical/components/humidity.vue
index ce462aa..a9444a7 100644
--- a/src/views/generalEnvironmentMechanical/components/humidity.vue
+++ b/src/views/generalEnvironmentMechanical/components/humidity.vue
@@ -1,26 +1,46 @@
 <template>
-  <div class="container" ref="humiture">
+  <border13  :color="errList.length>0?borderColor:[]">
+  <div class="container">
+    <div class="errList">
+      <div class="err-item icon-red" v-for="item in errList">{{ item.name }}</div>
+    </div>
+    <div class="echartbox" ref="humiture"></div>
   </div>
+</border13>
 </template>
   
 <script setup lang='ts'>
-import { getCurrentInstance, markRaw, onMounted, reactive, ref, watch } from "vue";
+import { getCurrentInstance, markRaw, onMounted, reactive, ref, watch, onUnmounted,computed } from "vue";
+import { useSocketStore } from "@/store/moduleSocketMechanics";
+import border13 from '@/components/border/Border13.vue'
 const { proxy } = getCurrentInstance() as any;
-const props = defineProps<{
-  title: String;
-  value: any;
-}>();
+const store = useSocketStore();
+let index = 0;
 let humiture = ref();
 let chart = null
-watch(props, (newVal) => {
-  init()
-}, { deep: true, })
+let timer = null
+const props = defineProps<{
+  top: any;
+  bottom: any;
+}>();
+let errList = computed(() => {
+  let arr = JSON.parse(JSON.stringify(store.humiture.filter(item=>{
+    return item.temp>props.top.temp||item.temp<props.bottom.temp||item.humidity>props.top.hum||item.humidity<props.bottom.hum
+  }))).map(item=>{
+    item.name = item.name.split('车间')[0]
+    return item
+  })
+  return arr;
+})
+const borderColor = ["#E43961","#E43961"]
 function init() {
 
-  const chart = proxy.$echarts.init(humiture.value, 'dark');
+  if (!chart) {
+    chart = proxy.$echarts.init(humiture.value, 'dark');
+  }
   let option = {
     title: {
-      text: props.title,
+      text: store.humiture[index].name+"温湿度",
       show: true,
       textStyle: {
         color: "#fff",
@@ -109,7 +129,7 @@ function init() {
         },
         data: [
           {
-            value: props.value.c
+            value: store.humiture[index].temp
           }
         ]
       },
@@ -178,7 +198,7 @@ function init() {
         },
         data: [
           {
-            value: props.value.h
+            value: store.humiture[index].humidity
           }
         ]
       },
@@ -190,6 +210,16 @@ function init() {
 
 onMounted(() => {
   init();
+  timer = setInterval(() => {
+    index = index + 1;
+    if (index >= store.humiture.length) {
+      index = 0;
+    }
+    init();
+  }, 5000);
+});
+onUnmounted(() => {
+  clearInterval(timer);
 });
 </script>
   
@@ -198,5 +228,39 @@ onMounted(() => {
   width: 100%;
   height: 100%;
 }
+
+.errList {
+  width: 100%;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-wrap: wrap;
+}
+.echartbox {
+  width: 100%;
+  height: calc(100% - 50px);
+}
+
+.icon-red {
+  color: #e43961;
+  animation: redstart 2s infinite;
+  font-size: 14px;
+  /* position: relative; */
+  /* top: -15px; */
+}
+.err-item {
+  margin: 0 10px;
+}
+
+@keyframes redstart {
+  0% {}
+
+  50% {
+    text-shadow: #fff 1px 0 10px;
+  }
+
+  100% {}
+}
 </style>
   
\ No newline at end of file
diff --git a/src/views/generalEnvironmentMechanical/components/pm.vue b/src/views/generalEnvironmentMechanical/components/pm.vue
index 2c5b850..8889907 100644
--- a/src/views/generalEnvironmentMechanical/components/pm.vue
+++ b/src/views/generalEnvironmentMechanical/components/pm.vue
@@ -1,27 +1,53 @@
 <template>
-  <div class="container" ref="dust">
+  <border13  :color="errList.length>0?borderColor:[]">
+  <div class="container">
+    <div class="errList">
+      <div class="err-item icon-red" v-for="item in errList">{{ item.name }}</div>
+    </div>
+    <div class="echartbox" ref="dust">
+    </div>
   </div>
+</border13>
 </template>
 
 <script setup lang='ts'>
-import { getCurrentInstance, markRaw, onMounted, reactive, ref, watch } from "vue";
+import { getCurrentInstance, markRaw, onMounted, onUnmounted, reactive, ref, watch,computed } from "vue";
+import { useSocketStore } from "@/store/moduleSocketMechanics";
+import border13 from '@/components/border/Border13.vue'
+import { number } from "echarts/core";
 const { proxy } = getCurrentInstance() as any;
-const props = defineProps<{
-  title: String;
-  value: any;
-}>();
+const store = useSocketStore();
+let index = 0;
 let dust = ref();
 let chart = ref(null)
-watch(props,(newVal)=>{
-  init()
-}, { deep: true,})
+let timer = null
+const props = defineProps({
+  pm10limit:{
+    type:Number,
+    default:150
+  },
+  pm25limit:{
+    type:Number,
+    default:75
+  }
+})
+let errList = computed(() => {
+  let arr = JSON.parse(JSON.stringify(store.pm.filter(item=>{
+    return +item.pm10>props.pm10limit||+item.pm25>props.pm25limit
+  }))).map(item=>{
+    item.name = item.name.split('车间')[0]
+    return item
+  })
+  return arr;
+})
+const borderColor = ["#E43961","#E43961"]
 function init() {
   if (!chart.value) {
-  chart.value = proxy.$echarts.init(dust.value, 'dark');    
+    chart.value = proxy.$echarts.init(dust.value, 'dark');
   }
   let option = {
     title: {
-      text: props.title,
+      text: store.pm[index].name,
       show: true,
       textStyle: {
         color: "#fff",
@@ -106,7 +132,7 @@ function init() {
         },
         data: [
           {
-            value: props.value.two,
+            value: store.pm[index].pm25,
             name: "PM2.5",
           },
         ],
@@ -166,7 +192,7 @@ function init() {
         },
         data: [
           {
-            value: props.value.ten,
+            value: store.pm[index].pm10,
             name: "PM10",
           },
         ],
@@ -179,7 +205,17 @@ function init() {
 
 onMounted(() => {
   init();
+  timer = setInterval(() => {
+    index = index + 1;
+    if (index >= store.humiture.length) {
+      index = 0;
+    }
+    init();
+  }, 5000);
 });
+onUnmounted(() => {
+  clearInterval(timer);
+})
 </script>
 
 <style scoped>
@@ -187,4 +223,38 @@ onMounted(() => {
   width: 100%;
   height: 100%;
 }
+
+.errList {
+  width: 100%;
+  height: 50px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-wrap: wrap;
+}
+.echartbox {
+  width: 100%;
+  height: calc(100% - 50px);
+}
+
+.icon-red {
+  color: #e43961;
+  animation: redstart 2s infinite;
+  font-size: 14px;
+  /* position: relative; */
+  /* top: -15px; */
+}
+.err-item {
+  margin: 0 10px;
+}
+
+@keyframes redstart {
+  0% {}
+
+  50% {
+    text-shadow: #fff 1px 0 10px;
+  }
+
+  100% {}
+}
 </style>
diff --git a/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue b/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
index 6d94fcb..e8173f8 100644
--- a/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
+++ b/src/views/generalEnvironmentMechanical/components/verticalNumLoop.vue
@@ -30,10 +30,14 @@
                   </li>
                 </ul>
                 <template #reference>
-                  <i :class="+items.val > +limit
+                  <!-- <i :class="+items.val > +limit
                       ? 'iconfont ' + icon + ' icon-red iconsmall-size'
                       : 'iconfont ' + icon + ' icon-blue iconsmall-size'
-                    "></i>
+                    "></i> -->
+                    <text :class="+items.val > +limit
+                      ? ' icon-red iconsmall-size cursor'
+                      : ' icon-blue iconsmall-size'
+                    ">{{ items.name.split('车间')[0]}}</text>
                 </template>
               </el-popover>
             </div>
@@ -140,7 +144,10 @@ p {
 }
 
 .iconsmall-size {
-  font-size: 20px;
+  font-size: 14px;
+}
+.cursor {
+  cursor: pointer;
 }
 
 .icon-red {
@@ -181,7 +188,7 @@ p {
 .icontip {
   display: flex;
   margin-top: -60px;
-  width: 100px;
+  width: 150px;
   flex-wrap: wrap;
   align-items: center;
   justify-content: center;
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index a39fae9..448aecf 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -9,34 +9,18 @@
         </div>
         <div class="content" ref="Acontent">
             <div class="top-box">
-                <div style="width: 12%; height: 250px; margin-bottom: 10px; display: flex; align-items: center; justify-content: space-evenly;"
-                    v-for="item in store.newVerticalNum">
-                    <verticalNumLoop @click="gotoTrendChart(item.value, item.unit)" :title="item.title" :icon="item.icon" :limit="item.limit" :unit="item.unit"
-                        :value="item.value"></verticalNumLoop>
+                <div class="top-box-item" v-for="item in store.newVerticalNum">
+                    <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 style="width: 12%;height: 250px;margin-bottom: 10px;" @click="gotoTrendChart(store.pm, 'μg/m3')">
-                    <border13>
-                        <template v-slot>
-                            <pm :value="{ two: store.pm[pmindex].pm10, ten: store.pm[pmindex].pm2 }"
-                                :title="store.pm[pmindex].name"></pm>
-                        </template>
-                    </border13>
+                <div class="top-box-item" @click="gotoTrendChart(store.pm, 'μg/m3')">
+                    <pm :pm10limit="150" :pm25limit="75"></pm>
                 </div>
-                <div style="width: 12%;height: 250px;margin-bottom: 10px;">
-                    <border13>
-                        <template v-slot>
-                            <gas :title="t('messages.gashistory')" :value="gasData"></gas>
-                        </template>
-                    </border13>
+                <div class="top-box-item"  @click="gotoTrendChart(store.humiture, '℃/%RH')">
+                    <humidity :top="humidityTop" :bottom="humidityBottom"></humidity>
                 </div>
             </div>
             <div class="bottom-box">
-                <div style="width: 33%;height: 100%;">
-                    <border13>
-                        <power :title="powerData.title" :seriesVal="powerData.seriesVal" :httpValue="powerData.value">
-                        </power>
-                    </border13>
-                </div>
                 <div style="width: 33%;height: 100%;">
                     <border13>
                         <pipe :title="t('messages.PipelinePressure_Mpa')" :value="pipeData"></pipe>
@@ -44,8 +28,24 @@
                 </div>
                 <div style="width: 33%;height: 100%;">
                     <border13>
-                        <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
-                        </humidityBar>
+                        <power :title="powerData.title" :seriesVal="powerData.seriesVal" :httpValue="powerData.value">
+                        </power>
+                    </border13>
+                </div>
+                <div style="width: 16%;height: 100%;">
+                    <border13>
+                        <!-- <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
+                        </humidityBar> -->
+                        <gas :title="t('messages.gashistory')" :value="gasData" 
+                        :color="gascolor"></gas>
+                    </border13>
+                </div>
+                <div style="width: 16%;height: 100%;">
+                    <border13>
+                        <!-- <humidityBar :title="'温湿度'" :data="humidityData" :bottom="humidityBottom" :top="humidityTop">
+                        </humidityBar> -->
+                        <gas :title="t('messages.waterhistory')" :value="waterData" 
+                        :color="watercolor"></gas>
                     </border13>
                 </div>
             </div>
@@ -61,6 +61,7 @@ import verticalNumLoop from './components/verticalNumLoop.vue'
 import power from './components/power2023.vue';
 import pm from './components/pm.vue';
 import humidityBar from './components/humidityBar.vue';
+import humidity from './components/humidity.vue';
 import gas from './components/gas.vue'
 import pipe from './components/pipe.vue'
 import border13 from '@/components/border/Border13.vue'
@@ -71,8 +72,9 @@ import { getPowerData, getconsumeDetail } from "@/http/energyConsume";
 import { useSocketStore } from "@/store/moduleSocketMechanics";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { gettime, clacendTime } from "@/utils/time"
-import {useRouter} from 'vue-router'
+import { useRouter } from 'vue-router'
 import { useI18n } from 'vue-i18n'
+import { hu } from 'element-plus/es/locale';
 let { t } = useI18n();
 let router = useRouter()
 const store = useSocketStore();
@@ -104,34 +106,35 @@ const verticalType = {
 let powerData = ref({ value: { name: [] }, seriesVal: [], title: t('messages.Powerto2023') })
 
 let gasData = ref(0)
-
+let waterData = ref(0)
 let pipeData = ref({ listData: [], top: 0 })
 
 let headerref = ref()
 let verticalList: any[] = reactive([])
 let pmtimer = null
-let humittimer = null
+let humidityTop = ref({})
+let humidityBottom = ref({})
 
 /**
  * 跳转到趋势图
  */
- function gotoTrendChart(value, unit) {
-  let ids = value.map((item) => item.devId).toString();
-  ElMessageBox.confirm(
-    '即将跳转到传感器监测走势图页面，是否继续？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'info',
-    }
-  )
-    .then(() => {
-      router.push({ path: '/TrendChart', query: { ids: ids, unit: unit } })
-    })
-    .catch(() => {
+function gotoTrendChart(value, unit) {
+    let ids = value.map((item) => item.devId).toString();
+    ElMessageBox.confirm(
+        '即将跳转到传感器监测走势图页面，是否继续？',
+        '提示',
+        {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'info',
+        }
+    )
+        .then(() => {
+            router.push({ path: '/TrendChart', query: { ids: ids, unit: unit } })
+        })
+        .catch(() => {
 
-    })
+        })
 
 }
 
@@ -194,10 +197,13 @@ async function gethumitureData() {
 
     if (result.code == 200) {
         store.$patch((state) => {
-            state.humiture = result.data
+            state.humiture = result.data.Humiture
         })
+        humidityBottom.value = result.data.bottom
+        humidityTop.value = result.data.top
     }
 }
+/**用电量柱状图
 let humidityData = ref({})
 let humidityBottom = ref({})
 let humidityTop = ref({})
@@ -212,7 +218,7 @@ watch(() => store.humiture, (newVal, oldVal) => {
     humidityBottom.value = newVal.bottom;
     humidityTop.value = newVal.top;
 }, { deep: true, immediate: true })
-
+ */
 //获取粉尘数据
 let pmindex = ref(0);
 async function getPmData() {
@@ -230,11 +236,11 @@ async function getPmData() {
     let data = {}
     if (resulttwo) {
         resulttwo.data.forEach(ele => {
-            if (arr.indexOf(ele.devId) > -1) {
+            if (arr.indexOf(ele.devId) > -1) {                
                 data[ele.devId] = {
                     devId: ele.devId,
-                    name: ele.name + '粉尘',
-                    pm2: ele.value,
+                    name: ele.devName.split('监测')[0],
+                    pm25: ele.value,
                     pm10: null
                 }
             }
@@ -249,15 +255,10 @@ async function getPmData() {
 
         })
     }
+    
     store.$patch((state) => {
         state.pm = Object.values(data)
     })
-    pmtimer = setInterval(() => {
-        pmindex.value++
-        if (pmindex.value >= store.pm.length) {
-            pmindex.value = 0
-        }
-    }, 5000)
 
 }
 //获取用电量数据
@@ -314,6 +315,10 @@ async function getPower_data() {
         powerData.value.title = '机械分厂用电量'
     }
 }
+
+let gascolor = {step0:'#186945',step1:'#1b7a4f',border:'rgba(8, 206, 120, 0.8)',color:'rgba(8, 206, 120, 0.4)'}
+let watercolor = {step0:'#0D73B3',step1:'#1176C6',border:'#1E4D7B',color:'#0F2A57'}
+//获取用气量数据
 async function getconsumeDetailfun() {
     let result: any = await getconsumeDetail()
     if (result.code == 200) {
@@ -321,6 +326,9 @@ async function getconsumeDetailfun() {
             if (res.deptName == '喷漆车间' && res.type == 'GasDetail') {
                 gasData.value = res.usageNum
             }
+            if (res.deptName == '生产区' && res.type == 'WaterDetail') {
+                waterData.value = res.usageNum
+            }
         })
 
     }
@@ -334,7 +342,8 @@ async function getpipeDatafun() {
         pipeData.value.top = result.data.top
     }
 }
-
+/************************************************************ */
+//socket
 function getWebsocket(val) {
     headerref.value.HeadergetWebsocket(val)
     try {
@@ -376,9 +385,12 @@ function getWebsocket(val) {
             store.changeHumiture(data.msg);
         }
 
+        if (data.type == "dust") {
+            store.changeDust(data.msg);
+        }
+
     } catch (err) {
-        console.log(err, "报错了大哥", console.log(val)
-        );
+        console.log(err, "报错了大哥", console.log(val));
 
     }
 }
@@ -399,7 +411,6 @@ onMounted(() => {
 })
 onUnmounted(() => {
     closeWebsocket();
-    clearInterval(pmtimer)
 })
 </script>
 
@@ -424,15 +435,24 @@ onUnmounted(() => {
 
 .top-box {
     width: 1920px;
-    height: 290px;
+    height: 340px;
     display: flex;
     justify-content: space-between;
     align-items: center;
 }
 
+.top-box-item {
+    width: 12%;
+    height: 300px;
+    margin-bottom: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-evenly;
+}
+
 .bottom-box {
     width: 1920px;
-    height: 630px;
+    height: 580px;
     display: flex;
     justify-content: space-between;
     align-items: center;

From 5bc8f45a34ba936441683a6ad6ba2c9e84897fa8 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Fri, 9 Jun 2023 18:31:44 +0800
Subject: [PATCH 22/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=97=B4?=
 =?UTF-8?q?=E5=8F=8A=E7=94=B5=E6=8E=A7=E5=88=86=E5=8E=82=E5=99=AA=E9=9F=B3?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E4=B8=BA85=20=20=E6=B7=BB=E5=8A=A0=E6=9C=BA?=
 =?UTF-8?q?=E6=A2=B0=E5=88=86=E5=8E=82=E7=8E=AF=E5=A2=83=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E5=99=AA=E5=A3=B0socket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PaintShopView/View1/top.vue            |  2 +-
 src/views/PaintShopView/finishView/top.vue       |  2 +-
 src/views/PaintShopView/machiningView/top.vue    |  2 +-
 src/views/PaintShopView/stuffView/top.vue        |  2 +-
 src/views/PaintShopView/weldView/top.vue         |  2 +-
 src/views/electronicControlAmbient/top.vue       |  2 +-
 src/views/generalEnvironmentMechanical/index.vue | 15 +++++++++++++++
 7 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/PaintShopView/View1/top.vue b/src/views/PaintShopView/View1/top.vue
index c7aa413..9d06f5b 100644
--- a/src/views/PaintShopView/View1/top.vue
+++ b/src/views/PaintShopView/View1/top.vue
@@ -268,7 +268,7 @@ function setcontentData(val) {
     return { name: item.name, val: item.data,status:item.status };
   });
   verticalNum3.value.setData(val.FIRE, 'icon-weibiaoti1', 0, "")
-  verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
+  verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB")
   verticalNum5.value.setData(Smoke, 'icon-yanwubaojingqi', 100, "PPM")
   verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3")
   verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3")
diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue
index ea913a8..e9bee6c 100644
--- a/src/views/PaintShopView/finishView/top.vue
+++ b/src/views/PaintShopView/finishView/top.vue
@@ -281,7 +281,7 @@ let temp_humi_index = 0
     return { name: item.name, val: item.data,status:item.status };
   });
     // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
-    verticalNum4.value.setData(noise,'icon-shengyin',120,"dB")
+    verticalNum4.value.setData(noise,'icon-shengyin',85,"dB")
     // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
     verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3")
     verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3")
diff --git a/src/views/PaintShopView/machiningView/top.vue b/src/views/PaintShopView/machiningView/top.vue
index 9056166..fb2a089 100644
--- a/src/views/PaintShopView/machiningView/top.vue
+++ b/src/views/PaintShopView/machiningView/top.vue
@@ -281,7 +281,7 @@ let temp_humi_index = 0
     return { name: item.name, val: item.data,status:item.status };
   });
     // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
-    verticalNum4.value.setData(noise,'icon-shengyin',120,"dB")
+    verticalNum4.value.setData(noise,'icon-shengyin',85,"dB")
     // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
     verticalNum6.value.setData(CH2O,'icon-app_icons--',0.08,"mg/m3")
     verticalNum7.value.setData(TVOC,'icon-TVOC-Outlined',0.5,"mg/m3")
diff --git a/src/views/PaintShopView/stuffView/top.vue b/src/views/PaintShopView/stuffView/top.vue
index 2b87281..98ea596 100644
--- a/src/views/PaintShopView/stuffView/top.vue
+++ b/src/views/PaintShopView/stuffView/top.vue
@@ -281,7 +281,7 @@ function setcontentData(val) {
     return { name: item.name, val: item.data,status:item.status };
   });
   // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
-  verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
+  verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB")
   // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
   verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3")
   verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3")
diff --git a/src/views/PaintShopView/weldView/top.vue b/src/views/PaintShopView/weldView/top.vue
index 968ed99..08d5c49 100644
--- a/src/views/PaintShopView/weldView/top.vue
+++ b/src/views/PaintShopView/weldView/top.vue
@@ -280,7 +280,7 @@ function setcontentData(val) {
     return { name: item.name, val: item.data,status:item.status };
   });
   // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
-  verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
+  verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB")
   // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
   verticalNum6.value.setData(CH2O, 'icon-app_icons--', 0.08, "mg/m3")
   verticalNum7.value.setData(TVOC, 'icon-TVOC-Outlined', 0.5, "mg/m3")
diff --git a/src/views/electronicControlAmbient/top.vue b/src/views/electronicControlAmbient/top.vue
index a5f398b..87b6ee0 100644
--- a/src/views/electronicControlAmbient/top.vue
+++ b/src/views/electronicControlAmbient/top.vue
@@ -261,7 +261,7 @@ function setcontentData(val) {
   });
 
   // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
-  verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")
+  verticalNum4.value.setData(noise, 'icon-shengyin', 85, "dB")
   // verticalNum5.value.setData(val.Smoke,'icon-yanwubaojingqi',200,"")
   // verticalNum6.value.setData(val.TVOC_CH2O.CH2O,'icon-app_icons--',5,"mg/m3")
   // verticalNum7.value.setData(val.TVOC_CH2O.TVOC,'icon-TVOC-Outlined',5,"PPM")
diff --git a/src/views/generalEnvironmentMechanical/index.vue b/src/views/generalEnvironmentMechanical/index.vue
index 448aecf..24a7514 100644
--- a/src/views/generalEnvironmentMechanical/index.vue
+++ b/src/views/generalEnvironmentMechanical/index.vue
@@ -343,12 +343,27 @@ async function getpipeDatafun() {
     }
 }
 /************************************************************ */
+let noiseData = [
+    '55aaf760-4e88-11ed-b6af-15994988a6b3',
+    '8733fe40-4e82-11ed-b6af-15994988a6b3',
+    'cae16000-4e88-11ed-b6af-15994988a6b3',
+    '08144ba0-4e88-11ed-b6af-15994988a6b3',
+    '2a5f6600-4e87-11ed-b6af-15994988a6b3'
+]
 //socket
 function getWebsocket(val) {
     headerref.value.HeadergetWebsocket(val)
     try {
         let data = JSON.parse(val);
 
+        if (data.type == "noise") {
+            data.msg.listData.forEach(ele => {
+                if (noiseData.indexOf(ele.devId) > -1) {
+                    let verticalData = { name: ele.name, val: ele.value, devId: ele.devId }                    
+                    store.changeNewVerticalNum({ type: 'noise', data: verticalData })
+                }
+            })
+        }
         //精饰车间燃气监测
         if (data.type == "paintingGas") {
             let verticalData = { name: data.msg.devName, val: data.msg.paintingGas.value, devId: data.msg.devId }

From bfe2400d46c042551d1e50e578b8f8ad586765ef Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Mon, 12 Jun 2023 17:06:00 +0800
Subject: [PATCH 23/29] =?UTF-8?q?1.=E8=AE=BE=E5=A4=87=E6=80=BB=E8=A7=88?=
 =?UTF-8?q?=E3=80=81=E6=95=85=E9=9A=9C=E6=8F=90=E9=86=92=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=B4=AF=E8=AE=A1=E6=97=B6=E9=95=BF=E3=80=81=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=80=BB=E8=A7=88=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Mechanics/components/DevOverview.vue      | 102 +++++++++++++
 .../Mechanics/components/devFaultTip.vue      | 134 +++++++++++++++++
 .../Mechanics/components/devStatusTip.vue     | 135 ++++++++++++++++++
 src/views/Mechanics/components/ringChart.vue  |  89 ++++++++++++
 4 files changed, 460 insertions(+)
 create mode 100644 src/views/Mechanics/components/DevOverview.vue
 create mode 100644 src/views/Mechanics/components/devFaultTip.vue
 create mode 100644 src/views/Mechanics/components/devStatusTip.vue
 create mode 100644 src/views/Mechanics/components/ringChart.vue

diff --git a/src/views/Mechanics/components/DevOverview.vue b/src/views/Mechanics/components/DevOverview.vue
new file mode 100644
index 0000000..4a47df0
--- /dev/null
+++ b/src/views/Mechanics/components/DevOverview.vue
@@ -0,0 +1,102 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\Mechanics\components\DevOverview.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-06-09 14:29:11
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+  <div class="devItem-box">
+    <h2>{{props.title}}</h2>
+    <div class="devItem-content">
+        <div class="content-value" v-if="props.title=='设备总数'">
+                <h2>112台</h2>
+        </div>
+        <div class="content-value-cheijan " v-else>
+                <el-row style="margin-top: 20px;">
+                <el-col :span="7"> <div class="chejian-online on-status">15在线</div></el-col>
+                <el-col :span="17"></el-col>
+            </el-row>
+            <el-row>
+                <el-col :span="17"></el-col>
+                <el-col :span="7"><div class="chejian-offline on-status">15离线</div></el-col>
+            </el-row>
+        </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {ref} from "vue"
+// props.value数组中下标：0为全部，1为在线，2为离线
+const props=defineProps({
+    title:{
+        type:String,
+        default:''
+    },
+    value:{
+        type:Array,
+        default:[]
+    }
+})
+</script>
+
+<style scoped>
+.devItem-box h2{
+color: #fff;
+font-size: 18px;
+padding-left: 20px;
+text-align: left;
+}
+.devItem-box{
+    width: 48%;
+    height: 30%;
+}
+.devItem-content{
+    width: 100%;
+    height: 90%;
+    display: flex;
+    justify-content: flex-end;
+}
+.content-value{
+    width: 70%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    border-bottom: 2px solid;
+    border-image: linear-gradient(to right, #00D0FE, #2969E8) 1;
+    
+}
+.on-status{
+    width: 50px;
+    font-size: 25px;
+}
+.chejian-online{
+color: #7CFFB2;
+}
+.chejian-offline{
+color: #4992FF;
+}
+.content-value-cheijan{
+    width: 70%;
+    height: 100%;
+    border-bottom: 2px solid;
+    border-image: linear-gradient(to right, #00D0FE, #2969E8) 1;
+}
+.content-value-cheijan::after{
+content: '';
+display: block;
+border-bottom: 2px dashed #2969E8;
+transform: rotate(-45deg);
+margin-top: -40%;
+}
+.content-value>h2{
+    display: block;
+    margin-top: 20px;
+    font-size: 50px;
+    color: #64A1FC;
+}
+</style>
diff --git a/src/views/Mechanics/components/devFaultTip.vue b/src/views/Mechanics/components/devFaultTip.vue
new file mode 100644
index 0000000..bfd141b
--- /dev/null
+++ b/src/views/Mechanics/components/devFaultTip.vue
@@ -0,0 +1,134 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\Mechanics\components\devFaultTip.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-06-12 08:52:40
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+  <div style="height: 100%; width: 100%">
+    <h2 class="components-header">{{title}}</h2>
+    <div class="components-content" :key="keynum">
+      <swiper-container
+        :slidesPerView="per_view"
+        :initialSlide="0"
+        :loop="true"
+        :spaceBetween="0"
+        direction="vertical"
+        :autoplay="{
+          delay: 3000,
+          disableOnInteraction: false,
+        }"
+        @progress="onProgress"
+        @slidechange="onSlideChange"
+      >
+        <swiper-slide v-for="(res, index) in props.tipList" :key="index">
+          <div class="itemclass">
+              <el-row :gutter="5" class="row-flex">
+                <el-col :span="2" class="col-flex" style="color: #fff; font-size: 18px;">
+                  {{ index + 1 }}
+                </el-col>
+                <el-col :span="18"  class="col-flex" style="flex-direction: column; font-size: 18px; color: #fff; align-items: flex-start;"> 
+                <p><span>机架号：</span><span>{{ res.label }}</span></p>
+                <p><span>设备位置及名称：</span><span> {{ res.devName }}</span></p>
+                </el-col>
+                <el-col :span="4" class="col-flex" style="font-size: 25px; color: red;"> 故障 </el-col>
+              </el-row>
+          </div>
+        </swiper-slide>
+      </swiper-container>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, ref, watch } from "vue";
+import { register } from "swiper/element/bundle";
+import { useI18n } from "vue-i18n";
+let { t } = useI18n();
+register();
+const props = defineProps({
+  title: {
+    type: String,
+    default: "",
+  },
+  tipList: {
+    type: Array,
+    default: [],
+  },
+});
+let per_view = ref(3);
+let useSwiper: any = ref(null);
+let swiperRef = ref(null);
+let listVal = ref([]);
+let keynum = ref(0);
+// space-between:幻灯片间距
+//             slides-per-view:每个视图幻灯片数量
+//             initialSlide：初始幻灯片索引
+//             height:框高,
+//             direction:滑动方向
+//             autoplay：{
+//                 delay：时间
+//                 disableOnInteraction：禁止交互
+//             }
+
+// let swiperConfig= reactive({
+//     perView:3,
+//     initialSlide:1,
+//     loop:true,
+//     spaceBetween:0,
+//     swiperHeight:200,
+//     direction:'vertical',
+//     autoplay:{ delay: 3000,disableOnInteraction: false,height:200}
+// })
+
+watch(
+  () => props.tipList,
+  (val) => {
+    keynum.value++;
+  },
+  { deep: true }
+);
+
+const onProgress = (e) => {};
+
+const onSlideChange = (e) => {};
+</script>
+
+<style scoped>
+.components-header {
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-size: 20px;
+  margin-bottom: 10px;
+}
+.components-content {
+  height: 90%;
+  width: 100%;
+}
+.itemclass {
+  display: flex;
+  height: 100%;
+  width: 100%;
+  align-items: center;
+  border-bottom: #0545a1 1px solid;
+}
+.row-flex{
+    width: 100%;
+    height: 100%;
+}
+.col-flex{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.swiper,
+swiper-container {
+  width: 100%;
+  height: 100%;
+  display: inline-block !important;
+}
+</style>
diff --git a/src/views/Mechanics/components/devStatusTip.vue b/src/views/Mechanics/components/devStatusTip.vue
new file mode 100644
index 0000000..462c74e
--- /dev/null
+++ b/src/views/Mechanics/components/devStatusTip.vue
@@ -0,0 +1,135 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\Mechanics\components\devStatusTip.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-06-12 08:52:40
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+    <div style="height: 100%; width: 100%">
+      <h2 class="components-header">{{title}}</h2>
+      <div class="components-content" :key="keynum">
+        <swiper-container
+          :slidesPerView="per_view"
+          :loop="true"
+          :spaceBetween="0"
+          direction="vertical"
+          :autoplay="{
+            delay: 3000,
+            disableOnInteraction: false,
+          }"
+          autoHeight=true
+          observer=true
+          observeParents=true
+          @progress="onProgress"
+          @slidechange="onSlideChange"
+        >
+          <swiper-slide v-for="(res, index) in props.tipList" :key="index">
+            <div class="itemclass">
+                <el-row :gutter="5" class="row-flex">
+                  <el-col :span="2" class="col-flex" style="color: #fff; font-size: 18px;">
+                    {{ index + 1 }}
+                  </el-col>
+                  <el-col :span="22"  class="col-flex" style="flex-direction: column; font-size: 18px; color: #fff; align-items: flex-start;"> 
+                  <p><span>机架号：</span><span>{{ res.label }}</span> &nbsp; <span>设备位置及名称：</span><span> {{ res.devName }}</span></p>
+                  <p><span>工作时长：</span><span>{{ res.on }}</span> &nbsp; <span>待机时长：</span><span>{{ res.off }}</span> &nbsp; <span>急停时长：</span><span>{{ res.stop }}</span></p>
+                  </el-col>
+                </el-row>
+            </div>
+          </swiper-slide>
+        </swiper-container>
+      </div>
+    </div>
+  </template>
+  
+  <script setup lang="ts">
+  import { reactive, ref, watch } from "vue";
+  import { register } from "swiper/element/bundle";
+  import { useI18n } from "vue-i18n";
+  let { t } = useI18n();
+  register();
+  const props = defineProps({
+    title: {
+      type: String,
+      default: "",
+    },
+    tipList: {
+      type: Array,
+      default: [],
+    },
+  });
+  let per_view = ref(5);
+  let useSwiper: any = ref(null);
+  let swiperRef = ref(null);
+  let listVal = ref([]);
+  let keynum = ref(0);
+  // space-between:幻灯片间距
+  //             slides-per-view:每个视图幻灯片数量
+  //             initialSlide：初始幻灯片索引
+  //             height:框高,
+  //             direction:滑动方向
+  //             autoplay：{
+  //                 delay：时间
+  //                 disableOnInteraction：禁止交互
+  //             }
+  
+  // let swiperConfig= reactive({
+  //     perView:3,
+  //     initialSlide:1,
+  //     loop:true,
+  //     spaceBetween:0,
+  //     swiperHeight:200,
+  //     direction:'vertical',
+  //     autoplay:{ delay: 3000,disableOnInteraction: false,height:200}
+  // })
+  
+  watch(
+    () => props.tipList,
+    (val) => {
+      keynum.value++;
+    },
+    { deep: true }
+  );
+  
+  const onProgress = (e) => {};
+  
+  const onSlideChange = (e) => {};
+  </script>
+  
+  <style scoped>
+  .components-header {
+    width: 100%;
+    text-align: center;
+    color: #fff;
+    font-size: 20px;
+    margin-bottom: 10px;
+  }
+  .components-content {
+    height: 90%;
+    width: 100%;
+  }
+  .itemclass {
+    display: flex;
+    height: 100%;
+    width: 100%;
+    align-items: center;
+    border-bottom: #0545a1 1px solid;
+  }
+  .row-flex{
+      width: 100%;
+      height: 100%;
+  }
+  .col-flex{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+  }
+  .swiper,swiper-container {
+    width: 100%;
+    height: 100%;
+    display: inline-block !important;
+  }
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/Mechanics/components/ringChart.vue b/src/views/Mechanics/components/ringChart.vue
new file mode 100644
index 0000000..508acd2
--- /dev/null
+++ b/src/views/Mechanics/components/ringChart.vue
@@ -0,0 +1,89 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\Mechanics\components\ringChart.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-04-28 08:01:55
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+    <div class="ring" ref="ringRef"></div>
+</template>
+
+<script setup lang='ts'>
+import { ref, onMounted, onUnmounted, getCurrentInstance,watch,onUpdated } from 'vue'
+const { proxy } = getCurrentInstance() as any;
+import { useI18n } from 'vue-i18n'
+let {t} = useI18n();
+let ringRef = ref();
+let ringChart = null;
+const prop = defineProps({
+    data: []
+})
+const init = () => {
+    ringChart = proxy.$echarts.init(ringRef.value, 'dark')
+    let option = {
+        title: {
+            text: t('messages.DevType'),
+            show: true,
+            textStyle: {
+                color: "#fff",
+                fontSize: 20,
+            },
+            left:'center'
+        },
+        tooltip: {
+            trigger: "item",
+        },
+        legend: {
+            type: "scroll",
+            bottom: "5%",
+            left: "center",
+        },
+        series: [
+            {
+                name: "",
+                type: "pie",
+                radius: ["20%", "50%"],
+                center: ["50%", "45%"],
+                avoidLabelOverlap: false,
+                itemStyle: {
+                    borderRadius: 5,
+                    // borderColor: '#fff',
+                    borderWidth: 2,
+                },
+                label: {
+                    show: true,
+                    formatter: "{b}: {c}",
+                },
+                labelLine: {
+                    show: true,
+                },
+                data: prop.data,
+            },
+        ],
+    }
+    ringChart.setOption(option)
+}
+
+onUpdated(() => {
+    ringChart.setOption({
+        series: [
+            {
+                data: prop.data
+            }
+        ]
+    })
+})
+onMounted(() => {
+    init()
+})
+</script>
+
+<style scoped>
+.ring {
+    width: 100%;
+    height: 100%;
+}
+</style>

From 3fc6935718a35e073eb6b1fb53cf18f5076dc060 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Tue, 13 Jun 2023 07:54:29 +0800
Subject: [PATCH 24/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E6=8B=93=E6=89=91=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/FactoryViewTopo/index.vue     |   2 +-
 src/views/FactoryViewTopo/statusBar.vue |  11 +-
 src/views/FactoryViewTopo/threeMap.vue  | 277 ++++++++++++++----------
 3 files changed, 172 insertions(+), 118 deletions(-)

diff --git a/src/views/FactoryViewTopo/index.vue b/src/views/FactoryViewTopo/index.vue
index df70c1f..3e63b6a 100644
--- a/src/views/FactoryViewTopo/index.vue
+++ b/src/views/FactoryViewTopo/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="$style['container']"  ref="Acontent">
     <threeMap  ref="mapdomref"/>
-    <!-- <statusBar :width="size.oWidth" :height="size.oHeight" :iconList="store.iconList" :devList="store.devList"></statusBar> -->
+    <statusBar :width="size.oWidth" :height="size.oHeight" :iconList="store.iconList" :devList="store.devList"></statusBar>
   </div>
   
 </template>
diff --git a/src/views/FactoryViewTopo/statusBar.vue b/src/views/FactoryViewTopo/statusBar.vue
index 0216a91..4bae705 100644
--- a/src/views/FactoryViewTopo/statusBar.vue
+++ b/src/views/FactoryViewTopo/statusBar.vue
@@ -15,16 +15,16 @@
         </div> -->
         <div class="iconTip">
           <ul>
-            <li v-for="item in prop.iconList" :key="item.id" >
+            <!-- <li v-for="item in prop.iconList" :key="item.id" >
               <i :class="'iconfont ' + item.name + ' icon-logo'"></i
               >{{ "&nbsp&nbsp&nbsp" + item.value }}
-              <div>{{ `&nbsp${item.counts}/${item.allnum}` }}</div>
-            </li>
-            <li v-for="item in prop.devList" :key="item.id" >
+              <div>{{ `&nbsp${item.counts}/${item.allnum}` }}</div> -->
+            <!-- </li> -->
+            <!-- <li v-for="item in prop.devList" :key="item.id" >
               <i :class="'iconfont ' + item.name + ' icon-logo SSCBar'"></i
               >{{ "&nbsp&nbsp&nbsp" + item.value }}
               <div>{{ `&nbsp${item.counts}/${item.allnum}` }}</div>
-            </li>
+            </li> -->
             <li>
               <i class="iconfont icon-WIFI icon-logo"></i> &nbsp;&nbsp;&nbsp;
               WIFI
@@ -95,6 +95,7 @@ watch(
   (newVal, oldVal) => {
     //监听父组件宽高变化，随时重置本组件尺寸
     reset(newVal);
+    console.log(newVal);
     
   },
   { immediate: true, deep: true, flush: "post" }
diff --git a/src/views/FactoryViewTopo/threeMap.vue b/src/views/FactoryViewTopo/threeMap.vue
index 23577f9..e0cdba0 100644
--- a/src/views/FactoryViewTopo/threeMap.vue
+++ b/src/views/FactoryViewTopo/threeMap.vue
@@ -3,11 +3,10 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, onMounted, defineExpose } from 'vue';
+import { ref, onMounted } from 'vue';
 import * as THREE from 'three';
 import * as TWEEN from '@tweenjs/tween.js';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls';
-import * as SceneUtils from 'three/examples/jsm/utils/SceneUtils.js';
 import { CSS2DRenderer, CSS2DObject } from 'three/examples/jsm/renderers/CSS2DRenderer.js';
 import { DragControls } from "@/utils/DragControls";
 import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
@@ -19,14 +18,7 @@ import { useRouter } from 'vue-router';
 import { updateCoordinateByPoint } from "@/http/AerialView/index"
 import { ElNotification } from 'element-plus'
 import { useI18n } from 'vue-i18n'
-import { useRoute } from 'vue-router';
 let { t } = useI18n();
-let route = useRoute();
-let edit = false;
-let type = route.params?.type;
-if (type == 'edit') {
-    edit = true;
-}
 const store = useFactoryStore();
 const router = useRouter();
 
@@ -66,9 +58,11 @@ const requires = {
     'tile': require("@/assets/img/Factory/tile.jpg"),
     'door': require("@/assets/img/Factory/door.jpg"),
     'sky': require("@/assets/img/Factory/sky.jpg"),
+    //数字化工厂物联3D图
     'titleFloor': require("@/assets/img/Factory/screen_title.png"),
     'guangmao': require("@/assets/img/Factory/guangmao.jpg"),
     'ac': require("@/assets/img/Factory/ac.jpg"),
+    'wifi': require("@/assets/img/Factory/wifi.jpg"),
 }
 
 const workerShopRoute = {
@@ -159,7 +153,7 @@ const init = () => {
     scene.add(hjLight);
     // 定位相机，并且指向场景中心
     camera.position.x = 0;
-    camera.position.y = 880; //650
+    camera.position.y = 910; //650
     camera.position.z = 0; //600
 
 
@@ -185,9 +179,9 @@ const init = () => {
     })
     /**-------------------------------结束后注释------------------------------------------------- */
     controls.mouseButtons = {
-        LEFT: THREE.MOUSE.PAN,
+        // LEFT: ,
         MIDDLE: THREE.MOUSE.DOLLY,
-        // RIGHT: 
+        RIGHT:THREE.MOUSE.PAN 
     };
 
 
@@ -374,61 +368,61 @@ const init = () => {
 
     createTitleFloor('', 464, 45, { x: 0, y: 0, z: 15 })
     //放置服务器
-    createGlb()
+    createGlb('服务器')
     /*放置光猫************/
     //汽车军团
-    createSwitch({ x: -287.44, y: 0, z: 19.24 })
+    createSwitch('光猫', { x: -287.44, y: 0, z: 19.24 })
     //精加车间
-    createSwitch({ x: -158.01, y: 0, z: 107.47 })
-    createSwitch({ x: -208.35, y: 0, z: 107.47 })
+    createSwitch('光猫', { x: -158.01, y: 0, z: 107.47 })
+    createSwitch('光猫', { x: -208.35, y: 0, z: 107.47 })
     //机加车间
-    createSwitch({ x: -40.22, y: 0, z: 19.90 })
+    createSwitch('光猫', { x: -40.22, y: 0, z: 19.90 })
     //电控分厂
-    createSwitch({ x: -232.96, y: 0, z: -64.48 })
+    createSwitch('光猫', { x: -232.96, y: 0, z: -64.48 })
     //大配套中心
-    createSwitch({ x: 29.01, y: 0, z: -60.75 })
+    createSwitch('光猫', { x: 29.01, y: 0, z: -60.75 })
     //大件车间
-    createSwitch({ x: 5.29, y: 0, z: 19.00 })
+    createSwitch('光猫', { x: 5.29, y: 0, z: 19.00 })
     //家纺 医防
-    createSwitch({ x: 88.55, y: 0, z: -214.89 })
+    createSwitch('光猫', { x: 88.55, y: 0, z: -214.89 })
     //二道岗
-    createSwitch({ x: 306.5, y: 0, z: 5.43 })
+    createSwitch('光猫', { x: 306.5, y: 0, z: 5.43 })
     /*光猫结束********************************* */
 
 
     /**创建ac */
-    createAc({ x: 52.56, y: 0, z: 52.24 })
+    createAc('AC', { x: 52.56, y: 0, z: 52.24 })
     //服装军团
-    createAc({ x: -88.39, y: 0, z: -249.36 })
-    createAc({ x: 82.99, y: 0, z: -170.17 })
+    createAc('AC', { x: -88.39, y: 0, z: -249.36 })
+    createAc('AC', { x: 82.99, y: 0, z: -170.17 })
 
     /**创建AC结束 */
 
 
     /*创建wifi */
     //机加
-    createWifi({ x: -46.96, y: 3, z: 156.57 })
+    createWifi('WIFI', { x: -46.96, y: 3, z: 156.57 })
     //大件
-    createWifi({ x: 52.60, y: 3, z: 96.44 })
-    createWifi({ x: 52.60, y: 3, z: 157.07 })
+    createWifi('WIFI', { x: 52.60, y: 3, z: 96.44 })
+    createWifi('WIFI', { x: 52.60, y: 3, z: 157.07 })
     //精饰
-    createWifi({ x: 133.14, y: 3, z: 107.43 })
-    createWifi({ x: 133.14, y: 3, z: 156.25 })
+    createWifi('WIFI', { x: 133.14, y: 3, z: 107.43 })
+    createWifi('WIFI', { x: 133.14, y: 3, z: 156.25 })
     //焊接
-    createWifi({ x: 305.73, y: 3, z: 110.45 })
-    createWifi({ x: 305.73, y: 3, z: 238.67 })
+    createWifi('WIFI', { x: 305.73, y: 3, z: 110.45 })
+    createWifi('WIFI', { x: 305.73, y: 3, z: 238.67 })
     //服装
-    createWifi({ x: -89.13, y: 4, z: -245.33 })
-    createWifi({ x: -132.07, y: 3, z: -245.33 })
-    createWifi({ x: -222.31, y: 3, z: -245.33 })
-    createWifi({ x: -119.3, y: 3, z: -114.15 })
-    createWifi({ x: -176.45, y: 3, z: -114.40 })
+    createWifi('WIFI', { x: -88, y: 3, z: -232 })
+    createWifi('WIFI', { x: -132.07, y: 3, z: -245.33 })
+    createWifi('WIFI', { x: -222.31, y: 3, z: -245.33 })
+    createWifi('WIFI', { x: -119.3, y: 3, z: -114.15 })
+    createWifi('WIFI', { x: -176.45, y: 3, z: -114.40 })
 
     //家纺 医防
-    createWifi({ x: 140.83, y: 2, z: -197.34 })
-    createWifi({ x: 259.37, y: 2, z: -197.34 })
-    createWifi({ x: 140.83, y: 2, z: -111.84 })
-    createWifi({ x: 259.50, y: 2, z: -111.81 })
+    createWifi('WIFI', { x: 140.83, y: 2, z: -197.34 })
+    createWifi('WIFI', { x: 259.37, y: 2, z: -197.34 })
+    createWifi('WIFI', { x: 140.83, y: 2, z: -111.84 })
+    createWifi('WIFI', { x: 259.50, y: 2, z: -111.81 })
 
 
 
@@ -447,10 +441,10 @@ const init = () => {
         { x: -47.67, y: 2, z: -25.70 },
         { x: -47.67, y: 2, z: -248.85 },
         { x: -221.76, y: 2, z: -248.85 }
-    ])
+    ], 4, true)
 
 
-    createLine(garyLine, [{ x: -88.73, y: 2, z: -249.01 }, { x: -88.73, y: 2, z: -117.33 }, { x: -174.65, y: 2, z: -117.33 }])
+    createLine(garyLine, [{ x: -88.73, y: 2, z: -249.01 }, { x: -88.73, y: 2, z: -117.33 }, { x: -174.65, y: 2, z: -117.33 }], 4, true)
     //汽车军团
     createLine(whiteColor, [{ x: -293.44, y: 2, z: 52.52 }, { x: -293.44, y: 2, z: 36.40 }, { x: -235.84, y: 2, z: -30.87 }], 2)
     //机加
@@ -463,7 +457,7 @@ const init = () => {
     createLine(garyLine, [
         { x: -46.13, y: 2, z: 52.90 },
         { x: -46.13, y: 2, z: 153.05 }
-    ])
+    ], 4, true)
     //家纺医防
     createLine(garyLine, [
         { x: 27.47, y: 2, z: -26.11 },
@@ -476,7 +470,7 @@ const init = () => {
         { x: 260.42, y: 2, z: -115.33 },
         { x: 141.66, y: 2, z: -115.33 },
         { x: 141.66, y: 2, z: -200.86 },
-    ])
+    ], 4, true)
 
 
     //创建第二条线
@@ -492,7 +486,7 @@ const init = () => {
     createLine(garyLine, [
         { x: 306.56, y: 2, z: 40.43 },
         { x: 306.56, y: 2, z: 235.28 }
-    ])
+    ], 4, true)
     //精加
     createLine(whiteColor, [
         { x: -164.26, y: 2, z: 30.98 },
@@ -503,7 +497,7 @@ const init = () => {
         { x: -164.26, y: 2, z: 140.05 },
         { x: -214.35, y: 2, z: 140.05 }
 
-    ])
+    ], 4, true)
     //大件 总---精饰
     createLine(garyLine, [
         { x: 26.61, y: 2, z: -27.08 },
@@ -512,12 +506,12 @@ const init = () => {
         { x: -0.90, y: 2, z: 52.24 },
         { x: 133.97, y: 2, z: 53.16 },
         { x: 133.97, y: 2, z: 154.31 }
-    ])
+    ], 4, true)
     //大件 分
     createLine(garyLine, [
         { x: 53.43, y: 2, z: 53.16 },
         { x: 53.43, y: 2, z: 154.31 }
-    ])
+    ], 4, true)
     /**
      * 
             { x: 26.61, y: 2, z: -27.08 },
@@ -543,12 +537,40 @@ const init = () => {
         { x: 71.44, y: 2, z: -251.40 },
         { x: 71.44, y: 2, z: -183.05 },
         { x: 83.96, y: 2, z: -183.05 }
-    ])
+    ], 4, true)
     createLine(whiteColor, [
         { x: 18.30, y: 2, z: 30.98 },
         { x: 18.30, y: 2, z: -28.94 }
     ], 2)
 
+
+    /**创建线 */
+    createLine(whiteColor, [
+        { x: -536, y: 2, z: 368 },
+        { x: -536, y: 2, z: -348 }
+    ], 8)
+    var dir = new THREE.Vector3(0, 0, -20);
+
+    //normalize the direction vector (convert to vector of length 1)
+    dir.normalize();
+    var origin = new THREE.Vector3(-536, 2, -348);
+    var length = 20;
+    var hex = 0xffffff;
+    var arrowHelper = new THREE.ArrowHelper(dir, origin, length, hex, length, 10);
+    scene.add(arrowHelper);
+    createLine(whiteColor, [
+        { x: -536, y: 2, z: 368 },
+        { x: 516, y: 2, z: 368 }
+    ], 8)
+    var dir = new THREE.Vector3(20, 0, 0);
+
+    //normalize the direction vector (convert to vector of length 1)
+    dir.normalize();
+    var origin = new THREE.Vector3(516, 2, 368);
+    var length = 20;
+    var hex = 0xffffff;
+    var arrowHelper = new THREE.ArrowHelper(dir, origin, length, hex, length, 10);
+    scene.add(arrowHelper);
     setTipDom()
     sethoveMesh()
 
@@ -626,26 +648,21 @@ const init = () => {
         let T1 = +new Date()
         // let t = T1 - T0 //获取时间间隔
         renderer.render(scene, camera)
-        //旋转立方体,每次绕y轴旋转0.01弧度，每一秒渲染0.001弧度
-        //box.rotateY(0.001 * t)
-        // if (t >= 2000) {
-        //     return
-        // }
-        boxObjects.value.forEach((element: any) => {
-            let color1 = 0x88e76a
-            let color2 = 0xff0000
-            //判断是否是更新的传感器数据
-            if (store.updateSensorData.hasOwnProperty(element.sensor_id)) {
-                // console.log(store.updateSensorData,'store.updateSensorData');
-                // console.log(element,'element');
+        // boxObjects.value.forEach((element: any) => {
+        //     let color1 = 0x88e76a
+        //     let color2 = 0xff0000
+        //     //判断是否是更新的传感器数据
+        //     if (store.updateSensorData.hasOwnProperty(element.sensor_id)) {
+        //         // console.log(store.updateSensorData,'store.updateSensorData');
+        //         // console.log(element,'element');
 
-                let color = store.updateSensorData[element.sensor_id].status ? color1 : color2
-                element.devStatus = store.updateSensorData[element.sensor_id].status
-                element.material.color = new THREE.Color(color)
+        //         let color = store.updateSensorData[element.sensor_id].status ? color1 : color2
+        //         element.devStatus = store.updateSensorData[element.sensor_id].status
+        //         element.material.color = new THREE.Color(color)
 
-            }
-            // reader(element)
-        });
+        //     }
+        //     // reader(element)
+        // });
         TWEEN.update()
         controls.update()
         labelRenderer.render(scene, camera)
@@ -659,7 +676,7 @@ const init = () => {
 
 
 //创建线
-function createLine(color: number, pointsList: any, width: number = 4) {
+function createLine(color: number, pointsList: any, width: number = 4, isDashed: boolean = false) {
     // const material = new THREE.LineBasicMaterial({ color: color });
     // const points = [];
     // pointsList.forEach(element => {
@@ -684,11 +701,11 @@ function createLine(color: number, pointsList: any, width: number = 4) {
         color: color,
         transparent: true,
         // opacity: 0.5,
-        dashed: width !== 2 ? true : false,
+        dashed: isDashed ? true : false,
         dashScale: 1,
         dashSize: 3,
         gapSize: 1,
-        linewidth: width
+        linewidth: width,
     })
     //console.log(material,'material');
 
@@ -702,25 +719,64 @@ function createLine(color: number, pointsList: any, width: number = 4) {
 }
 
 //创建wifi
-function createWifi(position: positionType) {
-    const loader = new GLTFLoader();
+// function createWifi(position: positionType) {
+//     const loader = new GLTFLoader();
 
-    loader.load('/models/glb/tothefuture_wifi.glb', function (gltf) {
-        const mesh = gltf.scene.children[0];
+//     loader.load('/models/glb/tothefuture_wifi.glb', function (gltf) {
+//         const mesh = gltf.scene.children[0];
 
-        const s = 0.5;
-        mesh.scale.set(s, s, s);
-        mesh.position.set(position.x, position.y, position.z);
-        // mesh.rotation.x = THREE.MathUtils.degToRad(270)
-        mesh.castShadow = true;
-        mesh.receiveShadow = true;
-        scene.add(mesh);
+//         const s = 0.5;
+//         mesh.scale.set(s, s, s);
+//         mesh.position.set(position.x, position.y, position.z);
+//         // mesh.rotation.x = THREE.MathUtils.degToRad(270)
+//         mesh.castShadow = true;
+//         mesh.receiveShadow = true;
+//         scene.add(mesh);
 
-    }, undefined, function (error) {
+//     }, undefined, function (error) {
 
-        console.error(error);
+//         console.error(error);
 
+//     });
+// }
+
+//计算经纬度与坐标的转换
+function getLonLatToPosition(point: any) {
+    // -507,-340.5 = 117.268834,39.769089
+    // 507,340.5 = 117.271089,39.771682
+    let minx = -507
+    let minz = -340.5
+    let minLon = 117.268834
+    let minLat = 39.769089
+    let lon_step = (117.271089 - 117.268834) / 681
+    let lat_step = (39.771682 - 39.769089) / 1014
+    let {x,z} = point
+    let lon = (minLon + (z-minz) * lon_step).toFixed(6)
+    let lat = (minLat + (x-minx) * lat_step).toFixed(6)
+    return {lon,lat}
+    
+}
+
+const createWifi = (name:string='wifi', boxposition: positionType, lon_lat:object={lon:117.269808,lat:39.770178}): object => {
+
+    const wallTexture = new THREE.TextureLoader().load(requires.wifi);
+    const wall = new THREE.BoxGeometry(15, 5, 10);
+    const wallMaterial = new THREE.MeshPhongMaterial({
+        map: wallTexture,
+        color: 0xe7e7e7,
+        transparent: true,
     });
+    //墙体的网格
+    const wallMesh = new THREE.Mesh(wall, wallMaterial);
+    // 物体移动位置
+    // wallMesh.position.set((-size.baseWidth / 2 + boxposition.x + 1), size.baseHeght / 2 + boxposition.y, -size.baseLength / 2 + boxposition.z);
+    wallMesh.position.set(boxposition.x, 5 + boxposition.y, boxposition.z - 6);
+    wallMesh.name = name
+    wallMesh.lon_lat = getLonLatToPosition({x:boxposition.x,z:boxposition.z - 6})
+    // 将立方体添加到场景中
+    group.add(wallMesh)
+    boxObjects.value.push(wallMesh)
+    return wallMesh
 }
 
 //创建交换机
@@ -747,7 +803,7 @@ function createWifi(position: positionType) {
 //     });
 // }
 
-const createSwitch = (boxposition: positionType, shadow: boolean = true): object => {
+const createSwitch = (name:string='光猫', boxposition: positionType, lon_lat:object={lon:117.269808,lat:39.770178}): object => {
 
     const wallTexture = new THREE.TextureLoader().load(requires.guangmao);
     const wall = new THREE.BoxGeometry(15, 5, 10);
@@ -761,12 +817,15 @@ const createSwitch = (boxposition: positionType, shadow: boolean = true): object
     // 物体移动位置
     // wallMesh.position.set((-size.baseWidth / 2 + boxposition.x + 1), size.baseHeght / 2 + boxposition.y, -size.baseLength / 2 + boxposition.z);
     wallMesh.position.set(boxposition.x - 6, 5 + boxposition.y, boxposition.z + 33.73);
+    wallMesh.name = name
+    wallMesh.lon_lat = getLonLatToPosition({x:boxposition.x - 6,z:boxposition.z + 33.73})
     // 将立方体添加到场景中
     group.add(wallMesh)
+    boxObjects.value.push(wallMesh)
     return wallMesh
 }
 
-const createAc = (boxposition: positionType, shadow: boolean = true): object => {
+const createAc = (name:string='Ac', boxposition: positionType, lon_lat:object={lon:117.269808,lat:39.770178}): object => {
 
     const wallTexture = new THREE.TextureLoader().load(requires.ac);
     const wall = new THREE.BoxGeometry(15, 5, 10);
@@ -780,8 +839,11 @@ const createAc = (boxposition: positionType, shadow: boolean = true): object =>
     // 物体移动位置
     // wallMesh.position.set((-size.baseWidth / 2 + boxposition.x + 1), size.baseHeght / 2 + boxposition.y, -size.baseLength / 2 + boxposition.z);
     wallMesh.position.set(boxposition.x, 5 + boxposition.y, boxposition.z);
+    wallMesh.name = name
+    wallMesh.lon_lat = getLonLatToPosition(boxposition)
     // 将立方体添加到场景中
     group.add(wallMesh)
+    boxObjects.value.push(wallMesh)
     return wallMesh
 }
 
@@ -789,7 +851,7 @@ const createAc = (boxposition: positionType, shadow: boolean = true): object =>
 
 
 //创建服务器
-function createGlb() {
+function createGlb(name) {
     const loader = new GLTFLoader();
 
     loader.load('/models/glb/server.glb', function (gltf) {
@@ -881,7 +943,7 @@ function createLableObj(mesh: any, text: string, vector: positionType) {
     laberDiv.className = 'laber_name';
     laberDiv.textContent = text;
     let pointLabel = new CSS2DObject(laberDiv);
-    pointLabel.position.set(vector.x, vector.y, vector.z);
+    pointLabel.position.set(vector.x, 0, vector.z);
 
     mesh.add(pointLabel);
 }
@@ -1134,6 +1196,7 @@ function createSkyBox() {
 function setTipDom() {
     const domTag = document.createElement("div");
     domTag.setAttribute("id2", "tipId");
+    domTag.className = "item-tag"
     // domTag.innerText='电流'
     domTag.style.fontSize = "14px";
     domTag.style.backgroundColor = "rgba(0,0,0,.5)";
@@ -1167,17 +1230,17 @@ function sethoveMesh() {
         camera,
         labelRenderer.domElement
     );
-
-    if (!edit) {
-        dragControls.deactivate();
-    }
-    dragControls.addEventListener("hoveron", function (event: any) {
-        saveTipDom.element.innerHTML = `${event.object.name}:${event.object.devStatus ? t('messages.onLine') : t('messages.offline')
-            }`;
+    dragControls.deactivate();
+    dragControls.addEventListener("hoveron", function (event: any) {        
+        saveTipDom.element.innerHTML = `
+            <div>${event.object.name}</div>
+            <div>经度：${event.object.lon_lat.lon}</div>
+            <div>纬度：${event.object.lon_lat.lat}</div>
+        `;
         saveTipDom.element.style.visibility = "visible";
         saveTipDom.position.x = event.object.position.x;
         saveTipDom.position.y = event.object.position.y + 5;
-        saveTipDom.position.z = event.object.position.z - 20;
+        saveTipDom.position.z = event.object.position.z - 30;
         saveTipDom.visible = true;
 
     });
@@ -1189,22 +1252,6 @@ function sethoveMesh() {
         saveTipDom.visible = false;
     });
 
-    dragControls.addEventListener("dragend", function (event: any) {
-        let data = { 'id': event.object.sensor_id, 'x': event.object.position.x.toFixed(2), 'y': event.object.position.z.toFixed(2) }
-        updateCoordinateByPoint(data).then((res: any) => {
-            if (res.code == 200) {
-                ElNotification({
-                    message: '移动位置成功',
-                    duration: 2000,
-                    type: 'success'
-                })
-            }
-
-
-        })
-
-    });
-
 }
 
 onMounted(() => {
@@ -1261,4 +1308,10 @@ onMounted(() => {
     padding: 2px;
     background: rgba(0, 0, 0, 0.6);
 }
+
+.item-tag {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
 </style>

From bd6a2dd4b551fadef55c54958489907fe1835f92 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Tue, 13 Jun 2023 18:07:18 +0800
Subject: [PATCH 25/29] =?UTF-8?q?1.=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=8E=9F=E5=9E=8B=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/module/Mechanics.ts                 |   8 +-
 src/views/Mechanics/components/gateway.vue    | 163 ++++++++++
 .../Mechanics/components/scrollBoard.vue      | 104 ++++++
 src/views/Mechanics/indexNew.vue              | 299 ++++++++++++++++++
 4 files changed, 572 insertions(+), 2 deletions(-)
 create mode 100644 src/views/Mechanics/components/gateway.vue
 create mode 100644 src/views/Mechanics/components/scrollBoard.vue
 create mode 100644 src/views/Mechanics/indexNew.vue

diff --git a/src/store/module/Mechanics.ts b/src/store/module/Mechanics.ts
index e25c4f7..1ff3c54 100644
--- a/src/store/module/Mechanics.ts
+++ b/src/store/module/Mechanics.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \wwwd:\code\screenFront\src\store\module\Mechanics.ts
+ * @FilePath: \code\gitscreenFront\src\store\module\Mechanics.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-06 15:58:13
@@ -102,7 +102,11 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
   //需要使用return将数据抛出
   //getters内可相互使用计算结果
   //使用时可直接放入标签内<div>Index.方法()</div>
-  getters: {},
+  getters: {
+    getmechanicsData(state){
+      return state.mechanicsData
+    }
+  },
   //methods 可同步/异步，提交state
   //actions内获取state数据使用this
   // 使用方式
diff --git a/src/views/Mechanics/components/gateway.vue b/src/views/Mechanics/components/gateway.vue
new file mode 100644
index 0000000..a85d868
--- /dev/null
+++ b/src/views/Mechanics/components/gateway.vue
@@ -0,0 +1,163 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\Mechanics\components\gateway.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-02-16 11:51:32
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+  <div class="box" :style="{ width: '100%', height: '100%' }">
+
+    <div class="title-box" >
+      <h2>{{ props.title }}</h2>
+      <div class="colorTip">
+        <div><i class="iconfont icon-beikongshuiwupingtaimenhu-tubiao_zhinengwangguan icon-blue"></i> {{t('messages.onLine')}}</div>
+        <div style="color:#e43961"><i class="iconfont icon-beikongshuiwupingtaimenhu-tubiao_zhinengwangguan icon-red"></i>
+          {{t('messages.offline')}}</div>
+      </div>
+    </div>
+    <ul class="gatewaystatus">
+      <li v-for="item in props.data" @click="clickBotton(item)">
+        <i :class="JSON.parse(item.gateway)
+            ? 'iconfont icon-beikongshuiwupingtaimenhu-tubiao_zhinengwangguan online'
+            : 'iconfont icon-beikongshuiwupingtaimenhu-tubiao_zhinengwangguan noonline'
+          "></i>
+        <h2 class="titlesize-name">{{ item.title+'车间' }}</h2>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { getCurrentInstance, onMounted, reactive, ref } from "vue";
+import border13 from "@/components/border/Border13.vue";
+import { useI18n } from 'vue-i18n'
+import { useMechanicsStore } from "@/store/module/Mechanics";
+import { useRouter } from "vue-router";
+const router=useRouter()
+const store = useMechanicsStore();
+let {t} = useI18n();
+let props = defineProps<{
+  title: string;
+  data: any
+}>();
+const clickBotton=(item:any)=>{
+    store.changePage(item.index)
+    router.push({
+    name:'Mechanicschild',
+    params:{
+      id:item.index
+    }
+})
+  }
+onMounted(() => { });
+</script>
+
+<style scoped>
+h2 {
+  color: #fff;
+  font-size: 20px;
+  flex: 1;
+}
+
+p {
+  margin: 0 10px 0 10px;
+  color: #fff;
+  font-weight: 800;
+  font-size: 2rem;
+}
+
+.box {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  padding: 0;
+}
+
+.gatewaystatus {
+  margin: auto;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.gatewaystatus>li {
+  width: 50%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.gatewaystatus>li {
+  flex-direction: column;
+}
+
+.noonline {
+  font-size: 5rem;
+  color: rgb(228, 57, 97);
+  position: relative;
+  /* top: -20px; */
+}
+
+.online {
+  font-size: 5rem;
+  color: rgb(32, 174, 197);
+  position: relative;
+  /* top: -20px; */
+}
+
+.colorTip {
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  right: 0;
+}
+
+.colorTip span {
+  margin-right: 1rem;
+}
+
+.colorTip>div {
+  margin-right: 1rem;
+  font-size: 1rem;
+}
+
+.colorTip .icon-red {
+  display: inline-block;
+  /* background-color: #e43961; */
+  /* border-radius: 1rem; */
+  color: #e43961;
+  width: 1rem;
+  height: 1rem;
+}
+
+.colorTip .icon-blue {
+  display: inline-block;
+  /* background-color: #20aec5; */
+  /* border-radius: 1rem; */
+  color: #20aec5;
+  width: 1rem;
+  height: 1rem;
+}
+
+.titlesize-name {
+  font-size: 1.5rem;
+}
+
+.title-box {
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+}
+</style>
diff --git a/src/views/Mechanics/components/scrollBoard.vue b/src/views/Mechanics/components/scrollBoard.vue
new file mode 100644
index 0000000..0677eb0
--- /dev/null
+++ b/src/views/Mechanics/components/scrollBoard.vue
@@ -0,0 +1,104 @@
+<!--
+ * @FilePath: \code\gitscreenFront\src\views\Mechanics\components\scrollBoard.vue
+ * @Author: 王路平
+ * @文件版本: V1.0.0
+ * @Date: 2023-06-13 08:33:37
+ * @Description: 
+ * 
+ * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
+-->
+<template>
+    <div class="box">
+        <div class="box-title">{{t('messages.LegionDevList')}}</div>
+        <div class="box-body">
+            <dv-scroll-board ref="devList" :config="prop.config" @mouseover="dvMouseover" @mouseend="dvmouseleave" :style="{
+                        width: '100%',
+                        height: '100%',
+                    }" />
+            <el-tooltip v-model:visible="visible" :content="tipcontent" placement="top" effect="light" trigger="click" popper-class="tooltip-class"
+                virtual-triggering :virtual-ref="triggerRef" />
+        </div>
+    </div>
+</template>
+
+<script setup lang='ts'>
+import { getCurrentInstance, onMounted, reactive, ref } from "vue";
+import { devListType } from "@/type/InPlantProducts";
+import { useRouter } from "vue-router"
+import { useI18n } from 'vue-i18n'
+let {t} = useI18n();
+const prop = defineProps({
+    config: Object,
+})
+const router = useRouter()
+//弹窗文本
+let tipcontent = ref(null)
+//弹窗显示与隐藏
+let visible = ref(false)
+//存储弹窗dom
+let triggerRef = ref(null)
+
+/**
+ * @函数功能: 鼠标移入组件方法
+ * @param {*} value 
+ * @出口参数: 
+ * @函数备注: 
+ */
+const dvMouseover = (value) => {
+    if (value.toElement && value.toElement.innerHTML&&value.toElement.className == 'ceil') {
+        triggerRef.value = value.toElement
+        tipcontent.value = value.toElement.innerText
+        visible.value = true
+    }
+
+};
+/**
+ * @函数功能:  鼠标移出组件方法
+ * @出口参数: 
+ * @函数备注: 
+ */
+const dvmouseleave = () => {
+    triggerRef.value = null
+    tipcontent.value = null
+    visible.value = false
+};
+
+</script>
+
+<style scoped>
+.box {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-around;
+}
+
+.box-title {
+    width: 100%;
+    padding: 10px;
+    font-size: 20px;
+    color: #fff;
+    text-align: center;
+    font-weight: bold;
+}
+
+.box-body {
+    width: 100%;
+    height: 90%;
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+}
+
+:deep(.dv-scroll-board .rows .ceil) {
+    overflow: auto;
+    white-space: pre-wrap;
+    text-overflow: none
+}
+</style>
+<style>
+.el-popper.tooltip-class{
+    color: #fff !important;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/Mechanics/indexNew.vue b/src/views/Mechanics/indexNew.vue
new file mode 100644
index 0000000..507a3a6
--- /dev/null
+++ b/src/views/Mechanics/indexNew.vue
@@ -0,0 +1,299 @@
+<template>
+  <div :class="$style['container']">
+    <div class="header">
+      <div class="title">
+        <header2
+          ref="headerref"
+          :width="'100%'"
+          :height="'100px'"
+          :title="t('messages.Mechanics')"
+          :titleTip="[]"
+          :typeFun="['AbnormalData', 'time']"
+          :alarmType="['machinefactory']"
+        >
+        </header2>
+      </div>
+    </div>
+
+    <div class="content" ref="Acontent">
+      <el-row class="layout" :gutter="20">
+        <el-col :span="7" class="flex-left">
+        <div style="width: 100%; height: 68%;">
+          <border13>
+                <div style="width: 100%;height: 100%;">
+                  <h2 class="module-header">设备总览</h2> 
+                  <div class="module-content">
+                    <DevOverview :title="'设备总数'" :value="[112]"></DevOverview>
+                    <DevOverview :title="'车间1'" :value="[null,12,12]"></DevOverview>
+                    <DevOverview :title="'车间2'" :value="[null,12,12]"></DevOverview>
+                    <DevOverview :title="'车间3'" :value="[null,12,12]"></DevOverview>
+                    <DevOverview :title="'车间4'" :value="[null,12,12]"></DevOverview>
+                    <DevOverview :title="'车间5'" :value="[null,12,12]"></DevOverview>
+                  </div>
+                </div>             
+          </border13>
+        </div>
+        <div style="width: 100%; height: 28%;">
+          <border13>
+            <div  style="width: 98%;height: 100%;">
+              <devFaultTip :title="'设备故障提醒'" :tipList="devFaultTipData"></devFaultTip>
+            </div>
+          </border13>
+        </div>
+      </el-col>
+        <el-col :span="10"  class="flex-left">
+        <div style="width: 100%; height: 18%;">
+          <gateway :title="'物联网关状态'" :data="gatewayData"></gateway>
+        </div>
+        <div style="width: 100%; height: 78%;">
+          <border13>
+            <scrollBoard :config="scrollBoardConfig"></scrollBoard>
+          </border13>
+        </div>
+        </el-col>
+        <el-col :span="7" class="flex-left">
+          <div style="width: 100%; height: 48%;">
+            <border13>
+              <ringChart :data="ringData"></ringChart>
+            </border13>
+        </div>
+          <div style="width: 100%; height: 48%;">
+          <border13>
+            <div  style="width: 100%;height: 100%;">
+              <devStatusTip :title="'设备状态累积时长'" :tipList="devStatusTipData"></devStatusTip>
+            </div>
+          </border13>
+        </div>
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { nextTick, onMounted, onUnmounted, reactive, ref } from "vue";
+import header2 from "@/components/headerBox/header2.vue";
+import border13 from '@/components/border/Border13.vue'
+import DevOverview from "./components/DevOverview.vue";
+import devFaultTip from "./components/devFaultTip.vue";
+import devStatusTip from "./components/devStatusTip.vue";
+import ringChart from "./components/ringChart.vue";
+import scrollBoard from "./components/scrollBoard.vue";
+import gateway from "./components/gateway.vue";
+import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
+import { ElRow, ElCol } from "element-plus";
+import { gatcountsOfMachineryFactoryInStatusTime } from "@/http/Mechanics";
+import { useMechanicsStore } from "@/store/module/Mechanics";
+import { gatewayOfMachineryFactory,gatcountsOfMachineryFactory } from "@/http/Mechanics";
+import { useI18n } from "vue-i18n";
+let { t } = useI18n();
+const store = useMechanicsStore();
+
+let Acontent = ref();
+let headerref = ref();
+
+let DevOverviewData=ref([])
+let devFaultTipData=ref([])
+let devStatusTipData=ref([])
+let ringData=ref([])
+let scrollBoardConfig = reactive({
+    header: ['序号', '机架号', '设备名称', '所属车间','设备状态','稼动率', '故障率'],
+    headerBGC: 'rgb(52, 105, 243)',
+    oddRowBGC: '#100c2a',
+    evenRowBGC: '#100c2a',
+    rowNum: 10,
+    columnWidth: [80, 170, 120, 120, 120, 120, 120],
+    align: ['center', 'center', 'center', 'center', 'center', 'center', 'center'],
+    data: []
+})
+let gatewayData=ref([])
+
+
+function getWebsocket(val) {
+  headerref.value.HeadergetWebsocket(val);
+  try {
+    let data = JSON.parse(val);
+
+    if (data.type == "CountsOfMachineryFactoryInStatusTime") {
+      store.changedevstatus(data.msg);
+    }
+    if (data.type == "gatewayMF") {
+      store.changegateway(data.msg);
+      gatewayData.value=store.getmechanicsData
+      store.changegatewaynum(data.msg);
+      // store.changePM(data.msg)
+    }
+  } catch (err) {
+    console.log(err);
+  }
+}
+function errWebsocket(val) {
+  headerref.value ? headerref.value.HeadererrWebsocket(val) : "";
+  // console.log(val);
+}
+async function gatewayOfMachineryFactoryfun(){
+    let result:any = await gatewayOfMachineryFactory()
+   
+    if(result.code==200){
+      store.changegateway(result.data)
+      gatewayData.value=store.getmechanicsData
+      
+    }
+  }
+  async function gatcountsOfMachineryFactoryfun(){
+    let result:any = await gatcountsOfMachineryFactory()
+   
+    if(result.code==200){
+      store.changegatewaynum(result.data)
+    }
+  }
+onMounted(() => {
+  // let Timedombox=Timedom.value
+  window.document.title = t("messages.Mechanics");
+  setTimeout(()=>{
+    DevOverviewData.value=[{title:'车间',value:[1,2,3]}]
+    devFaultTipData.value=[{label:'111111',devName:'富怡精密绣花机' ,status:'故障'},
+    {label:'222222',devName:'富怡精密绣花机' ,status:'故障'},
+    {label:'333333',devName:'富怡精密绣花机' ,status:'故障'},
+    {label:'444444',devName:'富怡精密绣花机' ,status:'故障'},
+    {label:'555555',devName:'富怡精密绣花机' ,status:'故障'},
+    {label:'666666',devName:'富怡精密绣花机' ,status:'故障'},
+    {label:'777777',devName:'富怡精密绣花机' ,status:'故障'}]
+    devStatusTipData.value=[{label:'111111',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'222222',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'333333',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'444444',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'555555',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'666666',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'777777',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},{label:'111111',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'222222',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'333333',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'444444',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'555555',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'666666',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
+    {label:'777777',devName:'富怡精密绣花机' ,on:111,off:222,stop:333}]
+    ringData.value=[{
+      value:120,
+      name:'在线',
+    },
+    {
+      value:120,
+      name:'离线',
+    }]
+    
+    scrollBoardConfig.data=[[1,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [2,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [3,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [4,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [5,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [6,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [7,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [8,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [9,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [10,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [11,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [12,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [13,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [14,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [15,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [16,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
+    [17,111111,'富怡绣花机123145','机加车间','在线','95%','1%']]
+    // gatewayData.value=[{
+    //   name:'机加车间',
+    //   status:'false'
+    // },{
+    //   name:'焊接车间',
+    //   status:'false'
+    // },{
+    //   name:'大件车间',
+    //   status:'false'
+    // },{
+    //   name:'精饰车间',
+    //   status:'false'
+    // },{
+    //   name:'精加车间',
+    //   status:'false'
+    // },]
+  },1000)
+
+  gatewayOfMachineryFactoryfun()
+  gatcountsOfMachineryFactoryfun()
+  connectWebsocket(null, null, getWebsocket, errWebsocket);
+});
+
+onUnmounted(() => {
+  closeWebsocket();
+});
+</script>
+
+<style module>
+.container {
+  height: 1080px;
+  width: 1920px;
+  color: #20aec5;
+  background-color: #100c2a;
+}
+</style>
+
+<style scoped>
+.title {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: relative;
+}
+.title > h1 {
+  font-size: 30px;
+  position: absolute;
+  top: 10px;
+}
+.header {
+  position: relative;
+}
+.header p {
+  position: absolute;
+  right: 50px;
+  bottom: 20px;
+  font-size: 20px;
+}
+.module-header{
+ width: 100%;
+ text-align: center;
+ color: #fff;
+ font-size: 20px;
+ margin-bottom: 10px;
+}
+.module-content{
+display: flex;
+flex-wrap: wrap;
+height: 98%;
+width: 100%;
+}
+ .layout {
+    height: 100%;
+}
+.flex-left{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+}
+.content {
+  width: 100%;
+  --header: 100px;
+  height: calc(1080px - var(--header));
+}
+</style>
+
+<style>
+body {
+  /* --content:calc(100vh - var(--header)) */
+  overflow: hidden !important;
+  -ms-overflow-style: none; /* IE + Edge */
+  scrollbar-width: none; /* Firefox */
+}
+::-webkit-scrollbar {
+  display: none;
+}
+</style>

From 79456c0c8f5a31e16fa1de31095daf25b49e74df Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Tue, 13 Jun 2023 18:10:29 +0800
Subject: [PATCH 26/29] =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/Factory/wifi.jpg               | Bin 0 -> 10848 bytes
 .../components/pm.vue                         |   2 +-
 src/views/pmTest/index.vue                    | 150 +++++++++---------
 3 files changed, 77 insertions(+), 75 deletions(-)
 create mode 100644 src/assets/img/Factory/wifi.jpg

diff --git a/src/assets/img/Factory/wifi.jpg b/src/assets/img/Factory/wifi.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1572bd15fe1e09cc40cdc94f5e46a6c2e1a86171
GIT binary patch
literal 10848
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
bRBK)BrA2dH?h(sie*gO{`oEp?TrK<$^`C7*

literal 0
HcmV?d00001

diff --git a/src/views/generalEnvironmentMechanical/components/pm.vue b/src/views/generalEnvironmentMechanical/components/pm.vue
index 8889907..5b1b9e0 100644
--- a/src/views/generalEnvironmentMechanical/components/pm.vue
+++ b/src/views/generalEnvironmentMechanical/components/pm.vue
@@ -207,7 +207,7 @@ onMounted(() => {
   init();
   timer = setInterval(() => {
     index = index + 1;
-    if (index >= store.humiture.length) {
+    if (index >= store.pm.length) {
       index = 0;
     }
     init();
diff --git a/src/views/pmTest/index.vue b/src/views/pmTest/index.vue
index 003248c..0fe36a8 100644
--- a/src/views/pmTest/index.vue
+++ b/src/views/pmTest/index.vue
@@ -7,16 +7,28 @@
       </div>
     </div>
     <div class="content">
-      <div class="test" v-for="item in pmData">
+      <div class="box">
         <Border12>
-          <PM :title="item.title" :value="item.value"></PM>
-        </Border12>
-      </div>
-      <div class="test" v-for="item in pmData">
-        <Border12>
-          <PM :title="item.title" :value="item.value"></PM>
+          <div style="width: 100%;height: 100%;overflow: hidden;" ref="boxRef">
+            <ul ref="ulRef" :style="{transform:`translateY(-${index * boxHeight}px)`}">
+              <li class="item-box" v-for="item in list" :key="item.id" :style="{height:`${boxHeight}px`}">
+                <div class="item-left">{{ item.id }}</div>
+                <div class="item-right">
+                  <div class="b-top">
+                    <text>机架号：<i>{{item.label}}</i></text> <text>设备位置及名称：<i>{{ item.position }}</i></text>
+                  </div>
+                  <div class="b-bottom">
+                    <text>工作时长：<i>{{ item.workTime }}</i></text> 
+                    <text>待机时长：<i>{{ item.standbyTime }}</i></text>
+                    <text>停机时长：<i>{{ item.downtime }}</i></text>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
         </Border12>
       </div>
+      
     </div>
 
   </div>
@@ -24,81 +36,40 @@
 
 <script setup lang='ts'>
 import { ref, reactive, onMounted, onUnmounted } from "vue"
-import PM from "@/components/PM/PM.vue"
 import Border12 from "@/components/border/Border12.vue"
 import Header2 from "@/components/headerBox/header2.vue"
-import { getPmtenData, getPmtwoData } from "@/http/generalEnvironment";
-import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
-let pmtest = ref({
-  title: 'PM测试',
-  value: { two: '44', ten: '51' }
-})
-type pmData = {
-  title: string,
-  value: {
-    two: string,
-    ten: string
-  }
-}
-let pmData = reactive<pmData[]>([]);
-/**
- * 请求数据
- */
-async function getData() {
-  let resulttwo: any = await getPmtwoData()
-  let resultten: any = await getPmtenData()
-
-  if (resulttwo.code == 200) {
-    resulttwo.data.forEach(res => {
-      let temp = {
-        title: res.name + "(PM2.5/PM10)",
-        value: {
-          two: res.value,
-          ten: '0'
-        }
-      }
-      pmData.push(temp)
-
-    })
-  }
-  if (resultten.code == 200) {
-    resultten.data.forEach(res => {
-      let index = pmData.findIndex(item => item.title == res.name + "(PM2.5/PM10)")
-
-      if (index != -1) {
-        pmData[index].value.ten = res.value
-      }
-    })
+let list = ref([])
+let rowNum =6;
+const boxRef = ref(null)
+const ulRef = ref(null)
+let boxHeight = ref(0)
+let interval = 3000;
+let index = ref(0);
+let timer = null
+for (let i = 1; i <= 10; i++) {
+  let item = {
+    id: i,
+    label: `机架号${i}`,
+    position: `设备位置及名称${i}`,
+    workTime: `65664 分钟`,
+    standbyTime: `57244 分钟`,
+    downtime: `6708 分钟`
   }
+  list.value.push(item)
 }
 
-
-//websocket 获取数据
-function getWebsocket(val) {
-  try {
-
-    let data = JSON.parse(val);
-    if (data.type == "dust") {
-      let index = pmData.findIndex(item => item.title == data.msg.enName + "(PM2.5/PM10)")
-      if (index != -1) {
-        pmData[index].value.ten = data.msg.pm10
-        pmData[index].value.two = data.msg.pm25
-      }
+onMounted(() => {  
+  boxHeight.value = boxRef.value.clientHeight / rowNum
+  //定时器 循环 添加过度效果
+  timer = setInterval(() => {
+    index.value++;
+    if (index.value >= (list.value.length - rowNum + 1)) {
+      index.value = 0;
     }
-
-  } catch (err) { }
-}
-
-function errWebsocket(val) {
-  console.log(val);
-}
-getData();
-
-onMounted(() => {
-  connectWebsocket(null, null, getWebsocket, errWebsocket);
+  }, interval);
 });
 onUnmounted(() => {
-  closeWebsocket();
+  clearInterval(timer)
 });
 </script>
 
@@ -123,12 +94,43 @@ onUnmounted(() => {
   align-items: center;
   padding: 20px;
 }
+.box {
+  width: 600px;
+  height: 400px;
+}
+ul {
+  transition: all 1s;
+}
 
 .test {
   width: 20%;
   height: 30%;
   margin: 20px 47px;
 }
+
+ul {
+  width: 100%;
+}
+.item-box {
+  width: 100%;
+  height: 50px;
+  color: #fff;
+  font-size: 14px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.item-left {
+  width: 10%;
+  margin-right: 10px;
+}
+.item-right {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: start;
+}
 </style>
 <style>
 body {

From 3f5189d292e8436429bf17ed664eff8a5c4e1e54 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Wed, 14 Jun 2023 11:51:16 +0800
Subject: [PATCH 27/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E9=95=BF=E6=A8=A1=E5=9D=97=E4=B8=BA?=
 =?UTF-8?q?=E4=BF=9D=E5=85=BB=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Mechanics/components/devStatusTip.vue | 7 ++++---
 src/views/Mechanics/indexNew.vue                | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/Mechanics/components/devStatusTip.vue b/src/views/Mechanics/components/devStatusTip.vue
index 462c74e..7ca8b8b 100644
--- a/src/views/Mechanics/components/devStatusTip.vue
+++ b/src/views/Mechanics/components/devStatusTip.vue
@@ -32,10 +32,11 @@
                   <el-col :span="2" class="col-flex" style="color: #fff; font-size: 18px;">
                     {{ index + 1 }}
                   </el-col>
-                  <el-col :span="22"  class="col-flex" style="flex-direction: column; font-size: 18px; color: #fff; align-items: flex-start;"> 
-                  <p><span>机架号：</span><span>{{ res.label }}</span> &nbsp; <span>设备位置及名称：</span><span> {{ res.devName }}</span></p>
-                  <p><span>工作时长：</span><span>{{ res.on }}</span> &nbsp; <span>待机时长：</span><span>{{ res.off }}</span> &nbsp; <span>急停时长：</span><span>{{ res.stop }}</span></p>
+                  <el-col :span="18"  class="col-flex" style="flex-direction: column; font-size: 18px; color: #fff; align-items: flex-start;"> 
+                  <p><span>设备名称：</span><span>{{ res.label }}</span></p>
+                  <p><span>保养日期：</span><span>{{ res.on }}</span> &nbsp; <span>保养时长：</span><span>{{ res.on }}</span> </p>
                   </el-col>
+                  <el-col :span="4" class="col-flex" style="font-size: 25px; color: red;"> 未进行 </el-col>
                 </el-row>
             </div>
           </swiper-slide>
diff --git a/src/views/Mechanics/indexNew.vue b/src/views/Mechanics/indexNew.vue
index 507a3a6..97da958 100644
--- a/src/views/Mechanics/indexNew.vue
+++ b/src/views/Mechanics/indexNew.vue
@@ -60,7 +60,7 @@
           <div style="width: 100%; height: 48%;">
           <border13>
             <div  style="width: 100%;height: 100%;">
-              <devStatusTip :title="'设备状态累积时长'" :tipList="devStatusTipData"></devStatusTip>
+              <devStatusTip :title="'设备保养提醒'" :tipList="devStatusTipData"></devStatusTip>
             </div>
           </border13>
         </div>

From 8884e04ff8289df313304b598626394546b27f4b Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Wed, 14 Jun 2023 15:52:17 +0800
Subject: [PATCH 28/29] =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=96=B0=20=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/http/Mechanics/index.ts                   |  12 +
 .../Mechanics/components/DevOverview.vue      | 112 +++---
 .../Mechanics/components/scrollBoard.vue      |   3 +
 src/views/Mechanics/indexNew.vue              | 333 +++++++++---------
 .../components/humidity.vue                   |   2 +-
 .../components/pm.vue                         |  13 +
 6 files changed, 264 insertions(+), 211 deletions(-)

diff --git a/src/http/Mechanics/index.ts b/src/http/Mechanics/index.ts
index 8725b34..697a8ee 100644
--- a/src/http/Mechanics/index.ts
+++ b/src/http/Mechanics/index.ts
@@ -29,3 +29,15 @@ export function gatcountsOfMachineryFactoryInStatusTime(){
 export function gatdeviceStatusInfoMF(data:any){
     return get('/device/deviceStatusInfoMF',data)
 }
+
+
+/**newIndex */
+//设备列表
+export function reqDeviceTotelListMF(){
+    return get('/device/deviceTotelListMF')
+}
+
+//状态数量
+export function reqDeviceTotelStatusMF() {
+    return get('/device/deviceTotelStatusMF')
+}
diff --git a/src/views/Mechanics/components/DevOverview.vue b/src/views/Mechanics/components/DevOverview.vue
index 4a47df0..dd59df3 100644
--- a/src/views/Mechanics/components/DevOverview.vue
+++ b/src/views/Mechanics/components/DevOverview.vue
@@ -8,59 +8,68 @@
  * 版权信息         : 2023 by ${再登软件}, All Rights Reserved.
 -->
 <template>
-  <div class="devItem-box">
-    <h2>{{props.title}}</h2>
-    <div class="devItem-content">
-        <div class="content-value" v-if="props.title=='设备总数'">
-                <h2>112台</h2>
-        </div>
-        <div class="content-value-cheijan " v-else>
-                <el-row style="margin-top: 20px;">
-                <el-col :span="7"> <div class="chejian-online on-status">15在线</div></el-col>
-                <el-col :span="17"></el-col>
-            </el-row>
-            <el-row>
-                <el-col :span="17"></el-col>
-                <el-col :span="7"><div class="chejian-offline on-status">15离线</div></el-col>
-            </el-row>
+    <div class="devItem-box">
+        <h2>{{ props.title }}</h2>
+        <div class="devItem-content">
+            <div class="content-value" v-if="props.title == '设备总数'">
+                <h2>{{ value.total }}台</h2>
+            </div>
+            <div class="content-value-cheijan " v-else>
+                <el-row>
+                    <el-col :span="7">
+                        <div class="chejian-online on-status">{{ value.onLine }} <div>在线</div>
+                        </div>
+                    </el-col>
+                    <el-col :span="17"></el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="17"></el-col>
+                    <el-col :span="7">
+                        <div class="chejian-offline on-status">{{ value.total - value.onLine }}<div>离线</div>
+                        </div>
+                    </el-col>
+                </el-row>
+            </div>
         </div>
     </div>
-  </div>
 </template>
 
 <script setup lang="ts">
-import {ref} from "vue"
+import { ref } from "vue"
 // props.value数组中下标：0为全部，1为在线，2为离线
-const props=defineProps({
-    title:{
-        type:String,
-        default:''
+const props = defineProps({
+    title: {
+        type: String,
+        default: ''
     },
-    value:{
-        type:Array,
-        default:[]
+    value: {
+        type: Object,
+        default: { onLine: 0, total: 0 }
     }
 })
 </script>
 
 <style scoped>
-.devItem-box h2{
-color: #fff;
-font-size: 18px;
-padding-left: 20px;
-text-align: left;
+.devItem-box h2 {
+    color: #fff;
+    font-size: 18px;
+    padding-left: 20px;
+    text-align: left;
 }
-.devItem-box{
+
+.devItem-box {
     width: 48%;
     height: 30%;
 }
-.devItem-content{
+
+.devItem-content {
     width: 100%;
-    height: 90%;
+    height: 75%;
     display: flex;
     justify-content: flex-end;
 }
-.content-value{
+
+.content-value {
     width: 70%;
     height: 100%;
     display: flex;
@@ -68,35 +77,40 @@ text-align: left;
     align-items: center;
     border-bottom: 2px solid;
     border-image: linear-gradient(to right, #00D0FE, #2969E8) 1;
-    
+
 }
-.on-status{
+
+.on-status {
     width: 50px;
     font-size: 25px;
 }
-.chejian-online{
-color: #7CFFB2;
+
+.chejian-online {
+    color: #7CFFB2;
 }
-.chejian-offline{
-color: #4992FF;
+
+.chejian-offline {
+    color: #4992FF;
 }
-.content-value-cheijan{
+
+.content-value-cheijan {
     width: 70%;
     height: 100%;
     border-bottom: 2px solid;
     border-image: linear-gradient(to right, #00D0FE, #2969E8) 1;
 }
-.content-value-cheijan::after{
-content: '';
-display: block;
-border-bottom: 2px dashed #2969E8;
-transform: rotate(-45deg);
-margin-top: -40%;
+
+.content-value-cheijan::after {
+    content: '';
+    display: block;
+    border-bottom: 2px dashed #2969E8;
+    transform: rotate(-45deg);
+    margin-top: -40%;
 }
-.content-value>h2{
+
+.content-value>h2 {
     display: block;
     margin-top: 20px;
     font-size: 50px;
     color: #64A1FC;
-}
-</style>
+}</style>
diff --git a/src/views/Mechanics/components/scrollBoard.vue b/src/views/Mechanics/components/scrollBoard.vue
index 0677eb0..7c98161 100644
--- a/src/views/Mechanics/components/scrollBoard.vue
+++ b/src/views/Mechanics/components/scrollBoard.vue
@@ -96,6 +96,9 @@ const dvmouseleave = () => {
     white-space: pre-wrap;
     text-overflow: none
 }
+:deep(.dv-scroll-board .rows .row-item) {
+    font-size: 16px;
+}
 </style>
 <style>
 .el-popper.tooltip-class{
diff --git a/src/views/Mechanics/indexNew.vue b/src/views/Mechanics/indexNew.vue
index 97da958..5801778 100644
--- a/src/views/Mechanics/indexNew.vue
+++ b/src/views/Mechanics/indexNew.vue
@@ -2,15 +2,8 @@
   <div :class="$style['container']">
     <div class="header">
       <div class="title">
-        <header2
-          ref="headerref"
-          :width="'100%'"
-          :height="'100px'"
-          :title="t('messages.Mechanics')"
-          :titleTip="[]"
-          :typeFun="['AbnormalData', 'time']"
-          :alarmType="['machinefactory']"
-        >
+        <header2 ref="headerref" :width="'100%'" :height="'100px'" :title="t('messages.Mechanics')" :titleTip="[]"
+          :typeFun="['AbnormalData', 'time']" :alarmType="['machinefactory']">
         </header2>
       </div>
     </div>
@@ -18,52 +11,49 @@
     <div class="content" ref="Acontent">
       <el-row class="layout" :gutter="20">
         <el-col :span="7" class="flex-left">
-        <div style="width: 100%; height: 68%;">
-          <border13>
-                <div style="width: 100%;height: 100%;">
-                  <h2 class="module-header">设备总览</h2> 
-                  <div class="module-content">
-                    <DevOverview :title="'设备总数'" :value="[112]"></DevOverview>
-                    <DevOverview :title="'车间1'" :value="[null,12,12]"></DevOverview>
-                    <DevOverview :title="'车间2'" :value="[null,12,12]"></DevOverview>
-                    <DevOverview :title="'车间3'" :value="[null,12,12]"></DevOverview>
-                    <DevOverview :title="'车间4'" :value="[null,12,12]"></DevOverview>
-                    <DevOverview :title="'车间5'" :value="[null,12,12]"></DevOverview>
-                  </div>
-                </div>             
-          </border13>
-        </div>
-        <div style="width: 100%; height: 28%;">
-          <border13>
-            <div  style="width: 98%;height: 100%;">
-              <devFaultTip :title="'设备故障提醒'" :tipList="devFaultTipData"></devFaultTip>
-            </div>
-          </border13>
-        </div>
-      </el-col>
-        <el-col :span="10"  class="flex-left">
-        <div style="width: 100%; height: 18%;">
-          <gateway :title="'物联网关状态'" :data="gatewayData"></gateway>
-        </div>
-        <div style="width: 100%; height: 78%;">
-          <border13>
-            <scrollBoard :config="scrollBoardConfig"></scrollBoard>
-          </border13>
-        </div>
+          <div style="width: 100%; height: 68%;">
+            <border13>
+              <div style="width: 100%;height: 100%;">
+                <h2 class="module-header">设备总览</h2>
+                <div class="module-content">
+                  <DevOverview :title="'设备总数'" :value="{ onLine: facTotal.onLine, total: facTotal.total }"></DevOverview>
+                  <DevOverview :title="item.name" :value="{ onLine: item.onLine, total: item.total }"
+                    v-for="(item) in facList"></DevOverview>
+                </div>
+              </div>
+            </border13>
+          </div>
+          <div style="width: 100%; height: 28%;">
+            <border13>
+              <div style="width: 98%;height: 100%;">
+                <devFaultTip :title="'设备故障提醒'" :tipList="devFaultTipData"></devFaultTip>
+              </div>
+            </border13>
+          </div>
+        </el-col>
+        <el-col :span="10" class="flex-left">
+          <div style="width: 100%; height: 18%;">
+            <gateway :title="'物联网关状态'" :data="gatewayData"></gateway>
+          </div>
+          <div style="width: 100%; height: 78%;">
+            <border13>
+              <scrollBoard :config="scrollBoardConfig"></scrollBoard>
+            </border13>
+          </div>
         </el-col>
         <el-col :span="7" class="flex-left">
           <div style="width: 100%; height: 48%;">
             <border13>
               <ringChart :data="ringData"></ringChart>
             </border13>
-        </div>
+          </div>
           <div style="width: 100%; height: 48%;">
-          <border13>
-            <div  style="width: 100%;height: 100%;">
-              <devStatusTip :title="'设备保养提醒'" :tipList="devStatusTipData"></devStatusTip>
-            </div>
-          </border13>
-        </div>
+            <border13>
+              <div style="width: 100%;height: 100%;">
+                <devStatusTip :title="'设备保养提醒'" :tipList="devStatusTipData"></devStatusTip>
+              </div>
+            </border13>
+          </div>
         </el-col>
       </el-row>
     </div>
@@ -82,9 +72,8 @@ import scrollBoard from "./components/scrollBoard.vue";
 import gateway from "./components/gateway.vue";
 import { connectWebsocket, closeWebsocket } from "@/utils/websocket";
 import { ElRow, ElCol } from "element-plus";
-import { gatcountsOfMachineryFactoryInStatusTime } from "@/http/Mechanics";
 import { useMechanicsStore } from "@/store/module/Mechanics";
-import { gatewayOfMachineryFactory,gatcountsOfMachineryFactory } from "@/http/Mechanics";
+import { gatewayOfMachineryFactory, gatcountsOfMachineryFactory, reqDeviceTotelListMF, reqDeviceTotelStatusMF } from "@/http/Mechanics";
 import { useI18n } from "vue-i18n";
 let { t } = useI18n();
 const store = useMechanicsStore();
@@ -92,21 +81,29 @@ const store = useMechanicsStore();
 let Acontent = ref();
 let headerref = ref();
 
-let DevOverviewData=ref([])
-let devFaultTipData=ref([])
-let devStatusTipData=ref([])
-let ringData=ref([])
+let DevOverviewData = ref([])
+let devFaultTipData = ref([])
+let devStatusTipData = ref([])
+let ringData = ref([])
 let scrollBoardConfig = reactive({
-    header: ['序号', '机架号', '设备名称', '所属车间','设备状态','稼动率', '故障率'],
-    headerBGC: 'rgb(52, 105, 243)',
-    oddRowBGC: '#100c2a',
-    evenRowBGC: '#100c2a',
-    rowNum: 10,
-    columnWidth: [80, 170, 120, 120, 120, 120, 120],
-    align: ['center', 'center', 'center', 'center', 'center', 'center', 'center'],
-    data: []
+  header: ['序号', '设备名称', '所属车间', '设备状态', '稼动率', '故障率'],
+  headerBGC: 'rgb(52, 105, 243)',
+  oddRowBGC: '#100c2a',
+  evenRowBGC: '#100c2a',
+  rowNum: 10,
+  columnWidth: [80, 290, 120, 120, 120, 120],
+  align: ['center', 'center', 'center', 'center', 'center', 'center'],
+  data: []
+})
+let gatewayData = ref([])
+//车间列表
+let facList = ref([])
+//机械分厂总数
+let facTotal = reactive({
+  total: 0,
+  onLine: 0,
+  offLine: 0
 })
-let gatewayData=ref([])
 
 
 function getWebsocket(val) {
@@ -119,7 +116,7 @@ function getWebsocket(val) {
     }
     if (data.type == "gatewayMF") {
       store.changegateway(data.msg);
-      gatewayData.value=store.getmechanicsData
+      gatewayData.value = store.getmechanicsData
       store.changegatewaynum(data.msg);
       // store.changePM(data.msg)
     }
@@ -131,93 +128,96 @@ function errWebsocket(val) {
   headerref.value ? headerref.value.HeadererrWebsocket(val) : "";
   // console.log(val);
 }
-async function gatewayOfMachineryFactoryfun(){
-    let result:any = await gatewayOfMachineryFactory()
-   
-    if(result.code==200){
-      store.changegateway(result.data)
-      gatewayData.value=store.getmechanicsData
-      
-    }
+//获取机械分厂网关状态
+async function gatewayOfMachineryFactoryfun() {
+  let result: any = await gatewayOfMachineryFactory()
+
+  if (result.code == 200) {
+    store.changegateway(result.data)
+    gatewayData.value = store.getmechanicsData
+
   }
-  async function gatcountsOfMachineryFactoryfun(){
-    let result:any = await gatcountsOfMachineryFactory()
-   
-    if(result.code==200){
-      store.changegatewaynum(result.data)
-    }
+}
+// async function gatcountsOfMachineryFactoryfun() {
+//   let result: any = await gatcountsOfMachineryFactory()
+
+//   if (result.code == 200) {
+//     store.changegatewaynum(result.data)
+//   }
+// }
+
+//获取机械分厂设备列表
+async function reqDeviceTotelListMFfun() {
+  let result: any = await reqDeviceTotelListMF()
+
+  if (result.code == 200) {
+    scrollBoardConfig.data = result.data.map((item, index) => {
+      return [
+        index + 1,
+        item.name,
+        item.dept,
+        item.status == 'false' ? '离线' : '在线',
+        item.activation+'%',
+        item.failure+'%'
+      ]
+    })
   }
+}
+
+//获取机械分厂设备总数
+async function getDeviceTotelStatusMF() {
+  let result: any = await reqDeviceTotelStatusMF()
+
+  if (result.code == 200) {
+    facList.value = result.data.list
+
+    facTotal.total = result.data.total
+    facTotal.onLine = result.data.list.reduce((total, item) => {
+      return total + item.onLine
+    }, 0)
+    facTotal.offLine = facTotal.total - facTotal.onLine
+    ringData.value = [
+      { name: '在线', value: facTotal.onLine },
+      { name: '离线', value: facTotal.offLine }
+    ]
+  }
+}
+
+
 onMounted(() => {
   // let Timedombox=Timedom.value
   window.document.title = t("messages.Mechanics");
-  setTimeout(()=>{
-    DevOverviewData.value=[{title:'车间',value:[1,2,3]}]
-    devFaultTipData.value=[{label:'111111',devName:'富怡精密绣花机' ,status:'故障'},
-    {label:'222222',devName:'富怡精密绣花机' ,status:'故障'},
-    {label:'333333',devName:'富怡精密绣花机' ,status:'故障'},
-    {label:'444444',devName:'富怡精密绣花机' ,status:'故障'},
-    {label:'555555',devName:'富怡精密绣花机' ,status:'故障'},
-    {label:'666666',devName:'富怡精密绣花机' ,status:'故障'},
-    {label:'777777',devName:'富怡精密绣花机' ,status:'故障'}]
-    devStatusTipData.value=[{label:'111111',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'222222',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'333333',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'444444',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'555555',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'666666',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'777777',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},{label:'111111',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'222222',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'333333',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'444444',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'555555',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'666666',devName:'富怡精密绣花机' ,on:111,off:222,stop:333},
-    {label:'777777',devName:'富怡精密绣花机' ,on:111,off:222,stop:333}]
-    ringData.value=[{
-      value:120,
-      name:'在线',
-    },
-    {
-      value:120,
-      name:'离线',
-    }]
-    
-    scrollBoardConfig.data=[[1,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [2,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [3,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [4,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [5,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [6,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [7,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [8,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [9,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [10,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [11,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [12,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [13,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [14,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [15,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [16,111111,'富怡绣花机123145','机加车间','在线','95%','1%'],
-    [17,111111,'富怡绣花机123145','机加车间','在线','95%','1%']]
-    // gatewayData.value=[{
-    //   name:'机加车间',
-    //   status:'false'
-    // },{
-    //   name:'焊接车间',
-    //   status:'false'
-    // },{
-    //   name:'大件车间',
-    //   status:'false'
-    // },{
-    //   name:'精饰车间',
-    //   status:'false'
-    // },{
-    //   name:'精加车间',
-    //   status:'false'
-    // },]
-  },1000)
+  setTimeout(() => {
+    DevOverviewData.value = [{ title: '车间', value: [1, 2, 3] }]
+    devFaultTipData.value = [
+      { label: '111111', devName: '富怡精密绣花机', status: '故障' },
+      { label: '222222', devName: '富怡精密绣花机', status: '故障' },
+      { label: '333333', devName: '富怡精密绣花机', status: '故障' },
+      { label: '444444', devName: '富怡精密绣花机', status: '故障' },
+      { label: '555555', devName: '富怡精密绣花机', status: '故障' },
+      { label: '666666', devName: '富怡精密绣花机', status: '故障' },
+      { label: '777777', devName: '富怡精密绣花机', status: '故障' }]
+    devStatusTipData.value = [{ label: '111111', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '222222', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '333333', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '444444', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '555555', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '666666', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '777777', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 }, { label: '111111', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '222222', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '333333', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '444444', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '555555', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '666666', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
+    { label: '777777', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 }]
+  }, 1000)
 
   gatewayOfMachineryFactoryfun()
-  gatcountsOfMachineryFactoryfun()
+  // gatcountsOfMachineryFactoryfun()
+  //获取机械分厂设备总数
+  getDeviceTotelStatusMF()
+  //获取机械分厂设备列表
+  reqDeviceTotelListMFfun()
   connectWebsocket(null, null, getWebsocket, errWebsocket);
 });
 
@@ -243,42 +243,50 @@ onUnmounted(() => {
   align-items: center;
   position: relative;
 }
-.title > h1 {
+
+.title>h1 {
   font-size: 30px;
   position: absolute;
   top: 10px;
 }
+
 .header {
   position: relative;
 }
+
 .header p {
   position: absolute;
   right: 50px;
   bottom: 20px;
   font-size: 20px;
 }
-.module-header{
- width: 100%;
- text-align: center;
- color: #fff;
- font-size: 20px;
- margin-bottom: 10px;
+
+.module-header {
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-size: 20px;
+  margin-bottom: 10px;
 }
-.module-content{
-display: flex;
-flex-wrap: wrap;
-height: 98%;
-width: 100%;
+
+.module-content {
+  display: flex;
+  flex-wrap: wrap;
+  height: 98%;
+  width: 100%;
 }
- .layout {
-    height: 100%;
+
+.layout {
+  height: 100%;
 }
-.flex-left{
+
+.flex-left {
   display: flex;
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
 }
+
 .content {
   width: 100%;
   --header: 100px;
@@ -290,9 +298,12 @@ width: 100%;
 body {
   /* --content:calc(100vh - var(--header)) */
   overflow: hidden !important;
-  -ms-overflow-style: none; /* IE + Edge */
-  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none;
+  /* IE + Edge */
+  scrollbar-width: none;
+  /* Firefox */
 }
+
 ::-webkit-scrollbar {
   display: none;
 }
diff --git a/src/views/generalEnvironmentMechanical/components/humidity.vue b/src/views/generalEnvironmentMechanical/components/humidity.vue
index a9444a7..223eaed 100644
--- a/src/views/generalEnvironmentMechanical/components/humidity.vue
+++ b/src/views/generalEnvironmentMechanical/components/humidity.vue
@@ -44,7 +44,7 @@ function init() {
       show: true,
       textStyle: {
         color: "#fff",
-        fontSize: 20,
+        fontSize: 18,
       },
       top: 5
     },
diff --git a/src/views/generalEnvironmentMechanical/components/pm.vue b/src/views/generalEnvironmentMechanical/components/pm.vue
index 5b1b9e0..38fabb0 100644
--- a/src/views/generalEnvironmentMechanical/components/pm.vue
+++ b/src/views/generalEnvironmentMechanical/components/pm.vue
@@ -38,6 +38,19 @@ let errList = computed(() => {
     item.name = item.name.split('车间')[0]
     return item
   })
+  if (arr.length>0) {
+    //name去重
+    let nameArr = []
+    arr = arr.filter(item=>{
+      if (nameArr.indexOf(item.name)===-1) {
+        nameArr.push(item.name)
+        return true
+      }else{
+        return false
+      }
+    })
+
+  }
   return arr;
 })
 const borderColor = ["#E43961","#E43961"]

From c0b8b10db09a7087f1566ff7e9cda5a5741aa864 Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Thu, 15 Jun 2023 08:58:54 +0800
Subject: [PATCH 29/29] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=93=E6=89=91?=
 =?UTF-8?q?=E5=9B=BE=E9=97=AE=E9=A2=98=EF=BC=8C=E6=9C=BA=E6=A2=B0=E5=88=86?=
 =?UTF-8?q?=E5=8E=82=E8=AE=BE=E5=A4=87new=20=E6=B7=BB=E5=8A=A0=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=99=A8=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/FactoryViewTopo/threeMap.vue | 26 ++------------------------
 src/views/Mechanics/indexNew.vue       |  7 +++++--
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/views/FactoryViewTopo/threeMap.vue b/src/views/FactoryViewTopo/threeMap.vue
index e0cdba0..5928a97 100644
--- a/src/views/FactoryViewTopo/threeMap.vue
+++ b/src/views/FactoryViewTopo/threeMap.vue
@@ -666,7 +666,6 @@ const init = () => {
         TWEEN.update()
         controls.update()
         labelRenderer.render(scene, camera)
-        store.clearupdateSensorData()
         // reader(mesh_qcjt)
         window.requestAnimationFrame(render) //避免掉帧，就是一帧接一帧，逐帧，预备加载下一帧
     }
@@ -862,12 +861,13 @@ function createGlb(name) {
         mesh.position.set(-346, 0, 51);
         mesh.castShadow = true;
         mesh.receiveShadow = true;
+        mesh.name = name
         scene.add(mesh);
     }, undefined, function (error) {
 
         console.error(error);
 
-    });
+    });    
 }
 
 
@@ -1259,28 +1259,6 @@ onMounted(() => {
 
     //初始化场景
     init()
-    /**创建传感器 */
-    getSensorDataTimer = setInterval(() => {
-        if (store.sensorList.length > 0) {
-            store.sensorList.forEach((element: any) => {
-                let state = element.status ? 0x88e76a : 0xff0000;
-                let wallMesh = createBox(small_size, { x: element.x, y: 0, z: element.y }, state, true, element, element.icon)
-
-            });
-            clearInterval(getSensorDataTimer)
-        }
-    }, 100)
-
-    getDevDataTimer = setInterval(() => {
-        if (store.devdataList.length > 0) {
-
-            store.devdataList.forEach((element: any) => {
-                let state = element.status ? 0x88e76a : 0xff0000;
-                let wallMesh = createBox(small_size, { x: element.x, y: 0, z: element.y }, state, false, element, element.icon)
-            });
-            clearInterval(getDevDataTimer)
-        }
-    }, 100)
 
 
 
diff --git a/src/views/Mechanics/indexNew.vue b/src/views/Mechanics/indexNew.vue
index 5801778..76c5640 100644
--- a/src/views/Mechanics/indexNew.vue
+++ b/src/views/Mechanics/indexNew.vue
@@ -96,6 +96,7 @@ let scrollBoardConfig = reactive({
   data: []
 })
 let gatewayData = ref([])
+let devNumTimer: any = null
 //车间列表
 let facList = ref([])
 //机械分厂总数
@@ -188,7 +189,6 @@ onMounted(() => {
   // let Timedombox=Timedom.value
   window.document.title = t("messages.Mechanics");
   setTimeout(() => {
-    DevOverviewData.value = [{ title: '车间', value: [1, 2, 3] }]
     devFaultTipData.value = [
       { label: '111111', devName: '富怡精密绣花机', status: '故障' },
       { label: '222222', devName: '富怡精密绣花机', status: '故障' },
@@ -211,7 +211,9 @@ onMounted(() => {
     { label: '666666', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 },
     { label: '777777', devName: '富怡精密绣花机', on: 111, off: 222, stop: 333 }]
   }, 1000)
-
+  devNumTimer = setInterval(() => {
+    getDeviceTotelStatusMF()
+  }, 1000*60)
   gatewayOfMachineryFactoryfun()
   // gatcountsOfMachineryFactoryfun()
   //获取机械分厂设备总数
@@ -223,6 +225,7 @@ onMounted(() => {
 
 onUnmounted(() => {
   closeWebsocket();
+  clearInterval(devNumTimer)
 });
 </script>