diff --git a/src/assets/images/screen/pie.png b/src/assets/images/screen/pie.png
new file mode 100644
index 0000000..71e5d5c
Binary files /dev/null and b/src/assets/images/screen/pie.png differ
diff --git a/src/assets/images/screen/zb1.png b/src/assets/images/screen/zb1.png
new file mode 100644
index 0000000..5a383a7
Binary files /dev/null and b/src/assets/images/screen/zb1.png differ
diff --git a/src/assets/images/screen/zb2.png b/src/assets/images/screen/zb2.png
new file mode 100644
index 0000000..b34a884
Binary files /dev/null and b/src/assets/images/screen/zb2.png differ
diff --git a/src/assets/images/screen/zb3.png b/src/assets/images/screen/zb3.png
new file mode 100644
index 0000000..7a6d8bd
Binary files /dev/null and b/src/assets/images/screen/zb3.png differ
diff --git a/src/assets/images/screen/zh.png b/src/assets/images/screen/zh.png
new file mode 100644
index 0000000..1c90424
Binary files /dev/null and b/src/assets/images/screen/zh.png differ
diff --git a/src/assets/images/screen/zz.png b/src/assets/images/screen/zz.png
new file mode 100644
index 0000000..372dd58
Binary files /dev/null and b/src/assets/images/screen/zz.png differ
diff --git a/src/loveflow/assets/index.scss b/src/loveflow/assets/index.scss
index a9279f6..eb4dc59 100644
--- a/src/loveflow/assets/index.scss
+++ b/src/loveflow/assets/index.scss
@@ -7,3 +7,16 @@ $designHeight: 1080;
@function vh($px) {
@return ($px / $designHeight) * 100vh;
}
+
+.fontsize14 {
+ font-size: vh(14);
+}
+.fontsize16 {
+ font-size: vh(16);
+}
+.fontsize22 {
+ font-size: vh(22);
+}
+.fontsize24 {
+ font-size: vh(24);
+}
diff --git a/src/loveflow/components/echart/bar/one.vue b/src/loveflow/components/echart/bar/one.vue
index 4be8fcb..67d03cf 100644
--- a/src/loveflow/components/echart/bar/one.vue
+++ b/src/loveflow/components/echart/bar/one.vue
@@ -28,8 +28,8 @@ export default {
show: false,
},
grid: {
- top: "20%",
- bottom: "10%",
+ top: this.chartObj.gridTop || "20%",
+ bottom: this.chartObj.gridBtm || "10%",
left: "6%",
right: "5%",
},
diff --git a/src/loveflow/components/echart/line/one.vue b/src/loveflow/components/echart/line/one.vue
index 7186f34..a383289 100644
--- a/src/loveflow/components/echart/line/one.vue
+++ b/src/loveflow/components/echart/line/one.vue
@@ -58,7 +58,7 @@ export default {
data: this.chartObj.legend,
icon: "rect",
right: "5%",
- top: "2%",
+ top: this.chartObj.legendTop || "2%",
itemWidth: 8, // 设置宽度
itemHeight: 8, // 设置高度
itemGap: 16, // 设置间距
@@ -69,7 +69,7 @@ export default {
},
},
grid: {
- top: "20%",
+ top: this.chartObj.gridTop || "20%",
bottom: "10%",
left: "6%",
right: "5%",
diff --git a/src/loveflow/components/echart/pie/one.vue b/src/loveflow/components/echart/pie/one.vue
new file mode 100644
index 0000000..46b916c
--- /dev/null
+++ b/src/loveflow/components/echart/pie/one.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
+
diff --git a/src/views/enterpriseRiskIndex/analysis.vue b/src/views/enterpriseRiskIndex/analysis.vue
index 1b7cbb4..fdb0aac 100644
--- a/src/views/enterpriseRiskIndex/analysis.vue
+++ b/src/views/enterpriseRiskIndex/analysis.vue
@@ -199,7 +199,7 @@ export default {
.chartPanel {
position: relative;
- height: calc(100% - 50px);
+ height: calc(100% - 40px);
.chartOpt {
position: absolute;
z-index: 12;
@@ -261,7 +261,7 @@ export default {
font-size: vh(16);
.riskName {
- height: 40px;
+ height: 30px;
display: flex;
margin-top: vh(6);
color: #d9e7ff;
diff --git a/src/views/enterpriseRiskIndex/synthetical.vue b/src/views/enterpriseRiskIndex/synthetical.vue
index 533fc47..699500d 100644
--- a/src/views/enterpriseRiskIndex/synthetical.vue
+++ b/src/views/enterpriseRiskIndex/synthetical.vue
@@ -15,9 +15,35 @@
企业综合风险趋势图
-
-
-
+
+
+
综合风险总量
+
+
+
+ {{ total.toLocaleString() }}
+
+
个
+
+
+
+
+
+
+
+
@@ -27,6 +53,7 @@
@@ -36,9 +63,17 @@
全区企业风险预警总量
-
@@ -48,7 +83,7 @@
-
+
@@ -56,6 +91,83 @@
全区企业风险标签增长趋势
+
+
+
+
本年度风险标签总量
+
+
+
+ {{ total.toLocaleString() }}
+
+
+
+
+
+
+
+
+
近三月风险标签总量
+
+
+
+ {{ total.toLocaleString() }}
+
+
+
+
+
+
+
+
+
当月风险标签总量
+
+
+
+ {{ total.toLocaleString() }}
+
+
+
+
+
+
+
@@ -65,10 +177,12 @@ import timeSelect from "./components/timeSelect.vue";
import barOne from "@/loveflow/components/echart/bar/one.vue";
import lineOne from "@/loveflow/components/echart/line/one.vue";
import radarOne from "@/loveflow/components/echart/radar/one.vue";
+import pieOne from "@/loveflow/components/echart/pie/one.vue";
export default {
- components: { barOne, lineOne, timeSelect, radarOne },
+ components: { barOne, lineOne, timeSelect, radarOne, pieOne },
data() {
return {
+ total: 21345,
tlObj: {
indicator: [
{
@@ -96,34 +210,8 @@ export default {
name: "风险监测项评分排行",
},
tmObj: {
- xData: [
- "1月",
- "2月",
- "3月",
- "4月",
- "5月",
- "6月",
- "7月",
- "8月",
- "9月",
- "10月",
- "11月",
- "12月",
- ],
- yData: [
- [18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18],
- [8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
- [11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11],
- ],
- name: "频繁变化风险监测信息近一年变化趋势图",
- legend: ["违规事故", "重点人员", "流动人员"],
- color: [
- ["#09C8F5", "rgba(9,200,245,0.1)", "rgba(9,200,245,0.1)"],
- ["#48EEBD", "rgba(72,238,189,0.1)", "rgba(72,238,189,0.1)"],
- ["#FFD16A", "rgba(255,209,106,0.1)", "rgba(255,209,106,0.1)"],
- ],
- },
- blObj: {
+ gridTop: "15%",
+ gridBtm: "15%",
xData: [
"人员安全",
"危化品运输",
@@ -135,9 +223,22 @@ export default {
"网络安全",
],
yData: [12, 11, 13, 14, 15, 11, 14, 12],
- name: "风险标签排行",
+ name: "企业综合风险趋势图",
},
- mmObj: {
+ blObj: {
+ height: 0,
+ color: ["#2B82F3", "#FFD16A", "#48EEBD", "#FF745A"],
+ data: [
+ { value: 1048, name: "重点人员预警" },
+ { value: 735, name: "企业整改预警" },
+ { value: 580, name: "流动人员预警" },
+ { value: 484, name: "其他" },
+ ],
+ name: "全区企业风险预警总量",
+ },
+ bmObj: {
+ gridTop: "25%",
+ legendTop: "15%",
xData: [
"1月",
"2月",
@@ -157,23 +258,43 @@ export default {
[8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8],
[11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11],
[5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5],
+ [3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3],
+ [15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15],
+ [25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25],
],
- name: "风险总量分析变化趋势图",
+ name: "全区企业风险标签数量变化趋势",
legend: [
- "企业风险总量",
- "企业风险标签总量",
- "企业风险得分",
- "风险预警提醒总量",
+ "澥浦镇",
+ "九龙湖镇",
+ "照宝山街道",
+ "蛟川街道",
+ "骆驼街道",
+ "贵驷街道",
+ "庄市街道",
],
color: [
["#09C8F5", "rgba(9,200,245,0.1)", "rgba(9,200,245,0.1)"],
["#48EEBD", "rgba(72,238,189,0.1)", "rgba(72,238,189,0.1)"],
["#FFD16A", "rgba(255,209,106,0.1)", "rgba(255,209,106,0.1)"],
+ ["#FF8A5A", "rgba(255,138,90,0.1)", "rgba(255,138,90,0.1)"],
["#FF3B3B", "rgba(255,59,59,0.1)", "rgba(255,59,59,0.1)"],
+ ["#B276FF", "rgba(178,118,255,0.1)", "rgba(178,118,255,0.1)"],
+ ["#FF6AEE", "rgba(255,106,238,0.1)", "rgba(255,106,238,0.1)"],
+ ],
+ },
+ trObj: {
+ color: ["#2B82F3", "#FFD16A", "#48EEBD", "#FF745A"],
+ data: [
+ { value: 1048, name: "重点人员预警" },
+ { value: 735, name: "企业整改预警" },
+ { value: 580, name: "流动人员预警" },
+ { value: 484, name: "其他" },
],
+ name: "全区企业风险预警总量",
},
};
},
+ mounted() {},
methods: {
tmTime(val) {
console.log("tmTime:" + val);
@@ -202,13 +323,178 @@ export default {
flex: 1;
display: flex;
.riskCol {
+ position: relative;
background: url("~@/assets/images/screen/line.png") no-repeat center
center;
background-size: 100% 100%;
-
+ .riskTotal {
+ margin-top: 46px;
+ margin-left: 2%;
+ width: 93%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 46px;
+ background: url("~@/assets/images/screen/total.png") no-repeat center
+ center;
+ background-size: 100% 100%;
+ font-size: 18px;
+ font-weight: 500;
+ color: #d0deee;
+ .totalText {
+ margin-left: 16px;
+ font-size: 26px;
+ color: #ebf9ff;
+ line-height: 25px;
+ letter-spacing: 3px;
+ text-shadow: 0px 0px 9px #159aff;
+ }
+ }
.chartPanel {
- position: relative;
+ height: calc(100% - 40px);
+ }
+ .chartPanelBg {
+ position: absolute;
+ width: 60%;
+ height: 208px;
+ top: calc(50% - 44px);
+ left: 30%;
+ background-color: rgba(108, 128, 151, 0.1);
+ }
+ .totalWrap {
+ display: flex;
+ margin-top: 38px;
+ .totalLeft {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ margin-right: 20px;
+ margin-left: 3%;
+ padding-left: 20px;
+ flex: 1;
+ height: 80px;
+ background: url("~@/assets/images/screen/zh.png") no-repeat center
+ center;
+ background-size: 100% 100%;
+ .totalValue {
+ .item {
+ .value {
+ color: #80d9ff;
+ }
+ }
+ }
+ }
+ .totalRight {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ padding-left: 20px;
+ margin-right: 5%;
+ flex: 2;
+ height: 80px;
+ background: url("~@/assets/images/screen/zz.png") no-repeat center
+ center;
+ background-size: 100% 100%;
+ }
+ .totalName {
+ font-weight: 500;
+ color: #d0deee;
+ }
+ .totalValue {
+ display: flex;
+ .item {
+ display: flex;
+ align-items: baseline;
+ margin-right: 20px;
+ .label {
+ margin-right: 8px;
+ font-weight: 500;
+ color: #ffffff;
+ }
+ .value {
+ margin-right: 4px;
+ font-weight: 500;
+ color: #80fff0;
+ letter-spacing: 1px;
+ text-shadow: 0px 0px 8px rgba(21, 154, 255, 0.5);
+ }
+ }
+ }
+ }
+ .riskUpWrap {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ margin-top: 2px;
height: calc(100% - 50px);
+ display: flex;
+ .left {
+ width: 190px;
+ }
+ .left,
+ .right {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ }
+ .totalTop {
+ display: flex;
+ padding-left: 20px;
+ flex: 1;
+ background: url("~@/assets/images/screen/zb1.png") no-repeat center
+ center;
+ background-size: 100% 100%;
+ color: #eed0d0;
+ .value {
+ color: #ff8080;
+ }
+ }
+ .totalMid {
+ display: flex;
+ padding-left: 20px;
+ flex: 1;
+ background: url("~@/assets/images/screen/zb2.png") no-repeat center
+ center;
+ background-size: 100% 100%;
+ color: #eee3d0;
+ .value {
+ color: #ffba80;
+ }
+ }
+ .totalBtm {
+ display: flex;
+ padding-left: 20px;
+ flex: 1;
+ background: url("~@/assets/images/screen/zb3.png") no-repeat center
+ center;
+ background-size: 100% 100%;
+ color: #d0e3ee;
+ .value {
+ color: #80dbff;
+ }
+ }
+ .totalName {
+ font-weight: 500;
+ }
+ .totalValue {
+ display: flex;
+ .item {
+ display: flex;
+ align-items: baseline;
+ margin-right: 20px;
+ .label {
+ margin-right: 8px;
+ font-weight: 500;
+ color: #ffffff;
+ }
+ .value {
+ margin-right: 4px;
+ font-weight: 500;
+ letter-spacing: 1px;
+ text-shadow: 0px 0px 8px rgba(21, 154, 255, 0.5);
+ }
+ }
+ }
}
}
.rightCol {
@@ -233,7 +519,7 @@ export default {
font-size: vh(16);
.riskName {
- height: 40px;
+ height: 30px;
display: flex;
margin-top: vh(6);
color: #d9e7ff;