From b07ab75fb61fff925c7eafb8b9533350e20d64c8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 08 Apr 2021 12:01:29 +0800
Subject: [PATCH] 警情路由放行，警情统计页面跳转，预警分析页面样式优化
---
src/router/views/index.js | 662 +++++++++++++++++++++++-----------------------
src/styles/alarmAnalysis/alarmAnalysis.scss | 19
src/views/alarmManagement/alarmAnalysis.vue | 125 +++++++-
3 files changed, 452 insertions(+), 354 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 22fe348..a79885f 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -1,342 +1,342 @@
import Layout from '@/page/index/'
export default [{
- path: '/wel',
- component: Layout,
- redirect: '/wel/index',
- children: [{
- path: 'index',
- name: '首页',
- meta: {
- i18n: 'dashboard'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
- }]
- },
+ path: '/wel',
+ component: Layout,
+ redirect: '/wel/index',
+ children: [{
+ path: 'index',
+ name: '首页',
+ meta: {
+ i18n: 'dashboard'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
+ }]
+ },
- // {
- // path: '/wel',
- // component: Layout,
- // redirect: '/wel/index',
- // children: [{
- // path: 'index',
- // name: '首页',
- // meta: {
- // i18n: 'dashboard'
- // },
- // component: () =>
- // import ( /* webpackChunkName: "views" */ '@/views/home/home')
- // }, {
- // path: 'dashboard',
- // name: '控制台',
- // meta: {
- // i18n: 'dashboard',
- // menu: false,
- // },
- // component: () =>
- // import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
- // }]
- // },
- {
- path: '/distribution',
- component: Layout,
- redirect: '/distribution/index',
- children: [{
- path: 'index',
- name: '警情分发处置',
- meta: {
- i18n: 'distribution'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/distribution/index')
- }]
- },
- {
- path: '/test',
- component: Layout,
- redirect: '/test/index',
- children: [{
- path: 'index',
- name: '测试页',
- meta: {
- i18n: 'test'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/test')
- }]
- }, {
- path: '/dict-horizontal',
- component: Layout,
- redirect: '/dict-horizontal/index',
- children: [{
- path: 'index',
- name: '字典管理',
- meta: {
- i18n: 'dict'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
- }]
- }, {
- path: '/dict-vertical',
- component: Layout,
- redirect: '/dict-vertical/index',
- children: [{
- path: 'index',
- name: '字典管理',
- meta: {
- i18n: 'dict'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
- }]
- }, {
- path: '/info',
- component: Layout,
- redirect: '/info/index',
- children: [{
- path: 'index',
- name: '个人信息',
- meta: {
- i18n: 'info'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/userinfo')
- }]
- },
- {
- path: '/real',
- component: Layout,
- redirect: '/real/video',
- children: [{
- path: 'video',
- name: '视频',
- meta: {
- i18n: 'real'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/Video/video')
+ // {
+ // path: '/wel',
+ // component: Layout,
+ // redirect: '/wel/index',
+ // children: [{
+ // path: 'index',
+ // name: '首页',
+ // meta: {
+ // i18n: 'dashboard'
+ // },
+ // component: () =>
+ // import ( /* webpackChunkName: "views" */ '@/views/home/home')
+ // }, {
+ // path: 'dashboard',
+ // name: '控制台',
+ // meta: {
+ // i18n: 'dashboard',
+ // menu: false,
+ // },
+ // component: () =>
+ // import ( /* webpackChunkName: "views" */ '@/views/wel/dashboard')
+ // }]
+ // },
+ {
+ path: '/distribution',
+ component: Layout,
+ redirect: '/distribution/index',
+ children: [{
+ path: 'index',
+ name: '警情分发处置',
+ meta: {
+ i18n: 'distribution'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/distribution/index')
+ }]
+ },
+ {
+ path: '/test',
+ component: Layout,
+ redirect: '/test/index',
+ children: [{
+ path: 'index',
+ name: '测试页',
+ meta: {
+ i18n: 'test'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/util/test')
+ }]
}, {
- path: 'history/:historyId',
- name: '设备历史',
- meta: {
- i18n: 'real'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
- }]
- },
- {
- path: '/welcomeData',
- component: Layout,
- redirect: '/welcomeData/data',
- children: [{
- path: 'data',
- name: '数据模式',
- meta: {
- i18n: 'data'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
+ path: '/dict-horizontal',
+ component: Layout,
+ redirect: '/dict-horizontal/index',
+ children: [{
+ path: 'index',
+ name: '字典管理',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-horizontal')
+ }]
}, {
- path: 'map',
- name: '地图模式',
- meta: {
- i18n: 'map'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/map')
+ path: '/dict-vertical',
+ component: Layout,
+ redirect: '/dict-vertical/index',
+ children: [{
+ path: 'index',
+ name: '字典管理',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/util/demo/dict-vertical')
+ }]
}, {
- path: 'card',
- name: '卡片模式',
- meta: {
- i18n: 'card'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/card')
- }]
- },
+ path: '/info',
+ component: Layout,
+ redirect: '/info/index',
+ children: [{
+ path: 'index',
+ name: '个人信息',
+ meta: {
+ i18n: 'info'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/system/userinfo')
+ }]
+ },
+ {
+ path: '/real',
+ component: Layout,
+ redirect: '/real/video',
+ children: [{
+ path: 'video',
+ name: '视频',
+ meta: {
+ i18n: 'real'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/Video/video')
+ }, {
+ path: 'history/:historyId',
+ name: '设备历史',
+ meta: {
+ i18n: 'real'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/realHistory')
+ }]
+ },
+ {
+ path: '/welcomeData',
+ component: Layout,
+ redirect: '/welcomeData/data',
+ children: [{
+ path: 'data',
+ name: '数据模式',
+ meta: {
+ i18n: 'data'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/data')
+ }, {
+ path: 'map',
+ name: '地图模式',
+ meta: {
+ i18n: 'map'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/map')
+ }, {
+ path: 'card',
+ name: '卡片模式',
+ meta: {
+ i18n: 'card'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/supervisoryConsole/card')
+ }]
+ },
- {
- path: '/work/process/leave',
- component: Layout,
- redirect: '/work/process/leave/form',
- children: [{
- path: 'form/:processDefinitionId',
- name: '请假流程',
- meta: {
- i18n: 'work'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
- }, {
- path: 'handle/:taskId/:processInstanceId/:businessId',
- name: '处理请假流程',
- meta: {
- i18n: 'work'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
- }, {
- path: 'detail/:processInstanceId/:businessId',
- name: '请假流程详情',
- meta: {
- i18n: 'work'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
- }]
- },
- // {
- // path: '/realTimePolice',
- // component: Layout,
- // redirect: '/realTimePolice/index',
- // children: [{
- // path: 'index',
- // name: '实时报警',
- // meta: {
- // i18n: 'real'
- // },
- // component: () =>
- // import( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
- // }]
- // },
- {
- path: '/home',
- component: Layout,
- redirect: '/home/index',
- children: [{
- path: 'index',
- name: '研判洞察',
- meta: {
- i18n: 'home'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/home/home')
- }]
- },
- {
- path: '/attendance',
- component: Layout,
- redirect: '/attendance/attendance',
- children: [{
- path: 'index',
- name: '考勤管理',
- meta: {
- i18n: 'attendance'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
- }]
- },
- {
- path: '/clientManagement',
- component: Layout,
- redirect: '/clientManagement/clientManagement',
- children: [{
+ {
+ path: '/work/process/leave',
+ component: Layout,
+ redirect: '/work/process/leave/form',
+ children: [{
+ path: 'form/:processDefinitionId',
+ name: '请假流程',
+ meta: {
+ i18n: 'work'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/form')
+ }, {
+ path: 'handle/:taskId/:processInstanceId/:businessId',
+ name: '处理请假流程',
+ meta: {
+ i18n: 'work'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/handle')
+ }, {
+ path: 'detail/:processInstanceId/:businessId',
+ name: '请假流程详情',
+ meta: {
+ i18n: 'work'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/work/process/leave/detail')
+ }]
+ },
+ {
+ path: '/realTimePolice',
+ component: Layout,
+ redirect: '/realTimePolice/index',
+ children: [{
+ path: 'index',
+ name: '实时报警',
+ meta: {
+ i18n: 'real'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/realTimePolice/real')
+ }]
+ },
+ {
+ path: '/home',
+ component: Layout,
+ redirect: '/home/index',
+ children: [{
+ path: 'index',
+ name: '研判洞察',
+ meta: {
+ i18n: 'home'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/home/home')
+ }]
+ },
+ {
+ path: '/attendance',
+ component: Layout,
+ redirect: '/attendance/attendance',
+ children: [{
+ path: 'index',
+ name: '考勤管理',
+ meta: {
+ i18n: 'attendance'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/attendance/attendance')
+ }]
+ },
+ {
+ path: '/clientManagement',
+ component: Layout,
+ redirect: '/clientManagement/clientManagement',
+ children: [{
- path: 'index',
- name: '设备管理',
- meta: {
- i18n: 'clientManagement'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
- }]
- },
- {
- path: '/suser',
- component: Layout,
- redirect: '/suser',
- children: [{
- path: 'index',
- name: '客户管理',
- meta: {
- i18n: 'suser'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/system/cs')
- }]
- }, {
- path: '/policeTracking',
- component: Layout,
- redirect: '/policeTracking/track',
- children: [{
- path: 'track',
- name: '警情追踪',
- meta: {
- i18n: 'track'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
- }]
- }, {
- path: '/healthcode',
- component: Layout,
- redirect: '/healthcode/healthcodePage',
- children: [{
- path: 'healthcodePage',
- name: '健康码',
- meta: {
- i18n: 'healthcode'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
- }]
- }, {
- path: '/animalHeat',
- component: Layout,
- redirect: '/animalHeat/animalHeatPage',
- children: [{
- path: 'animalHeatPage',
- name: '体温检测',
- meta: {
- i18n: 'animalHeat'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
- }]
- }, {
- path: '/alarm',
- component: Layout,
- redirect: '/alarm/alarmPage',
- children: [{
- path: 'alarmPage',
- name: '实时警情',
- meta: {
- i18n: 'alarm'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/alarm/alarm')
- }]
- }, {
- path: '/parcel',
- component: Layout,
- redirect: '/parcel/index',
- children: [{
- path: 'index',
- name: '安检包裹',
- meta: {
- i18n: 'parcel'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
- }]
- }, {
- path: '/parcelKind',
- component: Layout,
- redirect: '/parcelKind/index',
- children: [{
- path: 'index',
- name: '违禁品',
- meta: {
- i18n: 'parcelKind'
- },
- component: () =>
- import( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
- }]
- }
+ path: 'index',
+ name: '设备管理',
+ meta: {
+ i18n: 'clientManagement'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/clientManagement/clientManagement')
+ }]
+ },
+ {
+ path: '/suser',
+ component: Layout,
+ redirect: '/suser',
+ children: [{
+ path: 'index',
+ name: '客户管理',
+ meta: {
+ i18n: 'suser'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/system/cs')
+ }]
+ }, {
+ path: '/policeTracking',
+ component: Layout,
+ redirect: '/policeTracking/track',
+ children: [{
+ path: 'track',
+ name: '警情追踪',
+ meta: {
+ i18n: 'track'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/policeTracking/policeTracking')
+ }]
+ }, {
+ path: '/healthcode',
+ component: Layout,
+ redirect: '/healthcode/healthcodePage',
+ children: [{
+ path: 'healthcodePage',
+ name: '健康码',
+ meta: {
+ i18n: 'healthcode'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/healthcode/healthcode')
+ }]
+ }, {
+ path: '/animalHeat',
+ component: Layout,
+ redirect: '/animalHeat/animalHeatPage',
+ children: [{
+ path: 'animalHeatPage',
+ name: '体温检测',
+ meta: {
+ i18n: 'animalHeat'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/animalHeat/animalHeat')
+ }]
+ }, {
+ path: '/alarm',
+ component: Layout,
+ redirect: '/alarm/alarmPage',
+ children: [{
+ path: 'alarmPage',
+ name: '实时警情',
+ meta: {
+ i18n: 'alarm'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/alarm/alarm')
+ }]
+ }, {
+ path: '/parcel',
+ component: Layout,
+ redirect: '/parcel/index',
+ children: [{
+ path: 'index',
+ name: '安检包裹',
+ meta: {
+ i18n: 'parcel'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/parcel/parcel')
+ }]
+ }, {
+ path: '/parcelKind',
+ component: Layout,
+ redirect: '/parcelKind/index',
+ children: [{
+ path: 'index',
+ name: '违禁品',
+ meta: {
+ i18n: 'parcelKind'
+ },
+ component: () =>
+ import ( /* webpackChunkName: "views" */ '@/views/parcel/parcelKind')
+ }]
+ }
-]
+]
\ No newline at end of file
diff --git a/src/styles/alarmAnalysis/alarmAnalysis.scss b/src/styles/alarmAnalysis/alarmAnalysis.scss
index 3d8dd8a..73208fd 100644
--- a/src/styles/alarmAnalysis/alarmAnalysis.scss
+++ b/src/styles/alarmAnalysis/alarmAnalysis.scss
@@ -7,6 +7,7 @@
font-size: 12px;
color: #7B91B4;
left: 1%;
+ top: 30%;
position: relative;
}
@@ -18,20 +19,20 @@
.timeSearchBtn .timeBtn {
position: relative;
left: 0.8%;
- top: 15%;
+ top: 40%;
}
.timeSearchBtn .timeSearch {
position: relative;
left: 1.2%;
- top: 15.6%;
+ top: 40.6%;
}
//预警总数统计
.statisTotal {
position: relative;
left: 0.3%;
- top: 2%;
+ top: 3%;
width: 100%;
height: 10%;
}
@@ -51,7 +52,7 @@
height: 550px;
position: relative;
left: 0.8%;
- top: 6%;
+ top: 7%;
}
#alarmNumberStatis {
@@ -110,7 +111,7 @@
height: 450px;
position: relative;
left: 0.8%;
- top: 8%;
+ top: 9.5%;
}
#alarmTypeProEcharts {
@@ -141,7 +142,7 @@
height: 450px;
position: relative;
left: 0.8%;
- top: 10%;
+ top: 11%;
}
#alarmEquipmentProEcharts {
@@ -176,7 +177,7 @@
height: 450px;
position: relative;
left: 0.8%;
- top: 10%;
+ top: 11.8%;
}
#confirmTimeProEcharts {
@@ -206,7 +207,7 @@
width: 35%;
height: 450px;
position: relative;
- top: -43%;
+ top: -40.5%;
left: 64.4%;
}
@@ -227,7 +228,7 @@
height: 450px;
position: relative;
left: 0.8%;
- top: -40.6%;
+ top: -38%;
}
#alarmTimeDisEchars {
diff --git a/src/views/alarmManagement/alarmAnalysis.vue b/src/views/alarmManagement/alarmAnalysis.vue
index bbe4d92..9c64805 100644
--- a/src/views/alarmManagement/alarmAnalysis.vue
+++ b/src/views/alarmManagement/alarmAnalysis.vue
@@ -120,7 +120,11 @@
mounted() {
//默认是查询当月的数据
this.getData(2);
-
+ window.handleStartAlarm=this.handleStartAlarm;
+ window.handleStartParcel=this.handleStartParcel;
+ window.handleStartParcelKind=this.handleStartParcelKind;
+ window.handleStartEquipment=this.handleStartEquipment;
+ window.handleStartSuser=this.handleStartSuser;
},
methods: {
@@ -161,6 +165,12 @@
that.statisToTalData.data = [
{
click: function (item) {
+ var data =[];
+ data.push({
+ waringType:'紧急求救',
+ status:0
+ })
+ window.parent.handleStartAlarm(data);
},
title: '警情总数',
count: res.data.data[0].value,
@@ -169,6 +179,22 @@
},
{
click: function (item) {
+ var data =[];
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+
+ data.push({
+ startTime:Y + "-" + M + "-" + D + " 00:00:00",
+ endTime: Y +"-" +M +"-" + D + " 23:59:59",
+ decisioDiagramResult:"contraband"
+ });
+ window.parent.handleStartParcel(data);
},
title: '违禁包裹数',
count: res.data.data[1].value,
@@ -177,6 +203,22 @@
},
{
click: function (item) {
+ var data = [];
+ // 当前时间
+ var date = new Date();
+ //年
+ var Y = date.getFullYear();
+ //月
+ var M = date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
+ //日
+ var D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+
+ data.push({
+ startTime:Y + "-" + M + "-" + D + " 00:00:00",
+ endTime: Y +"-" +M +"-" + D + " 23:59:59",
+ decisioDiagramResult:"contraband"
+ });
+ window.parent.handleStartParcelKind(data);
},
title: '违禁物品数',
count: res.data.data[2].value,
@@ -185,6 +227,12 @@
},
{
click: function (item) {
+ var data =[];
+ data.push({
+ dxtype: 1
+ });
+ //console.log(data[0],111);
+ window.parent.handleStartEquipment(data);
},
title: '在线设备数',
count: res.data.data[3].value,
@@ -193,6 +241,7 @@
},
{
click: function (item) {
+ window.parent.handleStartSuser();
},
title: '客户数量',
count: res.data.data[4].value,
@@ -201,6 +250,46 @@
}
];
});
+ },
+
+ //主动报警（一键求助，电话报警）分页数据
+ handleStartAlarm(data) {
+ this.$router.push({
+ path: `/realTimePolice/index`,
+ query: data[0],
+ });
+ },
+
+ //包裹分页数据
+ handleStartParcel(data) {
+ debugger;
+ this.$router.push({
+ path: `/parcel/index`,
+ query: data[0],
+ });
+ },
+
+ //违禁品分页数据
+ handleStartParcelKind(data) {
+ this.$router.push({
+ path: `/parcelKind/index`,
+ query: data[0],
+ });
+ },
+
+ //在线设备分页数据
+ handleStartEquipment(data) {
+ this.$router.push({
+ path: `/clientManagement/index`,
+ query: data[0],
+ });
+ },
+
+ //客户管理分页数据
+ handleStartSuser() {
+ this.$router.push({
+ path: `/suser/index`,
+ });
},
//预警数量分布
@@ -245,7 +334,9 @@
})
let echarts = require('echarts');
let myChart = echarts.init(document.getElementById('alarmNumberStatis'));
+ var colors = ['#FF9836', '#1E90FF', '#F34A4A', '#8058A5'];
let option = {
+ color:colors,
title: {
textStyle: {
fontWeight: 'normal',
@@ -302,7 +393,7 @@
click: function (item) {
},
title:'一键求助',
- color:'yellow',
+ color:'#FF9836',
target:'_blank',
name:'日平均一键求助数',
date:(res.data.data[0]/Math.round(day)).toFixed(2)
@@ -311,7 +402,7 @@
click: function (item) {
},
title:'违禁品',
- color:'green',
+ color:'#1E90FF',
name:'日平均违禁品数',
date:(res.data.data[1]/Math.round(day)).toFixed(2)
},
@@ -319,7 +410,7 @@
click: function (item) {
},
title:'红色健康码',
- color:'#3fa1ff',
+ color:'#F34A4A',
name:'日平均红色健康码数',
date:(res.data.data[2]/Math.round(day)).toFixed(2)
},
@@ -327,7 +418,7 @@
click: function (item) {
},
title:'体温异常',
- color:'red',
+ color:'#8058A5',
name:'日平均体温异常数',
date:(res.data.data[3]/Math.round(day)).toFixed(2)
}
@@ -348,7 +439,9 @@
)
let echarts = require('echarts');
let myChart = echarts.init(document.getElementById('alarmTypeProEcharts'));
+ var colors = ['#FF9836', '#3fa1ff', '#F34A4A', '#8058A5'];
let option = {
+ color:colors,
title: {
textStyle: {
fontWeight: 'normal',
@@ -413,7 +506,7 @@
click: function (item) {
},
title:'一键求助',
- color:'yellow',
+ color:'#FF9836',
target:'_blank',
name:res.data.data[0],
date:(res.data.data[0]/count*100).toFixed(2)+'%'
@@ -422,7 +515,7 @@
click: function (item) {
},
title:'违禁品',
- color:'green',
+ color:'#3fa1ff',
name:res.data.data[1],
date:(res.data.data[1]/count*100).toFixed(2)+'%'
},
@@ -430,7 +523,7 @@
click: function (item) {
},
title:'红色健康码',
- color:'#3fa1ff',
+ color:'#F34A4A',
name:res.data.data[2],
date:(res.data.data[2]/count*100).toFixed(2)+'%'
},
@@ -438,7 +531,7 @@
click: function (item) {
},
title:'体温异常',
- color:'red',
+ color:'#8058A5',
name:res.data.data[3],
date:(res.data.data[3]/count*100).toFixed(2)+'%'
}
@@ -549,7 +642,9 @@
var data = res.data.data;
let echarts = require('echarts');
let myChart = echarts.init(document.getElementById('confirmTimeProEcharts'));
+ var colors = ['green','#3fa1ff','yellow','#F34A4A']
let option = {
+ color:colors,
title: {
textStyle: {
fontWeight: 'normal',
@@ -592,7 +687,7 @@
show: false
},
data: [
- {value: data[0], name: '0-5分钟'},
+ {value: data[0], name: '小于5分钟'},
{value: data[1], name: '5-10分钟'},
{value: data[2], name: '10-30分钟'},
{value: data[3], name: '30分钟以上'}
@@ -616,7 +711,7 @@
click: function (item) {
},
title:'小于5分钟',
- color:'yellow',
+ color:'green',
target:'_blank',
name:data[0]==0? 0:data[0]+"次",
},
@@ -624,21 +719,21 @@
click: function (item) {
},
title:'5-10分钟',
- color:'green',
+ color:'#3fa1ff',
name:data[1]==0? 0:data[1]+"次",
},
{
click: function (item) {
},
title:'10-30分钟',
- color:'#3fa1ff',
+ color:'yellow',
name:data[2]==0? 0:data[2]+"次",
},
{
click: function (item) {
},
title:'30分钟以上',
- color:'red',
+ color:'#F34A4A',
name:data[3]==0? 0:data[3]+"次",
}
];
@@ -683,7 +778,9 @@
var data = res.data;
let echarts = require('echarts');
let myChart = echarts.init(document.getElementById('alarmTimeDisEchars'));
+ var colors = ['#FF9836', '#1E90FF', '#F34A4A', '#8058A5'];
let option = {
+ color: colors,
title: {
textStyle: {
fontWeight: 'normal',
--
Gitblit v1.9.3