From 7c6e5b9c45d9d541f684a7899f3bf9bd6d9b4a5a Mon Sep 17 00:00:00 2001
From: liushilong <2224574157@qq.com>
Date: Sun, 7 Apr 2024 18:54:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9ui=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/UserSettings.vue |   4 +-
 src/layout/components/Header/index.vue        |   5 +-
 src/views/final/comp/FilterModal.vue          |   2 +-
 src/views/final/comp/NewFilterModal.vue       |   2 +-
 .../home/aside/comp/modals/FilterModal.vue    |   2 +-
 .../home/aside/comp/modals/NewFilterModal.vue |   2 +-
 src/views/home/content/Content.vue            |   7 +-
 .../home/content/modal/LoginSuccessModal.vue  | 101 +++++++++++-------
 .../content/modal/PackageSettingsModal.vue    |   7 +-
 src/views/task/content/PictureTable.vue       |   2 +-
 src/views/task/modal/NewFilterModal.vue       |   2 +-
 11 files changed, 83 insertions(+), 53 deletions(-)

diff --git a/src/layout/components/Header/UserSettings.vue b/src/layout/components/Header/UserSettings.vue
index 3585a3c..e10429e 100644
--- a/src/layout/components/Header/UserSettings.vue
+++ b/src/layout/components/Header/UserSettings.vue
@@ -101,8 +101,8 @@ const options = computed(() => {
   >
     <template #trigger>
       <div class="setting">
-        <span>{{ useInfo.username }}</span>
-        <SvgIcon style="margin-left: 6px" :name="iconName" size="14" />
+        <span style="color:#333333">{{ useInfo.username }}</span>
+        <SvgIcon style="margin-left: 6px" :name="iconName" size="16" />
       </div>
     </template>
     <div class="container">
diff --git a/src/layout/components/Header/index.vue b/src/layout/components/Header/index.vue
index d92a27e..e80254a 100644
--- a/src/layout/components/Header/index.vue
+++ b/src/layout/components/Header/index.vue
@@ -197,6 +197,7 @@ export default defineComponent({
       <!-- 菜单收起 -->
       <div
         class="ml-1 layout-header-trigger layout-header-trigger-min"
+        style="padding-top: 2px;"
         @click="() => $emit('update:collapsed', !collapsed)"
       >
         <SvgIcon name="homepage" size="16" />
@@ -267,7 +268,7 @@ export default defineComponent({
 
       img {
         width: auto;
-        height: 32px;
+        height: 34px;
         margin-right: 10px;
       }
 
@@ -280,7 +281,7 @@ export default defineComponent({
   &-right {
     display: flex;
     align-items: center;
-    margin-right: 20px;
+    margin-right: 24px;
 
     .back {
       width: 28px;
diff --git a/src/views/final/comp/FilterModal.vue b/src/views/final/comp/FilterModal.vue
index ad249c2..18fae93 100644
--- a/src/views/final/comp/FilterModal.vue
+++ b/src/views/final/comp/FilterModal.vue
@@ -312,7 +312,7 @@ const showSearch = computed(() => {
           <span class="wrapper-title">全部筛选值</span>
           <div class="wrapper-bar">
             <div class="wrapper-info">
-              <span :style="{ 'margin-left': '18px' }">基本信息</span>
+              <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
             </div>
           </div>
           <div class="wrapper-form" v-if="!showSearch">
diff --git a/src/views/final/comp/NewFilterModal.vue b/src/views/final/comp/NewFilterModal.vue
index c95016b..af7715f 100644
--- a/src/views/final/comp/NewFilterModal.vue
+++ b/src/views/final/comp/NewFilterModal.vue
@@ -261,7 +261,7 @@ defineExpose({
         <span class="wrapper-title">{{ modalTitle }}</span>
         <div class="wrapper-bar">
           <div class="wrapper-info">
-            <span :style="{ 'margin-left': '18px' }">基本信息</span>
+            <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
           </div>
         </div>
         <div class="wrapper-form">
diff --git a/src/views/home/aside/comp/modals/FilterModal.vue b/src/views/home/aside/comp/modals/FilterModal.vue
index 0173100..75a1ebc 100644
--- a/src/views/home/aside/comp/modals/FilterModal.vue
+++ b/src/views/home/aside/comp/modals/FilterModal.vue
@@ -364,7 +364,7 @@ const handleOk = () => {
           <div class="wrapper-bar">
             <div class="wrapper-info">
               <span
-                :style="{ 'margin-left': '18px', 'font-size': '16px' }"
+                :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }"
                 class="wrapper-info-title"
                 >基本信息</span
               >
diff --git a/src/views/home/aside/comp/modals/NewFilterModal.vue b/src/views/home/aside/comp/modals/NewFilterModal.vue
index b0185e4..02f1380 100644
--- a/src/views/home/aside/comp/modals/NewFilterModal.vue
+++ b/src/views/home/aside/comp/modals/NewFilterModal.vue
@@ -310,7 +310,7 @@ defineExpose({
         <span class="wrapper-title">{{ modalTitle }}</span>
         <div class="wrapper-bar">
           <div class="wrapper-info">
-            <span :style="{ 'margin-left': '18px' }">基本信息</span>
+            <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
           </div>
         </div>
         <div class="wrapper-form">
diff --git a/src/views/home/content/Content.vue b/src/views/home/content/Content.vue
index b92ad0c..5e5de99 100644
--- a/src/views/home/content/Content.vue
+++ b/src/views/home/content/Content.vue
@@ -785,7 +785,7 @@ const dropdownOptions = ref([
     justify-content: space-between;
     align-items: center;
     background: #fff;
-    padding: 0px 15px 0px 15px;
+    padding: 0px 16px 0px 15px;
     box-sizing: border-box;
     height: 64px;
     border: 1px solid rgb(239, 239, 245);
@@ -802,7 +802,10 @@ const dropdownOptions = ref([
       font-weight: bold;
       color: #333333;
       line-height: 25px;
-      margin-left: 12px;
+      width: 89px;
+      height: 25px;
+      white-space: nowrap;
+      // margin-left: 12px;
     }
   }
 
diff --git a/src/views/home/content/modal/LoginSuccessModal.vue b/src/views/home/content/modal/LoginSuccessModal.vue
index 2b02cb9..1e36e06 100644
--- a/src/views/home/content/modal/LoginSuccessModal.vue
+++ b/src/views/home/content/modal/LoginSuccessModal.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { onMounted, ref } from "vue";
-import {getToolsCount } from '@/api/home/main'
+import { getToolsCount } from "@/api/home/main";
 
 const emit = defineEmits<{
   (e: "reject", params: any);
@@ -10,16 +10,16 @@ const emit = defineEmits<{
 const show = ref(false);
 const toolsData = ref({} as any);
 
-async function getData(){
-  const res=await getToolsCount();
-  toolsData.value=res.data || {};
-  if(res.code == 'OK'){
+async function getData() {
+  const res = await getToolsCount();
+  toolsData.value = res.data || {};
+  if (res.code == "OK") {
     showModal();
   }
 }
-onMounted(()=>{
-  getData()
-})
+onMounted(() => {
+  getData();
+});
 
 function showModal() {
   show.value = true;
@@ -40,8 +40,6 @@ async function viewRepeat(e: MouseEvent) {
   closeModal();
 }
 
-
-
 defineExpose({
   showModal,
 });
@@ -55,32 +53,33 @@ defineExpose({
         <div class="wrapper-mark">某某有限公司-某某事业部-张小凡</div>
       </div>
       <div class="wrapper-content">
-        <div class="flex_box" style="height: 100px">
+        <div class="flex_box">
           <div class="item">
-            <SvgIcon name="task_count" width="80" height="96" />
+            <SvgIcon name="task_count" width="49" height="58" />
             <div class="num_box">{{ toolsData?.total || 0 }}</div>
             <div class="title_box">任务总数</div>
           </div>
           <div class="item">
-            <SvgIcon name="task_wait" width="80" height="96" />
+            <SvgIcon name="task_wait" width="49" height="58" />
             <div class="num_box">{{ toolsData?.treat || 0 }}</div>
             <div class="title_box">待审批</div>
           </div>
           <div class="item">
-            <SvgIcon name="task_over" width="80" height="96" />
+            <SvgIcon name="task_over" width="49" height="58" />
             <div class="num_box">{{ toolsData?.approvedCount || 0 }}</div>
             <div class="title_box">已审批</div>
           </div>
         </div>
-        <div class="footer">
+        <div class="footer" @click="viewRepeat">我知道了</div>
+        <!-- <div class="footer">
           <SvgIcon
             @click="viewRepeat"
             style="cursor: pointer"
             name="login_r"
-            width="200"
-            height="70"
+            width="167"
+            height="60"
           />
-        </div>
+        </div> -->
       </div>
     </div>
   </n-modal>
@@ -91,60 +90,61 @@ defineExpose({
   background-image: url(../../../../assets/images/approval_modal_bg.png);
   background-repeat: no-repeat;
   background-size: 100%;
-  width: 700px;
-  height: 500px;
+  width: 510px;
+  height: 361px;
   box-shadow: none !important;
 }
 .wrapper {
   position: absolute;
   left: calc(50% - 350px);
   .wrapper-hearder {
-    margin-top: 110px;
+    margin-top: 80px;
     .wrapper-title {
       text-align: center;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC-Semibold;
-      font-weight: Semibold;
+      font-weight: 600;
       text-align: center;
       color: #333333;
-      line-height: 32px;
+      line-height: 22px;
     }
     .wrapper-mark {
-      text-align: center;
       font-size: 13px;
       font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Regular;
-      font-weight: Regular;
+      font-weight: 400;
       text-align: center;
       color: #666666;
       line-height: 18px;
+      margin-top: 8px;
     }
   }
   .wrapper-content {
     flex: 1;
     border-radius: 8px;
-    margin: 100px 60px 35px 120px;
+    margin: 24px 50px 16px 48px;
     .flex_box {
       display: flex;
       flex-flow: row nowrap;
       align-items: center;
       justify-content: space-between;
+      margin: 58.5px 0 0 20px;
       .item {
         .num_box {
-          font-size: 32px;
+          font-size: 20px;
           font-family: HarmonyOS Sans SC, HarmonyOS Sans SC-Bold;
-          font-weight: Bold;
-          text-align: left;
-          color: #202020;
+          font-weight: bold;
           text-align: center;
+          color: #202020;
+          line-height: 23px;
         }
         .title_box {
           opacity: 0.6;
-          font-size: 16px;
+          font-size: 12px;
           font-family: PingFang SC, PingFang SC-Regular;
           font-weight: Regular;
           text-align: center;
           color: #202020;
-          text-align: center;
+          line-height: 16px;
         }
       }
     }
@@ -193,14 +193,39 @@ defineExpose({
       }
     }
     .footer {
-      display: flex;
-      flex-flow: row nowrap;
-      align-items: center;
-      justify-content: center;
-      margin: 20px 30px 0 0;
+      width: 153px;
+      height: 46px;
+      background: linear-gradient(135deg, #3258e8, #786efc);
+      border: 1px solid;
+      border-image: linear-gradient(123deg, #d7dffe 2%, #d7d5ff 88%) 1 1;
+      border-radius: 24px;
+      box-shadow: 0px 2px 6px 0px rgba(116, 153, 253, 0.3);
+      cursor: pointer;
+
+      margin: 20px auto 0;
       position: relative;
-      bottom: -80px;
+      bottom: -30px;
+      left: 20px;
+      
+      font-size: 24px;
+      font-family: YouSheBiaoTiHei, YouSheBiaoTiHei-Regular;
+      text-align: center;
+      color: #ffffff;
+      line-height: 46px;
+
+      border: none;
+      font-style: italic;
     }
+    // .footer {
+    //   display: flex;
+    //   flex-flow: row nowrap;
+    //   align-items: center;
+    //   justify-content: center;
+    //   margin: 20px 30px 0 0;
+    //   position: relative;
+    //   bottom: -30px;
+    //   left: 20px;
+    // }
   }
 }
 </style>
diff --git a/src/views/home/content/modal/PackageSettingsModal.vue b/src/views/home/content/modal/PackageSettingsModal.vue
index d817e38..034c3d9 100644
--- a/src/views/home/content/modal/PackageSettingsModal.vue
+++ b/src/views/home/content/modal/PackageSettingsModal.vue
@@ -77,7 +77,7 @@ function afterLeave() {
         <span class="wrapper-title">生成任务包设置</span>
         <div class="wrapper-bar">
           <div class="wrapper-info">
-            <span :style="{ 'margin-left': '18px' }">基本信息</span>
+            <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
           </div>
         </div>
         <n-form ref="formRef" :model="model" require-mark-placement="left" style="margin-top: 8px;" :rules="rules">
@@ -111,8 +111,9 @@ function afterLeave() {
   flex-direction: column;
 
   &-title {
-    font-weight: bold;
-    font-size: 16px;
+    font-weight: 600;
+    // font-weight: bold;
+    font-size: 18px;
     color: #333;
   }
 
diff --git a/src/views/task/content/PictureTable.vue b/src/views/task/content/PictureTable.vue
index 36ce636..f5ff7a2 100644
--- a/src/views/task/content/PictureTable.vue
+++ b/src/views/task/content/PictureTable.vue
@@ -74,7 +74,7 @@ defineProps({
       align-items: center;
       font-size: 16px;
       font-family: PingFang SC, PingFang SC-Medium;
-      font-weight: 500;
+      font-weight: 600;
       color: #333333;
 
       &:before {
diff --git a/src/views/task/modal/NewFilterModal.vue b/src/views/task/modal/NewFilterModal.vue
index bc7a681..a5af85e 100644
--- a/src/views/task/modal/NewFilterModal.vue
+++ b/src/views/task/modal/NewFilterModal.vue
@@ -275,7 +275,7 @@ defineExpose({
         <span class="wrapper-title">{{ modalTitle }}</span>
         <div class="wrapper-bar">
           <div class="wrapper-info">
-            <span :style="{ 'margin-left': '18px' }">基本信息</span>
+            <span :style="{ 'margin-left': '18px', 'font-size': '16px','font-weight':'600' }">基本信息</span>
           </div>
         </div>
         <div class="wrapper-form">