From ef85aedfe4edce169c93534b6ce54c0b402fe7e3 Mon Sep 17 00:00:00 2001
From: key <2338751759@qq.com>
Date: Wed, 20 Mar 2024 14:16:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E7=BB=84=E4=BB=B6=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/views/basics-date/customer/index.vue  |  2 +-
 Web/src/views/basics-date/matter/index.vue    |  2 +-
 .../productionProgressKanban/index.vue        |  2 +-
 .../warningStatisticsWeek/index.vue           |  2 +-
 .../views/system/menu/component/editMenu.vue  | 43 ++++++++-----------
 5 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/Web/src/views/basics-date/customer/index.vue b/Web/src/views/basics-date/customer/index.vue
index ea3cb09..f68be0d 100644
--- a/Web/src/views/basics-date/customer/index.vue
+++ b/Web/src/views/basics-date/customer/index.vue
@@ -47,7 +47,7 @@
 
         <div class="main-table common-box">
             <div class="tab-hed">
-                <el-select v-model="formInline.region" placeholder="分类" clearable>
+                <el-select v-model="formInline.region" placeholder="分类" clearable style="width: 200px;">
                     <el-option label="所有" value="shanghai" />
                     <el-option label="成品" value="shanghai" />
                     <el-option label="成品非追溯" value="shanghai" />
diff --git a/Web/src/views/basics-date/matter/index.vue b/Web/src/views/basics-date/matter/index.vue
index 711bb24..42e0088 100644
--- a/Web/src/views/basics-date/matter/index.vue
+++ b/Web/src/views/basics-date/matter/index.vue
@@ -67,7 +67,7 @@
 
         <div class="main-table common-box">
             <div class="tab-hed">
-                <el-select v-model="formInline.region" placeholder="分类" clearable>
+                <el-select v-model="formInline.region" placeholder="分类" clearable  style="width: 200px;">
                     <el-option label="所有" value="shanghai" />
                     <el-option label="成品" value="shanghai" />
                     <el-option label="成品非追溯" value="shanghai" />
diff --git a/Web/src/views/reportCenter/productionProgressKanban/index.vue b/Web/src/views/reportCenter/productionProgressKanban/index.vue
index 6dab894..5c938ed 100644
--- a/Web/src/views/reportCenter/productionProgressKanban/index.vue
+++ b/Web/src/views/reportCenter/productionProgressKanban/index.vue
@@ -209,7 +209,7 @@ let option = ref({
                         color: rgb(210, 217, 222);
                     }
                     &>p:nth-child(2){
-                        font-size: 20px;
+                    font-size: 20px;
                         color: #4093f9;
                         margin-left: auto;
                     }
diff --git a/Web/src/views/reportCenter/warningStatistics/warningStatisticsWeek/index.vue b/Web/src/views/reportCenter/warningStatistics/warningStatisticsWeek/index.vue
index 987945b..73af27f 100644
--- a/Web/src/views/reportCenter/warningStatistics/warningStatisticsWeek/index.vue
+++ b/Web/src/views/reportCenter/warningStatistics/warningStatisticsWeek/index.vue
@@ -157,7 +157,7 @@ let option2  = {
 
 
 
-const handleChange = (value) => {
+const handleChange = (value: any) => {
     console.log(value)
 }
 const formInline = reactive({
diff --git a/Web/src/views/system/menu/component/editMenu.vue b/Web/src/views/system/menu/component/editMenu.vue
index c1767b8..c5458f8 100644
--- a/Web/src/views/system/menu/component/editMenu.vue
+++ b/Web/src/views/system/menu/component/editMenu.vue
@@ -1,13 +1,13 @@
 <template>
 	<div class="sys-menu-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
+		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="769px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
 					<span> {{ props.title }} </span>
 				</div>
 			</template>
-			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
+			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="80px">
 				<el-row :gutter="35">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="上级菜单">
@@ -29,9 +29,9 @@
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="菜单类型" prop="type" :rules="[{ required: true, message: '菜单类型不能为空', trigger: 'blur' }]">
 							<el-radio-group v-model="state.ruleForm.type">
-								<el-radio :value="1">目录</el-radio>
-								<el-radio :value="2">菜单</el-radio>
-								<el-radio :value="3">按钮</el-radio>
+								<el-radio :label="1">目录</el-radio>
+								<el-radio :label="2">菜单</el-radio>
+								<el-radio :label="3">按钮</el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
@@ -58,7 +58,7 @@
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="菜单图标">
-								<IconSelector v-model="state.ruleForm.icon" :size="getGlobalComponentSize" placeholder="菜单图标" type="all" />
+								<IconSelector v-model="state.ruleForm.icon" placeholder="菜单图标" type="all" />
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@@ -79,32 +79,32 @@
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="是否隐藏">
 								<el-radio-group v-model="state.ruleForm.isHide">
-									<el-radio :value="true">隐藏</el-radio>
-									<el-radio :value="false">不隐藏</el-radio>
+									<el-radio :label="true">隐藏</el-radio>
+									<el-radio :label="false">不隐藏</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="是否缓存">
 								<el-radio-group v-model="state.ruleForm.isKeepAlive">
-									<el-radio :value="true">缓存</el-radio>
-									<el-radio :value="false">不缓存</el-radio>
+									<el-radio :label="true">缓存</el-radio>
+									<el-radio :label="false">不缓存</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="是否固定">
 								<el-radio-group v-model="state.ruleForm.isAffix">
-									<el-radio :value="true">固定</el-radio>
-									<el-radio :value="false">不固定</el-radio>
+									<el-radio :label="true">固定</el-radio>
+									<el-radio :label="false">不固定</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
 						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 							<el-form-item label="是否内嵌">
 								<el-radio-group v-model="state.ruleForm.isIframe">
-									<el-radio :value="true">内嵌</el-radio>
-									<el-radio :value="false">不内嵌</el-radio>
+									<el-radio :label="true">内嵌</el-radio>
+									<el-radio :label="false">不内嵌</el-radio>
 								</el-radio-group>
 							</el-form-item>
 						</el-col>
@@ -124,8 +124,8 @@
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="是否启用">
 							<el-radio-group v-model="state.ruleForm.status">
-								<el-radio :value="1">启用</el-radio>
-								<el-radio :value="2">不启用</el-radio>
+								<el-radio :label="1">启用</el-radio>
+								<el-radio :label="2">不启用</el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
@@ -147,11 +147,10 @@
 </template>
 
 <script lang="ts" setup name="sysEditMenu">
-import { computed, reactive, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import IconSelector from '/@/components/iconSelector/index.vue';
 
 import { getAPI } from '/@/utils/axios-utils';
-import other from '/@/utils/other';
 import { SysMenuApi } from '/@/api-services/api';
 import { SysMenu, UpdateMenuInput } from '/@/api-services/models';
 
@@ -166,16 +165,10 @@ const state = reactive({
 	ruleForm: {} as UpdateMenuInput,
 });
 
-// 获取全局组件大小
-const getGlobalComponentSize = computed(() => {
-	return other.globalComponentSize();
-});
-
 // 打开弹窗
 const openDialog = (row: any) => {
 	state.ruleForm = JSON.parse(JSON.stringify(row));
 	state.isShowDialog = true;
-	ruleFormRef.value?.resetFields();
 };
 
 // 关闭弹窗
@@ -204,4 +197,4 @@ const submit = () => {
 
 // 导出对象
 defineExpose({ openDialog });
-</script>
+</script>
\ No newline at end of file