From 8e2a42e4a2da78f9cda9fa3e7732a0ef72f0c906 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 12 Nov 2021 09:29:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityAnalysis/index.vue | 48 ++++++++++++++++++++++++++----------------------
1 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index 4e3ad01..ed69d55 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -57,14 +57,14 @@
top="9vh"
>
<situation
- :card="{ deptid: deptid, jurisdiction: jurisdiction }"
+ :card="{ deptId: deptid, jurisdiction: jurisdiction }"
v-if="sees == 1"
>
<!-- 保安员审查情况统计 -->
</situation>
<certificate
- :card="{ deptid: deptid, jurisdiction: jurisdiction }"
+ :card="{ deptId: deptid, jurisdiction: jurisdiction }"
v-if="sees == 2"
>
<!-- 保安员持证情况统计 -->
@@ -89,6 +89,7 @@
</assignment>
<socialSecurity
:card="{ deptid: deptid, jurisdiction: jurisdiction }"
+ :reself="dialogVisible"
v-if="sees == 6"
>
<!-- 社保缴纳情况 -->
@@ -142,6 +143,7 @@
// czdata: [],
sees: "",
+ colors: ["#29C093", "#F34A4A"], //[正常，异常]；
};
},
computed: {
@@ -254,8 +256,11 @@
feature: {
myTool1: {
show: true,
- title: title,
- icon: "image://img/table.png",
+ title: "",
+ // icon: "path://M432.45,595.444c0,2.177-4.661,6.82-11.305,6.82c-6.475,0-11.306-4.567-11.306-6.82s4.852-6.812,11.306-6.812C427.841,588.632,432.452,593.191,432.45,595.444L432.45,595.444z M421.155,589.876c-3.009,0-5.448,2.495-5.448,5.572s2.439,5.572,5.448,5.572c3.01,0,5.449-2.495,5.449-5.572C426.604,592.371,424.165,589.876,421.155,589.876L421.155,589.876z M421.146,591.891c-1.916,0-3.47,1.589-3.47,3.549c0,1.959,1.554,3.548,3.47,3.548s3.469-1.589,3.469-3.548C424.614,593.479,423.062,591.891,421.146,591.891L421.146,591.891zM421.146,591.891",
+ // icon: "image://http://echarts.baidu.com/images/favicon.png",
+ icon: "image://http://223.82.109.183:2080/img/table.png",
+ // icon: "M271.68 304.64h472a32 32 0 1 0 0-64h-472a32 32 0 0 0 0 64z m0 234.88h408.64a32 32 0 0 0 0-64H271.68a32 32 0 1 0 0 64z m0 198.4h376.64a32 32 0 1 0 0-64H271.68a32 32 0 0 0 0 64z",
onclick: function () {
that.dialogVisible = true;
that.sees = id;
@@ -264,6 +269,16 @@
},
},
};
+ },
+ setColor(d, color) {
+ for (var k in d) {
+ var itemStyle = {
+ color: color[k],
+ };
+ d[k]["itemStyle"] = itemStyle;
+ }
+ console.log(d);
+ return d;
},
getEC1() {
var that = this;
@@ -295,22 +310,10 @@
},
];
var option, data;
- // if (d) {
- data = d;
- // } else {
- // data = [
- // { value: 1048, name: "搜索引擎" },
- // { value: 735, name: "直接访问" },
- // { value: 580, name: "邮件营销" },
- // { value: 484, name: "联盟广告" },
- // { value: 300, name: "视频广告" },
- // ];
- // }
- // console.log(data);
+ data = this.setColor(d, this.colors);
option = {
title: {
text: "保安员审查情况统计",
- // subtext: "纯属虚构",
top: 25,
left: "center",
},
@@ -428,6 +431,7 @@
setEC2(data) {
var option;
var that = this;
+ data = this.setColor(data, this.colors);
// console.log(data, "持证");
option = {
title: {
@@ -501,7 +505,7 @@
sd = [],
ld = [],
that = this;
- for (var i = 0; i < 100; i++) {
+ for (var i = 0; i <= 100; i++) {
xd.push(i + "分");
}
// console.log(sd);
@@ -707,7 +711,7 @@
},
setEC5(d) {
var option;
-
+ d = this.setColor(d, this.colors);
option = {
title: {
text: "保安派遣情况统计",
@@ -776,7 +780,7 @@
},
setEC6(d) {
var option;
-
+ d = this.setColor(d, this.colors);
option = {
title: {
text: "社保缴纳情况统计",
@@ -854,10 +858,10 @@
// console.log(roleName);
// console.log(res.data.data);
// console.log(roleAlias);
- if (roleName == "超级管理员" || roleName == "公安管理员") {
+ if (roleName != "保安公司管理员") {
this.deptid = "";
this.jurisdiction = this.userInfo.jurisdiction;
- } else if (roleName == "保安公司管理员") {
+ } else {
this.deptid = this.userInfo.dept_id;
this.jurisdiction = "";
}
--
Gitblit v1.9.3