From 87ee53fca45eec09d2fcb3efa852bb075a08d641 Mon Sep 17 00:00:00 2001 From: hzz Date: Wed, 15 Jan 2025 17:04:39 +0800 Subject: [PATCH] update --- src/router/index.js | 10 +- .../R_D_Environment/component/proge.vue | 11 +- src/views/screen/R_D_Environment/index.vue | 73 +++++- .../screen/R_D_Environment1/component/Lr1.vue | 86 +++++++ .../screen/R_D_Environment1/component/Lr2.vue | 240 ++++++++++++++++++ .../screen/R_D_Environment1/component/Lr3.vue | 41 +++ .../screen/R_D_Environment1/component/Lr4.vue | 41 +++ .../component/temp_humi_icon.vue | 49 ++++ .../screen/R_D_Environment1/image/u796.png | Bin 0 -> 53793 bytes .../screen/R_D_Environment1/image/u797.png | Bin 0 -> 33711 bytes .../screen/R_D_Environment1/image/u798.png | Bin 0 -> 34119 bytes .../screen/R_D_Environment1/image/u799.png | Bin 0 -> 31745 bytes .../screen/R_D_Environment1/image/u800.png | Bin 0 -> 166103 bytes .../screen/R_D_Environment1/image/u801.png | Bin 0 -> 165516 bytes .../screen/R_D_Environment1/image/u802.png | Bin 0 -> 153246 bytes .../screen/R_D_Environment1/image/u803.png | Bin 0 -> 12984 bytes .../screen/R_D_Environment1/image/u810.svg | 6 + .../screen/R_D_Environment1/image/u811.svg | 6 + .../screen/R_D_Environment1/image/u829.png | Bin 0 -> 44229 bytes .../screen/R_D_Environment1/image/u918.png | Bin 0 -> 2209 bytes src/views/screen/R_D_Environment1/index.vue | 224 ++++++++++++++++ 21 files changed, 776 insertions(+), 11 deletions(-) create mode 100644 src/views/screen/R_D_Environment1/component/Lr1.vue create mode 100644 src/views/screen/R_D_Environment1/component/Lr2.vue create mode 100644 src/views/screen/R_D_Environment1/component/Lr3.vue create mode 100644 src/views/screen/R_D_Environment1/component/Lr4.vue create mode 100644 src/views/screen/R_D_Environment1/component/temp_humi_icon.vue create mode 100644 src/views/screen/R_D_Environment1/image/u796.png create mode 100644 src/views/screen/R_D_Environment1/image/u797.png create mode 100644 src/views/screen/R_D_Environment1/image/u798.png create mode 100644 src/views/screen/R_D_Environment1/image/u799.png create mode 100644 src/views/screen/R_D_Environment1/image/u800.png create mode 100644 src/views/screen/R_D_Environment1/image/u801.png create mode 100644 src/views/screen/R_D_Environment1/image/u802.png create mode 100644 src/views/screen/R_D_Environment1/image/u803.png create mode 100644 src/views/screen/R_D_Environment1/image/u810.svg create mode 100644 src/views/screen/R_D_Environment1/image/u811.svg create mode 100644 src/views/screen/R_D_Environment1/image/u829.png create mode 100644 src/views/screen/R_D_Environment1/image/u918.png create mode 100644 src/views/screen/R_D_Environment1/index.vue diff --git a/src/router/index.js b/src/router/index.js index 76d57f1..6da0ad3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,4 +1,4 @@ -import { createWebHistory, createRouter } from 'vue-router' +import { createWebHistory, createRouter,createWebHashHistory } from 'vue-router' /* Layout */ import Layout from '@/layout' import ScaleScreen from '@/layout/scaleScreen' @@ -83,6 +83,12 @@ export const constantRoutes = [ component: () => import("../views/screen/R_D_Environment/index.vue"), hidden: true }, + { + path: "/screen/R_D_Environment1", + name: "R_D_Environment1", + component: () => import("../views/screen/R_D_Environment1/index.vue"), + hidden: true + }, ] }, { @@ -176,7 +182,7 @@ export const dynamicRoutes = [ ] const router = createRouter({ - history: createWebHistory(), + history: createWebHashHistory(), routes: constantRoutes, scrollBehavior(to, from, savedPosition) { if (savedPosition) { diff --git a/src/views/screen/R_D_Environment/component/proge.vue b/src/views/screen/R_D_Environment/component/proge.vue index 3cf3110..e2bd78d 100644 --- a/src/views/screen/R_D_Environment/component/proge.vue +++ b/src/views/screen/R_D_Environment/component/proge.vue @@ -83,9 +83,16 @@ const options = computed(() => { color: '#33FFFF' }, data: seriesData.map((item) => { - return { + let dataobj = { value: item - }; + } + if (item > 100) { + dataobj.itemStyle = { + color: '#FF0000' + } + + } + return dataobj }), z: 10 }, diff --git a/src/views/screen/R_D_Environment/index.vue b/src/views/screen/R_D_Environment/index.vue index 548e2f0..a129739 100644 --- a/src/views/screen/R_D_Environment/index.vue +++ b/src/views/screen/R_D_Environment/index.vue @@ -1,6 +1,6 @@