From 497efcc48de4cd471676d303f245527fd82053c4 Mon Sep 17 00:00:00 2001
From: hui <770260999@qq.com>
Date: Mon, 4 Mar 2024 11:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/assets/jihe/images/offline.svg | 1 +
ruoyi-ui/src/assets/jihe/images/online.svg | 1 +
.../pages/Home/components/InfoBoard/index.vue | 4 +-
.../pages/service/board/index.vue | 53 +++++++++++--------
4 files changed, 36 insertions(+), 23 deletions(-)
create mode 100644 ruoyi-ui/src/assets/jihe/images/offline.svg
create mode 100644 ruoyi-ui/src/assets/jihe/images/online.svg
diff --git a/ruoyi-ui/src/assets/jihe/images/offline.svg b/ruoyi-ui/src/assets/jihe/images/offline.svg
new file mode 100644
index 00000000..ab89f89f
--- /dev/null
+++ b/ruoyi-ui/src/assets/jihe/images/offline.svg
@@ -0,0 +1 @@
+
diff --git a/ruoyi-ui/src/assets/jihe/images/online.svg b/ruoyi-ui/src/assets/jihe/images/online.svg
new file mode 100644
index 00000000..ecc5d4e4
--- /dev/null
+++ b/ruoyi-ui/src/assets/jihe/images/online.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
index d7563596..460059f3 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/InfoBoard/index.vue
@@ -354,8 +354,8 @@ export default {
} else {
//改下判断条件 iotDeviceId为null时不要请求后台 加个提示 设备未接入
const iotDeviceId = this.selectedDevice.iotDeviceId;
- if (!(iotDeviceId === null || iotDeviceId === undefined))
- getBoardDeviceInfo()
+ if (iotDeviceId != null && iotDeviceId != undefined)
+ getBoardDeviceInfo(iotDeviceId)
.then((res) => {
this.selectedBdMsg = res.data["3A"].content;
})
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
index e28fc90e..3b04b637 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue
@@ -56,7 +56,9 @@
:label="itm.iotDeviceId"
:key="index"
>
- {{ itm.deviceName }}
+ {{ itm.deviceName }}
+ 
+ 
{
- res.data.forEach((item) => {
+ res.data.forEach((item, index) => {
+ if(!item.iotDeviceId){
+ return
+ }
if (_.isString(item.otherConfig)) {
item.otherConfig = JSON.parse(item.otherConfig);
}
@@ -1257,12 +1262,15 @@ export default {
}
.checkbox {
- label {
- width: 100%;
- padding: 10px 0;
- box-sizing: border-box;
- display: flex;
+ .boardLabel{
+
}
+ // label {
+ // width: 100%;
+ // padding: 10px 0;
+ // box-sizing: border-box;
+ // display: flex;
+ // }
}
}
@@ -1283,11 +1291,28 @@ export default {
display: flex !important;
justify-content: space-between;
width: 100%;
+ .title{ flex:1; width:0; overflow: hidden; text-overflow: ellipsis; word-break: keep-all;}
+ .wifi{ width: 18px; height: 18px; margin-right: 4px;}
+ .huiduButton {
+ background: transparent;
+ border: none;
+ height: 18px;
+ width: 18px;
+ line-height: 20px;
+ padding: 0;
+ color: #fff;
+ font-size: 16px;
+ }
+
+ .huiduButton:hover {
+ color: #05afe3 !important;
+ }
}
.el-checkbox {
display: flex !important;
padding-top: 10px;
+ margin: 0;
}
::v-deep .el-table {
@@ -1299,20 +1324,6 @@ export default {
}
}
-.huiduButton {
- background: transparent;
- border: none;
- height: 19px;
- line-height: 20px;
- padding: 0;
- color: #fff;
- font-size: 16px;
-}
-
-.huiduButton:hover {
- color: #05afe3 !important;
-}
-
// .boardListTitle {
// // margin-top: 1vh;
// color: #fff;