IIYIt
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
literal 0
HcmV?d00001
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/topComponent/assets/车辆故障.png b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/components/topComponent/assets/车辆故障.png
new file mode 100644
index 0000000000000000000000000000000000000000..f002ed8c5e04c4771a9f690d002e768a387bbbf5
GIT binary patch
literal 2244
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
S#i5q~0000
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue
new file mode 100644
index 00000000..30cd160f
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/control/event/governanceAnalysis/index.vue
@@ -0,0 +1,178 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js
index cf0fac1d..d5fde08a 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/chargeableOperations/components/RoadSectionTolls/assets/charts.js
@@ -20,7 +20,7 @@ let options = {
fontSize: 14,
color: "#000",
},
- formatter: "{a}
{b} :\n\n{c} 个",
+ formatter: "{a}
{b} :\n\n{c} ",
},
legend: {
top: 10,
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
index 4b35b669..48948996 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/assets/charts.js
@@ -50,7 +50,7 @@ let options = {
series: [{
type: 'radar',
data: [data],
- name: '安全作业',
+ name: '设备在线率',
label: {
show: true,
formatter: function (params) {
@@ -80,7 +80,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100],
],
@@ -100,7 +100,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[80, 80, 80, 80, 80, 80, 80, 80,80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80]
],
@@ -120,7 +120,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[60, 60, 60, 60, 60, 60, 60, 60,60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60],
],
@@ -140,7 +140,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[40, 40, 40, 40, 40, 40, 40, 40,40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40],
],
@@ -159,7 +159,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20],
],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
index dfd3d256..9204ae69 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
@@ -50,7 +50,7 @@ let options = {
series: [{
type: 'radar',
data: [data],
- name: '安全作业',
+ name: '设备在线率',
label: {
show: true,
formatter: function (params) {
@@ -80,7 +80,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100, 100, 100, 100, 100, 100],
],
@@ -100,7 +100,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[80, 80, 80, 80, 80, 80, 80, 80,80, 80, 80, 80, 80, 80, 80, 80]
],
@@ -120,7 +120,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[60, 60, 60, 60, 60, 60, 60, 60,60, 60, 60, 60, 60, 60, 60, 60],
],
@@ -140,7 +140,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[40, 40, 40, 40, 40, 40, 40, 40,40, 40, 40, 40, 40, 40, 40, 40],
],
@@ -159,7 +159,7 @@ let options = {
},
{
type: 'radar',
- name: '安全作业',
+ name: '设备在线率',
data: [
[20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20],
],
From 64ac974ffaf186206dbffbeddbd48dc178ea0d94 Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Fri, 19 Jan 2024 12:50:29 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=80=E6=96=B0?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/common/menuData.js | 6 ++++++
.../components/monthlyEquipment/index.vue | 3 ++-
ruoyi-ui/src/views/login.vue | 5 +++--
ruoyi-ui/vue.config.js | 15 ++-------------
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/common/menuData.js b/ruoyi-ui/src/common/menuData.js
index d1af6aca..7c08946f 100644
--- a/ruoyi-ui/src/common/menuData.js
+++ b/ruoyi-ui/src/common/menuData.js
@@ -88,6 +88,12 @@ export default [
name: "commandDispatch",
component: "control/event/commandDispatch/index.vue",
},
+ {
+ title: "管控事件分析",
+ path: "/control/event/governanceAnalysis",
+ name: "governanceAnalysis",
+ component: "control/event/governanceAnalysis/index.vue",
+ },
],
},
],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
index a55e0448..1063bc54 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -248,7 +248,8 @@
border-radius: 50%;
border: 2px solid;
border: rgba(23, 162, 255, 0.2);
-
+ border: 2px solid;
+// border-image: linear-gradient(33deg, rgba(23, 162, 255, 0.71), rgba(23, 162, 255, 0)) 2 2;
> .round-num {
width:100%;
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 41b8e14f..093607d5 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -250,7 +250,7 @@ export default {
position: relative;
height: 100%;
background-image: url("../assets/images/login-background.png");
- background-size: cover;
+ background-size: 100% auto;
}
.login::after {
@@ -259,7 +259,8 @@ export default {
width: 100%;
height: 120px;
background-image: url('../assets/images/login-head.png');
- background-size: auto 100%;
+ background-repeat: no-repeat;
+ background-size: 100% auto ;
background-position: center center;
}
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 431fc799..7a16ca3c 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -1,8 +1,5 @@
"use strict";
const path = require("path");
-const webpack = require("webpack");
-
-const packageJSON = require("./package.json");
function resolve(dir) {
return path.join(__dirname, dir);
@@ -46,8 +43,8 @@ module.exports = {
// target: `http://10.168.73.36:8080`, // 周乐
// target: `http://10.168.77.209:8080`, // 刘朋
// target: `http://10.168.66.196:8080`, //刘文阁
- // target: `http://10.168.56.206:8087`, //孟
- target: `http://10.0.81.202:8087`, //现场后台
+ target: `http://10.168.65.156:8087`,//孟
+ // target: `http://10.0.81.202:8087`, //现场后台
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",
@@ -82,14 +79,6 @@ module.exports = {
chainWebpack(config) {
config.plugins.delete("preload"); // TODO: need test
config.plugins.delete("prefetch"); // TODO: need test
- config.plugin("DefinePlugin").use(webpack.DefinePlugin, [
- {
- "process.env.Version": (() =>
- JSON.stringify(
- `${new Date().toLocaleString()}-V${packageJSON.version}`
- ))(),
- },
- ]);
const rootModulesPath = path.resolve("node_modules");
if (config.resolve.modules.store.has(rootModulesPath)) {
From 11338abb5521fb4ce31a953888f39bdd1b55e1c8 Mon Sep 17 00:00:00 2001
From: yyl <279235553@qq.com>
Date: Fri, 19 Jan 2024 12:51:58 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9C=80=E6=96=B0?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../statisticalAnalysis/components/monthlyEquipment/index.vue | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
index 1063bc54..0a17c933 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -246,9 +246,7 @@
border-radius: 0px 0px 0px 0px;
opacity: 1;
border-radius: 50%;
- border: 2px solid;
- border: rgba(23, 162, 255, 0.2);
- border: 2px solid;
+ border: 0px solid;
// border-image: linear-gradient(33deg, rgba(23, 162, 255, 0.71), rgba(23, 162, 255, 0)) 2 2;
> .round-num {
From c5ea0672abb7a91161097bb873b54ad564bdaadd Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Fri, 19 Jan 2024 12:55:51 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/Home/components/RoadAndEvents/utils/map.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index b2bddf1e..87c906d1 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -104,7 +104,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
const normal = require(`@screen/images/layer${item.id.replace(
/^\.|[^/]+(?=.svg$)/g,
- (data) => (data === "." ? "" : `${data}_active`)
+ (data) => (data === "." ? "" : `${data}`)
)}`);
const fault = require(`@screen/images/layer${item.id.replace(
@@ -113,7 +113,7 @@ export async function setMarkToMap(item, data, _markerClick, content) {
)}`);
const faultBg = require(`@screen/images/mapBg/fault.svg`);
- const normalBg = require(`@screen/images/mapBg/active.svg`);
+ const normalBg = require(`@screen/images/mapBg/normal.svg`);
const markerClick = (e) => {
const extData = e.target.getExtData();
From 1d71b14779c60d1c2441d34b78305db96e1f5a95 Mon Sep 17 00:00:00 2001
From: Joe <1712833832@qq.com>
Date: Fri, 19 Jan 2024 13:04:10 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../JiHeExpressway/images/deviceType/ball.svg | 14 ++++++++
.../images/deviceType/ball_fault.svg | 14 ++++++++
.../RoadAndEvents/utils/buttonEvent.js | 15 ++++++++
.../components/RoadAndEvents/utils/map.js | 36 +++++++++++++------
4 files changed, 69 insertions(+), 10 deletions(-)
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball.svg
create mode 100644 ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball_fault.svg
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball.svg
new file mode 100644
index 00000000..17e57887
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball.svg
@@ -0,0 +1,14 @@
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball_fault.svg b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball_fault.svg
new file mode 100644
index 00000000..b575f454
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/images/deviceType/ball_fault.svg
@@ -0,0 +1,14 @@
+
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
index d08b34ea..38a5c421 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/buttonEvent.js
@@ -33,6 +33,9 @@ export const eventMap = {
// status: "0",
// };
+ const ballFault = require("@screen/images/deviceType/ball_fault.svg");
+ const ball = require("@screen/images/deviceType/ball.svg");
+
const data = await getDeviceList(1);
// const data = [
// {
@@ -74,6 +77,18 @@ export const eventMap = {
data: extData,
};
} catch (error) {}
+ },
+ null,
+ {
+ iconCallback(bool, item) {
+ const type = JSON.parse(item.otherConfig)?.ptzCtrl;
+
+ switch (type) {
+ case "0":
+ case 0:
+ return bool ? ball : ballFault;
+ }
+ },
}
);
},
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
index 87c906d1..8f5879f8 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/Home/components/RoadAndEvents/utils/map.js
@@ -97,20 +97,30 @@ export async function setMarkerCluster(map, points, markerFun) {
* @param {*} _markerClick marker 点击
* @returns
*/
-export async function setMarkToMap(item, data, _markerClick, content) {
+export async function setMarkToMap(
+ item,
+ data,
+ _markerClick,
+ content,
+ { iconCallback } = {}
+) {
const { mapIns } = this.getMap();
if (!mapIns) return Message.error("地图加载失败!");
- const normal = require(`@screen/images/layer${item.id.replace(
- /^\.|[^/]+(?=.svg$)/g,
- (data) => (data === "." ? "" : `${data}`)
- )}`);
+ const normal =
+ normal ||
+ require(`@screen/images/layer${item.id.replace(
+ /^\.|[^/]+(?=.svg$)/g,
+ (data) => (data === "." ? "" : `${data}`)
+ )}`);
- const fault = require(`@screen/images/layer${item.id.replace(
- /^\.|[^/]+(?=.svg$)/g,
- (data) => (data === "." ? "" : `${data}_fault`)
- )}`);
+ const fault =
+ fault ||
+ require(`@screen/images/layer${item.id.replace(
+ /^\.|[^/]+(?=.svg$)/g,
+ (data) => (data === "." ? "" : `${data}_fault`)
+ )}`);
const faultBg = require(`@screen/images/mapBg/fault.svg`);
const normalBg = require(`@screen/images/mapBg/normal.svg`);
@@ -124,6 +134,10 @@ export async function setMarkToMap(item, data, _markerClick, content) {
const markerCluster = await setMarkerCluster(
mapIns,
data.map((item) => {
+ const deviceIcon =
+ iconCallback === "function" &&
+ iconCallback(item.deviceState == 1, item);
+
return {
weight: 1,
lnglat: [item.longitude, item.latitude],
@@ -146,7 +160,9 @@ export async function setMarkToMap(item, data, _markerClick, content) {
height: 18px;
margin-left: 3px;
margin-bottom: 6px;
- " src='${item.deviceState == 1 ? normal : fault}'>
+ " src='${
+ deviceIcon ? deviceIcon : item.deviceState == 1 ? normal : fault
+ }'>