diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
index 3686c892..a7d54ec2 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/assets/charts.js
@@ -2,7 +2,7 @@ import * as echarts from "echarts";
var data1 = [50, 32, 41, 61, 70, 39, 40, 55, 63, 55, 36, 45, 62, 74, 46, 73, 92, 60, 45, 33, 45,66,55, 32, 46, 36, 67, 49, 60, 55, 33, 35, 66]
var data2 = [5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6, 15,12, 4, 6, 7, 9, 10, 15, 3, 5, 6,5, 12, 4, 6, 7, 9, 10, 15, 3, 5, 6]
-var options = {
+let options = {
tooltip: {
trigger: 'axis',
backgroundColor: 'rgba(17,95,182,0.5)',
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 c955c485..c10c506b 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
@@ -1,4 +1,3 @@
-import { options } from "runjs";
let data = [100, 0, 0, 0, 40, 40,40, 64,40, 64,40, 64]
let indicator = [
@@ -22,7 +21,7 @@ let indicator = [
]
let options = {
- backgroundColor: '#000928',
+
tooltip: {},
radar: {
center: ['50%', '50%'],
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
index e69de29b..2371dd10 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/deviceUptime/index.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
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
new file mode 100644
index 00000000..c10c506b
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/assets/charts.js
@@ -0,0 +1,182 @@
+
+let data = [100, 0, 0, 0, 40, 40,40, 64,40, 64,40, 64]
+let indicator = [
+
+ { name: '智能设备箱', max: 100 },
+ { name: '智能行车诱导系统', max: 100 },
+ { name: '一类交通量调查站', max: 100 },
+ { name: '激光疲劳唤醒系统', max: 100 },
+ { name: '合流区预警系统', max: 100 },
+ { name: '毫米波雷达', max: 100 },
+ { name: '护碰撞预警系统', max: 100 },
+ { name: '路段语音广播系统', max: 100 },
+ { name: '气象检测器', max: 100 },
+ { name: '站前悬臂式可变信息标志', max: 100 },
+ { name: '雨棚可变信息标志', max: 100 },
+ { name: '门架式可变信息标志', max: 100 },
+ { name: '180°全景摄像机', max: 100 },
+ { name: '360°全景摄像机', max: 100 },
+ { name: '高清网络枪型固定摄像机', max: 100 },
+ { name: '高清网络球形摄像机', max: 100 },
+]
+
+let options = {
+
+ tooltip: {},
+ radar: {
+ center: ['50%', '50%'],
+ radius: '75%',
+ nameGap: 0,
+ indicator: indicator,
+ splitLine: {
+ show: false
+
+ },
+ splitArea: {
+ show: false
+ },
+ axisLine: {
+ show: true
+ },
+ name: {
+ textStyle: {
+ color: '#F2F3F5',
+ fontSize: '20',
+ borderRadius: 3,
+ padding: [3, 5]
+ }
+ },
+ },
+ series: [{
+ type: 'radar',
+ data: [data],
+ name: '安全作业',
+ label: {
+ show: true,
+ formatter: function (params) {
+ console.log(params)
+ return params.value;
+ },
+ color: '#fff',
+ // position:[-20,-10,-10,-10],
+ align: 'right',
+ distance: 10,
+ align: 'right'
+ },
+ symbolSize: 10,
+ lineStyle: { //边缘颜色
+ width: 2,
+ color: '#2287FE'
+ },
+ itemStyle: {
+ borderWidth: 0,
+ color: '#ffffff00',
+ borderColor: '#2287F00',
+ },
+ areaStyle: {
+ color: '#2287FE60',
+ opacity: 1
+ }
+ },
+ {
+ type: 'radar',
+ name: '安全作业',
+ data: [
+ [100, 100, 100, 100, 100, 100, 100, 100,100, 100, 100, 100, 100, 100, 100, 100],
+ ],
+
+ symbol: 'none',
+ lineStyle: {
+ width: 1
+ },
+ itemStyle: {
+ color: '#2AD1BC'
+ },
+
+ areaStyle: {
+ color: '#2AD1BC29',
+ opacity: 0.1
+ }
+ },
+ {
+ type: 'radar',
+ name: '安全作业',
+ data: [
+ [80, 80, 80, 80, 80, 80, 80, 80,80, 80, 80, 80, 80, 80, 80, 80]
+ ],
+
+ symbol: 'none',
+ lineStyle: {
+ width: 1
+ },
+ itemStyle: {
+ color: '#2AD1BC'
+ },
+
+ areaStyle: {
+ color: '#2AD1BC29',
+ opacity: 0.2
+ }
+ },
+ {
+ type: 'radar',
+ name: '安全作业',
+ data: [
+ [60, 60, 60, 60, 60, 60, 60, 60,60, 60, 60, 60, 60, 60, 60, 60],
+ ],
+
+ symbol: 'none',
+ lineStyle: {
+ width: 1
+ },
+ itemStyle: {
+ color: '#2AD1BC'
+ },
+
+ areaStyle: {
+ color: '#2AD1BC29',
+ opacity: 0.1
+ }
+ },
+ {
+ type: 'radar',
+ name: '安全作业',
+ data: [
+ [40, 40, 40, 40, 40, 40, 40, 40,40, 40, 40, 40, 40, 40, 40, 40],
+ ],
+ symbol: 'none',
+ lineStyle: {
+ width: 1
+ },
+ itemStyle: {
+ color: '#2AD1BC'
+ },
+
+ areaStyle: {
+ color: '#2AD1BC29',
+ opacity: 0.1
+ }
+ },
+ {
+ type: 'radar',
+ name: '安全作业',
+ data: [
+ [20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20],
+ ],
+ symbol: 'none',
+ lineStyle: {
+ width: 1
+ },
+ itemStyle: {
+ color: '#2AD1BC'
+ },
+
+ areaStyle: {
+ color: '#2AD1BC29',
+ opacity: 0.1
+ }
+ },
+ ]
+};
+
+export default options;
\ No newline at end of file
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
new file mode 100644
index 00000000..4c3ea3a1
--- /dev/null
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/components/monthlyEquipment/index.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
+ {{ item.num }}%
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
index 97a22e8b..05e74d28 100644
--- a/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
+++ b/ruoyi-ui/src/views/JiHeExpressway/pages/maintenanceOperations/statisticalAnalysis/index.vue
@@ -39,6 +39,10 @@
+
+
+
+
@@ -125,10 +129,14 @@
import * as echarts from "echarts";
import chartsStatistics from "./assets/charts";
+ import DeviceUptime from './components/deviceUptime';
+ import MonthlyEquipment from './components/monthlyEquipment';
+
export default {
name: 'publicService',
components: {
-
+ DeviceUptime,
+ MonthlyEquipment
},
data(){
return {
@@ -387,6 +395,25 @@ import * as echarts from "echarts";