fix: BUG修改

src/views/goverment/huizhou/projectMonitoring/qualityControl/components/orderAdd.vue

@@ -700,30 +700,30 @@ const allSubmit = async () => {
 		ElMessage.error("请选择工程/项目");
 		return;
 	}
-	if (!basicData.value.selectedMember) {
+	// if (!basicData.value.selectedMember) {
-		ElMessage.error("请选择检查人员");
+	// 	ElMessage.error("请选择检查人员");
-		return;
+	// 	return;
-	}
+	// }
 	if (!basicData.value.deadline) {
 		ElMessage.error("请选择整改期限");
 		return;
 	}
-	if (basicData.value.opSignature.length == 0) {
+	// if (basicData.value.opSignature.length == 0) {
-		ElMessage.error("请上传施工单位责任人签名");
+	// 	ElMessage.error("请上传施工单位责任人签名");
-		return;
+	// 	return;
-	}
+	// }
-	if (basicData.value.supervisorSignature.length == 0) {
+	// if (basicData.value.supervisorSignature.length == 0) {
-		ElMessage.error("请上传监理单位责任人签名");
+	// 	ElMessage.error("请上传监理单位责任人签名");
-		return;
+	// 	return;
-	}
+	// }
-	if (basicData.value.inspectSignature.length == 0) {
+	// if (basicData.value.inspectSignature.length == 0) {
-		ElMessage.error("请上传检查人员责任人签名");
+	// 	ElMessage.error("请上传检查人员责任人签名");
-		return;
+	// 	return;
-	}
+	// }
-	if (basicData.value.otherSignature.length == 0) {
+	// if (basicData.value.otherSignature.length == 0) {
-		ElMessage.error("请上传其他单位责任人签名");
+	// 	ElMessage.error("请上传其他单位责任人签名");
-		return;
+	// 	return;
-	}
+	// }
 	recordData.value.map(item => {
 		item.image = JSON.stringify(item.image);
 	});

src/views/goverment/huizhou/projectMonitoring/safetyManagement/components/orderAdd.vue

@@ -653,10 +653,34 @@ const submitForm = async () => {
 };
 // 全部提交
 const allSubmit = async () => {
+	if (!(projectSelectedData.value.projectName || projectSelectedData.value.engineeringName)) {
+		ElMessage.error("请选择工程/项目");
+		return;
+	}
+	// if (!basicData.value.selectedMember) {
+	// 	ElMessage.error("请选择检查人员");
+	// 	return;
+	// }
 	if (!basicData.value.deadline) {
 		ElMessage.error("请选择整改期限");
 		return;
 	}
+	// if (basicData.value.opSignature.length == 0) {
+	// 	ElMessage.error("请上传施工单位责任人签名");
+	// 	return;
+	// }
+	// if (basicData.value.supervisorSignature.length == 0) {
+	// 	ElMessage.error("请上传监理单位责任人签名");
+	// 	return;
+	// }
+	// if (basicData.value.inspectSignature.length == 0) {
+	// 	ElMessage.error("请上传检查人员责任人签名");
+	// 	return;
+	// }
+	// if (basicData.value.otherSignature.length == 0) {
+	// 	ElMessage.error("请上传其他单位责任人签名");
+	// 	return;
+	// }
 	recordData.value.map(item => {
 		item.image = JSON.stringify(item.image);
 	});

src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.scss

@@ -65,7 +65,7 @@
 				.el-card {
 					border-radius: 8px;
 					width: 100%;
-					background-color: var(--el-menu-bg-color);
+					background-color: #092945;
 				}
 			}
 			.topCard {
@@ -76,7 +76,38 @@
 					align-items: center;
 				}
 				span {
-					color: var(--el-menu-text-color);
+					color: white;
+				}
+			}
+		}
+		.echarts-content {
+			height: calc(100% - 100px);
+			background-color: #092945;
+			box-shadow: none;
+			margin-top: 20px;
+			padding-bottom: 20px;
+			border-radius: 8px;
+			padding: 20px;
+			display: flex;
+			flex-direction: column;
+			position: relative;
+			.echarts-option {
+				padding: 10px;
+				border: 1px solid #216876;
+				border-radius: 8px;
+				.top-search {
+					display: flex;
+					align-items: center;
+					> span {
+						font-size: 18px;
+						color: white;
+						margin-right: auto;
+					}
+				}
+				.card {
+					width: 100%;
+					height: 300px;
+					padding: 0;
 				}
 			}
 		}

src/views/goverment/huizhou/siteSupervision/historyDataAnalysis/index.vue

@@ -30,7 +30,7 @@
 		<div class="table-box">
 			<div class="search-select">
 				<el-card shadow="never" class="topCard">
-					<span style="margin: 0 20px 2px 10px; font-size: 18px">分组</span>
+					<span style="margin: 0 20px 2px 0px; font-size: 18px">分组</span>
 					<el-checkbox-group v-model="checkList">
 						<el-checkbox label="温度"></el-checkbox>
 						<el-checkbox label="风速"></el-checkbox>
@@ -43,6 +43,30 @@
 					</el-checkbox-group>
 				</el-card>
 			</div>
+			<div class="echarts-content">
+				<div class="echarts-option">
+					<div class="top-search">
+						<span>温度</span>
+						<el-date-picker
+							style="width: 260px; margin-right: 10px"
+							v-model="value1"
+							type="datetime"
+							placeholder="选择日期时间"
+						></el-date-picker>
+						<el-date-picker
+							style="width: 260px; margin-right: 10px"
+							v-model="value1"
+							type="datetime"
+							placeholder="选择日期时间"
+						></el-date-picker>
+						<el-select style="width: 200px; margin-right: 10px" v-model="value2" clearable placeholder="请选择">
+							<el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+						<el-button type="primary" style="margin-left: 10px">查询</el-button>
+					</div>
+					<div id="echarts1" class="card content-box"></div>
+				</div>
+			</div>
 		</div>
 	</div>
 </template>
@@ -54,7 +78,19 @@ import { GlobalStore } from "@/stores";
 import LeftMenu from "@/components/LeftMenu/LeftMenu.vue";
 import type { ResAiProjectPage, ResAiEngineerPage } from "@/api/types/government/AIwaring";
 import { sendIframeMessage } from "@/utils/util";
-const radio = ref(1);
+import * as echarts from "echarts";
+const statusList = ref([
+	{ label: "半小时", value: 0.5 },
+	{ label: "一小时", value: 1 },
+	{ label: "一天", value: 24 },
+	{ label: "七天", value: 24 * 7 },
+	{ label: "十五天", value: 24 * 15 },
+	{ label: "一个月", value: 24 * 31 },
+	{ label: "半年", value: 24 * 31 * 6 },
+	{ label: "一年", value: 24 * 31 * 12 }
+]);
+const value1 = ref(null);
+const value2 = ref(null);
 const checkList = ref([]);
 const pages = ref({
 	pageNo: 1,
@@ -87,6 +123,86 @@ const searchSn = ref("");
 
 // 项目或者工程名字
 const searchName = ref<string>("");
+// 绘制折线图
+const drawEcharts = () => {
+	let chartDom = document.getElementById("echarts1");
+	let myChart: echarts.ECharts = echarts.init(chartDom);
+	let option;
+	option = {
+		tooltip: {
+			trigger: "axis",
+			axisPointer: {
+				type: "cross",
+				crossStyle: {
+					color: "fff"
+				}
+			}
+		},
+		grid: {
+			left: 60,
+			top: 60,
+			width: "95%"
+		},
+		// legend: {
+		// 	right: 0,
+		// 	top: 0,
+		// 	textStyle: {
+		// 		color: "#c4c4c4",
+		// 		fontSize: 16
+		// 	},
+		// 	data: ["出勤总数(人)", "在职总数(人)", "出勤率(%)"]
+		// },
+		xAxis: [
+			{
+				type: "category",
+				data: ["1月", "2月", "3月", "4月", "5月", "6月", "7月"],
+				axisPointer: {
+					type: "shadow"
+				},
+				axisLabel: {
+					color: "#fff",
+					fontSize: 14
+				}
+			}
+		],
+		yAxis: [
+			{
+				type: "value",
+				name: "单位(人)",
+				nameTextStyle: {
+					align: "right",
+					color: "#fff",
+					fontSize: 14
+				},
+				axisLabel: {
+					color: "#fff",
+					fontSize: 16
+				},
+				min: 0,
+				max: 250,
+				interval: 50
+			}
+		],
+		series: [
+			{
+				name: "出勤总数(人)",
+				type: "line",
+				barWidth: 18,
+				itemStyle: {
+					borderRadius: [11, 11, 11, 11]
+				},
+				tooltip: {
+					valueFormatter: function (value) {
+						return value + " ml";
+					}
+				},
+				data: [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3]
+			}
+		]
+	};
+
+	option && myChart.setOption(option);
+};
 // 页面的项目名称和工程名称的div点击事件
 const onSearch = async (params: ResAiProjectPage | ResAiEngineerPage) => {
 	const { result } = await getAIQuestionPage(
@@ -168,6 +284,7 @@ watch(
 	}
 );
 onMounted(async () => {
+	drawEcharts();
 	await getProPage();
 	onSearch(records.value[0]);
 	searchSn.value = (records.value as ResAiProjectPage[])[0].projectSn;