diff --git a/src/views/projectAdmin/fourEngin/security/centerTop.vue b/src/views/projectAdmin/fourEngin/security/centerTop.vue index f5e457f1..a6c20bf4 100644 --- a/src/views/projectAdmin/fourEngin/security/centerTop.vue +++ b/src/views/projectAdmin/fourEngin/security/centerTop.vue @@ -6,15 +6,15 @@
- 67 + {{threeLevel.projectWorkerNumber}}

项目总人数

- 51 + {{threeLevel.projectTrainWorkerNumber}}

项目培训人数

- 46.79% + {{threeLevel.projectTrainRatio}}%

项目培训率

@@ -28,11 +28,14 @@
-
-
每日安全交底
-
缪维彪
-
45
-
2022-09-28
+
+
{{i.eduCourseName}}
+
{{i.eduTeacher}}
+
{{(i.eduClasshour!=0?i.eduClasshour/60:0)}}
+
{{i.eduTime}}
+
+
+
暂无数据
@@ -43,11 +46,11 @@
- 3次 + {{shouting.allCount}}

今日班前喊话次数

- 12 + {{shouting.todayCount}}

班前喊话次数

@@ -61,11 +64,14 @@
-
-
{{item.time}}
-
{{item.names}}
-
{{item.team}}
-
+
+
{{item.shoutTime}}
+
{{item.dutyUserName}}
+
{{item.teamName}}
+
+
+
+
暂无数据
@@ -78,21 +84,21 @@ 安全交
-
+
- 67次 + {{safetyDisclosure.trainNumber}}次

培训次数

- 23次 + {{safetyDisclosure.specialOperationsNumber}}次

特种作业

- 11次 + {{safetyDisclosure.disclosureInRainySeasonNumber}}次

雨季交底

- 26次 + {{safetyDisclosure.electricityDisclosureNumber}}次

用电交底

@@ -106,11 +112,14 @@
-
-
每日安全交底
-
钢筋交底
-
缪维彪
-
2022-09-28
+
+
{{i.eduCourseName}}
+
{{i.eduTypeList[i.eduType]}}
+
{{i.eduTeacher}}
+
{{i.eduTime}}
+
+
+
暂无数据
@@ -122,29 +131,60 @@ diff --git a/src/views/projectAdmin/fourEngin/security/leftBottom.vue b/src/views/projectAdmin/fourEngin/security/leftBottom.vue index e64af4dc..36d33d22 100644 --- a/src/views/projectAdmin/fourEngin/security/leftBottom.vue +++ b/src/views/projectAdmin/fourEngin/security/leftBottom.vue @@ -10,12 +10,12 @@
-
+
- +
-
{{item.thingType}}
-
{{item.time}}
+
{{ alarmTypeList[item.thingType] }}
+
{{ item.createTime }}
@@ -25,18 +25,39 @@ @@ -45,32 +66,41 @@ export default { width: 100%; height: 100%; color: #fff; + .thead { height: 36px; line-height: 36px; color: #59b2c0; } + .tbody { height: calc(100% - 30px); font-size: 12px; } + .row { display: flex; align-items: center; + &:not(:last-child) { margin-bottom: 12px; } + div { text-align: center; + &:last-child { flex: 1; } + &:first-child { width: 100px; } + &:not(:last-child) { width: 100px; } + img { width: 80px; height: 50px; diff --git a/src/views/projectAdmin/fourEngin/security/leftTop.vue b/src/views/projectAdmin/fourEngin/security/leftTop.vue index 59e2631b..f924a764 100644 --- a/src/views/projectAdmin/fourEngin/security/leftTop.vue +++ b/src/views/projectAdmin/fourEngin/security/leftTop.vue @@ -3,13 +3,10 @@
- + :data="[{ value: safetyPatrolInspection.allRectificationNum, name: '已处理' }, { value: safetyPatrolInspection.allNoRectificationNum, name: '未处理' }]" + :radius="['60%', '85%']" :legend="false" />
@@ -17,8 +14,8 @@ 占比
- {{ safetyPeril.rectificationNum || 0 }} - {{ safetyPeril.rectificationRatio || 0 }}% + {{ safetyPatrolInspection.allRectificationNum || 0 }} + {{ safetyPatrolInspection.allRectificationRatio || 0 }}%
@@ -27,20 +24,17 @@ 占比
- {{ safetyPeril.noRectificationNum || 0 }} - {{ safetyPeril.noRectificationRatio || 0 }}% + {{ safetyPatrolInspection.allNoRectificationNum || 0 }} + {{ safetyPatrolInspection.noRectificationRatio || 0 }}%
- + :data="[{ value: safetyPatrolInspection.todayRectificationNum, name: '已巡检' }, { value: safetyPatrolInspection.todayNoRectificationRatio, name: '未巡检' }]" + :radius="['60%', '85%']" :legend="false" />
@@ -48,8 +42,8 @@ 占比
- {{ todayInspection.rectificationNum || 0 }} - {{ todayInspection.rectificationRatio || 0 }}% + {{ safetyPatrolInspection.todayRectificationNum || 0 }} + {{ safetyPatrolInspection.todayRectificationRatio || 0 }}%
@@ -58,8 +52,8 @@ 占比
- {{ todayInspection.noRectificationNum || 0 }} - {{ todayInspection.noRectificationRatio || 0 }}% + {{ safetyPatrolInspection.todayNoRectificationRatio || 0 }} + {{ safetyPatrolInspection.todayNoRectificationRatio || 0 }}%
@@ -74,11 +68,15 @@
-
-
{{ fmtType(item.type) }}
-
{{ item.datetime }}
+
+
{{ fmtType(item.recordType) }}
+
{{ item.inspectTime }}
{{ fmtStatus(item.status) }}
+
+
暂无数据
+
@@ -86,10 +84,10 @@ \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/security/rightTopComponents/electrical.vue b/src/views/projectAdmin/fourEngin/security/rightTopComponents/electrical.vue new file mode 100644 index 00000000..bed3891f --- /dev/null +++ b/src/views/projectAdmin/fourEngin/security/rightTopComponents/electrical.vue @@ -0,0 +1,86 @@ + + + \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/security/rightTopComponents/environmentDevList.vue b/src/views/projectAdmin/fourEngin/security/rightTopComponents/environmentDevList.vue new file mode 100644 index 00000000..afab73e4 --- /dev/null +++ b/src/views/projectAdmin/fourEngin/security/rightTopComponents/environmentDevList.vue @@ -0,0 +1,85 @@ + + + \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/security/rightTopComponents/lifterList.vue b/src/views/projectAdmin/fourEngin/security/rightTopComponents/lifterList.vue new file mode 100644 index 00000000..16d485ca --- /dev/null +++ b/src/views/projectAdmin/fourEngin/security/rightTopComponents/lifterList.vue @@ -0,0 +1,90 @@ + + + \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/security/rightTopComponents/towerList.vue b/src/views/projectAdmin/fourEngin/security/rightTopComponents/towerList.vue new file mode 100644 index 00000000..f8f2c34b --- /dev/null +++ b/src/views/projectAdmin/fourEngin/security/rightTopComponents/towerList.vue @@ -0,0 +1,94 @@ + + + \ No newline at end of file diff --git a/src/views/projectAdmin/fourEngin/security/rightTopComponents/videoItemList.vue b/src/views/projectAdmin/fourEngin/security/rightTopComponents/videoItemList.vue new file mode 100644 index 00000000..79b530f1 --- /dev/null +++ b/src/views/projectAdmin/fourEngin/security/rightTopComponents/videoItemList.vue @@ -0,0 +1,99 @@ + + + \ No newline at end of file