From 37db6d303eb3be221357e711c4e4d21f826012d9 Mon Sep 17 00:00:00 2001 From: cjp <3096114695@qq.com> Date: Sat, 29 Jul 2023 17:59:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=83=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=A4=A7=E5=B1=8F25=E4=B8=AABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionMonitoring/topRight.vue | 12 +- .../elevatorMonitoring/leftCenter.vue | 7 +- .../headNoise/centerBottom.vue | 7 +- .../sevenLargeScreen/headNoise/leftBottom.vue | 15 +- .../headNoise/rightBottom.vue | 2 +- .../laborManagement/circularGraph.vue | 2 +- .../laborManagement/leftBottom.vue | 24 ++-- .../laborManagement/rightBottom.vue | 1 - .../laborManagement/rightCenter.vue | 135 ++++++++++++++++-- .../laborManagement/rightTop.vue | 89 +++++++++--- .../towerCraneMonitoring/right.vue | 8 +- .../vehicleManagement/topLeft.vue | 24 +++- .../vehicleManagement/topRight.vue | 25 +++- 13 files changed, 291 insertions(+), 60 deletions(-) diff --git a/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue b/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue index aa0e1b5..787b66e 100644 --- a/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue +++ b/src/views/sevenLargeScreen/distributionMonitoring/topRight.vue @@ -153,11 +153,21 @@ onMounted(async () => { .listBox { .listStyle { display: flex; - justify-content: space-around; + // justify-content: space-around; color: #fff; height: 12%; line-height: 25px; font-size: calc(100vw * 12 / 1920); + .dev { + width: 25%; + padding-left: 7%; + } + .time { + width: 40%; + } + .type { + width: 20%; + } } .listStyle:hover { background: #091f3f; diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue b/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue index 0883a7c..cd91dfc 100644 --- a/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue +++ b/src/views/sevenLargeScreen/elevatorMonitoring/leftCenter.vue @@ -4,6 +4,7 @@
{ getAlarmTypeList(); diff --git a/src/views/sevenLargeScreen/headNoise/centerBottom.vue b/src/views/sevenLargeScreen/headNoise/centerBottom.vue index 1d6ddd0..3496f8d 100644 --- a/src/views/sevenLargeScreen/headNoise/centerBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/centerBottom.vue @@ -6,6 +6,8 @@

{{ item.day }}

+ +

{{ item.wea }}
{{ item.tem2 }} ~ {{ item.tem1 }}
@@ -24,9 +26,10 @@ const weatherList = ref([]); //获取天气 const loadWeather = async () => { const res = await getWeatherDataApi({ cityid: "" }); - var json = JSON.parse(res.result); - var list = json; + let json = JSON.parse(res.result); + let list = json; list.forEach((element, index) => { + // 这里的写法线上解析不了待解决 element.url = "src/assets/images/dustNoise/weatherIcon/" + element.wea_img + ".png"; weatherList.value.push(element); console.log("weatherList ========== ", weatherList.value); diff --git a/src/views/sevenLargeScreen/headNoise/leftBottom.vue b/src/views/sevenLargeScreen/headNoise/leftBottom.vue index 32ccc79..32ee08b 100644 --- a/src/views/sevenLargeScreen/headNoise/leftBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/leftBottom.vue @@ -1,6 +1,15 @@ @@ -121,6 +125,7 @@ function _pie3() { // } let max = ref(0 as Number); +let projectWorkerTypeData = ref(null as any); //获取部门管理人员分析数据 // let timer = null const getProjectWorkerList = async () => { @@ -131,17 +136,15 @@ const getProjectWorkerList = async () => { let projectWorkerTypeOption: any = []; if (res.result) { res.result.projectCompanyWorkTotalList.forEach(item => { - // 只取有数据的工种 - if (item.totalPersonNum > 0) { - // 计算工人总和 - max.value = max.value + item.totalPersonNum; - dataName.value.push(item.enterpriseName); - projectWorkerTypeOption.push({ - value: item.totalPersonNum, - name: item.enterpriseName - }); - } + // 计算工人总和 在场——实时 出勤——今日 + max.value = item.presencePersonNum - 0 + max.value; + dataName.value.push(item.enterpriseName); + projectWorkerTypeOption.push({ + value: item.presencePersonNum, + name: item.enterpriseName + }); }); + projectWorkerTypeData.value = res.result.projectCompanyWorkTotalList; // 接口成功获取新值 totalData.value = projectWorkerTypeOption; trafficWay.value = projectWorkerTypeOption; @@ -252,19 +255,95 @@ function initOption() { }; } +function getNowData() { + let projectWorkerTypeOption: any = []; + max.value = 0; + projectWorkerTypeData.value.forEach(item => { + if (item.presencePersonNum >= 0) { + // 计算实时总和 + max.value = item.presencePersonNum - 0 + max.value; + // 取 + projectWorkerTypeOption.push({ + value: item.presencePersonNum, + name: item.typeName + }); + } + }); + console.log("部门管理出勤分析", projectWorkerTypeData); + + totalData.value = projectWorkerTypeOption; + trafficWay.value = projectWorkerTypeOption; + // optionData.value = getData(data); + // 初始化option + initOption(); + // 处理data + data.value.length = 0; + for (let i = 0; i < trafficWay.value.length; i++) { + data.value.push({ + value: trafficWay.value[i].value, + name: trafficWay.value[i].name, + itemStyle: { + normal: { + borderWidth: 0, + shadowBlur: 2, + borderColor: color.value[i], + shadowColor: color.value[i] + } + } + }); + } +} +function getTodayData() { + // console.log("部门管理出勤分析", projectWorkerTypeData); + max.value = 0; + let projectWorkerTypeOption: any = []; + projectWorkerTypeData.value.forEach(item => { + if (item.attendancePersonNum >= 0) { + // 计算今日总和 + max.value = item.attendancePersonNum - 0 + max.value; + // 取 + projectWorkerTypeOption.push({ + value: item.attendancePersonNum, + name: item.typeName + }); + } + }); + totalData.value = projectWorkerTypeOption; + trafficWay.value = projectWorkerTypeOption; + // optionData.value = getData(data); + // 初始化option + initOption(); + // 处理data + data.value.length = 0; + for (let i = 0; i < trafficWay.value.length; i++) { + data.value.push({ + value: trafficWay.value[i].value, + name: trafficWay.value[i].name, + itemStyle: { + normal: { + borderWidth: 0, + shadowBlur: 2, + borderColor: color.value[i], + shadowColor: color.value[i] + } + } + }); + } +} + onMounted(async () => { await getProjectWorkerList(); draw(); }); onBeforeUnmount(() => { - // clearInterval(timer); + echarts.dispose; }); // 图表绘制 function draw() { let echartsTest = echarts.init(document.getElementById("echartsRight")); echartsTest.setOption(option.value); - console.log('右中出勤绘图数据',option.value); + console.log("右中出勤绘图数据", option.value); } @@ -287,4 +366,36 @@ function draw() { background: url("@/assets/images/dustNoise/motionEffect.webp") no-repeat; background-size: 100% 100%; } + +.rightHeader { + width: 20%; + display: flex; + position: absolute; + z-index: 99; + color: #fff; + font-size: 10px; + text-align: center; + line-height: 20px; + left: 80%; + top: 45%; + .Selected { + height: 5%; + background: url("@/assets/images/dustNoise/rightImg2.png") no-repeat; + background-size: 100% 100%; + cursor: pointer; + } + .day { + width: 15%; + margin-right: 5%; + margin-left: 55%; + } + .year { + width: 15%; + margin-right: 8%; + } + .Selected:hover { + background: url("@/assets/images/dustNoise/rightImg.png") no-repeat; + background-size: 100% 100%; + } +} diff --git a/src/views/sevenLargeScreen/laborManagement/rightTop.vue b/src/views/sevenLargeScreen/laborManagement/rightTop.vue index 41a25b3..13fba3d 100644 --- a/src/views/sevenLargeScreen/laborManagement/rightTop.vue +++ b/src/views/sevenLargeScreen/laborManagement/rightTop.vue @@ -1,8 +1,8 @@ @@ -218,7 +261,7 @@ onMounted(async () => { color: #fff; position: absolute; top: 25%; - left: 78.8%; + left: 79.8%; z-index: 9; } diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue index 02e094d..e77b42b 100644 --- a/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue +++ b/src/views/sevenLargeScreen/towerCraneMonitoring/right.vue @@ -40,7 +40,7 @@
荷载比
-
0%
+
{{ towerDetail.loadRatio || 0 }}%
力矩比
@@ -235,6 +235,8 @@ function selectTower(e: any) { getTowerDetail(); getTowerData(); getDriverInfoList(); + getNewestData(); + getSelectTower(); } // 获取塔吊详情 // 进入页面播放ID @@ -292,10 +294,12 @@ const getTowerNumAndAlarmList = async () => { //获取运行状态 let towerList = ref([] as any); const getSelectTower = async () => { + towerList.value.length = 0 const res = await getTowerCurrentCountApi({ projectSn: store.sn }); if (res.result) { + console.log("运行状态",res.result); res.result.forEach((item: any) => { if (item.devSn == towerDevSn.value) { towerList.value.push(item); @@ -311,7 +315,7 @@ const getDriverInfoList = async () => { devSn: towerDevSn.value }); if (res.result) { - driverInfo.value = res.result.devWorker.workerList.slice(0, 1); + driverInfo.value = res.result.devWorker.workerList.slice(0,1); } }; diff --git a/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue b/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue index b54a6cd..feb89de 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/topLeft.vue @@ -1,7 +1,7 @@ @@ -158,6 +162,22 @@ onMounted(async () => { cursor: default; } } + +.notoDta { + top: 30%; + width: 12%; + left: 20%; + position: absolute; + img { + width: 40%; + margin: 5% 30%; + } + p { + color: #fff; + font-size: calc(100vw * 14 / 1920); + margin: -6% 37%; + } +} ::v-deep .el-input__prefix { color: #4ac0f3; } diff --git a/src/views/sevenLargeScreen/vehicleManagement/topRight.vue b/src/views/sevenLargeScreen/vehicleManagement/topRight.vue index fe2aabb..eea3de1 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/topRight.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/topRight.vue @@ -1,7 +1,7 @@ @@ -157,6 +161,23 @@ onMounted(async () => { cursor: default; } } + +.notoDta { + top: 30%; + width: 12%; + left: 70%; + position: absolute; + img { + width: 40%; + margin: 5% 30%; + } + p { + color: #fff; + font-size: calc(100vw * 14 / 1920); + margin: -6% 37%; + } +} + ::v-deep .el-input__prefix { color: #4ac0f3; }