From c505496a6fde0d537b001304876198bfef4eefed Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 3 Jun 2024 18:26:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- src/views/commandScreen/commandCenter/leftBottom.vue | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 62fc1cf..a2dde07 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.221:19111' -VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' @@ -24,7 +24,7 @@ VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://182.90.224.237:15551' # agjt # VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 -VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 +# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信 diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 9280600..4b11e5f 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -163,7 +163,8 @@ let yData = ref([] as any) //获取总包出勤情况分析数据 const queryAttendanceOfEachCompany = async () => { const res: any = await queryAttendanceOfEachCompanyApi({ - projectSn: store.sn + projectSn: store.sn, + isCountMainEnterprise: 1 }); if (res.result) { console.log("获取总包出勤情况分析数据", res); @@ -327,7 +328,7 @@ let processList = ref([] as any) const queryCountEnterprise = async () => { const res: any = await queryCountEnterpriseApi({ projectSn: store.sn, - isCountMainEnterprise: "1" + isCountMainEnterprise: 1 }); if (res.result) { console.log("总包进度列表", res); From 8a1b5ef989cb3abde630a490feaa83156ae11977 Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 3 Jun 2024 18:30:37 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9A=82=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/commandScreen/commandCenter/leftBottom.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index 4b11e5f..598bd56 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -76,12 +76,12 @@ - +
{{totalPersonRhbRatio}}%
-
{{totalPersonRhbRatio}}%
+ +
0%
{{Math.abs(totalPersonRhbRatio)}}%
@@ -29,9 +33,15 @@
总包出勤情况分析
人员风险趋势分析
-
+
+
+
+ +

暂无数据

+
+
From e7cf73b0515cc434a4fd915eeb223addc92d611b Mon Sep 17 00:00:00 2001 From: Vce Date: Mon, 3 Jun 2024 18:42:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/commandScreen/commandCenter/leftBottom.vue | 2 +- src/views/commandScreen/commandCenter/rightAll.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/commandScreen/commandCenter/leftBottom.vue b/src/views/commandScreen/commandCenter/leftBottom.vue index f2fc095..19520c1 100644 --- a/src/views/commandScreen/commandCenter/leftBottom.vue +++ b/src/views/commandScreen/commandCenter/leftBottom.vue @@ -429,7 +429,7 @@ onMounted(async () => { height: 25px; .line2Item{ color: #fff; - width: 120px; + width: 140px; text-align: center; cursor: pointer; // background-color: #fff; diff --git a/src/views/commandScreen/commandCenter/rightAll.vue b/src/views/commandScreen/commandCenter/rightAll.vue index d164909..b99ccfa 100644 --- a/src/views/commandScreen/commandCenter/rightAll.vue +++ b/src/views/commandScreen/commandCenter/rightAll.vue @@ -1430,6 +1430,7 @@ onMounted(async () => { > div { // padding: 2px 0; font-size: 13px; + font-weight: normal; line-height: 25px; width: 170px; width: 140px;