From dbae5764b52c45114edd4910ee4eea90caa49fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E6=99=8F=E5=BD=AD?= <995457985@qq.com>
Date: Tue, 23 May 2023 09:21:07 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/goverment/notice/newNotification/index.scss |  5 ++++-
 src/views/goverment/notice/newNotification/index.vue  | 11 ++++++-----
 src/views/goverment/videoMonitor/index.vue            |  6 ++++--
 src/views/home/index.vue                              |  2 ++
 src/views/jxjview/menumanage/index.vue                |  2 +-
 src/views/login/components/LoginForm.vue              |  4 ++--
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/views/goverment/notice/newNotification/index.scss b/src/views/goverment/notice/newNotification/index.scss
index 477ec50..3d17ac4 100644
--- a/src/views/goverment/notice/newNotification/index.scss
+++ b/src/views/goverment/notice/newNotification/index.scss
@@ -3,13 +3,16 @@
 		margin-bottom: 20px;
 		border-radius: 8px;
 		height: 68px;
+		.noticeForm {
+			margin-top: 6px;
+		}
 	}
 	.content {
 		display: flex;
 		flex: 1;
 		.left-content {
 			// flex: 1;
-			margin-top: 20px;
+			padding: 26px 36px 0 0;
 			width: 60%;
 			background-color: #fff;
 		}
diff --git a/src/views/goverment/notice/newNotification/index.vue b/src/views/goverment/notice/newNotification/index.vue
index 0b921b6..84de220 100644
--- a/src/views/goverment/notice/newNotification/index.vue
+++ b/src/views/goverment/notice/newNotification/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="table-box">
 		<el-card shadow="never" class="topCard">
-			<el-form :model="searchForm">
+			<el-form class="noticeForm" :model="searchForm">
 				<el-form-item label="通知类型">
 					<el-select v-model="searchForm.type" placeholder="请选择">
 						<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value" />
@@ -26,7 +26,7 @@
 					<el-form-item label="内容">
 						<el-input
 							type="textarea"
-							:autosize="{ minRows: 4, maxRows: 6 }"
+							:autosize="{ minRows: 18, maxRows: 18 }"
 							v-model="leftForm.content"
 							placeholder="请输入内容"
 						/>
@@ -35,11 +35,12 @@
 						<el-table
 							class="table"
 							:data="annexFileList"
-							max-height="500"
+							max-height="160"
 							style="width: 100%"
 							:header-cell-style="{ backgroundColor: '#D6E7FF', textAlign: 'center' }"
 							:cell-style="{ textAlign: 'center' }"
 							border
+							size="small"
 						>
 							<el-table-column label="序号" type="index" width="80" />
 							<el-table-column label="附件名称" prop="fileName">
@@ -53,7 +54,7 @@
 									<el-button type="primary" @click="onUpload(row)" link>上传附件</el-button>
 								</template>
 							</el-table-column>
-							<el-table-column>
+							<el-table-column width="120">
 								<template #header>
 									<el-button style="background: rgba(0, 139, 255, 0.9); color: #fff" @click="onAddData" round size="small"
 										>添加</el-button
@@ -337,7 +338,7 @@ onUnmounted(() => {
 <style lang="scss" scoped>
 @import "./index.scss";
 :deep(.el-card__body) {
-	padding: 12px 0 12px 36px;
+	padding: 12px 0 6px 36px;
 }
 .test :deep(.el-input__wrapper) {
 	box-shadow: 0 0 0 0;
diff --git a/src/views/goverment/videoMonitor/index.vue b/src/views/goverment/videoMonitor/index.vue
index 6d3fcbd..a751b48 100644
--- a/src/views/goverment/videoMonitor/index.vue
+++ b/src/views/goverment/videoMonitor/index.vue
@@ -412,12 +412,14 @@ const onDatePicker = () => {
 // 点击日期的时候隐藏部分视频
 const onTimeFocus = () => {
 	if (oWebControl.value === undefined) {
-		oWebControl.JS_CuttingPartWindow(938, 0, 362, 316);
+		// oWebControl.JS_CuttingPartWindow(938, 0, 362, 316);
+		oWebControl.JS_HideWnd();
 	}
 };
 const onTimeBlur = () => {
 	if (oWebControl.value === undefined) {
-		oWebControl.JS_RepairPartWindow(938, 0, 362, 316);
+		// oWebControl.JS_RepairPartWindow(938, 0, 362, 316);
+		oWebControl.JS_ShowWnd();
 	}
 };
 
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 1961643..2e9cbd8 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -90,6 +90,8 @@ const onChange = async (val: string) => {
 // );
 
 onMounted(async () => {
+	console.log(import.meta.url);
+
 	const res1 = await getHomePage();
 	data.value = res1.result || {};
 	const res = await getModuleList();
diff --git a/src/views/jxjview/menumanage/index.vue b/src/views/jxjview/menumanage/index.vue
index 423db5d..08acd93 100644
--- a/src/views/jxjview/menumanage/index.vue
+++ b/src/views/jxjview/menumanage/index.vue
@@ -731,7 +731,7 @@ onMounted(async () => {
 	margin-bottom: 20px;
 }
 :deep(.el-card__body) {
-	padding: 12px 0 12px 36px;
+	padding: 18px 0 18px 36px;
 }
 :deep(.el-select--default) {
 	width: 100%;
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index fd56a04..d8c9d5c 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -94,8 +94,8 @@ const login = (formEl: FormInstance | undefined) => {
 			} else {
 				router.push(arr.value[result.accountType - 1]);
 			}
-			router.go(0);
-			// router.push(arr.value[result.accountType - 1]);
+			// router.go(0);
+			router.push(arr.value[result.accountType - 1]);
 			// 4.跳转到首页
 
 			// ElNotification({