fix: BUG修改

2023-09-20 18:11:50 +08:00 · 2023-09-20 18:11:50 +08:00 · a4d2f79758
commit a4d2f79758
parent 725b4ecad8
14 changed files with 91 additions and 12 deletions
--- a/src/layouts/components/Header/components/Message.vue
+++ b/src/layouts/components/Header/components/Message.vue
@ -118,7 +118,7 @@ const destroyConnection = () => {
 	}
 };
 onMounted(() => {
-	createMqttConnect();
+	// createMqttConnect();
 });
 onBeforeUnmount(() => {
 	destroyConnection();
--- a/src/views/enterprise/notice/myReceive/index.scss
+++ b/src/views/enterprise/notice/myReceive/index.scss
@ -4,7 +4,17 @@
 .el-table :deep(.el-table__header th) {
 	height: 36px;
 }
-
+.el-table {
+	.table-empty {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 150px;
+		flex: 1;
+		flex-direction: column;
+		color: #999;
+	}
+}
 .list {
 	margin: 18px 0 32px 0;
 }
--- a/src/views/enterprise/notice/myReceive/index.vue
+++ b/src/views/enterprise/notice/myReceive/index.vue
@ -34,7 +34,7 @@
 			<el-table
 				:data="annexFiles"
 				border
-				max-height="200"
+				height="200"
 				class="el-table"
 				:header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }"
 				:cell-style="{ textAlign: 'center' }"
@ -46,6 +46,14 @@
 						<el-button type="primary" link size="small" @click="addAnnexFile(row)">查看</el-button>
 					</template>
 				</el-table-column>
+				<template #empty>
+					<div class="table-empty">
+						<slot name="empty">
+							<img src="@/assets/images/notData.png" alt="notData" />
+							<div>暂无数据</div>
+						</slot>
+					</div>
+				</template>
 			</el-table>
 			<div class="littleTitle list">接收人员列表</div>
 			<el-table
--- a/src/views/goverment/laborRealName/memberSelect/components/memberDetails.vue
+++ b/src/views/goverment/laborRealName/memberSelect/components/memberDetails.vue
@ -166,7 +166,7 @@ watch(
 	() => props.detailsDialog,
 	(n, o) => {
 		if (n) {
-			resetForm(ruleFormRef.value);
+			// resetForm(ruleFormRef.value);
 			console.log(props.formData);
 			form.value = props.formData;
 			form.value.sexName = form.value.sex == 1 ? "男" : "女";
--- a/src/views/goverment/laborRealName/memberSelect/index.vue
+++ b/src/views/goverment/laborRealName/memberSelect/index.vue
@ -85,8 +85,11 @@ const getListData = async () => {
 	}
 };
 const showDetails = (obj: any) => {
+	console.log(obj, "---------666");
 	formData.value = obj;
+	setTimeout(() => {
 		detailsDialog.value = true;
+	}, 20);
 };
 const handleSizeChange = size => {
 	console.log(size);
--- a/src/views/goverment/laborRealName/projectSelect/components/projectDetails.vue
+++ b/src/views/goverment/laborRealName/projectSelect/components/projectDetails.vue
@ -160,7 +160,8 @@
 									<div class="member-list" v-if="memberListData.length > 0">
 										<div class="list-item" v-for="(item, index) in memberListData" :key="index">
 											<div class="avater-item">
-												<img :src="item.portrait" alt="" />
+												<img :src="item.portrait" alt="" v-if="item.portrait" />
+												<img v-else src="@/assets/images/govermentImg/在职人数.png" alt="" />
 												<div class="avater-right">
 													<div>
 														<span>{{ item.personName }}</span>
--- a/src/views/goverment/largeScreen/components/map2D.vue
+++ b/src/views/goverment/largeScreen/components/map2D.vue
@ -172,9 +172,10 @@ const initMap = () => {
 			    </div>
 			    <div class="info">
 			      <span class="label">项目地址：</span>
-			      <span class="value">${item.province + item.city + item.district + item.address || "暂无"}</span>
+			      <span class="value">${item.address || "暂无"}</span>
 			    </div>
 			  </div>`;
+				//   <span class="value">${item.province + item.city + item.district + item.address || "暂无"}</span>
 				marker.on("mousemove", markerMousemove);
 				// 鼠标移出事件
 				// marker.on("mouseout", markerMouseout);
--- a/src/views/goverment/notice/myPosted/index.scss
+++ b/src/views/goverment/notice/myPosted/index.scss
@ -4,6 +4,17 @@
 .el-table :deep(.el-table__header th) {
 	height: 36px;
 }
+.el-table {
+	.table-empty {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 150px;
+		flex: 1;
+		flex-direction: column;
+		color: #999;
+	}
+}
 // .el-table :deep(.el-table__inner-wrapper) {
 // 	min-height: 120px;
 // }
--- a/src/views/goverment/notice/myPosted/index.vue
+++ b/src/views/goverment/notice/myPosted/index.vue
@ -38,6 +38,7 @@
 			<div class="littleTitle list">附件列表</div>
 			<el-table
 				:data="annexFiles"
+				height="200"
 				border
 				class="el-table"
 				:header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }"
@ -50,6 +51,14 @@
 						<el-button type="primary" link size="small" @click="addAnnexFile(row)">查看</el-button>
 					</template>
 				</el-table-column>
+				<template #empty>
+					<div class="table-empty">
+						<slot name="empty">
+							<img src="@/assets/images/notData.png" alt="notData" />
+							<div>暂无数据</div>
+						</slot>
+					</div>
+				</template>
 			</el-table>
 			<div class="littleTitle list">接收人员列表</div>
 			<el-table
--- a/src/views/goverment/notice/myReceive/index.scss
+++ b/src/views/goverment/notice/myReceive/index.scss
@ -4,7 +4,17 @@
 .el-table :deep(.el-table__header th) {
 	height: 36px;
 }
-
+.el-table {
+	.table-empty {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 150px;
+		flex: 1;
+		flex-direction: column;
+		color: #999;
+	}
+}
 .list {
 	margin: 18px 0 32px 0;
 }
--- a/src/views/goverment/notice/myReceive/index.vue
+++ b/src/views/goverment/notice/myReceive/index.vue
@ -34,7 +34,7 @@
 			<el-table
 				:data="annexFiles"
 				border
-				max-height="200"
+				height="200"
 				class="el-table"
 				:header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }"
 				:cell-style="{ textAlign: 'center' }"
@ -46,6 +46,14 @@
 						<el-button type="primary" link size="small" @click="addAnnexFile(row)">查看</el-button>
 					</template>
 				</el-table-column>
+				<template #empty>
+					<div class="table-empty">
+						<slot name="empty">
+							<img src="@/assets/images/notData.png" alt="notData" />
+							<div>暂无数据</div>
+						</slot>
+					</div>
+				</template>
 			</el-table>
 			<div class="littleTitle list">接收人员列表</div>
 			<el-table
--- a/src/views/goverment/notice/newNotification/index.vue
+++ b/src/views/goverment/notice/newNotification/index.vue
@ -21,7 +21,7 @@
 						</div>
 					</el-form-item>
 					<el-form-item label="主题" prop="title">
-						<el-input v-model="leftForm.title" disabled placeholder="请输入主题" />
+						<el-input v-model="leftForm.title" placeholder="请输入主题" />
 					</el-form-item>
 					<el-form-item label="内容" prop="content">
 						<!-- <el-input
--- a/src/views/project/notice/myReceive/index.scss
+++ b/src/views/project/notice/myReceive/index.scss
@ -4,7 +4,17 @@
 .el-table :deep(.el-table__header th) {
 	height: 36px;
 }
-
+.el-table {
+	.table-empty {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 150px;
+		flex: 1;
+		flex-direction: column;
+		color: #999;
+	}
+}
 .list {
 	margin: 18px 0 32px 0;
 }
--- a/src/views/project/notice/myReceive/index.vue
+++ b/src/views/project/notice/myReceive/index.vue
@ -34,7 +34,7 @@
 			<el-table
 				:data="annexFiles"
 				border
-				max-height="200"
+				height="200"
 				class="el-table"
 				:header-cell-style="{ backgroundColor: '#e1eeff', textAlign: 'center' }"
 				:cell-style="{ textAlign: 'center' }"
@ -46,6 +46,14 @@
 						<el-button type="primary" link size="small" @click="addAnnexFile(row)">查看</el-button>
 					</template>
 				</el-table-column>
+				<template #empty>
+					<div class="table-empty">
+						<slot name="empty">
+							<img src="@/assets/images/notData.png" alt="notData" />
+							<div>暂无数据</div>
+						</slot>
+					</div>
+				</template>
 			</el-table>
 			<div class="littleTitle list">接收人员列表</div>
 			<el-table