From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/views/system/name/name.vue |  153 +++++++++++++++++++++++++++++++++++---------------
 1 files changed, 106 insertions(+), 47 deletions(-)

diff --git a/zhitan-vue/src/views/system/name/name.vue b/zhitan-vue/src/views/system/name/name.vue
index 803a941..8b4482d 100644
--- a/zhitan-vue/src/views/system/name/name.vue
+++ b/zhitan-vue/src/views/system/name/name.vue
@@ -1,47 +1,57 @@
 <template>
-  <div class="app-container">
-    <el-form :model="form" label-width="80px">
-      <el-row class="mb20 mt20">
-        <el-col :offset="1" :span="18">
-          <el-form-item label="绯荤粺鍚嶇О" prop="systemName">
-            <el-input v-model="form.systemName" placeholder="璇疯緭鍏ョ郴缁熷悕绉�" maxlength="64" show-word-limit />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="mb20 mt20">
-        <el-col :offset="1" :span="18">
-          <el-form-item label="鐧诲綍logo" prop="homeLogo">
-            <ImageUpload v-model="form.homeLogo" :fileType="['png']" :limit="1" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="mb20 mt20">
-        <el-col :offset="1" :span="18">
-          <el-form-item label="鍚庡彴logo" prop="leftLogo">
-            <ImageUpload v-model="form.leftLogo" :fileType="['png']" :limit="1" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="mb20 mt20">
-        <el-col :offset="1" :span="18">
-          <el-form-item label="copyRight" prop="copyRight">
-            <el-input v-model="form.copyRight" placeholder="璇疯緭鍏�" type="textarea" maxlength="200" :rows="6"
-              show-word-limit />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row class="mb20 mt20">
-        <el-col :offset="2" :span="18">
-          <el-button type="primary" @click="handleSave">淇濆瓨</el-button>
-        </el-col>
-      </el-row>
-    </el-form>
+  <div class="app-container page name-settings-page">
+    <div class="name-settings-card">
+      <el-form :model="form" label-width="120px">
+        <el-row class="form-row">
+          <el-col :span="18">
+            <el-form-item label="绯荤粺鍚嶇О" prop="systemName">
+              <el-input v-model="form.systemName" placeholder="璇疯緭鍏ョ郴缁熷悕绉�" maxlength="64" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="form-row">
+          <el-col :span="18">
+            <el-form-item label="鐧诲綍logo" prop="homeLogo">
+              <ImageUpload v-model="form.homeLogo" :fileType="['png']" :limit="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="form-row">
+          <el-col :span="18">
+            <el-form-item label="鍚庡彴logo" prop="leftLogo">
+              <ImageUpload v-model="form.leftLogo" :fileType="['png']" :limit="1" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="form-row">
+          <el-col :span="18">
+            <el-form-item label="copyRight" prop="copyRight">
+              <el-input
+                v-model="form.copyRight"
+                placeholder="璇疯緭鍏�"
+                type="textarea"
+                maxlength="200"
+                :rows="6"
+                show-word-limit
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row class="form-row form-footer">
+          <el-col :span="18">
+            <el-form-item>
+              <el-button type="primary" @click="handleSave">淇濆瓨</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
   </div>
 </template>
 <script setup>
-import Cookies from 'js-cookie'
-import { systemName, systemNameSave } from '@/api/system/name'
-const baseUrl = import.meta.env.VITE_APP_BASE_API;
+import Cookies from "js-cookie"
+import { systemName, systemNameSave } from "@/api/system/name"
+const baseUrl = import.meta.env.VITE_APP_BASE_API
 const { proxy } = getCurrentInstance()
 let form = ref({
   systemName: null,
@@ -51,15 +61,19 @@
 })
 
 function getSystemName() {
-  systemName().then(res => {
+  systemName().then((res) => {
     if (res.code == 200) {
       form.value = res.data
-      sessionStorage.setItem('SystemInfo', JSON.stringify(res.data))
+      sessionStorage.setItem("SystemInfo", JSON.stringify(res.data))
     }
   })
 }
 getSystemName()
 function handleSave() {
+  if (!form.value.leftLogo || !form.value.homeLogo) {
+    proxy.$modal.msgError("璇蜂笂浼爈ogo")
+    return
+  }
 
   if (!form.value.leftLogo.includes(baseUrl)) {
     form.value.leftLogo = baseUrl + form.value.leftLogo
@@ -69,9 +83,9 @@
     form.value.homeLogo = baseUrl + form.value.homeLogo
   }
 
-  systemNameSave(form.value).then(res => {
+  systemNameSave(form.value).then((res) => {
     if (res.code == 200) {
-      proxy.$modal.msgSuccess(res.msg);
+      proxy.$modal.msgSuccess(res.msg)
       getSystemName()
     }
   })
@@ -79,7 +93,52 @@
 </script>
 
 <style lang="scss" scoped>
-:deep .avatar-uploader .el-upload {
+@import "@/assets/styles/page.scss";
+
+.name-settings-page {
+  height: 100%;
+  min-height: calc(100vh - 60px);
+  display: flex;
+  flex-direction: column;
+}
+
+.name-settings-card {
+ 
+  border-radius: 4px;
+  margin: 16px;
+  padding: 24px;
+  flex: 1;
+  height: calc(100vh - 100px);
+  overflow-y: auto;
+  
+  .el-form {
+    width: 100%;
+    
+    .form-row {
+      margin-bottom: 24px;
+      
+      &.form-footer {
+        margin-top: 40px;
+      }
+    }
+    
+    .el-form-item {
+      margin-bottom: 0;
+      
+      .el-form-item__label {
+        color: var(--el-text-color-primary, #fff);
+      }
+      
+      .el-form-item__content {
+        .el-button {
+          padding: 10px 24px;
+        }
+      }
+    }
+  }
+}
+
+:deep(.avatar-uploader .el-upload) {
   border: 1px dashed var(--el-border-color);
   border-radius: 6px;
   cursor: pointer;
@@ -88,11 +147,11 @@
   transition: var(--el-transition-duration-fast);
 }
 
-:deep .avatar-uploader .el-upload:hover {
+:deep(.avatar-uploader .el-upload:hover) {
   border-color: var(--el-color-primary);
 }
 
-:deep .el-icon.avatar-uploader-icon {
+:deep(.el-icon.avatar-uploader-icon) {
   font-size: 28px;
   color: #8c939d;
   width: 178px;

--
Gitblit v1.9.3