diff --git a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue index e9fc5661..789c61ff 100644 --- a/src/views/projectAdmin/common/jChart/pie/JRingChart.vue +++ b/src/views/projectAdmin/common/jChart/pie/JRingChart.vue @@ -74,9 +74,20 @@ export default { subtext: title.subTitle, subtextStyle: { color: "rgba(255, 255, 255, 0.8)", - fontSize: 13 + fontSize: 16 } }, + // 图例 + legend: [{ + selectedMode:true, // 图例选择的模式,控制是否可以通过点击图例改变系列的显示状态。默认开启图例选择,可以设成 false 关闭。 + top: '30%', + left: 'center', + textStyle: { // 图例的公用文本样式。 + fontSize: 14, + color: '#fff' + }, + data: ['其它攻击数','未知攻击数'] + }], grid: { right: 0 }, diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_amk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_amk.png new file mode 100644 index 00000000..b7096133 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_amk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_bmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_bmk.png new file mode 100644 index 00000000..51710b49 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_bmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_dmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_dmk.png new file mode 100644 index 00000000..50533401 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_dmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_fmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_fmk.png new file mode 100644 index 00000000..f7657396 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_fmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_jmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_jmk.png new file mode 100644 index 00000000..dd2523ad Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_jmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_kmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_kmk.png new file mode 100644 index 00000000..16e460ca Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_kmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_lmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_lmk.png new file mode 100644 index 00000000..c3fa679c Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_lmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_nmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_nmk.png new file mode 100644 index 00000000..0eeca03d Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_nmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_omk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_omk.png new file mode 100644 index 00000000..667e484d Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_omk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_pmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_pmk.png new file mode 100644 index 00000000..1f9039a6 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_pmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_qmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_qmk.png new file mode 100644 index 00000000..2b5825f3 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_qmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_rmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_rmk.png new file mode 100644 index 00000000..abec0639 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_rmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_smk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_smk.png new file mode 100644 index 00000000..4c416b07 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_smk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_wmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_wmk.png new file mode 100644 index 00000000..41ed6883 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_wmk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_ymk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_ymk.png new file mode 100644 index 00000000..623e8d4b Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_ymk.png differ diff --git a/src/views/projectAdmin/fourEngin/assets/images/common/bg_zmk.png b/src/views/projectAdmin/fourEngin/assets/images/common/bg_zmk.png new file mode 100644 index 00000000..8d5087a2 Binary files /dev/null and b/src/views/projectAdmin/fourEngin/assets/images/common/bg_zmk.png differ diff --git a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue index fff63f29..3b1e0dcc 100644 --- a/src/views/projectAdmin/fourEngin/carbon/centerTop.vue +++ b/src/views/projectAdmin/fourEngin/carbon/centerTop.vue @@ -6,21 +6,25 @@
-

+
+ + +
+ + \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/quality/leftTop.vue b/src/views/projectAdmin/fourEngin/quality/leftTop.vue index b5716d27..ad7d8f9f 100644 --- a/src/views/projectAdmin/fourEngin/quality/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/quality/leftTop.vue @@ -4,7 +4,7 @@
-
-
2022-09-28
-
缪维彪
-
钢筋班组
-
+
+
{{item.time}}
+
{{item.names}}
+
{{item.team}}
+
@@ -128,7 +128,21 @@ export default { }, data() { return { - src: require('../assets/images/common/bg_redCar.png') + imgList: [ + { src:require("../assets/images/common/bg_fmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_wmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_wmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_kmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_fmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_pmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_rmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_dmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_bmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_amk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_nmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + { src:require("../assets/images/common/bg_nmk.png"),time:"2022-09-28", names:"缪维彪",team:"钢筋班组"}, + + ] } } } diff --git a/src/views/projectAdmin/fourEngin/security/leftBottom.vue b/src/views/projectAdmin/fourEngin/security/leftBottom.vue index de72f64b..e64af4dc 100644 --- a/src/views/projectAdmin/fourEngin/security/leftBottom.vue +++ b/src/views/projectAdmin/fourEngin/security/leftBottom.vue @@ -4,7 +4,7 @@
抓拍照片
-
事件类型
+
报警类型
抓拍时间
@@ -30,10 +30,10 @@ export default { data(){ return{ aiList:[ - { src:require("../assets/images/common/bg_redCar.png"),thingType:"垃圾车", time: "2022-06-15 15:30" }, - { src:require("../assets/images/common/bg_gayCar.png"),thingType:"渣土车", time: "2022-08-03 12:30" }, - { src:require("../assets/images/common/bg_BluCar.png"),thingType:"垃圾车", time: "2022-04-15 10:17" }, - { src:require("../assets/images/common/bg_redCar.png"),thingType:"渣土车", time: "2022-06-03 15:30" }, + { src:require("../assets/images/common/bg_smk.png"),thingType:"上班抽烟", time: "2022-01-23 15:30" }, + { src:require("../assets/images/common/bg_omk.png"),thingType:"未戴安全帽", time: "2022-01-23 15:30" }, + { src:require("../assets/images/common/bg_ymk.png"),thingType:"未穿反光衣", time: "2022-01-23 15:30" }, + { src:require("../assets/images/common/bg_ymk.png"),thingType:"未穿反光衣", time: "2022-01-23 15:30" }, ] } } diff --git a/src/views/projectAdmin/fourEngin/security/leftTop.vue b/src/views/projectAdmin/fourEngin/security/leftTop.vue index 52172201..7bd28b9b 100644 --- a/src/views/projectAdmin/fourEngin/security/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/security/leftTop.vue @@ -4,7 +4,7 @@