From 362404c222fe846d9472bb9b46ba1b042146a8ed Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 9 Oct 2023 11:26:08 +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

---
 index.html                                    |  4 +--
 src/components/TreeFilter/index.vue           |  7 ++--
 .../components/Header/components/Message.vue  | 21 ++++++-----
 .../goverment/videoMonitor/HKVideo/index.scss |  2 +-
 .../goverment/videoMonitor/HKVideo/index.vue  |  2 +-
 src/views/jxjview/menumanage/index.vue        | 35 ++++++++++++++++---
 6 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/index.html b/index.html
index 8c7dc69..73c9f6a 100644
--- a/index.html
+++ b/index.html
@@ -107,12 +107,12 @@
 		<!-- 用于RSA加密 -->
 		<script src="/jsWebControl-1.0.0.min.js"></script>
 		<!-- 用于RSA加密 -->
-		<script
+		<!-- <script
 			type="text/javascript"
 			src="<%= BASE_URL %>lib/include-lib.js?time=20210329"
 			libpath="<%= BASE_URL %>lib/"
 			include="jquery,jquery.range,bootstrap,bootstrap-checkbox,font-awesome,web-icons,layer,haoutil,nprogress,toastr,admui,turf,cesium,mars3d,mars3d-widget"
-		></script>
+		></script> -->
 		<!-- 播放器视频文件 -->
 		<script type="text/javascript" src="ckplayer/flv.js/flv.min.js"></script>
 		<script type="text/javascript" src="ckplayer/hls.js/hls.min.js"></script>
diff --git a/src/components/TreeFilter/index.vue b/src/components/TreeFilter/index.vue
index dc6eefa..aed874b 100644
--- a/src/components/TreeFilter/index.vue
+++ b/src/components/TreeFilter/index.vue
@@ -92,10 +92,11 @@ onMounted(async () => {
 	}
 	const res = await props.requestApi!();
 	console.log(res);
-	treeData.value = res?.result || [];
 	// treeAllData.value = [{ id: "", [props.label]: "全部" }, ...result];
-
-	treeAllData.value = res ? [...res.result] : [];
+	setTimeout(function () {
+		treeData.value = res?.result || [];
+		// treeAllData.value = res ? [...res.result] : [];
+	}, 200);
 });
 // onBeforeMount(async () => {
 // 	// 重新接收一下默认值
diff --git a/src/layouts/components/Header/components/Message.vue b/src/layouts/components/Header/components/Message.vue
index bf19c76..aedad06 100644
--- a/src/layouts/components/Header/components/Message.vue
+++ b/src/layouts/components/Header/components/Message.vue
@@ -166,6 +166,7 @@ onBeforeUnmount(() => {
 .message-list {
 	display: flex;
 	flex-direction: column;
+	align-items: flex-end;
 	height: 300px;
 	overflow-y: scroll;
 	/* 隐藏滚动条 */
@@ -173,15 +174,12 @@ onBeforeUnmount(() => {
 		display: none;
 	}
 	.message-item {
-		width: 100%;
+		width: 96%;
 		display: flex;
 		align-items: center;
-		padding: 20px 0;
+		padding: 20px 0 15px 0;
 		border-bottom: 1px solid var(--el-border-color-light);
 		cursor: pointer;
-		&:last-child {
-			border: none;
-		}
 		.message-content {
 			display: flex;
 			flex-direction: column;
@@ -189,6 +187,7 @@ onBeforeUnmount(() => {
 				display: flex;
 				align-items: center;
 				margin-bottom: 5px;
+				position: relative;
 				.redCircle {
 					display: inline-block;
 					width: 5px;
@@ -196,14 +195,20 @@ onBeforeUnmount(() => {
 					border-radius: 50%;
 					background-color: #e70000;
 					margin-right: 5px;
+					position: absolute;
+					left: -10px;
 				}
 				.message-title {
-					color: #343434;
-					font-weight: 700;
+					font-size: 14px;
+					font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+					font-weight: 400;
+					color: #333333;
 				}
 			}
 			.message-date {
-				font-size: 12px;
+				font-size: 10px;
+				font-family: Source Han Sans CN-Regular, Source Han Sans CN;
+				font-weight: 400;
 				color: #bababa;
 			}
 		}
diff --git a/src/views/goverment/videoMonitor/HKVideo/index.scss b/src/views/goverment/videoMonitor/HKVideo/index.scss
index f6a6e65..da85a1c 100644
--- a/src/views/goverment/videoMonitor/HKVideo/index.scss
+++ b/src/views/goverment/videoMonitor/HKVideo/index.scss
@@ -5,7 +5,7 @@
 	flex-direction: column;
 	background-color: #f6f6f6;
 	// padding: 0 20px;
-	// overflow: hidden;
+	overflow: hidden;
 	.middle-video {
 		margin: 0 20px;
 		flex: 1;
diff --git a/src/views/goverment/videoMonitor/HKVideo/index.vue b/src/views/goverment/videoMonitor/HKVideo/index.vue
index 0caa9e3..78dbe15 100644
--- a/src/views/goverment/videoMonitor/HKVideo/index.vue
+++ b/src/views/goverment/videoMonitor/HKVideo/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="video-box" v-waterMarker>
 		<layoutTop></layoutTop>
-		<div class="plr-20" style="display: flex">
+		<div class="plr-20" style="display: flex; height: calc(100% - 112px)">
 			<el-tabs class="demo-tabs" v-model="active">
 				<el-tab-pane label="项目名称" name="first">
 					<!-- <div>11</div> -->
diff --git a/src/views/jxjview/menumanage/index.vue b/src/views/jxjview/menumanage/index.vue
index a12be89..794295d 100644
--- a/src/views/jxjview/menumanage/index.vue
+++ b/src/views/jxjview/menumanage/index.vue
@@ -166,6 +166,18 @@
 					<el-form-item label="描述：">
 						<el-input v-model="formMenu.menuDesc" placeholder="请输入" />
 					</el-form-item>
+					<el-form-item label="是否全屏：" prop="isFull">
+						<el-select v-model="formMenu.isFull" class="m-2" placeholder="请选择">
+							<el-option label="是" :value="true" />
+							<el-option label="否" :value="false" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="是否显示侧边栏：" prop="showSidebar">
+						<el-select v-model="formMenu.showSidebar" class="m-2" placeholder="请选择">
+							<el-option label="是" :value="true" />
+							<el-option label="否" :value="false" />
+						</el-select>
+					</el-form-item>
 				</el-form>
 			</div>
 			<template #footer>
@@ -258,7 +270,9 @@ const formMenu = ref({
 	status: "",
 	target: "",
 	priority: "",
-	menuDesc: ""
+	menuDesc: "",
+	isFull: false,
+	showSidebar: false
 });
 
 const rules = reactive<FormRules>({
@@ -287,14 +301,24 @@ const rules = reactive<FormRules>({
 		message: "请输入菜单图标",
 		trigger: "blur"
 	},
+	status: {
+		required: true,
+		message: "请选择状态",
+		trigger: "blur"
+	},
 	target: {
 		required: true,
 		message: "请选择打开方式",
 		trigger: "blur"
 	},
-	status: {
+	isFull: {
 		required: true,
-		message: "请选择状态",
+		message: "请选择",
+		trigger: "blur"
+	},
+	showSidebar: {
+		required: true,
+		message: "请选择",
 		trigger: "blur"
 	}
 });
@@ -351,7 +375,10 @@ const onDiabtnAdd = (index: number, row) => {
 
 const DiaAddItem = async (val: any) => {
 	resetForm(ruleFormRef.value);
-	formMenu.value = reactive({});
+	formMenu.value = reactive({
+		isFull: false,
+		showSidebar: false
+	});
 	const res1 = await menuList({ moduleId: getModuleId.value, flag: true });
 	fatherNameTo.value = res1.result;
 	addOrEditDialogVisibleMenu.value = true;