From 079a4734e6840016b8ac221bfc19358e74617965 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 17 Apr 2024 21:05:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E5=8F=8A?=
 =?UTF-8?q?ai=E9=A2=84=E8=AD=A6=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  5 ++-
 .env.production                               |  4 +-
 src/config/config.ts                          |  4 +-
 .../projectOverview/leftCenter.vue            | 39 +++++++++++++++----
 .../aIEarlyWarning/bottomRight.vue            |  7 +++-
 .../aIEarlyWarning/index.vue                  |  1 +
 .../aIEarlyWarning/topCenter.vue              | 38 +++++++++++++++---
 7 files changed, 77 insertions(+), 21 deletions(-)

diff --git a/.env.development b/.env.development
index e333189..65cbf35 100644
--- a/.env.development
+++ b/.env.development
@@ -3,7 +3,7 @@ NODE_ENV = 'development'
 
 # 本地环境接口地址(/api/index.ts文件中使用)
 # 后端本地
-VITE_API_URL = 'http://192.168.34.221:9111'
+# VITE_API_URL = 'http://192.168.34.221:9111'
 # VITE_API_URL = 'http://192.168.34.221:28888'
 # VITE_API_URL = 'http://121.196.214.246/api'
 # VITE_API_URL = 'http://jxj.zhgdyun.com:100'
@@ -15,13 +15,14 @@ VITE_API_URL = 'http://192.168.34.221:9111'
 # 演示平台
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
 # 百色七参数线上地址
-VITE_API_URL = 'http://101.43.164.214:11111'
+# VITE_API_URL = 'http://101.43.164.214:11111'
 # 七参数标准版(测试平台)
 # VITE_API_URL = 'http://jxj.zhgdyun.com:15551'
 # 七参数标准版(测试平台)
 # VITE_API_URL = 'http://182.90.224.237:15551'
 # agjt
 # VITE_API_URL = 'http://47.93.215.234:9809'
+VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
 
diff --git a/.env.production b/.env.production
index af81f8e..9467bd1 100644
--- a/.env.production
+++ b/.env.production
@@ -12,7 +12,7 @@ NODE_ENV = "production"
 # VITE_API_URL = "http://183.249.224.118:9003"
 
 # 百色  新项目通用地址
-VITE_API_URL = 'http://101.43.164.214:11111'
+# VITE_API_URL = 'http://101.43.164.214:11111'
 
 # 七参数标准版(演示平台)
 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809'
@@ -21,7 +21,7 @@ VITE_API_URL = 'http://101.43.164.214:11111'
 # 七参数标准版(测试平台)
 # VITE_API_URL = 'http://182.90.224.237:15551'
 # agjt
-# VITE_API_URL = 'http://47.93.215.234:9809'
+VITE_API_URL = 'http://47.93.215.234:9809'
 
 # 打包
 VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
diff --git a/src/config/config.ts b/src/config/config.ts
index 1772b2a..d03b9fe 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -25,8 +25,8 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 // 项目环境标识配置 部署时需更改对应的项目
 // export const COMPANY: string = ""; //标准版
 // export const COMPANY: string = "as"; //鞍山项目
-// export const COMPANY: string = "agjt"; //鞍钢集团
-export const COMPANY: string = "hfqc"; //合肥启程项目
+export const COMPANY: string = "agjt"; //鞍钢集团
+// export const COMPANY: string = "hfqc"; //合肥启程项目
 // export const COMPANY: string = "jsyc"; // 江苏盐城项目
 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页)
 // export const COMPANY: string = "jxwjj"; //嘉兴王江泾公用码头项目 (需要去src\routers\modules\staticRouter.ts更换首页)
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue
index f31cb34..acad0e9 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftCenter.vue
@@ -3,9 +3,11 @@
 		<Card title="人员概况">
 			<div class="topPeopleNum">
 				<div class="dataTlo">
-					<div class="text"><i>实名制人数</i></div>
+					<div class="text" v-if="COMPANY === 'agjt'"><i>出勤人数</i></div>
+					<div class="text" v-else><i>实名制人数</i></div>
 					<div class="num">
-						<i>{{ statisticsCount.workercount.totalPerson || 0 }}</i>
+						<i v-if="COMPANY === 'agjt'">{{ attendancePerson.totalPerson || 0 }}</i>
+						<i v-else>{{ statisticsCount.workercount.totalPerson || 0 }}</i>
 					</div>
 				</div>
 				<div class="dataTlt">
@@ -28,11 +30,9 @@
 						<div class="numData1 numData">
 							<div class="text"><i>甲方人员</i></div>
 							<div class="num">
-								<i style="color: #eea959"
-									>{{ statisticsCount.presencecount.jfGlPersonTotal || 0 }}/{{
-										statisticsCount.workercount.jfGlPersonTotal || 0
-									}}</i
-								>
+								<i style="color: #eea959">{{ statisticsCount.presencecount.jfGlPersonTotal || 0 }}/
+									{{ statisticsCount.workercount.jfGlPersonTotal || 0 }}
+								</i>
 							</div>
 						</div>
 						<div class="numData2 numData">
@@ -46,7 +46,8 @@
 							</div>
 						</div>
 						<div class="numData3 numData">
-							<div class="text"><i>乙方人员</i></div>
+							<div class="text" v-if="COMPANY === 'agjt'"><i>施工方</i></div>
+							<div class="text" v-else><i>乙方人员</i></div>
 							<div class="num">
 								<i style="color: #7aa0ea"
 									>{{ statisticsCount.presencecount.yfGlPersonTotal || 0 }}/{{
@@ -65,7 +66,10 @@
 <script setup lang="ts">
 import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
+import { COMPANY } from "@/config/config";
 import { ref, onMounted, watch } from "vue";
+import { getPersonTypeAndEduStatisticsApi } from "@/api/modules/labor";
+const store = GlobalStore();
 // ts
 type Props = {
 	statisticsCount?: any; // 传入人员数据
@@ -90,6 +94,25 @@ watch(
 		}
 	}
 );
+const presencePerson = ref(0)
+const attendancePerson = ref(0)
+const toaltPerson = ref(0)
+//获取人员数据
+const getPersonList = async () => {
+	const res = await getPersonTypeAndEduStatisticsApi({
+		projectSn: store.sn
+	});
+	if (res.result) {
+		console.log("+++++++++++++++++++++++++++++++++")
+		console.log(res)
+		presencePerson.value = res.result.personType.presencePerson;
+		attendancePerson.value = res.result.personType.attendancePerson;
+		toaltPerson.value = res.result.personType.toaltPerson;
+	}
+};
+onMounted( async () => {
+	getPersonList();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue
index 364c9c4..5b77889 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/bottomRight.vue
@@ -65,9 +65,10 @@
 
 <script lang="ts" setup>
 import Card from "@/components/card.vue";
-import { ref, onMounted, computed } from "vue";
+import { ref, onMounted, computed , onBeforeUnmount} from "vue";
 import { getAlarmList, getAlarmTypeOption } from "@/api/modules/aIEarlyWarn";
 import { GlobalStore } from "@/stores";
+import mitts from "@/utils/bus"; //兄弟组件传值
 // import { aiAlarmTypeEnum } from "@/enums/project/aiAlarmTypeEnum";
 
 let aiAlarmTypeEnum = ref([] as any);
@@ -170,6 +171,7 @@ const getWarnAlarmList = async () => {
 	console.log("获取告警列表", res);
 	if (res.result.length > 0) {
 		warnAlarmList.value = res.result;
+		mitts.emit("warnAlarmList", res.result[0]);
 		detailData.value = res.result[0];
 	} else {
 		warnAlarmList.value = [];
@@ -217,6 +219,9 @@ onMounted(async () => {
 	getWarnTypeOption();
 	getWarnAlarmList();
 });
+onBeforeUnmount(async () => {
+	mitts.off("warnAlarmList");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue
index a1b513e..69d333b 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/index.vue
@@ -76,6 +76,7 @@ window.onbeforeunload = (e) => {
 	destroyInterval();
 }
 onMounted(() => {
+	callChildFn();	
 	startInterval();
 });
 </script>
diff --git a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topCenter.vue b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topCenter.vue
index a9e68a3..250780d 100644
--- a/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topCenter.vue
+++ b/src/views/sevenLargeScreen/digitalConstruction/aIEarlyWarning/topCenter.vue
@@ -2,11 +2,13 @@
 	<Card title="实时监测">
 		<div class="ai-center-bottom">
 			<div class="today-warn">
-				<i
-					>今日告警: <span style="padding-left: 1%">{{ realTimeTotal.todayAlarmNum || 0 }}</span></i
-				>
+				<i>今日告警: <span style="padding-left: 1%">{{ realTimeTotal.todayAlarmNum || 0 }}</span></i>
 			</div>
-			<div class="icon"></div>
+			<div class="icon2" v-if="COMPANY === 'agjt'">
+				<!-- <img :src="BASEURL + '/image/' + imgFileUrl.imageUrl" /> -->
+				<img :src="BASEURL + '/image/' + imgFileUrl" />
+			</div>
+			<div class="icon1" v-else>	</div>
 			<div class="week-warn">
 				<div class="text">近7日告警</div>
 				<div class="num">{{ realTimeTotal.past7AlarmNum || 0 }}</div>
@@ -24,6 +26,10 @@ import Card from "@/components/card.vue";
 import { onMounted, reactive, ref, onBeforeUnmount } from "vue";
 import { getRealTimeTotal } from "@/api/modules/aIEarlyWarn";
 import { GlobalStore } from "@/stores";
+import { COMPANY } from "@/config/config";
+import mitts from "@/utils/bus"; //兄弟组件传值
+// 当前环境
+const BASEURL = import.meta.env.VITE_API_URL;
 const store = GlobalStore();
 
 const realTimeTotal = ref({} as any);
@@ -39,8 +45,13 @@ const getMemberCareList = async () => {
 defineExpose({
 	getMemberCareList
 })
+const imgFileUrl = ref()
 onMounted(async () => {
 	getMemberCareList();
+	mitts.on("warnAlarmList", e => {
+		console.log("=======================================================", e);
+		imgFileUrl.value = e.imageUrl;
+	});
 });
 </script>
 
@@ -118,14 +129,29 @@ onMounted(async () => {
 			-webkit-text-fill-color: transparent;
 		}
 	}
-	.icon {
+	.icon1 {
 		left: 5%;
 		bottom: 5%;
 		position: absolute;
 		width: 60%;
 		height: 90%;
 		background: url("@/assets/images/aIEarlyWarning/warnMonitor.png") no-repeat;
-		background-size: 100% 100%;
+		background-size: 100% 80%;
+	}
+	.icon2 {
+		left: 3%;
+		bottom: -16%;
+		position: absolute;
+		width: 60%;
+		height: 90%;
+		// background: url("@/assets/images/aIEarlyWarning/warnMonitor.png") no-repeat;
+		background: url("/src/assets/images/vehicleManagement/leftImg.png") no-repeat;
+		background-size: 100% 80%;
+		padding: 20px 20px;
+		img{
+			width: 100%;
+			height: 78%;
+		}
 	}
 }
 </style>

From 8b041157803e861df0ab00c4806c6243affc0b46 Mon Sep 17 00:00:00 2001
From: Vce <daisy_vce@yeah.net>
Date: Wed, 17 Apr 2024 21:06:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix::=E4=BF=AE=E6=94=B9BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 65cbf35..011d6f6 100644
--- a/.env.development
+++ b/.env.development
@@ -21,8 +21,8 @@ NODE_ENV = 'development'
 # 七参数标准版(测试平台)
 # VITE_API_URL = 'http://182.90.224.237:15551'
 # agjt
-# VITE_API_URL = 'http://47.93.215.234:9809'
-VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
+VITE_API_URL = 'http://47.93.215.234:9809'
+# VITE_API_URL = 'http://jxj.zhgdyun.com:19812'
 # 上传
 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='