Merge branch 'master' of http://gogs.gisvg.com/YDM/graduate-ui

src/store/modules/app.ts

@@ -54,9 +54,9 @@ export const useAppStore = defineStore('app', {
       uniqueOpened: true, // 是否只保持一个子菜单的展开
       hamburger: true, // 折叠图标
       screenfull: true, // 全屏图标
-      search: true, // 搜索图标
-      size: true, // 尺寸图标
-      locale: true, // 多语言图标
+      search: false, // 搜索图标
+      size: false, // 尺寸图标
+      locale: false, // 多语言图标
       message: true, // 消息图标
       tagsView: true, // 标签页
       tagsViewImmerse: false, // 标签页沉浸

src/views/Home/Index.vue

@@ -56,13 +56,13 @@
         <el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
           <el-card style="height: 99%;">
             <el-card shadow="never" class="h-100%  ">
-  
+
               <template #header>
                 <div class="h-7 flex justify-between fw-800 text-20px">
                   <span>基本信息</span>
                 </div>
               </template>
-  
+
               <el-row style="flex-wrap: wrap; ">
                 <el-col v-for="(item, index) in projects" :key="`card-${index}`" :xs="24" :sm="24" :md="24" :lg="8"
                   :xl="8">
@@ -70,19 +70,19 @@
                     <div class="flex items-center h-90px ">
                       <!-- <Icon :icon="item.icon" :size="25" class="mr-8px" /> -->
                       <Icon :icon="item.icon" :size="38" class="mr-8px " />
-  
+
                       <span class="text-17px c-white">{{ item.name }}</span>
                     </div>
                     <div class="mb-18px text-32px c-white ml-20px text-center">{{ t(item.message) }}</div>
                     <!-- <div class="mt-12px flex justify-between text-12px text-gray-400">
-                                                                                 
+
                                                                                   <span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
                                                                                 </div> -->
                   </el-card>
                 </el-col>
               </el-row>
             </el-card>
-  
+
             <el-card shadow="never" class=" h-100% mt-20px ">
               <template #header>
                 <div class="h-5 flex justify-between fw-800 text-20px">
@@ -107,7 +107,7 @@
                 </div>
               </el-card>
             </el-card>
-  
+
             <el-card shadow="hover" class="mb-8px   mt-30px">
               <template #header>
                 <div class="h-5 flex justify-between fw-800 text-20px">
@@ -138,7 +138,7 @@
                 </el-card>
               </el-card>
             </el-col>
-  
+
             <el-col :xs="24" :sm="24" :md="10" :lg="12" :xl="10">
               <el-card shadow="never">
                 <template #header>
@@ -176,10 +176,10 @@
                   </vue3ScrollSeamless>
                 </div>
               </el-card>
-  
+
             </el-col>
           </el-row>
-  
+
           <!-- 第二个el-row -->
           <el-row class="mt-12px" :gutter="15" align="center">
             <el-col :xs="24" :sm="24" :md="12" :lg="13" :xl="7">
@@ -189,12 +189,12 @@
                     <span>缺勤预警</span>
                   </div>
                 </template>
-  
+
                 <div class="demos">
                   <!-- <div class="table-header">
                         <div class="header">
-                          <el-row class="shouye" style="border: none;"> 
-                            <el-col :span="8" class="center text-18px" style="border: none;"> 
+                          <el-row class="shouye" style="border: none;">
+                            <el-col :span="8" class="center text-18px" style="border: none;">
                               <div>学生学号</div>
                             </el-col>
                             <el-col :span="10" class="center text-18px" style="border: none;">
@@ -209,7 +209,7 @@
                           </el-row>
                         </div>
                       </div> -->
-  
+
                   <vue3ScrollSeamless class="scroll-wraps text-color" :classOptions="class2Options" :dataList="list2">
                     <div v-if="list2.length > 0">
                       <el-row v-for="(item, i) of list2" :key="i" class="shouye">
@@ -234,9 +234,9 @@
                   </vue3ScrollSeamless>
                 </div>
               </el-card>
-  
+
             </el-col>
-  
+
             <el-col :xs="24" :sm="24" :md="9" :lg="11" :xl="7">
               <el-card shadow="never" class="mr-8px mt-1px h-480px ">
                 <template #header>
@@ -257,7 +257,7 @@
                           </el-row>
                         </div>
                       </div> -->
-  
+
                   <vue3ScrollSeamless class="scroll-wrapss  text-color" :classOptions="list1Options" :dataList="list1">
                     <div v-if="list1.length > 0">
                       <el-row v-for="(item, i) of list1" :key="i" class="shouye" :style="{ marginBottom: '10px' }">
@@ -275,19 +275,17 @@
                       暂无预测记录
                     </div>
                   </vue3ScrollSeamless>
-  
+
                 </div>
-  
+
               </el-card>
             </el-col>
-  
+
           </el-row>
         </el-col>
       </el-row>
     </el-skeleton>
   </div>
-<<<<<<< HEAD
-=======
 
   <el-row class="mt-8px" :gutter="8" justify="space-between">
     <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
@@ -936,7 +934,7 @@ getAllApi()
 }
 
 /* .text-color {
- color: rgb(15, 131, 233); 
+ color: rgb(15, 131, 233);
 } */