fix: 代码合并以及冲突解决

.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://42.180.188.17:9809' #生产环境
+VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
 # 苏立信/重庆市南岸区
 # VITE_API_URL = 'http://101.43.164.214:11111'

src/config/config.ts

@@ -29,11 +29,11 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 // export const COMPANY: string = "as"; //鞍山项目
 // export const COMPANY: string = "agjt"; //鞍钢集团
 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
-// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
+export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
 // export const COMPANY: string = "zkjc"; //中科佳成项目
-export const COMPANY: string = "cqna"; //重庆南岸项目
+// export const COMPANY: string = "cqna"; //重庆南岸项目
 // export const COMPANY: string = "slx"; //苏立信项目
 // export const COMPANY: string = "hfqc"; //合肥启程(乌丹)项目
 // export const COMPANY: string = "cpgs"; //成平高速项目

src/routers/modules/staticRouter.ts

@@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [
 	{
 		path: "/large",
 		name: "大屏",
-		component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
+		// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
-		// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
+		component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
 		// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
 		// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
 		// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏

src/views/commandScreen/commandCenter/centerBottom.vue

@@ -207,6 +207,7 @@ const randerInfo = reactive({
 });
 //切换tab
 const handleTab = (val: number) => {
+	if (val == activeIfo.activeIndex) return;
 	if (activeIfo.activeIndex == 1) {
 		activeIfo.activeIndex = val;
 		getCountAlarmNumByEnterprise(false);

src/views/commandScreen/commandCenter/leftBottom.vue

@@ -35,21 +35,30 @@ s
 					</div>
 				</div>
 				<div class="line2">
-					<div :class="['line2Item', activeIndex == 0 ? 'activeTab' : '']" @click="handleTab(0)">总包出勤情况分析</div>
+					<!-- <div :class="['line2Item', activeIndex == 0 ? 'activeTab' : '']" @click="handleTab(0)">总包出勤情况分析</div>
-					<div :class="['line2Item', activeIndex === 1 ? 'activeTab' : '']" @click="handleTab(1)">人员风险趋势分析</div>
+					<div :class="['line2Item', activeIndex === 1 ? 'activeTab' : '']" @click="handleTab(1)">人员风险趋势分析</div> -->
+					<div
+						class="line2Item"
+						:class="{ activeTab: activeIfo.activeIndex == index }"
+						v-for="(item, index) in activeIfo.activeTitleList"
+						:key="item.id"
+						@click="handleTab(index)"
+					>
+						{{ item.title }}
 					</div>
-				<div class="barContent1" v-if="activeIndex == 0">
+				</div>
+				<div class="barContent1" v-if="activeIfo.activeIndex == 0">
 					<div class="barContent" v-if="isFlag">
 						<div id="bar" style="width: 98%; height: 100%" ref="bar"></div>
 					</div>
 					<div class="cbProcess" v-if="!isFlag">
 						<div class="notoDta" v-if="projectCompanyWorkTotalList.length == 0">
-							<img src="@/assets/images/noData.png" style="margin-top: 100px" alt="" />
+							<img src="@/assets/images/noData.png" alt="" />
 							<p>暂无数据</p>
 						</div>
 					</div>
 				</div>
-				<div class="barContent1" v-else-if="activeIndex == 1">
+				<div class="barContent1" v-else-if="activeIfo.activeIndex == 1">
 					<radarMapOption @openRadarDialog="openDialogData" :randerInfo="randerInfo" />
 				</div>
 			</div>
@@ -162,6 +171,17 @@ import { Vue3SeamlessScroll } from "vue3-seamless-scroll";
 import radarMapOption from "@/views/commandScreen/components/radarMapOption.vue";
 const store = GlobalStore();
 
+const activeIfo = reactive({
+	activeIndex: 0,
+	activeTitleList: [
+		{
+			id: 1,
+			title: "总包出勤情况分析"
+		},
+		{ id: 2, title: "人员风险趋势分析" }
+	]
+});
+
 const randerInfo = reactive({
 	id: "radarMap1",
 	fontSize: 12,
@@ -301,10 +321,12 @@ const queryAttendanceOfEachCompany = async (showLoading: boolean) => {
 
 //切换tab
 const handleTab = (val: number) => {
-	if (isFlag.value && activeIndex.value == 1) {
+	if (val == activeIfo.activeIndex) return;
-		activeIndex.value = val;
+	isFlag.value = true;
+	if (isFlag.value && activeIfo.activeIndex == 1) {
+		activeIfo.activeIndex = val;
 		queryAttendanceOfEachCompany(false);
-	} else if (activeIndex.value == 0) {
+	} else if (activeIfo.activeIndex == 0) {
 		getWorkerRiskByProject(false, 1);
 	}
 };
@@ -524,13 +546,13 @@ const getWorkerRiskByProject = async (showLoading: boolean, val: number) => {
 		];
 		randerInfo.titleInfo.percentage = res.result.area;
 	}
-	activeIndex.value = val;
+	activeIfo.activeIndex = val;
 };
 
 const setIntervalFn = (showLoading: boolean) => {
 	// drawBar()
 	getPersonTypeAndEduStatistics(showLoading);
-	if (activeIndex.value == 0) {
+	if (activeIfo.activeIndex == 0) {
 		queryAttendanceOfEachCompany(showLoading);
 	}
 	getCountTaskProgress(showLoading);
@@ -578,6 +600,7 @@ onMounted(async () => {
 			height: 50%;
 			// background-color: #fff;
 			font-size: 13px;
+			position: relative;
 			.line1 {
 				color: #fff;
 				padding-top: 5px;
@@ -771,7 +794,7 @@ onMounted(async () => {
 	overflow: hidden;
 }
 .notoDta {
-	top: 35%;
+	top: 38%;
 	width: 50%;
 	// left: 40%;
 	position: absolute;

src/views/commandScreen/commandCenter/rightAll.vue

@@ -341,6 +341,7 @@ const randerInfo2 = reactive({
 //切换tab
 const handleTab = (val: number, type: number) => {
 	if (type == 1) {
+		if (val == activeInfo.activeIndex) return;
 		if (activeInfo.activeIndex == 1) {
 			activeInfo.activeIndex = val;
 			getInspectionRiskChart(false);
@@ -348,6 +349,7 @@ const handleTab = (val: number, type: number) => {
 			getSafetyRiskByProject(false, 1);
 		}
 	} else if (type == 2) {
+		if (val == activeInfo.activeIndex2) return;
 		if (activeInfo.activeIndex2 == 1) {
 			activeInfo.activeIndex2 = val;
 			getCountAllSpecial(false);

src/views/commandScreen/dialogCompnnents/radar-map-list.vue

@@ -6,6 +6,10 @@
 					<radarMapOption :randerInfo="item" />
 				</div>
 			</div>
+			<div class="notoDta" v-if="randerDetail.randerList.length == 0">
+				<img src="@/assets/images/noData.png" alt="" />
+				<p>暂无数据</p>
+			</div>
 		</el-scrollbar>
 	</div>
 </template>
@@ -76,8 +80,28 @@ onMounted(async () => {
 
 .scrollbar {
 	height: 85%;
+	position: relative;
 }
+.notoDta {
+	top: 40%;
+	width: 20%;
+	// left: 40%;
+	position: absolute;
+	text-align: center;
+	left: 50%;
+	transform: translateX(-50%);
 
+	img {
+		width: 40%;
+		margin: 5% 30%;
+	}
+
+	p {
+		color: #fff;
+		font-size: calc(100vw * 14 / 1920);
+		margin: -6% 30%;
+	}
+}
 .radar-map_list {
 	height: 100%;
 	display: flex;