fix: BUG修改

src/components/TreeFilter/index.scss

@@ -30,7 +30,8 @@
 			background-color: transparent;
 			color: #c4c4c4;
 			.el-tree-node__content {
-				height: 33px;
+				height: auto;
+				margin-bottom: 5px;
 			}
 			.el-tree-node__content:hover {
 				background: #09405f;
@@ -38,21 +39,28 @@
 				font-size: 20px;
 			}
 			.el-tree-node__label {
-				font-size: 20px !important;
+				font-size: 18px !important;
+				line-height: 20px;
+				white-space: wrap;
+			}
+			.el-tree-node__children .el-tree-node__label {
+				font-size: 17px !important;
+			}
+			.el-tree-node__expand-icon {
+				color: white;
+				font-size: 18px;
+			}
+			.el-tree-node__expand-icon.is-leaf {
+				color: transparent;
 			}
 		}
 		:deep(.el-tree--highlight-current) {
 			.el-tree-node.is-current > .el-tree-node__content {
 				background-color: #09405f;
 				.el-tree-node__label {
-					font-size: 16px;
 					color: #0bc4f0;
 					font-size: 20px;
 				}
-				.el-tree-node__expand-icon {
-					color: white;
-					font-size: 20px;
-				}
 				.is-leaf {
 					color: transparent;
 					font-size: 20px;

src/views/goverment/huizhou/assessmentManagement/unitList/components/addCompany.vue

@@ -128,11 +128,12 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
-						<el-form-item label="手机号码:" prop="phone">
+						<el-form-item label="邮箱:" prop="email">
-							<el-input v-model.number="ruleForm.phone" placeholder="请输入手机号码" />
+							<el-input v-model="ruleForm.email" placeholder="请输入邮箱" />
 						</el-form-item>
 					</el-col>
 				</el-row>
+				<div class="copy-content-box">
 					<el-row :gutter="120">
 						<el-col :span="12">
 							<el-form-item label="手机绑定账号:" prop="account">
@@ -140,24 +141,43 @@
 							</el-form-item>
 						</el-col>
 						<el-col :span="12">
-						<el-form-item label="密码:" prop="password">
+							<el-form-item label="手机号码:" prop="phone">
-							<el-input type="password" v-model="ruleForm.password" placeholder="请输入密码" />
+								<el-input v-model.number="ruleForm.phone" placeholder="请输入手机号码" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row :gutter="120">
+						<el-col :span="12">
+							<el-form-item label="密码:" prop="password">
+								<el-input type="password" v-model="ruleForm.password" placeholder="请输入密码" />
+							</el-form-item>
+						</el-col>
 						<el-col :span="12">
 							<el-form-item label="确认密码:" prop="enterPassword">
 								<el-input type="password" v-model="ruleForm.enterPassword" placeholder="请确认密码" />
 							</el-form-item>
 						</el-col>
+					</el-row>
+					<el-row :gutter="120">
 						<el-col :span="12">
-						<el-form-item label="邮箱:" prop="email">
+							<el-form-item label="第三方用户登录地址:" prop="password">
-							<el-input v-model="ruleForm.email" placeholder="请输入邮箱" />
+								<span class="text-style">https://hyjgxt.cn:6090/cockpit/#/login</span>
+							</el-form-item>
+						</el-col>
+						<el-col :span="12">
+							<el-form-item prop="enterPassword">
+								<el-button
+									class="btnStyle"
+									type="primary"
+									v-copy="
+										`https://hyjgxt.cn:6090/cockpit/#/login&nbsp;&nbsp;&nbsp;${ruleForm.phone}&nbsp;&nbsp;&nbsp;${ruleForm.password}`
+									"
+									>复 制</el-button
+								>
 							</el-form-item>
 						</el-col>
 					</el-row>
-
+				</div>
 				<el-row :gutter="120">
 					<el-col :span="24">
 						<el-form-item class="full-item" label="公司简介:">
@@ -531,6 +551,18 @@ onMounted(() => {
 	:deep(.el-dialog) {
 		position: relative;
 	}
+	.copy-content-box {
+		border: 2px solid #087ba4;
+		border-radius: 4px;
+		padding: 11px 11px 5px 11px;
+		margin-bottom: 20px;
+		.text-style {
+			font-size: 20px;
+			font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+			font-weight: 400;
+			color: var(--el-menu-text-color);
+		}
+	}
 	.title-detail {
 		@include flex;
 		border-left: 2px solid #0f81ff;

src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/LeftcentView.vue

@@ -108,6 +108,8 @@
 import { ref, onMounted } from "vue";
 import * as echarts from "echarts";
 import { getProjectInfo } from "@/api/modules/largeScreenTwo";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
 //项目信息 --- start
 const projectInfo = ref({
 	importance: 0,
@@ -414,6 +416,18 @@ const myChamainleto = () => {
 			}
 		]
 	});
+	myChart.on("click", val => {
+		console.log(val, 666777);
+		if (val.name == "新建") {
+			router.push("/goverment/huizhou/projectList/index?projectType=1");
+		} else if (val.name == "改建") {
+			router.push("/goverment/huizhou/projectList/index?projectType=2");
+		} else if (val.name == "扩建") {
+			router.push("/goverment/huizhou/projectList/index?projectType=3");
+		} else if (val.name == "合计") {
+			router.push("/goverment/huizhou/projectList/index");
+		}
+	});
 };
 const myChamainlett = () => {
 	let myChart = echarts.init(mainlett.value);
@@ -688,6 +702,18 @@ const myChamainlett = () => {
 			}
 		]
 	});
+	myChart.on("click", val => {
+		console.log(val, 666777);
+		if (val.name == "完工") {
+			router.push("/goverment/huizhou/projectList/index?projectType=4");
+		} else if (val.name == "在建") {
+			router.push("/goverment/huizhou/projectList/index?projectType=5");
+		} else if (val.name == "停工") {
+			router.push("/goverment/huizhou/projectList/index?projectType=6");
+		} else if (val.name == "合计") {
+			router.push("/goverment/huizhou/projectList/index");
+		}
+	});
 };
 </script>
 <style scoped lang="scss">

src/views/goverment/huizhou/progressManagement/divisionsAndISubItems/index.scss

@@ -12,6 +12,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/progressManagement/engineerInventory/index.scss

@@ -13,6 +13,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/progressManagement/investmentPayment/index.scss

@@ -13,6 +13,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/progressManagement/panoramicPlan/index.scss

@@ -13,6 +13,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/progressManagement/planFinishSituation/index.scss

@@ -13,6 +13,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/projectMonitoring/progressManagement/index.scss

@@ -13,6 +13,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/projectMonitoring/qualityControl/index.scss

@@ -12,6 +12,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

src/views/goverment/huizhou/projectMonitoring/safetyManagement/index.scss

@@ -12,6 +12,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

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

@@ -12,6 +12,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

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

@@ -12,6 +12,7 @@
 			}
 			.content {
 				height: calc(100% - 160px) !important;
+				overflow-y: scroll;
 			}
 			.tab-wrapper {
 				display: none;

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

@@ -34,7 +34,7 @@
 		z-index: 1;
 	}
 	.plr-20 {
-		height: 100%;
+		height: calc(100% - 80px);
 		padding: 50px 20px 30px 20px;
 	}
 	.middle-video {

src/views/goverment/huizhou/unDealList/index.vue

@@ -30,7 +30,7 @@
 </template>
 
 <script setup lang="tsx" name="governMentCompanyApprove">
-import { ref, reactive, onMounted } from "vue";
+import { ref, reactive, onMounted, onBeforeMount } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { ColumnProps } from "@/components/ProTable/interface";
 import ProTable from "@/components/ProTable/index.vue";
@@ -88,7 +88,8 @@ const columns: ColumnProps[] = [
 		enum: [
 			{ label: "质量管理", value: 1 },
 			{ label: "安全管理", value: 2 },
-			{ label: "进度管理", value: 3 }
+			{ label: "进度管理", value: 3 },
+			{ label: "扬尘管理", value: 4 }
 		],
 		width: 120
 	},
@@ -97,7 +98,7 @@ const columns: ColumnProps[] = [
 
 // 如果表格需要初始化请求参数，直接定义传给 ProTable(之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
 const initParam = reactive({
-	// state: 0
+	// state: 0,
 });
 
 // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total && pageNum && pageSize 这些字段，那么你可以在这里进行处理成这些字段
@@ -125,6 +126,19 @@ const getTableList = async (params: any) => {
 	// }
 	return noFinishApi(newParams);
 };
+onBeforeMount(() => {
+	if (route.query.type) {
+		let matchArr = [] as any;
+		matchArr = columns[4].enum;
+		let findItem = matchArr.find((item: any) => {
+			return item.label.indexOf(route.query.type) != -1;
+		});
+		console.log(findItem, 888999);
+		if (findItem) {
+			columns[4].search.defaultValue = findItem.value;
+		}
+	}
+});
 onMounted(async () => {
 	await sendIframeMessage({ obj: { path: route.path } }, 2, undefined);
 });

src/views/hz-enterprise/smartSite/alarmLedger/index.vue

@@ -193,15 +193,15 @@ const formConfig = reactive({
 			type: "textarea",
 			inputType: "textarea"
 		},
-		{
+		// {
-			label: "图片显示",
+		// 	label: "图片显示",
-			prop: "image",
+		// 	prop: "image",
-			type: "image",
+		// 	type: "image",
-			src: "image",
+		// 	src: "image",
-			width: "auto",
+		// 	width: "auto",
-			height: "100px",
+		// 	height: "100px",
-			fit: "fill"
+		// 	fit: "fill"
-		},
+		// },
 		{
 			label: "整改状态",
 			prop: "state",

src/views/loading/index.vue

@@ -48,7 +48,13 @@ const tokenIdentify = async () => {
 		keepAlive.setKeepAliveName();
 		await sendMessage({ isSuccess: true }, 2);
 		globalStore.setPath(data["惠州项目"][0].modulePath);
-		await initDynamicRouter({ moduleId: data["惠州项目"][0].moduleId }, route.query.routeUrl);
+		let defalutRouteUrl = "";
+		if (route.query.routeUrl && route.query.type) {
+			defalutRouteUrl = route.query.routeUrl + "?type=" + route.query.type;
+		} else if (route.query.routeUrl) {
+			defalutRouteUrl = route.query.routeUrl;
+		}
+		await initDynamicRouter({ moduleId: data["惠州项目"][0].moduleId }, defalutRouteUrl);
 		globalStore.moduleId = data["惠州项目"][0].moduleId;
 		// if (responseData.accountType === 2) {
 		// 	await sendMessage({ isSuccess: true }, 2);