From 9b6c40fee3d1d8bf3370c9427a81212f02caff1d Mon Sep 17 00:00:00 2001 From: zhoule Date: Fri, 1 Mar 2024 14:24:59 +0800 Subject: [PATCH 1/2] bug --- .../components/composeFeatures/assets/charts.js | 2 +- .../IndicatorAnalysis/components/crowding/assets/charts.js | 2 +- .../IndicatorAnalysis/components/saturationMax/assets/charts.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js index f92ef076..f2681aae 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/composeFeatures/assets/charts.js @@ -5,7 +5,7 @@ var options = { left: "0%", right: "8%", bottom: "0%", - top: "20%", + top: "25px", containLabel: true, }, tooltip: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js index c553ff0e..a05acf4b 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/crowding/assets/charts.js @@ -5,7 +5,7 @@ var options = { left: "0%", right: "0%", bottom: "0%", - top: "20%", + top: "25px", containLabel: true, }, tooltip: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js index d305bda1..a6c84e4e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/perception/trafficSituation/components/IndicatorAnalysis/components/saturationMax/assets/charts.js @@ -9,7 +9,7 @@ var options = { left: "0%", right: "0%", bottom: "0%", - top: "20%", + top: "25px", containLabel: true, }, From fbe7c1bdd16beb8062101d75c054c45bc7aca24f Mon Sep 17 00:00:00 2001 From: zhangzhang <1747194829@qq.com> Date: Fri, 1 Mar 2024 14:25:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/HeaderMenu/UserArea.vue | 176 +++++++++++------- .../components/InputSearch/index.vue | 3 +- .../pages/Home/components/InfoBoard/index.vue | 151 +++++++++++---- .../components/postTrendsDay/assets/charts.js | 4 - .../postTrendsMonth/assets/charts.js | 4 - .../postTrendsMonth/assets/charts2.js | 5 - .../postTrendsMonth/assets/charts3.js | 4 - .../pages/service/board/index.vue | 4 +- 8 files changed, 234 insertions(+), 117 deletions(-) diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue index 5fbbaa50..3d5216ac 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/HeaderMenu/UserArea.vue @@ -3,8 +3,15 @@
- -

admin

+ +

+ admin +

@@ -14,22 +21,26 @@
-
-
+
+ +
+
+ +
- + - diff --git a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue index b23aba5e..98ea66df 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/components/InputSearch/index.vue @@ -133,9 +133,10 @@ export default { this.width = this.$refs.ReferenceInputRef.getBoundingClientRect().width; }, handleResetForm() { + this.visible = true; this.$refs.FormConfigRef?.reset(); this.$refs.FormConfigRef.$refs.ElFormRef.resetFields(); - this.$refs.PopoverRef.doClose(); + // this.$refs.PopoverRef.doClose(); this.$emit("handleSearch", cloneDeep(this.$refs.FormConfigRef?.formData)); }, 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 53bd1e01..d7563596 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 @@ -6,22 +6,49 @@
{{ selectedDevice.deviceName }}
- - + +
-
+
-
+
- +
-

+

-

+

@@ -61,30 +88,62 @@
-->
- 设备参数 - 在线率统计 + 设备参数 + 在线率统计
- 添加信息 - 发布信息 + 添加信息 + 发布信息
- +
信息模板
-
- +
+
附近相机
@@ -93,12 +152,23 @@
-
+

{{ item.dictLabel }}

-
+
- +
-

+

@@ -116,13 +189,23 @@
- +
- +
@@ -232,7 +315,7 @@ export default { // this.____getAllTemplate(); }, computed: {}, - mounted() { }, + mounted() {}, methods: { // 获取信息模板分类 ____getTemplateCategory() { @@ -276,7 +359,7 @@ export default { .then((res) => { this.selectedBdMsg = res.data["3A"].content; }) - .catch((err) => { }); + .catch((err) => {}); else this.$message.error("设备未接入"); } }, @@ -317,7 +400,7 @@ export default { ____onDeleteBoardItem(index) { if (index > -1) { this.selectedBdMsg.splice(index, 1); - this.$message.success("删除成功。"); + this.$message.success("删除成功"); } }, //编辑机编辑后的回调 @@ -338,7 +421,7 @@ export default { } }, - ____refreshPageData(para) { }, + ____refreshPageData(para) {}, ____getNearbyCams() { if (!this.selectedDevice.stakeMark) { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js index 322bd9bd..ff0b4cf9 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsDay/assets/charts.js @@ -3,10 +3,6 @@ var options = { tooltip: { show: true, trigger: "axis", - textStyle: { - // color: "#fff", - fontSize: 10, - }, // formatter: "{b}:{c}人", }, legend: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js index 7abcecd8..28433ebe 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts.js @@ -23,10 +23,6 @@ let options = { // 坐标轴指示器,坐标轴触发有效 type: "shadow", // 默认为直线,可选为:'line' | 'shadow' }, - textStyle: { - // color: "#fff", - fontSize: 10, - }, // backgroundColor: "rgba(3, 31, 71, .0)", //设置背景颜色 // borderColor: "rgba(3, 31, 71, .0)", // formatter: "健康监测
{b}:{c}人", diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js index 941d01c6..fffb4ddc 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts2.js @@ -5,11 +5,6 @@ let options = { tooltip: { show: true, trigger: "axis", - // backgroundColor: "rgba(17,95,182,0.5)", //设置背景颜色 - textStyle: { - // color: "#fff", - fontSize: 10, - }, // formatter: "{b}:{c}人", }, grid: { diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js index dc31896c..7dc5ed46 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/postTrendsMonth/assets/charts3.js @@ -23,10 +23,6 @@ var options = { }, tooltip: { show: true, - textStyle: { - // color: "#fff", - fontSize: 10, - }, // valueFormatter: function (value) { // return value; // // return (value + minNumber).toFixed(2) + " %"; 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 5dbddb0c..e28fc90e 100644 --- a/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue +++ b/ruoyi-ui/src/views/JiHeExpressway/pages/service/board/index.vue @@ -736,7 +736,7 @@ export default { type: "warning", }).then(() => { deleteTemplate(id).then(() => { - this.$message.success("删除成功!"); + this.$message.success("删除成功"); this.____refreshPageData({ type: "template" }); }); }); @@ -746,7 +746,7 @@ export default { ____onDeleteBoardItem(index) { if (index > -1) { this.selectedBdMsg.splice(index, 1); - this.$message.success("删除成功。"); + this.$message.success("删除成功"); } },