diff --git a/src/assets/images/topic/num.png b/src/assets/images/topic/num.png new file mode 100644 index 0000000..e3f2603 Binary files /dev/null and b/src/assets/images/topic/num.png differ diff --git a/src/assets/images/topic/numb.png b/src/assets/images/topic/numb.png new file mode 100644 index 0000000..05bfcec Binary files /dev/null and b/src/assets/images/topic/numb.png differ diff --git a/src/assets/images/topic/道路安全(绿)_00000.png b/src/assets/images/topic/pie1b.png similarity index 100% rename from src/assets/images/topic/道路安全(绿)_00000.png rename to src/assets/images/topic/pie1b.png diff --git a/src/assets/images/topic/Element 03_00000.png b/src/assets/images/topic/pie2b.png similarity index 100% rename from src/assets/images/topic/Element 03_00000.png rename to src/assets/images/topic/pie2b.png diff --git a/src/assets/images/topic/道路安全_00000.png b/src/assets/images/topic/pie4b.png similarity index 100% rename from src/assets/images/topic/道路安全_00000.png rename to src/assets/images/topic/pie4b.png diff --git a/src/assets/images/topic/编组 62.png b/src/assets/images/topic/编组 62.png deleted file mode 100644 index 7fb982a..0000000 Binary files a/src/assets/images/topic/编组 62.png and /dev/null differ diff --git a/src/loveflow/components/echart/pie/six.vue b/src/loveflow/components/echart/pie/six.vue new file mode 100644 index 0000000..bc83ae0 --- /dev/null +++ b/src/loveflow/components/echart/pie/six.vue @@ -0,0 +1,155 @@ + + diff --git a/src/views/enterpriseTopic/components/num.vue b/src/views/enterpriseTopic/components/num.vue new file mode 100644 index 0000000..f2a4801 --- /dev/null +++ b/src/views/enterpriseTopic/components/num.vue @@ -0,0 +1,75 @@ + + + diff --git a/src/views/enterpriseTopic/personSafety/screen.vue b/src/views/enterpriseTopic/personSafety/screen.vue index ebdd1ce..31094ea 100644 --- a/src/views/enterpriseTopic/personSafety/screen.vue +++ b/src/views/enterpriseTopic/personSafety/screen.vue @@ -8,12 +8,31 @@
重点岗位异常数
-
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
流动人口总数
-
+
+ +
@@ -75,10 +94,44 @@ import headWrap from "@/views/home/head.vue"; import pCard from "../components/pCard.vue"; import pTotal from "../components/pTotal.vue"; +import pNum from "../components/num.vue"; +import pieSix from "@/loveflow/components/echart/pie/six.vue"; + export default { - components: { headWrap, pCard, pTotal }, + components: { headWrap, pCard, pTotal, pNum, pieSix }, data() { return { + total: 53981 + "", + + tl1Obj: { + name: "危险品领用人员", + total: 3400, + point: 1000, + icon: require("@/assets/images/topic/pie1b.png"), + color: ["#57F0FF", "#37A1CC", "#08FAC4"], + }, + tl2Obj: { + name: "危险品领用人员", + total: 3400, + point: 1200, + icon: require("@/assets/images/topic/pie2b.png"), + color: ["#FFF7E3;", "#EB9104", "#FAC608"], + }, + tl3Obj: { + name: "危险品领用人员", + total: 3400, + point: 1300, + icon: require("@/assets/images/topic/pie1b.png"), + color: ["#57F0FF", "#37A1CC", "#08FAC4"], + }, + tl4Obj: { + name: "危险品领用人员", + total: 3400, + point: 900, + icon: require("@/assets/images/topic/pie4b.png"), + color: ["#FFE3E3", "#FF2C2C", "#FF6D6D"], + }, + tmObj: { l1: { icon: require("@/assets/images/topic/l1.png"), @@ -230,13 +283,24 @@ export default { .safeManageWrap { flex: 1; } + .line { + display: flex; + flex: 1; + .item { + flex: 1; + } + } } } .screenMCol { align-items: center; .totalWrap { + margin-top: vw(40); + display: flex; + flex-direction: column; + align-items: center; .totalTitle { - font-weight: 600; + font-weight: 500; font-size: vw(18); color: #ffffff; } @@ -244,7 +308,6 @@ export default { } } .totalTypeWrap { - margin-top: vw(88); width: vw(612); height: vw(54); display: flex;