From 5789e435950006f7e844744cc4f36d5f96fa75fc Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 1 Mar 2024 18:05:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/dailyDisposal/assets/charts.js | 3 +++ .../eventDetection/components/dayTotal/assets/charts.js | 2 +- .../components/eventQuery/assets/charts.js | 6 +++++- .../components/eventQuery/assets/charts2.js | 4 ++-- .../components/eventQuery/assets/charts3.js | 8 ++++++-- .../components/eventSource/assets/charts.js | 6 ++---- .../components/monthStatistics/assets/charts.js | 4 ++-- .../components/railwayDay/assets/charts.js | 2 +- .../components/typeAnalysis/assets/charts.js | 3 +++ .../components/classification/assets/charts.js | 9 +++------ .../trafficFlow/components/congestion/assets/charts.js | 3 +++ .../trafficFlow/components/flowstate/assets/charts.js | 6 +++--- 12 files changed, 34 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js index ed426413..1cb40387 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dailyDisposal/assets/charts.js @@ -62,6 +62,9 @@ var options = { }, tooltip: { trigger: "item", + valueFormatter: function (value) { + return value + " 起"; + }, }, series: [ { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js index ef26b2fd..a00afd6c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/dayTotal/assets/charts.js @@ -35,7 +35,7 @@ var options = { }, tooltip: { valueFormatter: function (value) { - return value + minNumber; + return value + minNumber + " 起"; }, }, grid: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js index 2ca3e1f4..a79d3a8a 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts.js @@ -66,7 +66,11 @@ var options = { bottom: "2%", //下边距 containLabel: true, }, - tooltip: {}, + tooltip: { + valueFormatter: function (value) { + return value + " 起"; + }, + }, xAxis: { type: "category", data: [], diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js index 86fa33f2..40d15fd3 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts2.js @@ -99,8 +99,8 @@ for (let i = 0; i < chartData.length; i++) { var options = { tooltip: { confine: true, - textStyle: { - fontSize: 14, // 字体大小 + valueFormatter: function (value) { + return value + " 起"; }, }, title: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js index 5a3ff46e..6b237946 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventQuery/assets/charts3.js @@ -16,7 +16,11 @@ let xData = [ ]; let data1 = [200, 530, 920, 400, 600, 700, 300, 800, 900, 120, 570, 800]; let options = { - tooltip: {}, + tooltip: { + valueFormatter: function (value) { + return value + " 起"; + }, + }, grid: { left: "2%", right: "4%", @@ -39,7 +43,7 @@ let options = { }, }, axisLabel: { - interval: 'auto', + interval: "auto", align: "center", rotate: "1", margin: "20", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js index e268c1bd..5eb9094b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/eventSource/assets/charts.js @@ -55,11 +55,9 @@ for (let i = 0; i < chartData.length; i++) { var options = { tooltip: { confine: true, - textStyle: { - color: "#333", + valueFormatter: function (value) { + return value + " 起"; }, - color: "#333", - backgroundColor: "#ffffff", }, title: { //圆环中间内容 diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js index 4e502d93..34481b34 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/monthStatistics/assets/charts.js @@ -3,8 +3,8 @@ var options = { color: ["#5090FF", "#01B3E4"], tooltip: { trigger: "axis", - textStyle: { - color: "#333", + valueFormatter: function (value) { + return value + " 起"; }, }, grid: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js index a757f395..ce5a0d1c 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/railwayDay/assets/charts.js @@ -64,7 +64,7 @@ var options = { }, tooltip: { valueFormatter: function (value) { - return value + minNumber; + return value + minNumber + " 起"; }, }, xAxis: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/assets/charts.js index 6023fbf0..44f90e45 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/eventDetection/components/typeAnalysis/assets/charts.js @@ -80,6 +80,9 @@ var options = { }, tooltip: { trigger: "item", + valueFormatter: function (value) { + return value + " 起"; + }, }, series: [ { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js index fd3edf39..b0245b95 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/classification/assets/charts.js @@ -64,12 +64,9 @@ for (var i of datas) { var options = { tooltip: { show: true, - // trigger: "item", - // formatter: "{a}
{b}: {c} ({d}%)", - // backgroundColor: "#ffffff", - // textStyle: { - // color: "#666", - // }, + valueFormatter: function (value) { + return value + " 辆"; + }, }, legend: { orient: "vertical", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js index 213ed6ef..714fb8c9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/congestion/assets/charts.js @@ -58,6 +58,9 @@ var options = { tooltip: { show: true, trigger: "axis", + valueFormatter: function (value) { + return value + " 起"; + }, }, grid: { top: "5%", //上边距 diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js index 142f464c..c093d022 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficFlow/components/flowstate/assets/charts.js @@ -7,9 +7,9 @@ var options = { return `${params[0].name.replace(/-/g, "")}${params[1].name.replace( /-/g, "" - )}
${params[0].marker}${params[0].seriesName} : ${ - params[0].value - } 辆`; + )}
${params[0].marker}${ + params[0].seriesName + }: ${params[0].value} 辆`; }, }, axisPointer: { 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 2/3] =?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; From 2dcb6985e3a0791e2448c989f62183b5bc6abe9d Mon Sep 17 00:00:00 2001 From: hui <770260999@qq.com> Date: Mon, 4 Mar 2024 14:13:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JiHeExpressway/pages/service/board/index.vue | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) 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 3b04b637..516e4897 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -57,9 +57,11 @@ :key="index" >
{{ itm.deviceName }}
- - - + + + + + { res.data.forEach((item, index) => { - if(!item.iotDeviceId){ - return - } if (_.isString(item.otherConfig)) { item.otherConfig = JSON.parse(item.otherConfig); } @@ -1292,7 +1291,7 @@ export default { 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;} + .state{ width: 18px; height: 18px; margin-right: 4px;} .huiduButton { background: transparent; border: none;