From 5bacfbfa3ce60c18faa2307fd85eabf2254b5542 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 30 Jun 2023 21:36:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DialogForm/index.vue           |  2 +-
 src/components/TreeFilter/index.scss          |  4 +-
 src/styles/element.scss                       |  4 +-
 .../components/transformInfo.vue              |  6 ++-
 .../components/RigthBottRigthView.vue         | 46 +++++++++++++++++++
 .../divisionsAndISubItems/index.scss          |  2 +-
 .../investmentPayment/index.scss              |  2 +-
 .../panoramicPlan/index.scss                  |  2 +-
 .../projectSchedule/index.scss                |  2 +-
 .../components/transformInfo.vue              |  2 +-
 .../components/transformInfo.vue              |  2 +-
 .../siteSupervision/realNameSystem/index.vue  | 20 ++++++--
 .../huizhou/smartConstructionSite/index.scss  |  2 +-
 .../unmannedVideo/accessSituation/index.scss  |  2 +-
 .../unmannedVideo/alarmRecord/index.scss      |  2 +-
 .../components/transformInfo.vue              | 10 ++--
 .../components/transformInfo.vue              | 10 ++--
 .../unmannedVideo/videoData/index.vue         |  2 +-
 18 files changed, 97 insertions(+), 25 deletions(-)

diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue
index 8fb3f2f..f916f10 100644
--- a/src/components/DialogForm/index.vue
+++ b/src/components/DialogForm/index.vue
@@ -150,7 +150,7 @@
 			</el-form>
 			<template #footer>
 				<el-button class="hzCancelStyle" @click="visible1 = false">取消</el-button>
-				<el-button class="hzStyle" type="primary" @click="confirm(ruleFormRef)"> 保存 </el-button>
+				<el-button class="btnStyle" type="primary" @click="confirm(ruleFormRef)"> 保存 </el-button>
 			</template>
 		</el-dialog>
 	</div>
diff --git a/src/components/TreeFilter/index.scss b/src/components/TreeFilter/index.scss
index 83a222a..116b1df 100644
--- a/src/components/TreeFilter/index.scss
+++ b/src/components/TreeFilter/index.scss
@@ -28,7 +28,6 @@
 			overflow: auto;
 			background-color: transparent;
 			color: #c4c4c4;
-			font-size: 16px;
 			.el-tree-node__content {
 				height: 33px;
 			}
@@ -37,6 +36,9 @@
 				color: #0bc4f0;
 				font-size: 16px;
 			}
+			.el-tree-node__label {
+				font-size: 16px !important;
+			}
 		}
 		:deep(.el-tree--highlight-current) {
 			.el-tree-node.is-current > .el-tree-node__content {
diff --git a/src/styles/element.scss b/src/styles/element.scss
index 6be87f9..740b603 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -162,7 +162,7 @@
 			background-color: transparent !important;
 			border-bottom: 0 !important;
 			color: var(--el-menu-text-color);
-			font-size: 16px;
+			font-size: 16px !important;
 		}
 		th.el-table__cell {
 			background-color: transparent;
@@ -403,7 +403,7 @@
 .btnStyle {
 	background-color: #087ba4;
 	border-color: #087ba4;
-	font-size: 16px;
+	font-size: 16px !important;
 	color: white;
 }
 .darkStyle {
diff --git a/src/views/enterprise/qualitySupervision/components/transformInfo.vue b/src/views/enterprise/qualitySupervision/components/transformInfo.vue
index 876e99e..2253266 100644
--- a/src/views/enterprise/qualitySupervision/components/transformInfo.vue
+++ b/src/views/enterprise/qualitySupervision/components/transformInfo.vue
@@ -156,7 +156,11 @@
 				</div>
 				<div class="situation">
 					<span>整改情况</span>
-					<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
+					<el-button
+						class="btnStyle"
+						type="success"
+						@click="addSituation"
+						v-if="recordRowData.state === 1 || recordRowData.state === 4"
 						>新增整改记录</el-button
 					>
 				</div>
diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottRigthView.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottRigthView.vue
index d0b372e..250ea94 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottRigthView.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottRigthView.vue
@@ -13,6 +13,17 @@
 			<div class="jiantb"></div>
 			<div></div>
 			<div class="jiantbcent">动态跟踪</div>
+			<div class="scrollTitle">
+				<div class="item">
+					<div class="time">时间</div>
+					<div class="qs">名称</div>
+					<div class="denjji">
+						<div>等级</div>
+					</div>
+					<div class="cent">预警类型</div>
+					<div class="vaks">预警值</div>
+				</div>
+			</div>
 			<vue3-seamless-scroll :list="list" class="scroll" :hover="true" :step="0.4" :singleWaitTime="3000" :wheel="true">
 				<div class="item" v-for="(item, index) in list" :key="index">
 					<div class="time">{{ item.date }}</div>
@@ -357,6 +368,41 @@ const settxa = () => {
 			color: #e8e9ef;
 		}
 		.scroll {
+			width: 97.5%;
+			margin-left: 1px;
+			overflow: hidden;
+			.item {
+				position: relative;
+				display: flex;
+				align-items: center;
+				user-select: none;
+				justify-content: space-around;
+				padding: 3px 0;
+				color: #cfcfcf;
+				div {
+					width: 100%;
+					display: flex;
+					justify-content: center;
+				}
+				div:nth-child(1) {
+					width: 110%;
+				}
+				.time {
+					display: flex;
+					justify-content: center;
+				}
+				.qs {
+				}
+				.denjji {
+					width: 50%;
+				}
+
+				.vaks {
+					width: 50%;
+				}
+			}
+		}
+		.scrollTitle {
 			margin-top: 30px;
 			width: 97.5%;
 			margin-left: 1px;
diff --git a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss
index 1010d29..6a1544f 100644
--- a/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss
+++ b/src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss
@@ -47,7 +47,7 @@
 			}
 			.bottom_item {
 				.bottomSize {
-					font-size: 12px;
+					font-size: 14px !important;
 					color: #666666;
 				}
 			}
diff --git a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss
index 1010d29..6a1544f 100644
--- a/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss
+++ b/src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss
@@ -47,7 +47,7 @@
 			}
 			.bottom_item {
 				.bottomSize {
-					font-size: 12px;
+					font-size: 14px !important;
 					color: #666666;
 				}
 			}
diff --git a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss
index e8da9bd..212146a 100644
--- a/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss
+++ b/src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss
@@ -48,7 +48,7 @@
 			}
 			.bottom_item {
 				.bottomSize {
-					font-size: 12px;
+					font-size: 14px !important;
 					color: #666666;
 				}
 			}
diff --git a/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss b/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss
index 270faf6..4454ad6 100644
--- a/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss
+++ b/src/views/goverment/huizhou/progressManagement/projectSchedule/index.scss
@@ -47,7 +47,7 @@
 			}
 			.bottom_item {
 				.bottomSize {
-					font-size: 12px;
+					font-size: 14px !important;
 					color: #666666;
 				}
 			}
diff --git a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
index b411b03..0811dfe 100644
--- a/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/qualityControl/components/transformInfo.vue
@@ -119,7 +119,7 @@
 				</div>
 				<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
 					<el-button type="info" class="hzCancelStyle" style="margin-right: 98px" @click="backAll">驳回,请尽快整改</el-button>
-					<el-button class="hzStyle" type="primary" @click="allSubmit">整改完成,全部合格</el-button>
+					<el-button class="btnStyle" type="primary" @click="allSubmit">整改完成,全部合格</el-button>
 				</div>
 			</div>
 			<div class="transform-record" v-if="transformDialog">
diff --git a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
index 32fec75..0e90aea 100644
--- a/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
+++ b/src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/transformInfo.vue
@@ -119,7 +119,7 @@
 				</div>
 				<div class="operation-btn" v-if="basicData?.state != 1 && basicData?.state != 4">
 					<el-button type="info" class="hzCancelStyle" style="margin-right: 98px" @click="backAll">驳回,请尽快整改</el-button>
-					<el-button type="primary" class="hzStyle" @click="allSubmit">整改完成,全部合格</el-button>
+					<el-button type="primary" class="btnStyle" @click="allSubmit">整改完成,全部合格</el-button>
 				</div>
 			</div>
 			<div class="transform-record" v-if="transformDialog">
diff --git a/src/views/goverment/huizhou/siteSupervision/realNameSystem/index.vue b/src/views/goverment/huizhou/siteSupervision/realNameSystem/index.vue
index 4d635ae..9e04115 100644
--- a/src/views/goverment/huizhou/siteSupervision/realNameSystem/index.vue
+++ b/src/views/goverment/huizhou/siteSupervision/realNameSystem/index.vue
@@ -30,7 +30,7 @@
 					end-placeholder="结束日期"
 				>
 				</el-date-picker>
-				<el-button class="hzStyle" type="primary" style="margin-left: 20px" @click="getAttendanceData">发送</el-button>
+				<el-button class="btnStyle" type="primary" style="margin-left: 20px" @click="getAttendanceData">发送</el-button>
 			</el-card>
 		</div>
 		<div class="statistics-echart">
@@ -113,7 +113,8 @@ const drawEcharts = () => {
 			right: 0,
 			top: 0,
 			textStyle: {
-				color: "#c4c4c4"
+				color: "#c4c4c4",
+				fontSize: 16
 			},
 			data: ["出勤总数(人)", "在职总数(人)", "出勤率(%)"]
 		},
@@ -123,6 +124,9 @@ const drawEcharts = () => {
 				data: ["1月", "2月", "3月", "4月", "5月", "6月", "7月"],
 				axisPointer: {
 					type: "shadow"
+				},
+				axisLabel: {
+					fontSize: 14
 				}
 			}
 		],
@@ -132,7 +136,11 @@ const drawEcharts = () => {
 				name: "单位(人)",
 				nameTextStyle: {
 					align: "right",
-					color: "#c4c4c4"
+					color: "#c4c4c4",
+					fontSize: 14
+				},
+				axisLabel: {
+					fontSize: 16
 				},
 				min: 0,
 				max: 250,
@@ -142,7 +150,11 @@ const drawEcharts = () => {
 				type: "value",
 				name: "出勤率(%)",
 				nameTextStyle: {
-					color: "#c4c4c4"
+					color: "#c4c4c4",
+					fontSize: 14
+				},
+				axisLabel: {
+					fontSize: 16
 				},
 				min: 0,
 				max: 25,
diff --git a/src/views/goverment/huizhou/smartConstructionSite/index.scss b/src/views/goverment/huizhou/smartConstructionSite/index.scss
index 6787d8c..83d04aa 100644
--- a/src/views/goverment/huizhou/smartConstructionSite/index.scss
+++ b/src/views/goverment/huizhou/smartConstructionSite/index.scss
@@ -231,7 +231,7 @@
 	}
 	.bottom_item {
 		.bottomSize {
-			font-size: 10px;
+			font-size: 14px !important;
 			color: rgba(196, 196, 196, 0.65);
 		}
 	}
diff --git a/src/views/goverment/unmannedVideo/accessSituation/index.scss b/src/views/goverment/unmannedVideo/accessSituation/index.scss
index 555aee9..00b62e7 100644
--- a/src/views/goverment/unmannedVideo/accessSituation/index.scss
+++ b/src/views/goverment/unmannedVideo/accessSituation/index.scss
@@ -166,7 +166,7 @@
 		}
 		.bottom_item {
 			.bottomSize {
-				font-size: 10px;
+				font-size: 14px !important;
 				color: #666666;
 			}
 		}
diff --git a/src/views/goverment/unmannedVideo/alarmRecord/index.scss b/src/views/goverment/unmannedVideo/alarmRecord/index.scss
index 4787c8c..31bcf5e 100644
--- a/src/views/goverment/unmannedVideo/alarmRecord/index.scss
+++ b/src/views/goverment/unmannedVideo/alarmRecord/index.scss
@@ -116,7 +116,7 @@
 	}
 	.bottom_item {
 		.bottomSize {
-			font-size: 10px;
+			font-size: 14px !important;
 			color: #666666;
 		}
 	}
diff --git a/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue b/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue
index 093f2a0..4aa68f6 100644
--- a/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue
+++ b/src/views/hz-project/projectMonitor/qualityManagement/components/transformInfo.vue
@@ -120,7 +120,7 @@
 			<div class="operation-btn" v-if="basicData?.state != 4">
 				<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
 					<el-button type="primary">整改完成,全部合格</el-button> -->
-				<el-button class="hzStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
+				<el-button class="btnStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
 			</div>
 		</div>
 		<div class="transform-record" v-if="transformDialog">
@@ -156,7 +156,11 @@
 			</div>
 			<div class="situation">
 				<span>整改情况</span>
-				<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
+				<el-button
+					class="btnStyle"
+					type="success"
+					@click="addSituation"
+					v-if="recordRowData.state === 1 || recordRowData.state === 4"
 					>新增整改记录</el-button
 				>
 			</div>
@@ -228,7 +232,7 @@
 								<el-button type="primary" @click="auditVisible = true">审核</el-button>
 							</div> -->
 						<div class="status-operate" v-if="item.type">
-							<el-button class="hzStyle" type="primary" @click="submitForm">提交</el-button>
+							<el-button class="btnStyle" type="primary" @click="submitForm">提交</el-button>
 						</div>
 					</el-timeline-item>
 				</el-timeline>
diff --git a/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue b/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue
index 0e01238..5e6159d 100644
--- a/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue
+++ b/src/views/hz-project/projectMonitor/safetyManagement/components/transformInfo.vue
@@ -120,7 +120,7 @@
 			<div class="operation-btn" v-if="basicData?.state != 4">
 				<!-- <el-button type="info" style="margin-right: 98px">驳回,请尽快整改</el-button>
 					<el-button type="primary">整改完成,全部合格</el-button> -->
-				<el-button class="hzStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
+				<el-button class="btnStyle" type="primary" @click="allSubmit">全部整改完成,提交审核</el-button>
 			</div>
 		</div>
 		<div class="transform-record" v-if="transformDialog">
@@ -156,7 +156,11 @@
 			</div>
 			<div class="situation">
 				<span>整改情况</span>
-				<el-button type="success" @click="addSituation" v-if="recordRowData.state === 1 || recordRowData.state === 4"
+				<el-button
+					class="btnStyle"
+					type="success"
+					@click="addSituation"
+					v-if="recordRowData.state === 1 || recordRowData.state === 4"
 					>新增整改记录</el-button
 				>
 			</div>
@@ -226,7 +230,7 @@
 								<el-button type="primary" @click="auditVisible = true">审核</el-button>
 							</div> -->
 						<div class="status-operate" v-if="item.type">
-							<el-button class="hzStyle" type="primary" @click="submitForm">提交</el-button>
+							<el-button class="btnStyle" type="primary" @click="submitForm">提交</el-button>
 						</div>
 					</el-timeline-item>
 				</el-timeline>
diff --git a/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue b/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue
index 218b771..e11731e 100644
--- a/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue
+++ b/src/views/hz-project/smartSite/unmannedVideo/videoData/index.vue
@@ -105,7 +105,7 @@
 		<template #footer>
 			<div class="form-footer">
 				<el-button class="hzCancelStyle" @click="visible = false">取消</el-button>
-				<el-button class="hzStyle" type="primary" @click="confirm(ruleFormRef, formData)"> 保存 </el-button>
+				<el-button class="btnStyle" type="primary" @click="confirm(ruleFormRef, formData)"> 保存 </el-button>
 			</div>
 		</template>
 	</el-dialog>