From 21d75ed24563013526ebc11b403cc32a35f5a89d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 11 Aug 2025 09:28:48 +0800
Subject: [PATCH] v1.9 解决张峰提出的问题

---
 src/components/system/EditSystemInfo.vue  | 16 ++++++++--------
 src/router/index.js                       |  4 ++++
 src/views/layout/layout.vue               |  4 ++++
 src/views/system/systemInfoManageList.vue | 14 +++++---------
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/components/system/EditSystemInfo.vue b/src/components/system/EditSystemInfo.vue
index 80c7ac2..e308cc9 100644
--- a/src/components/system/EditSystemInfo.vue
+++ b/src/components/system/EditSystemInfo.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('systemInfo.editTitle')" :visible="visible" width="70%" :close-on-click-modal="false">
+  <el-dialog :title="$t('systemInfo.editTitle')" :visible="visible" width="70%" :close-on-click-modal="true" @close="close">
     <el-form ref="form" :model="formData" label-width="150px" :rules="rules">
       <el-row :gutter="20">
         <el-col :span="12">
@@ -64,14 +64,12 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('systemInfo.propertyTitle')" prop="propertyTitle">
-            <el-input v-model="formData.propertyTitle"
-               />
+            <el-input v-model="formData.propertyTitle" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('systemInfo.qqMapKey')" prop="qqMapKey">
-            <el-input v-model="formData.qqMapKey"
-               />
+            <el-input v-model="formData.qqMapKey" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -79,8 +77,7 @@
       <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item :label="$t('systemInfo.mallUrl')" prop="mallUrl">
-            <el-input v-model="formData.mallUrl"
-               />
+            <el-input v-model="formData.mallUrl" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -88,7 +85,7 @@
 
     <div slot="footer" class="dialog-footer">
       <el-button @click="visible = false">{{ $t('common.cancel') }}</el-button>
-      <el-button type="primary" @click="submitForm">{{$t('common.save')}}</el-button>
+      <el-button type="primary" @click="submitForm">{{ $t('common.save') }}</el-button>
 
     </div>
   </el-dialog>
@@ -164,6 +161,9 @@ export default {
           }
         }
       })
+    },
+    close() {
+      this.visible = false
     }
   }
 }
diff --git a/src/router/index.js b/src/router/index.js
index 87392c6..3f0d13c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -655,6 +655,10 @@ const routes = [
     }
   },
   {
+    path: '/login',
+    redirect: '/views/user/login'
+  },
+  {
     path: '/views/resource/printEquipmentAccountLabel',
     name: '/views/resource/printEquipmentAccountLabel',
     component: printEquipmentAccountLabel
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index 3fd8f93..c9e691d 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -315,6 +315,10 @@ export default {
     },
     _toIndex(){
       location.href = '/'
+    },
+    _closeSubMenu(){
+      this.subMenus = []
+      this.curMenuName = ''
     }
 
   }
diff --git a/src/views/system/systemInfoManageList.vue b/src/views/system/systemInfoManageList.vue
index 67139c8..80e53b2 100644
--- a/src/views/system/systemInfoManageList.vue
+++ b/src/views/system/systemInfoManageList.vue
@@ -9,7 +9,7 @@
               {{ $t('common.edit') }}
             </el-button>
           </div>
-          
+
           <el-row :gutter="20">
             <el-col :span="8">
               <div class="info-item">
@@ -91,11 +91,7 @@
       </el-col>
     </el-row>
 
-    <edit-system-info 
-      ref="editSystemInfoRef" 
-      :form-data="systemInfo"
-      @success="handleEditSuccess"
-    />
+    <edit-system-info ref="editSystemInfoRef" :form-data="systemInfo" @success="handleEditSuccess" />
   </div>
 </template>
 
@@ -160,16 +156,16 @@ export default {
 <style lang="scss" scoped>
 .system-info-manage-container {
   padding: 20px;
-  
+
   .info-item {
     margin-bottom: 20px;
     text-align: left;
-    
+
     label {
       margin-right: 10px;
     }
   }
-  
+
   .float-right {
     float: right;
   }
--
libgit2 0.21.4