首页部分

src/layouts/default/header/index.vue

@@ -3,15 +3,11 @@
     <!-- left start -->
     <div :class="`${prefixCls}-left`">
       <!-- logo -->
-      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme" :style="getLogoWidth" />
+      <AppLogo v-if="getShowHeaderLogo || getIsMobile" :class="`${prefixCls}-logo`" :theme="getHeaderTheme"
-      <LayoutTrigger
+        :style="getLogoWidth" />
-        v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
+      <LayoutTrigger v-if="(getShowContent && getShowHeaderTrigger && !getSplit && !getIsMixSidebar) || getIsMobile"
-        :theme="getHeaderTheme"
+        :theme="getHeaderTheme" :sider="false" />
-        :sider="false"
-      />
       <LayoutBreadcrumb v-if="getShowContent && getShowBread" :theme="getHeaderTheme" />
-      <!-- 欢迎语 -->
-      <span v-if="getShowContent && getShowBreadTitle && !getIsMobile" :class="[prefixCls, `${prefixCls}--${getHeaderTheme}`,'headerIntroductionClass']"> 欢迎进入 {{ title }} </span>
     </div>
     <!-- left end -->
 
@@ -26,7 +22,10 @@
       <ErrorAction v-if="getUseErrorHandle" :class="`${prefixCls}-action__item error-action`" />
       <FullScreen v-if="getShowFullScreen" :class="`${prefixCls}-action__item fullscreen-item`" />
       <UserDropDown :theme="getHeaderTheme" />
+
+      <SettingDrawer v-if="getShowSetting" :class="`${prefixCls}-action__item`" /> 
     </div>
+
   </Header>
   <LoginSelect ref="loginSelectRef" @success="loginSelectOk"></LoginSelect>
 </template>
@@ -59,6 +58,8 @@
 
 import LoginSelect from '/@/views/sys/login/LoginSelect.vue';
 import { useUserStore } from '/@/store/modules/user';
+import { useI18n } from '/@/hooks/web/useI18n';
+const { t } = useI18n();
 
 export default defineComponent({
   name: 'LayoutHeader',
@@ -196,7 +197,8 @@
       getUseLockPage,
       loginSelectOk,
       loginSelectRef,
-        title
+      title,
+      t
     };
   },
 });
@@ -230,10 +232,13 @@
     .headerIntroductionClass {
       color: rgba(255, 255, 255, 0.6);
     }
-      .anticon, .truncate {
+
+    .anticon,
+    .truncate {
       color: rgba(255, 255, 255, 0.8);
     }
   }
+
   //update-end---author:scott ---date::2022-09-30  for：默认隐藏顶部菜单面包屑--------------
 }
 </style>

src/layouts/default/sider/MixSider.vue

@@ -49,8 +49,7 @@
           },
         ]"
       >
-        <span class="text"> {{ title }}</span>
+        <span class="text" style="margin-left: 15px;"> {{ title }}</span>
-        <Icon :size="16" :icon="getMixSideFixed ? 'ri:pushpin-2-fill' : 'ri:pushpin-2-line'" class="pushpin" @click="handleFixedMenu" />
       </div>
       <ScrollContainer :class="`${prefixCls}-menu-list__content`">
         <SimpleMenu :items="childrenMenus" :theme="getMenuTheme" mixSider @menuClick="handleMenuClick" />

src/views/dashboard/Analysis/index.vue

@@ -1,6 +1,12 @@
 <template>
-  <div>
+  <div style="background: #ececec; padding: 25px">
-    <p class="title">中英足球联赛上座情况</p>
+    <a-card title="四六级总通过率查询" :bordered="false">
+      <template #extra>
+        <a-select v-model:value="college" style="width: 300px" :options="collegeOptions"></a-select>
+        <a-select v-model:value="entrydate" style="margin-left: 15px;width: 100px"
+          :options="entrydateOptions"></a-select>
+      </template>
+
       <a-row :gutter="24">
         <a-col :xl="12" :style="{ marginBottom: '24px' }">
           <div class="container">
@@ -13,13 +19,27 @@
           </div>
         </a-col>
       </a-row>
+    </a-card>
   </div>
 </template>
 
 <script>
+import { defHttp } from '/@/utils/http/axios';
 import * as echarts from 'echarts';
 
 export default {
+  name: "Analysis",
+  data() {
+    return {
+      Url: {
+        getGradeAndCollegeData: '/cet/getGradeAndCollege',
+      },
+      collegeOptions: [],
+      entrydateOptions: [],
+      college: null,
+      entrydate: null
+    };
+  },
   methods: {
     map1Chart() {
       // 基于准备好的dom，初始化echarts实例  这个和上面的main对应
@@ -119,8 +139,17 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       myChart.setOption(option);
     },
+    // 获取年级和学院数据
+    async getGradeAndCollegeData() {
+      const data = await defHttp.get({ url: this.Url.getGradeAndCollegeData });
+      this.collegeOptions = data.colleges;
+      this.college= this.collegeOptions[0].value;
+      this.entrydateOptions = data.entrydates;
+      this.entrydate = this.entrydateOptions[0].value;
+    }
   },
   mounted() {
+    this.getGradeAndCollegeData();
     this.map1Chart();
     this.map2Chart();
   }
@@ -142,5 +171,4 @@ export default {
   color: rgb(8, 8, 8);
   font-weight: bold;
 }
-
 </style>