From d886eec60ab213e2028257b44b45daa678ae086c Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Fri, 22 Sep 2023 13:55:40 +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/directives/modules/waterMarker.ts                 |  3 ++-
 .../enterprise/hoistingMachineryRecord/index.vue      |  2 +-
 .../progressManagement/ganttChart/index.vue           |  1 +
 src/views/enterprise/qualitySupervision/index.vue     |  1 -
 src/views/enterprise/safetySupervision/index.vue      |  1 -
 src/views/goverment/dustManagement/index.vue          |  2 +-
 src/views/goverment/hoistingMachineryRecord/index.vue |  2 +-
 .../goverment/liftSupervision/operatingData/index.vue |  2 +-
 src/views/goverment/naturalResources/index.vue        |  2 +-
 src/views/goverment/qualitySupervision/index.vue      |  1 -
 src/views/goverment/reportStatistics/index.vue        |  2 +-
 src/views/goverment/safetySupervision/index.vue       |  1 -
 .../towerCraneSupervision/operatingData/index.vue     |  2 +-
 src/views/goverment/videoMonitor/index.vue            |  2 +-
 src/views/jxjview/system/index.vue                    | 11 ++---------
 src/views/project/hoistingMachineryRecord/index.vue   |  2 +-
 .../project/progressManagement/ganttChart/index.vue   |  1 +
 src/views/project/qualitySupervision/index.vue        |  1 -
 src/views/project/safetySupervision/index.vue         |  1 -
 19 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/directives/modules/waterMarker.ts b/src/directives/modules/waterMarker.ts
index c97e95c..773b3b2 100644
--- a/src/directives/modules/waterMarker.ts
+++ b/src/directives/modules/waterMarker.ts
@@ -19,6 +19,7 @@ let style = `
 	height: 100%;
 	background-repeat: repeat;
 	pointer-events: none;
+	z-index: 100;
 `;
 let systemConfig = {};
 import type { Directive, DirectiveBinding } from "vue";
@@ -27,7 +28,7 @@ import { getSystemConfig } from "@/api/modules/jxjview";
 const getConfigMarker = async () => {
 	// 获取起重机械设备类型字典
 	const { result } = await getSystemConfig({ configKey: "system_watermark" });
-	systemConfig = result;
+	systemConfig = result[0];
 	console.log(result);
 };
 // 设置水印
diff --git a/src/views/enterprise/hoistingMachineryRecord/index.vue b/src/views/enterprise/hoistingMachineryRecord/index.vue
index a9c5d66..643db56 100644
--- a/src/views/enterprise/hoistingMachineryRecord/index.vue
+++ b/src/views/enterprise/hoistingMachineryRecord/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="all-content">
+	<div class="all-content" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div class="table-box">
 			<div class="table">
diff --git a/src/views/enterprise/progressManagement/ganttChart/index.vue b/src/views/enterprise/progressManagement/ganttChart/index.vue
index 4471a15..c0d5d75 100644
--- a/src/views/enterprise/progressManagement/ganttChart/index.vue
+++ b/src/views/enterprise/progressManagement/ganttChart/index.vue
@@ -499,6 +499,7 @@ const dateList = computed(() => {
 .gantt-box {
 	box-sizing: border-box;
 	min-width: 1120px;
+	width: 100%;
 	height: 100%;
 	padding: 18px;
 	background: #ffffff;
diff --git a/src/views/enterprise/qualitySupervision/index.vue b/src/views/enterprise/qualitySupervision/index.vue
index cdadaa1..a9e11e0 100644
--- a/src/views/enterprise/qualitySupervision/index.vue
+++ b/src/views/enterprise/qualitySupervision/index.vue
@@ -220,7 +220,6 @@ const getInfo = async () => {
 	.table {
 		height: calc(100% - 133px);
 		position: relative;
-		z-index: 500;
 		:deep() {
 			.table-main {
 				height: calc(100% - 82px);
diff --git a/src/views/enterprise/safetySupervision/index.vue b/src/views/enterprise/safetySupervision/index.vue
index 0951a71..71619a7 100644
--- a/src/views/enterprise/safetySupervision/index.vue
+++ b/src/views/enterprise/safetySupervision/index.vue
@@ -220,7 +220,6 @@ const getInfo = async () => {
 	.table {
 		height: calc(100% - 133px);
 		position: relative;
-		z-index: 500;
 		:deep() {
 			.table-main {
 				height: calc(100% - 82px);
diff --git a/src/views/goverment/dustManagement/index.vue b/src/views/goverment/dustManagement/index.vue
index 3aca564..1582afe 100644
--- a/src/views/goverment/dustManagement/index.vue
+++ b/src/views/goverment/dustManagement/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="warning-page">
+	<div class="warning-page" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div id="map-container" class="map"></div>
 		<LeftMenu
diff --git a/src/views/goverment/hoistingMachineryRecord/index.vue b/src/views/goverment/hoistingMachineryRecord/index.vue
index d9fdc01..c877cac 100644
--- a/src/views/goverment/hoistingMachineryRecord/index.vue
+++ b/src/views/goverment/hoistingMachineryRecord/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="all-content">
+	<div class="all-content" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div class="type-select">
 			<div
diff --git a/src/views/goverment/liftSupervision/operatingData/index.vue b/src/views/goverment/liftSupervision/operatingData/index.vue
index 5ead95e..e34d6a8 100644
--- a/src/views/goverment/liftSupervision/operatingData/index.vue
+++ b/src/views/goverment/liftSupervision/operatingData/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="entire-box">
+	<div class="entire-box" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div class="operate-box">
 			<div class="alarm-data">
diff --git a/src/views/goverment/naturalResources/index.vue b/src/views/goverment/naturalResources/index.vue
index 5b6c549..e8ec27e 100644
--- a/src/views/goverment/naturalResources/index.vue
+++ b/src/views/goverment/naturalResources/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="outside">
+	<div class="outside" v-waterMarker>
 		<layoutTop></layoutTop>
 		<iframe :src="`${baseUrl}?token=${token}`" style="width: 100%; height: 100%; border: medium none" frameborder="1"></iframe>
 	</div>
diff --git a/src/views/goverment/qualitySupervision/index.vue b/src/views/goverment/qualitySupervision/index.vue
index 5348615..6d56752 100644
--- a/src/views/goverment/qualitySupervision/index.vue
+++ b/src/views/goverment/qualitySupervision/index.vue
@@ -233,7 +233,6 @@ const getInfo = async () => {
 	.table {
 		height: calc(100% - 133px);
 		position: relative;
-		z-index: 500;
 		:deep() {
 			.table-main {
 				height: calc(100% - 82px);
diff --git a/src/views/goverment/reportStatistics/index.vue b/src/views/goverment/reportStatistics/index.vue
index 1bf85be..2dd7217 100644
--- a/src/views/goverment/reportStatistics/index.vue
+++ b/src/views/goverment/reportStatistics/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="outside">
+	<div class="outside" v-waterMarker>
 		<layoutTop></layoutTop>
 		<iframe :src="`${baseUrl}/jmreport/list`" style="width: 100%; height: 98%; border: medium none" frameborder="1"></iframe>
 	</div>
diff --git a/src/views/goverment/safetySupervision/index.vue b/src/views/goverment/safetySupervision/index.vue
index 8f34e14..0480ce1 100644
--- a/src/views/goverment/safetySupervision/index.vue
+++ b/src/views/goverment/safetySupervision/index.vue
@@ -232,7 +232,6 @@ const getInfo = async () => {
 	.table {
 		height: calc(100% - 133px);
 		position: relative;
-		z-index: 500;
 		:deep() {
 			.table-main {
 				height: calc(100% - 82px);
diff --git a/src/views/goverment/towerCraneSupervision/operatingData/index.vue b/src/views/goverment/towerCraneSupervision/operatingData/index.vue
index af04f4d..18dcc4c 100644
--- a/src/views/goverment/towerCraneSupervision/operatingData/index.vue
+++ b/src/views/goverment/towerCraneSupervision/operatingData/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="entire-box">
+	<div class="entire-box" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div class="operate-box">
 			<div class="alarm-data">
diff --git a/src/views/goverment/videoMonitor/index.vue b/src/views/goverment/videoMonitor/index.vue
index 77c383e..a3b3c8c 100644
--- a/src/views/goverment/videoMonitor/index.vue
+++ b/src/views/goverment/videoMonitor/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="video-box">
+	<div class="video-box" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div class="plr-20" style="display: flex">
 			<el-tabs class="demo-tabs" v-model="active">
diff --git a/src/views/jxjview/system/index.vue b/src/views/jxjview/system/index.vue
index 61412a6..3f0ad07 100644
--- a/src/views/jxjview/system/index.vue
+++ b/src/views/jxjview/system/index.vue
@@ -48,7 +48,7 @@
 					<el-input v-model="formData.configValue" placeholder="请输入" />
 				</el-form-item>
 				<el-form-item label="图片：" prop="configValueUrl" v-if="formData.configValueType == 2">
-					<div class="face-img" v-if="!formData.configValueUrl">
+					<div class="face-img">
 						<el-upload
 							class="face-uploader"
 							:action="`${baseUrl}` + '/xmgl/file/upload'"
@@ -60,7 +60,6 @@
 							<el-icon v-else><plus /></el-icon>
 						</el-upload>
 					</div>
-					<img class="showImg" v-else :src="formData.configValueUrl" />
 				</el-form-item>
 				<el-form-item label="备注：" prop="remark">
 					<el-input v-model="formData.remark" placeholder="请输入" />
@@ -208,7 +207,7 @@ const submitConfirm = async (formEl: FormInstance | undefined, form: any) => {
 				form.configValue = form.configValueUrl;
 				delete form.configValueUrl;
 			}
-			if (form.id) {
+			if (form.configId) {
 				const res = await editUser(form);
 				proTable.value.getTableList();
 				ElMessage.success("编辑成功");
@@ -290,11 +289,5 @@ const deleteAccount = async (params: User.ResUserList) => {
 			display: block;
 		}
 	}
-
-	.showImg {
-		width: 50px;
-		height: 50px;
-		border-radius: 6px;
-	}
 }
 </style>
diff --git a/src/views/project/hoistingMachineryRecord/index.vue b/src/views/project/hoistingMachineryRecord/index.vue
index ed580b7..decf82b 100644
--- a/src/views/project/hoistingMachineryRecord/index.vue
+++ b/src/views/project/hoistingMachineryRecord/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="all-content">
+	<div class="all-content" v-waterMarker>
 		<layoutTop></layoutTop>
 		<div class="table-box">
 			<div class="table">
diff --git a/src/views/project/progressManagement/ganttChart/index.vue b/src/views/project/progressManagement/ganttChart/index.vue
index cd1ced1..62f5e0d 100644
--- a/src/views/project/progressManagement/ganttChart/index.vue
+++ b/src/views/project/progressManagement/ganttChart/index.vue
@@ -532,6 +532,7 @@ const dateList = computed(() => {
 .gantt-box {
 	box-sizing: border-box;
 	min-width: 1120px;
+	width: 100%;
 	height: 100%;
 	padding: 18px;
 	background: #ffffff;
diff --git a/src/views/project/qualitySupervision/index.vue b/src/views/project/qualitySupervision/index.vue
index 5b1b592..6bcebac 100644
--- a/src/views/project/qualitySupervision/index.vue
+++ b/src/views/project/qualitySupervision/index.vue
@@ -221,7 +221,6 @@ const getInfo = async () => {
 	.table {
 		height: calc(100% - 133px);
 		position: relative;
-		z-index: 500;
 		:deep() {
 			.table-main {
 				height: calc(100% - 82px);
diff --git a/src/views/project/safetySupervision/index.vue b/src/views/project/safetySupervision/index.vue
index be41654..9910b0e 100644
--- a/src/views/project/safetySupervision/index.vue
+++ b/src/views/project/safetySupervision/index.vue
@@ -218,7 +218,6 @@ const getInfo = async () => {
 	.table {
 		height: calc(100% - 133px);
 		position: relative;
-		z-index: 500;
 		:deep() {
 			.table-main {
 				height: calc(100% - 82px);