fix: BUG修改

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);
 };
 // 设置水印

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">

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;

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);

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);

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

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

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">

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>

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);

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>

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);

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">

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">

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>

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">

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;

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);

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);