diff --git a/src/assets/images/topic/Element 03_00000.png b/src/assets/images/topic/Element 03_00000.png
new file mode 100644
index 0000000..61f40a2
Binary files /dev/null and b/src/assets/images/topic/Element 03_00000.png differ
diff --git a/src/assets/images/topic/ct.png b/src/assets/images/topic/ct.png
new file mode 100644
index 0000000..f82f10c
Binary files /dev/null and b/src/assets/images/topic/ct.png differ
diff --git a/src/assets/images/topic/dz.png b/src/assets/images/topic/dz.png
new file mode 100644
index 0000000..c51ca5a
Binary files /dev/null and b/src/assets/images/topic/dz.png differ
diff --git a/src/assets/images/topic/ffr.png b/src/assets/images/topic/ffr.png
new file mode 100644
index 0000000..e54d23b
Binary files /dev/null and b/src/assets/images/topic/ffr.png differ
diff --git a/src/assets/images/topic/fzi.png b/src/assets/images/topic/fzi.png
new file mode 100644
index 0000000..f3540a8
Binary files /dev/null and b/src/assets/images/topic/fzi.png differ
diff --git a/src/assets/images/topic/grjd.png b/src/assets/images/topic/grjd.png
new file mode 100644
index 0000000..647a4a3
Binary files /dev/null and b/src/assets/images/topic/grjd.png differ
diff --git a/src/assets/images/topic/jbr.png b/src/assets/images/topic/jbr.png
new file mode 100644
index 0000000..5cad1d1
Binary files /dev/null and b/src/assets/images/topic/jbr.png differ
diff --git a/src/assets/images/topic/jsb.png b/src/assets/images/topic/jsb.png
new file mode 100644
index 0000000..54ca156
Binary files /dev/null and b/src/assets/images/topic/jsb.png differ
diff --git a/src/assets/images/topic/l1.png b/src/assets/images/topic/l1.png
new file mode 100644
index 0000000..d787455
Binary files /dev/null and b/src/assets/images/topic/l1.png differ
diff --git a/src/assets/images/topic/l2.png b/src/assets/images/topic/l2.png
new file mode 100644
index 0000000..665f895
Binary files /dev/null and b/src/assets/images/topic/l2.png differ
diff --git a/src/assets/images/topic/pie.png b/src/assets/images/topic/pie.png
new file mode 100644
index 0000000..88af32d
Binary files /dev/null and b/src/assets/images/topic/pie.png differ
diff --git a/src/assets/images/topic/pieIcon.png b/src/assets/images/topic/pieIcon.png
new file mode 100644
index 0000000..246990f
Binary files /dev/null and b/src/assets/images/topic/pieIcon.png differ
diff --git a/src/assets/images/topic/qkr.png b/src/assets/images/topic/qkr.png
new file mode 100644
index 0000000..33f1453
Binary files /dev/null and b/src/assets/images/topic/qkr.png differ
diff --git a/src/assets/images/topic/r1.png b/src/assets/images/topic/r1.png
new file mode 100644
index 0000000..91c32f6
Binary files /dev/null and b/src/assets/images/topic/r1.png differ
diff --git a/src/assets/images/topic/r2.png b/src/assets/images/topic/r2.png
new file mode 100644
index 0000000..f4dcfc2
Binary files /dev/null and b/src/assets/images/topic/r2.png differ
diff --git a/src/assets/images/topic/r3.png b/src/assets/images/topic/r3.png
new file mode 100644
index 0000000..8e1ac6d
Binary files /dev/null and b/src/assets/images/topic/r3.png differ
diff --git a/src/assets/images/topic/scolb.png b/src/assets/images/topic/scolb.png
new file mode 100644
index 0000000..e7bb22b
Binary files /dev/null and b/src/assets/images/topic/scolb.png differ
diff --git a/src/assets/images/topic/scolmid.png b/src/assets/images/topic/scolmid.png
new file mode 100644
index 0000000..d037471
Binary files /dev/null and b/src/assets/images/topic/scolmid.png differ
diff --git a/src/assets/images/topic/scolt.png b/src/assets/images/topic/scolt.png
new file mode 100644
index 0000000..534ec6c
Binary files /dev/null and b/src/assets/images/topic/scolt.png differ
diff --git a/src/assets/images/topic/totalType.png b/src/assets/images/topic/totalType.png
new file mode 100644
index 0000000..b13fee9
Binary files /dev/null and b/src/assets/images/topic/totalType.png differ
diff --git a/src/assets/images/topic/tyr.png b/src/assets/images/topic/tyr.png
new file mode 100644
index 0000000..224d11b
Binary files /dev/null and b/src/assets/images/topic/tyr.png differ
diff --git a/src/assets/images/topic/xf.png b/src/assets/images/topic/xf.png
new file mode 100644
index 0000000..7b82380
Binary files /dev/null and b/src/assets/images/topic/xf.png differ
diff --git a/src/assets/images/topic/xjr.png b/src/assets/images/topic/xjr.png
new file mode 100644
index 0000000..88f2100
Binary files /dev/null and b/src/assets/images/topic/xjr.png differ
diff --git a/src/assets/images/topic/编组 62.png b/src/assets/images/topic/编组 62.png
new file mode 100644
index 0000000..7fb982a
Binary files /dev/null and b/src/assets/images/topic/编组 62.png differ
diff --git a/src/assets/images/topic/道路安全_00000.png b/src/assets/images/topic/道路安全_00000.png
new file mode 100644
index 0000000..3dca740
Binary files /dev/null and b/src/assets/images/topic/道路安全_00000.png differ
diff --git a/src/assets/images/topic/道路安全(绿)_00000.png b/src/assets/images/topic/道路安全(绿)_00000.png
new file mode 100644
index 0000000..4c453bb
Binary files /dev/null and b/src/assets/images/topic/道路安全(绿)_00000.png differ
diff --git a/src/loveflow/assets/index.scss b/src/loveflow/assets/index.scss
index eb4dc59..1cd7308 100644
--- a/src/loveflow/assets/index.scss
+++ b/src/loveflow/assets/index.scss
@@ -1,4 +1,4 @@
-$designWidth: 1920;
+$designWidth: 2040;
$designHeight: 1080;
@function vw($px) {
diff --git a/src/loveflow/components/echart/bar/four.vue b/src/loveflow/components/echart/bar/four.vue
index f01aab4..1b381d3 100644
--- a/src/loveflow/components/echart/bar/four.vue
+++ b/src/loveflow/components/echart/bar/four.vue
@@ -28,7 +28,7 @@ export default {
data: this.chartObj.legend,
icon: "rect",
right: "5%",
- top: this.chartObj.legendTop || "2%",
+ top: this.chartObj.legendTop || "4%",
itemWidth: 8, // 设置宽度
itemHeight: 8, // 设置高度
itemGap: 16, // 设置间距
@@ -39,7 +39,7 @@ export default {
},
},
grid: {
- top: this.chartObj.gridTop || "20%",
+ top: this.chartObj.gridTop || "15%",
bottom: this.chartObj.gridBtm || "10%",
left: this.chartObj.gridLeft || "6%",
right: "5%",
@@ -65,6 +65,7 @@ export default {
},
},
yAxis: {
+ name:"单位:吨",
type: "value",
splitLine: {
show: true,
diff --git a/src/loveflow/components/echart/pie/five.vue b/src/loveflow/components/echart/pie/five.vue
new file mode 100644
index 0000000..b080a9f
--- /dev/null
+++ b/src/loveflow/components/echart/pie/five.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
diff --git a/src/loveflow/components/echart/pie/four.vue b/src/loveflow/components/echart/pie/four.vue
new file mode 100644
index 0000000..27bdb86
--- /dev/null
+++ b/src/loveflow/components/echart/pie/four.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
diff --git a/src/loveflow/components/echart/radar/three.vue b/src/loveflow/components/echart/radar/three.vue
new file mode 100644
index 0000000..8bf7d5e
--- /dev/null
+++ b/src/loveflow/components/echart/radar/three.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
diff --git a/src/loveflow/components/echart/radar/two.vue b/src/loveflow/components/echart/radar/two.vue
index a5a100b..c4177f5 100644
--- a/src/loveflow/components/echart/radar/two.vue
+++ b/src/loveflow/components/echart/radar/two.vue
@@ -90,9 +90,7 @@ export default {
lineStyle: {
width: 3,
},
- areaStyle: {
- color: "transparent",
- },
+
data: [
{
value: [80, 80, 80, 70, 60, 50],
@@ -100,6 +98,9 @@ export default {
lineStyle: {
color: "#C6403E",
},
+ areaStyle: {
+ color: "rgba(198,64,62,0.2)",
+ },
},
{
value: [40, 70, 50, 60, 30, 80],
@@ -107,6 +108,9 @@ export default {
lineStyle: {
color: "#FF8A5A",
},
+ areaStyle: {
+ color: "rgba(255,138,90,0.2)",
+ },
},
{
value: [50, 60, 90, 30, 10, 80],
@@ -114,6 +118,9 @@ export default {
lineStyle: {
color: "#5B8FF9",
},
+ areaStyle: {
+ color: "rgba(91,143,249,0.2)",
+ },
},
],
},
diff --git a/src/views/enterpriseRiskIndex/analysis.vue b/src/views/enterpriseRiskIndex/analysis.vue
index ce1d031..da91da0 100644
--- a/src/views/enterpriseRiskIndex/analysis.vue
+++ b/src/views/enterpriseRiskIndex/analysis.vue
@@ -304,17 +304,17 @@ export default {
.analysisWrap {
.riskCol {
padding-left: vw(8);
- font-size: vh(16);
+ font-size: vw(16);
.riskName {
height: 30px;
display: flex;
- margin-top: vh(6);
+ margin-top: vw(6);
color: #d9e7ff;
.riskIcon {
- width: vh(24);
- height: vh(24);
+ width: vw(24);
+ height: vw(24);
background: url("~@/assets/images/screen/riskIcon.png") no-repeat center
center;
background-size: 100% 100%;
diff --git a/src/views/enterpriseRiskIndex/components/iconCard.vue b/src/views/enterpriseRiskIndex/components/iconCard.vue
index e707e20..e56a127 100644
--- a/src/views/enterpriseRiskIndex/components/iconCard.vue
+++ b/src/views/enterpriseRiskIndex/components/iconCard.vue
@@ -41,7 +41,7 @@ export default {
margin-right: 18px;
padding-left: 10px;
align-items: center;
- height: vh(122);
+ height: vw(122);
background: url("~@/assets/images/screen/error.png") no-repeat center
center;
background-size: 100% 100%;
@@ -49,7 +49,7 @@ export default {
margin-right: 10px;
.icon {
width: vw(90);
- height: vh(70);
+ height: vw(70);
img {
width: 100%;
height: 100%;
@@ -61,14 +61,14 @@ export default {
font-weight: 500;
font-family: PingFangSC, PingFang SC;
.riskItemName {
- font-size: vh(18);
+ font-size: vw(18);
color: #c4e5ff;
- line-height: vh(25);
+ line-height: vw(25);
}
.riskItemValue {
- font-size: vh(28);
+ font-size: vw(28);
color: #ebf9ff;
- line-height: vh(36);
+ line-height: vw(36);
letter-spacing: 1px;
text-shadow: 0px 0px 9px #159aff;
}
diff --git a/src/views/enterpriseRiskIndex/components/leftCard.vue b/src/views/enterpriseRiskIndex/components/leftCard.vue
index fadd7bc..aa77008 100644
--- a/src/views/enterpriseRiskIndex/components/leftCard.vue
+++ b/src/views/enterpriseRiskIndex/components/leftCard.vue
@@ -36,12 +36,12 @@ export default {
margin-left: 3%;
padding-left: 20px;
flex: 1;
- height: vh(80);
+ height: vw(80);
background: url("~@/assets/images/screen/zh.png") no-repeat center center;
background-size: 100% 100%;
.totalName {
margin-bottom: 4px;
- font-size: vh(16);
+ font-size: vw(16);
font-weight: 500;
color: #d0deee;
}
@@ -53,12 +53,12 @@ export default {
margin-right: 20px;
font-weight: 500;
.label {
- font-size: vh(14);
+ font-size: vw(14);
margin-right: 8px;
color: #ffffff;
}
.value {
- font-size: vh(22);
+ font-size: vw(22);
margin-right: 4px;
color: #80d9ff;
letter-spacing: 1px;
diff --git a/src/views/enterpriseRiskIndex/components/rightCard.vue b/src/views/enterpriseRiskIndex/components/rightCard.vue
index 0d66c21..007a62c 100644
--- a/src/views/enterpriseRiskIndex/components/rightCard.vue
+++ b/src/views/enterpriseRiskIndex/components/rightCard.vue
@@ -38,12 +38,12 @@ export default {
padding-left: 20px;
margin-right: 5%;
flex: 2;
- height: vh(80);
+ height: vw(80);
background: url("~@/assets/images/screen/zz.png") no-repeat center center;
background-size: 100% 100%;
.totalName {
margin-bottom: 4px;
- font-size: vh(16);
+ font-size: vw(16);
font-weight: 500;
color: #d0deee;
}
@@ -55,12 +55,12 @@ export default {
margin-right: 20px;
font-weight: 500;
.label {
- font-size: vh(14);
+ font-size: vw(14);
margin-right: 8px;
color: #ffffff;
}
.value {
- font-size: vh(22);
+ font-size: vw(22);
margin-right: 4px;
color: #80fff0;
letter-spacing: 1px;
diff --git a/src/views/enterpriseRiskIndex/components/timeSelect.vue b/src/views/enterpriseRiskIndex/components/timeSelect.vue
index a5bda7e..da24d93 100644
--- a/src/views/enterpriseRiskIndex/components/timeSelect.vue
+++ b/src/views/enterpriseRiskIndex/components/timeSelect.vue
@@ -77,6 +77,6 @@ export default {
diff --git a/src/views/enterpriseRiskIndex/components/totalCard.vue b/src/views/enterpriseRiskIndex/components/totalCard.vue
index 0186919..3220340 100644
--- a/src/views/enterpriseRiskIndex/components/totalCard.vue
+++ b/src/views/enterpriseRiskIndex/components/totalCard.vue
@@ -27,15 +27,15 @@ export default {
display: flex;
align-items: center;
justify-content: center;
- height: vh(46);
+ height: vw(46);
background: url("~@/assets/images/screen/total.png") no-repeat center center;
background-size: 100% 100%;
- font-size: vh(18);
+ font-size: vw(18);
font-weight: 500;
color: #d0deee;
.totalText {
margin-left: 16px;
- font-size: vh(26);
+ font-size: vw(26);
color: #ebf9ff;
letter-spacing: 3px;
text-shadow: 0px 0px 9px #159aff;
diff --git a/src/views/enterpriseRiskIndex/estimateDetail.vue b/src/views/enterpriseRiskIndex/estimateDetail.vue
index 5b8a2d9..3778b87 100644
--- a/src/views/enterpriseRiskIndex/estimateDetail.vue
+++ b/src/views/enterpriseRiskIndex/estimateDetail.vue
@@ -480,7 +480,7 @@ export default {
.riskUpWrap {
padding: 0 10px;
.left {
- width: 190px;
+ width: 220px;
}
.left,
.right {
diff --git a/src/views/enterpriseRiskIndex/synthetical.vue b/src/views/enterpriseRiskIndex/synthetical.vue
index 33e59e8..4fc4dc2 100644
--- a/src/views/enterpriseRiskIndex/synthetical.vue
+++ b/src/views/enterpriseRiskIndex/synthetical.vue
@@ -469,7 +469,7 @@ export default {
height: calc(100% - 4vh);
display: flex;
.left {
- width: 190px;
+ width: 220px;
}
.left,
.right {
@@ -557,17 +557,17 @@ export default {
.syntheticalWrap {
.riskCol {
padding-left: vw(8);
- font-size: vh(16);
+ font-size: vw(16);
.riskName {
- height: vh(30);
+ height: vw(30);
display: flex;
- margin-top: vh(6);
+ margin-top: vw(6);
color: #d9e7ff;
.riskIcon {
- width: vh(24);
- height: vh(24);
+ width: vw(24);
+ height: vw(24);
background: url("~@/assets/images/screen/riskIcon.png") no-repeat center
center;
background-size: 100% 100%;
@@ -575,10 +575,10 @@ export default {
}
.totalWrap {
display: flex;
- margin-top: vh(40);
+ margin-top: vw(40);
}
.riskTotalPanel {
- margin-top: vh(40);
+ margin-top: vw(40);
}
}
}
diff --git a/src/views/enterpriseTopic/components/pCard.vue b/src/views/enterpriseTopic/components/pCard.vue
new file mode 100644
index 0000000..41a8270
--- /dev/null
+++ b/src/views/enterpriseTopic/components/pCard.vue
@@ -0,0 +1,66 @@
+
+
+
+
{{ info.name }}
+
{{ info.value.toLocaleString() }}
+
+
+
+
diff --git a/src/views/enterpriseTopic/components/pTotal.vue b/src/views/enterpriseTopic/components/pTotal.vue
new file mode 100644
index 0000000..3714cd2
--- /dev/null
+++ b/src/views/enterpriseTopic/components/pTotal.vue
@@ -0,0 +1,49 @@
+
+
+
{{ info.value.toLocaleString() }}
+
{{ info.name }}
+
+
+
+
diff --git a/src/views/enterpriseTopic/listGoods/index.vue b/src/views/enterpriseTopic/listGoods/index.vue
index 61e4c73..a15ed6c 100644
--- a/src/views/enterpriseTopic/listGoods/index.vue
+++ b/src/views/enterpriseTopic/listGoods/index.vue
@@ -82,21 +82,27 @@
放射源种类及数量
-
+
@@ -124,7 +130,7 @@
-
+
@@ -137,8 +143,11 @@
import lineOne from "@/loveflow/components/echart/line/one.vue";
import barFour from "@/loveflow/components/echart/bar/four.vue";
import radarTwo from "@/loveflow/components/echart/radar/two.vue";
+import radarThree from "@/loveflow/components/echart/radar/three.vue";
+import pieFour from "@/loveflow/components/echart/pie/four.vue";
+import pieFive from "@/loveflow/components/echart/pie/five.vue";
export default {
- components: { lineOne, barFour,radarTwo },
+ components: { lineOne, barFour, radarTwo, radarThree, pieFour, pieFive },
data() {
return {
tlObj: {
@@ -268,6 +277,56 @@ export default {
yData: [12, 13, 14, 15, 11, 14],
name: "民用枪支",
},
+ mlrObj: {
+ indicator: [
+ {
+ name: "使用次数",
+ max: 100,
+ },
+ {
+ name: "使用部门",
+ max: 100,
+ },
+ {
+ name: "使用途径",
+ max: 100,
+ },
+ {
+ name: "使用人员",
+ max: 100,
+ },
+ {
+ name: "使用方式",
+ max: 100,
+ },
+ {
+ name: "关联单位",
+ max: 100,
+ },
+ ],
+ yData: [12, 13, 14, 15, 11, 14],
+ name: "放射源使用",
+ },
+ mllObj: {
+ color: ["#2B82F3", "#09C8F5", "#66C3FF", "#FEF699", "#E4FEF0"],
+ data: [
+ { value: 448, name: "中子源1" },
+ { value: 735, name: "中子源2" },
+ { value: 580, name: "中子源3" },
+ { value: 484, name: "中子源4" },
+ ],
+ name: "放射源种类及数量",
+ },
+ mlmObj: {
+ color: ["#2B82F3", "#66C3FF", "#E4FEF0", "#FF745A", "#FEF699"],
+ data: [
+ { value: 484, name: "航空运输1" },
+ { value: 567, name: "航空运输2" },
+ { value: 489, name: "航空运输3" },
+ { value: 517, name: "航空运输4" },
+ ],
+ name: "放射源运输",
+ },
};
},
};
@@ -294,6 +353,8 @@ export default {
display: flex;
flex: 1;
.screenCol {
+ display: flex;
+ flex-direction: column;
flex: 1;
height: 100%;
background: url("~@/assets/images/topic/pcolT.png") no-repeat center
@@ -356,6 +417,8 @@ export default {
display: flex;
height: 100%;
.fsheWrap {
+ display: flex;
+ flex-direction: column;
flex: 1;
height: calc(100% - 26px);
margin-top: 12px;
@@ -486,14 +549,14 @@ export default {
.screenName {
display: flex;
align-items: center;
- padding-left: vh(6);
- height: vh(36);
- font-size: vh(16);
+ padding-left: vw(6);
+ height: vw(36);
+ font-size: vw(16);
color: #d9e7ff;
.screenIcon {
margin-right: 2px;
- width: vh(24);
- height: vh(24);
+ width: vw(24);
+ height: vw(24);
background: url("~@/assets/images/screen/riskIcon.png") no-repeat
center center;
background-size: 100% 100%;
@@ -502,29 +565,35 @@ export default {
}
}
.screenChart {
- position: relative;
- height: calc(100% - 3.3333vh);
+ flex: 1;
+ display: flex;
+ flex-direction: column;
.screenErrorWrap {
- margin-top: vh(24);
+ margin-top: vw(16);
.errorWrap {
- width: vh(142);
- height: vh(100);
+ width: vw(142);
+ height: vw(100);
.errorNum {
- font-size: vh(16);
+ font-size: vw(16);
}
.errorName {
- font-size: vh(14);
+ font-size: vw(14);
}
}
}
.screenErrorAlarmWrap {
- margin: vh(15) vh(15) 0;
+ margin: vw(15) vw(15) 0;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
.screenErrorAlarm {
- height: vh(56);
- margin-bottom: vh(15);
+ /* height: vw(56); */
+ margin-bottom: vw(12);
+ flex: 1;
font-size: vw(12);
.line {
- padding-left: vh(8);
+ padding-left: vw(8);
}
}
}
@@ -534,17 +603,18 @@ export default {
.fsheHead {
display: flex;
align-items: center;
- height: vh(36);
+ height: vw(36);
.fsheIcon {
- width: vh(32);
- height: vh(38);
+ width: vw(32);
+ height: vw(38);
}
.fsheTitle {
- font-size: vh(14);
+ font-size: vw(14);
}
}
.fsheBody {
- height: calc(100% - 3.3333vh);
+ flex: 1;
+ /* height: calc(100% - 3.3333vw); */
}
}
}
@@ -553,19 +623,19 @@ export default {
.gunsLeft {
.gunsItem {
.gunsIcon {
- width: vh(90);
- height: vh(70);
+ width: vw(90);
+ height: vw(70);
}
.gunsInfo {
- height: vh(70);
+ /* height: vw(70); */
display: flex;
flex-direction: column;
justify-content: space-evenly;
.label {
- font-size: vh(18);
+ font-size: vw(18);
}
.value {
- font-size: vh(28);
+ font-size: vw(28);
}
}
}
diff --git a/src/views/enterpriseTopic/personSafety/screen.vue b/src/views/enterpriseTopic/personSafety/screen.vue
index c8be249..ebdd1ce 100644
--- a/src/views/enterpriseTopic/personSafety/screen.vue
+++ b/src/views/enterpriseTopic/personSafety/screen.vue
@@ -6,45 +6,66 @@
-