From 287691efe7b36589280f939a488520f09c092b7e Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Mon, 11 Nov 2024 14:30:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E9=97=AE=E9=A2=98=E6=95=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/logout.png | Bin 0 -> 1018 bytes src/components/home/commonDialog.vue | 25 +++++++++++- src/components/substation/envirDetect.vue | 26 +++++-------- src/components/substation/pitDetect.vue | 16 ++++---- src/utils/configure.js | 6 +-- src/views/Home/index.vue | 18 ++++++++- src/views/Lines/index.vue | 36 ++++++++---------- src/views/Substation/index.vue | 17 +++++---- .../Workbench/components/workbenchEdit.vue | 9 ++++- 9 files changed, 93 insertions(+), 60 deletions(-) create mode 100644 src/assets/img/logout.png diff --git a/src/assets/img/logout.png b/src/assets/img/logout.png new file mode 100644 index 0000000000000000000000000000000000000000..ed49fa60bde6b85d94c20b20489fd0c62a999826 GIT binary patch literal 1018 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR916`%tE1ONa40RR917ytkO0Pu^}zW@LOWJyFpR7ee#RLx6NQ53)D&M@js zZBk3aH`F32%DxEd9}rqZ1T6wr2}M?mQ0I*wi=0|$`o@tKLP60gS3yM4O4=qFA+{-N z)4WMdu@>Su<-B(~=jwgFd5%zT@y^%p{O-Buo_mET_a)Qz8<8B&_LmC^LE-T&5f7ev zI2+Z`)Dx^!I;DKpPA$!}y$EcWRu*Fru4R1%i;I>SSAMo>vFyB3=qI&;DE1`N-8$vr6aWkC1Q0)1lJZju#NDh9CE|4~$=)TU2%V==vTUts4NN<$zn zOMsqKD-<+9OXUOTLv(Mbr3Vwn<}Lw-K*FE~TM6SX>sxkBfi4a5OU2kVoV(_C`gI+n z=@l~sVGz~5H67fkLQ>3Z%Y)xJiC$U)E$HPlyz1D#3WDMm*9&mzsd&Uvs9knPMjaHma z-P}D7snLbHe7^9F$RgC>Ur`Y`m@@0s1EmS|&15@x#d}8<>(`vZG|g}gOj05R8u)i oM4AP}@o-o^>u+zE^5 + + + + + -->
{{ - environmentInfoList - ? environmentInfoList[8].jcValue - : '' - }}°C + >{{environmentInfoList ? environmentInfoList[8].jcValue : '0'}}°C 温湿度
@@ -49,7 +44,7 @@ >{{ environmentInfoList ? environmentInfoList[7].jcValue - : '' + : '0' }}m/s 风速 @@ -60,7 +55,7 @@ >{{ environmentInfoList ? environmentInfoList[9].jcValue - : '' + : '0' }}%rh 湿度 @@ -71,7 +66,7 @@ >{{ environmentInfoList ? environmentInfoList[5].jcValue - : '' + : '0' }}db 噪声 @@ -82,7 +77,7 @@ >{{ environmentInfoList ? environmentInfoList[3].jcValue - : '' + : '0' }}/ugm3 PM2.5 @@ -93,7 +88,7 @@ >{{ environmentInfoList ? environmentInfoList[4].jcValue - : '' + : '0' }}/ugm3 PM10 @@ -108,7 +103,7 @@
温湿度 - （温度阈值：{{deviceConfig.tempThreshold}}，温度阈值：{{deviceConfig.tempThreshold}}） + （温度阈值：{{deviceConfig.tempThreshold}}，温度阈值：{{deviceConfig.tempThreshold}}）
@@ -116,7 +111,7 @@
风速 - （风速阈值：{{deviceConfig.windSpeed}}） + （风速阈值：{{deviceConfig.windSpeed}}）
@@ -126,7 +121,7 @@
噪声 - （噪声阈值：{{deviceConfig.noise}}） + （噪声阈值：{{deviceConfig.noise}}）
@@ -134,7 +129,7 @@
空气质量 - （PM2.5：{{deviceConfig.particulate}}，PM10：{{deviceConfig.particulateMatter}}） + （PM2.5：{{deviceConfig.particulate}}，PM10：{{deviceConfig.particulateMatter}}）
@@ -242,7 +237,6 @@ export default { console.log(this.sendMsg) this.getDeviceData(this.sendMsg.projectId) this.getDevTypeCodeDetails(this.sendMsg.projectId) - }, methods: { async getDeviceData(proId) { diff --git a/src/components/substation/pitDetect.vue b/src/components/substation/pitDetect.vue index e81ade8..c906294 100644 --- a/src/components/substation/pitDetect.vue +++ b/src/components/substation/pitDetect.vue @@ -35,22 +35,22 @@ {{ item.tit }} -->
- {{ environmentInfoList ? environmentInfoList[0].jcValue : '' }}%VOL + {{ environmentInfoList[0].jcValue ? environmentInfoList[0].jcValue : '0' }}%VOL 含氧量
- {{ environmentInfoList ? environmentInfoList[1].jcValue : '' }}%PPM + {{ environmentInfoList[1].jcValue ? environmentInfoList[1].jcValue : '0' }}%PPM 一氧化碳
- {{ environmentInfoList ? environmentInfoList[2].jcValue : '' }}%LEL + {{ environmentInfoList[2].jcValue ? environmentInfoList[2].jcValue : '0' }}%LEL 可燃气体
- {{ environmentInfoList ? environmentInfoList[3].jcValue : '' }}%PPM + {{ environmentInfoList[3].jcValue ? environmentInfoList[3].jcValue : '0' }}%PPM 硫化氢
@@ -106,7 +106,7 @@
含氧量 - （阈值：{{deviceConfig.oxyThreshold}}） + （阈值：{{deviceConfig.oxyThreshold}}）
@@ -114,7 +114,7 @@
可燃气体 - （阈值：{{deviceConfig.flamGasThreshold}}） + （阈值：{{deviceConfig.flamGasThreshold}}）
@@ -161,7 +161,7 @@
一氧化碳 - （阈值：{{deviceConfig.cothreshold}}） + （阈值：{{deviceConfig.cothreshold}}）
@@ -169,7 +169,7 @@
硫化氢 - （阈值：{{deviceConfig.h2SThreshold}}） + （阈值：{{deviceConfig.h2SThreshold}}）
diff --git a/src/utils/configure.js b/src/utils/configure.js index 3aa6e31..b0396c2 100644 --- a/src/utils/configure.js +++ b/src/utils/configure.js @@ -43,9 +43,9 @@ const CONFIG = { IS_CODE_LOGIN: LOGIN_CONFIG.CODE_EMAIL_LOGIN || LOGIN_CONFIG.CODE_PHONE_LOGIN, // 是否开启短信登录 // 数据设置 dataSettings: { - integrityCheck: DATA_SETTINGS.CLOSE, // 数据完整性校验（true：开启，false：关闭） - encryptRequest: DATA_SETTINGS.CLOSE, // 数据传输加密（true：开启，false：关闭） - encryptResponse: DATA_SETTINGS.CLOSE // 数据返回解密（true：开启，false：关闭） + integrityCheck: DATA_SETTINGS.OPEN, // 数据完整性校验（true：开启，false：关闭） + encryptRequest: DATA_SETTINGS.OPEN, // 数据传输加密（true：开启，false：关闭） + encryptResponse: DATA_SETTINGS.OPEN // 数据返回解密（true：开启，false：关闭） } } diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 4367df5..9b0f8c3 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -24,6 +24,7 @@ +
@@ -34,7 +35,7 @@ - @@ -153,7 +167,7 @@ export default { height: 60px; display: flex; justify-content: space-around; - padding: 0 100px; + padding: 0 50px; .single-tit { font-size: 22px; width: 180px; diff --git a/src/views/Lines/index.vue b/src/views/Lines/index.vue index 0663c26..33d084e 100644 --- a/src/views/Lines/index.vue +++ b/src/views/Lines/index.vue @@ -4,27 +4,21 @@
+
+ +
总览 -
- +
{ - return item.name.includes(this.searchIpt) + return item.projectName.includes(this.searchIpt) }) }, - searchLefSec() { - if(!this.searchIpt) { - return this.lefSecList - } - return this.lefSecList.filter(item => { - return item.title.includes(this.searchIpt) - }) - } + // searchLefSec() { + // if(!this.searchIpt) { + // return this.lefSecList + // } + // return this.lefSecList.filter(item => { + // return item.title.includes(this.searchIpt) + // }) + // } }, created() { diff --git a/src/views/Substation/index.vue b/src/views/Substation/index.vue index 9c1bbc1..f21f8a8 100644 --- a/src/views/Substation/index.vue +++ b/src/views/Substation/index.vue @@ -4,6 +4,9 @@
+
+ +
全国
-
{{ sendMsg.projName }}
+
{ - return item.title.includes(this.searchIpt) + return this.countryList.filter(item => { + return item.areaName.includes(this.searchIpt) }) } }, diff --git a/src/views/Workbench/components/workbenchEdit.vue b/src/views/Workbench/components/workbenchEdit.vue index 4fdbc78..18dac13 100644 --- a/src/views/Workbench/components/workbenchEdit.vue +++ b/src/views/Workbench/components/workbenchEdit.vue @@ -44,7 +44,7 @@
-
+
@@ -504,7 +504,9 @@ export default { this.layout.forEach(item=>{ setTimeout(()=>{ let index2 = this.menuLayout.findIndex(v => v.componentName == item.componentName) - this.menuLayout[index2].isPut = "1" + if(index2>-1){ + this.menuLayout[index2].isPut = "1" + } },500) }) }, @@ -534,6 +536,9 @@ export default { {x: 6,y: 2,w: 3,h: 4,i: 10,isAccord: '1*1',componentName: '',}, {x: 9,y: 2,w: 3,h: 4,i: 11,isAccord: '1*1',componentName: '',} ] + this.menuLayout.forEach(item=>{ + item.isPut = "0" + }) this.$message({ type: 'success', message: '清空完成!'