diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue index 60de84e..6a24e3a 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomLeft.vue @@ -17,28 +17,20 @@
-
-
-
1
-
钢筋工-张三
+ +
+
+
1
+
钢筋工-张三
+
+
20/40
-
20/40
-
-
-
-
2
-
钢筋工-张三
-
-
20/40
-
-
-
-
3
-
钢筋工-张三
-
-
20/40
-
+
+
@@ -113,7 +105,7 @@ import { GlobalStore } from "@/stores"; // justify-content: space-around; .listItem{ width: 100%; - height: 27.6%; + height: 52px; margin-bottom: 10px; background-color: rgba($color: #062d5a, $alpha: 0.7); font-size: 18px; @@ -144,16 +136,16 @@ import { GlobalStore } from "@/stores"; height: 80%; margin-top: 4%; } -.notoDta { - bottom: 10%; - width: 20%; +.not-data { + top: 50%; + width: 30%; left: 35%; - text-align: center; position: absolute; + text-align: center; img { - width: 40%; + width: 50%; } - div { + p { color: #fff; font-size: 14px; } diff --git a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue index 0eeda0f..3abe011 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerBottomRight.vue @@ -2,16 +2,25 @@
-
-
外墙、顶板、地板出现贯通性裂缝
-
整改结果:已逾期
-
-
整改人:李四
-
检查人:张三
-
检查时间:2024-03-01 12:00:00
+ +
+
外墙、顶板、地板出现贯通性裂缝
+
+
整改结果:已逾期
+
责任单位:辽宁五瞏
+
+
+
整改人:李四
+
检查人:张三
+
检查时间:2024-03-01 12:00:00
+
-
+
+
@@ -50,6 +59,7 @@ import { GlobalStore } from "@/stores"; .itemLine2{ font-size: 11px; line-height: 20px; + display: flex; } .itemLine3{ font-size: 11px; @@ -64,16 +74,16 @@ import { GlobalStore } from "@/stores"; height: 80%; margin-top: 4%; } -.notoDta { - bottom: 10%; - width: 20%; +.not-data { + top: 40%; + width: 30%; left: 35%; - text-align: center; position: absolute; + text-align: center; img { - width: 40%; + width: 50%; } - div { + p { color: #fff; font-size: 14px; } diff --git a/src/views/agjtLiveScreen/liveScreen/centerTop.vue b/src/views/agjtLiveScreen/liveScreen/centerTop.vue index 9f2e974..645146e 100644 --- a/src/views/agjtLiveScreen/liveScreen/centerTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/centerTop.vue @@ -250,7 +250,7 @@ defineExpose({ }); onMounted(async () => { if (COMPANY !== "agjt") showVideo.value = 2; - await getVideoList(); + // await getVideoList(); getQueryBySnData(); if (COMPANY != "agjt") { showVideo.value = 2; diff --git a/src/views/agjtLiveScreen/liveScreen/index.vue b/src/views/agjtLiveScreen/liveScreen/index.vue index d304b50..75c53b3 100644 --- a/src/views/agjtLiveScreen/liveScreen/index.vue +++ b/src/views/agjtLiveScreen/liveScreen/index.vue @@ -85,8 +85,8 @@ window.onbeforeunload = (e) => { destroyInterval(); } onMounted( async () => { - getPersonDetail(); - getProjectInfo(); + // getPersonDetail(); + // getProjectInfo(); startInterval(); }); diff --git a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue index f856332..b5d1ed2 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftBottom.vue @@ -1,9 +1,14 @@ @@ -14,18 +19,22 @@ import { ref, onMounted, watch } from "vue"; import * as echarts from 'echarts'; let tempList = ref([ - {name:'高处作业',value:12,doing:10,per:'12.5'},{name:'断路作业',value:12,doing:10,per:'12.5'},{name:'吊装安全',value:12,doing:10,per:'12.5'},{name:'受限空间',value:12,doing:10,per:'12.5'}, - {name:'动火作业',value:12,doing:10,per:'12.5'},{name:'盲板抽堵',value:12,doing:10,per:'12.5'},{name:'动土作业',value:12,doing:10,per:'12.5'},{name:'临时用电',value:12,doing:10,per:'12.5'}, + // {name:'高处作业',value:12,doing:10,per:'12.5'},{name:'断路作业',value:12,doing:10,per:'12.5'},{name:'吊装安全',value:12,doing:10,per:'12.5'},{name:'受限空间',value:12,doing:10,per:'12.5'}, + // {name:'动火作业',value:12,doing:10,per:'12.5'},{name:'盲板抽堵',value:12,doing:10,per:'12.5'},{name:'动土作业',value:12,doing:10,per:'12.5'},{name:'临时用电',value:12,doing:10,per:'12.5'}, ] as any) let tempList2 = ref([ - { value: 123, name: '高处作业' }, - { value: 123, name: '断路作业' }, - { value: 123, name: '吊装安全' }, - { value: 123, name: '受限空间' }, - { value: 123, name: '动火作业' }, - { value: 123, name: '盲板抽堵' }, - { value: 123, name: '动土作业' }, - { value: 123, name: '临时用电' } + // { value: 123, name: '高处作业' }, + // { value: 123, name: '断路作业' }, + // { value: 123, name: '吊装安全' }, + // { value: 123, name: '受限空间' }, + // { value: 123, name: '动火作业' }, + // { value: 123, name: '盲板抽堵' }, + // { value: 123, name: '动土作业' }, + // { value: 123, name: '临时用电' } +] as any) +let tempList3 = ref([ + // { value: 96, name: '进行中' }, + // { value: 80, name: '已完成' }, ] as any) function drawPie(){ type EChartsOption = echarts.EChartsOption; @@ -68,10 +77,7 @@ function drawPie(){ labelLine: { show: false }, - data: [ - { value: 96, name: '进行中' }, - { value: 80, name: '已完成' }, - ] + data: tempList3.value }, { name: 'Access From', @@ -140,9 +146,42 @@ function drawPie(){ option && myChart.setOption(option); } - -onMounted( async () => { +watch(tempList2, (newV,oldV) => { + if(newV.length !== 0){ + // drawPie() + } +}) +watch(tempList, (newV,oldV) => { + if(newV.length !== 0){ + // drawPie() + } +}) +function getData(){ + // setTimeout(() => { + tempList.value = [ + {name:'高处作业',value:12,doing:10,per:'12.5'},{name:'断路作业',value:12,doing:10,per:'12.5'},{name:'吊装安全',value:12,doing:10,per:'12.5'},{name:'受限空间',value:12,doing:10,per:'12.5'}, + {name:'动火作业',value:12,doing:10,per:'12.5'},{name:'盲板抽堵',value:12,doing:10,per:'12.5'},{name:'动土作业',value:12,doing:10,per:'12.5'},{name:'临时用电',value:12,doing:10,per:'12.5'}, + ] + tempList2.value = [ + { value: 123, name: '高处作业' }, + { value: 123, name: '断路作业' }, + { value: 123, name: '吊装安全' }, + { value: 123, name: '受限空间' }, + { value: 123, name: '动火作业' }, + { value: 123, name: '盲板抽堵' }, + { value: 123, name: '动土作业' }, + { value: 123, name: '临时用电' } + ] + tempList3.value = [ + { value: 96, name: '进行中' }, + { value: 80, name: '已完成' }, + ] + // },1000) drawPie() +} +onMounted( async () => { + + getData() }); @@ -162,4 +201,18 @@ onMounted( async () => { ::v-deep .h-card .content { height: 80%; } +.not-data { + top: 40%; + width: 30%; + left: 35%; + position: absolute; + text-align: center; + img { + width: 50%; + } + p { + color: #fff; + font-size: 14px; + } +} diff --git a/src/views/agjtLiveScreen/liveScreen/leftCenter.vue b/src/views/agjtLiveScreen/liveScreen/leftCenter.vue index 139ddc0..5d78682 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftCenter.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftCenter.vue @@ -8,6 +8,10 @@
报警事件:2024-03-01 12:00:00
+ @@ -55,4 +59,18 @@ onMounted( async () => { ::v-deep .h-card .content { height: 80%; } +.not-data { + top: 40%; + width: 30%; + left: 35%; + position: absolute; + text-align: center; + img { + width: 50%; + } + p { + color: #fff; + font-size: 14px; + } +} diff --git a/src/views/agjtLiveScreen/liveScreen/leftTop.vue b/src/views/agjtLiveScreen/liveScreen/leftTop.vue index 63985d9..e2fcc56 100644 --- a/src/views/agjtLiveScreen/liveScreen/leftTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/leftTop.vue @@ -82,7 +82,7 @@ defineExpose({ projectTypeEnum }) onMounted( async () => { - await projectTypeEnum(); + // await projectTypeEnum(); }) watch( () => props.projectData, diff --git a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue index cadef37..c54d89b 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightBottom.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightBottom.vue @@ -2,16 +2,25 @@
-
+ +
外墙、顶板、地板出现贯通性裂缝
-
整改结果:已逾期
+
+
整改结果:已逾期
+
责任单位:辽宁五瞏
+
整改人:李四
检查人:张三
检查时间:2024-03-01 12:00:00
+
+
@@ -54,6 +63,7 @@ onMounted( async () => { .itemLine2{ font-size: 11px; line-height: 20px; + display: flex; } .itemLine3{ font-size: 11px; @@ -68,4 +78,18 @@ onMounted( async () => { ::v-deep .h-card .content { height: 80%; } +.not-data { + top: 38%; + width: 30%; + left: 35%; + position: absolute; + text-align: center; + img { + width: 50%; + } + p { + color: #fff; + font-size: 14px; + } +} diff --git a/src/views/agjtLiveScreen/liveScreen/rightTop.vue b/src/views/agjtLiveScreen/liveScreen/rightTop.vue index 43e9df2..8080412 100644 --- a/src/views/agjtLiveScreen/liveScreen/rightTop.vue +++ b/src/views/agjtLiveScreen/liveScreen/rightTop.vue @@ -2,21 +2,33 @@
-
-
-
-
事项
-
-
-
被困电梯,需要救援
-
-
处理状态:已处理
-
处理报告:下载
-
2024-03-01 12:00:00
+ +
+
+
+
事项
+
+
+
+
被困电梯,需要救援的风景和深刻搭街坊后来空手道解放螺丝钉顺利打开飞机螺丝钉看见分列式雕刻技法
+
检查人:张三
+
+
+
责任单位:辽宁五瞏
+
+
+
处理状态:已处理
+
处理报告:下载
+
2024-03-01 12:00:00
+
-
+
+
@@ -42,7 +54,7 @@ onMounted(async () => { padding: 10px 10px; .itemBox{ width: 100%; - height: 30%; + height: 65px; color: #fff; display: flex; justify-content: space-between; @@ -58,40 +70,68 @@ onMounted(async () => { } .itemRight{ - height: 100%; - width: calc(81% - 10px); - padding: 0 5px; + height: calc(100% - 10px); + width: calc(82% - 10px); + padding: 5px 5px; // background-color: rgba($color: #a85454, $alpha: 0.3); background: repeating-linear-gradient(100deg, rgba(200,10,10,0.1), rgba(200,10,10,0.1) 20px, rgba(0,0,0,0) 20px, rgba(0,0,0,0) 40px), linear-gradient(to bottom, rgba(200,10,10,0.2), rgba(200,10,10,0.3)); background-size: 100% 100%, 100% 100%; + display: flex; + flex-direction: column; + justify-content: space-between; .rightTop{ - height: 50%; + height: 30%; width: 100%; - transform: translateY(10px); - white-space: nowrap; /* 防止文字换行 */ - overflow: hidden; /* 超出部分隐藏 */ - text-overflow: ellipsis; /* 超出部分显示省略号 */ + display: flex; + justify-content: space-between; + } + .rightCenter{ + height: 30%; + width: 100%; + display: flex; + justify-content: flex-end; } .rightBottom{ color: #19bfef; - height: 50%; + height: 30%; display: flex; align-items: center; justify-content: space-between; - transform: translateY(-3px); + // transform: translateY(-3px); .rbInner1{} .rbInner2{} - .rbInner3{} + .rbInner3{ + font-style: italic; + } } } } } } +.overHiddenText{ + white-space: nowrap; /* 防止文字换行 */ + overflow: hidden; /* 超出部分隐藏 */ + text-overflow: ellipsis; /* 超出部分显示省略号 */ +} ::v-deep .h-card .content { height: 80%; } ::v-deep .h-card { position: relative; } +.not-data { + top: 40%; + width: 30%; + left: 35%; + position: absolute; + text-align: center; + img { + width: 50%; + } + p { + color: #fff; + font-size: 14px; + } +}