Merge remote-tracking branch 'refs/remotes/origin/feature/1.0版本校领导页面开发' into feature/1.0版本页面优化

# Conflicts:
#	src/views/cet/universityDashboard.vue

.env.development

@@ -6,10 +6,10 @@ VITE_PUBLIC_PATH = /
 
 
 # 跨域代理，您可以配置多个 ,请注意，没有换行符
-VITE_PROXY = [["/jeecgboot","http://127.0.0.1:8080/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://62.234.217.137:10000/jeecg-boot"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
-VITE_GLOB_DOMAIN_URL=http://127.0.0.1:8080/jeecg-boot
+VITE_GLOB_DOMAIN_URL=http://62.234.217.137:10000/jeecg-boot
 
 #后台接口父地址(必填)
 VITE_GLOB_API_URL=/jeecgboot

src/views/cet/cet-ana-3.vue

@@ -214,12 +214,26 @@
       // 获取批次数据
       async getBatch() {
         const getBatch = await defHttp.get({ url: this.Url.getBatch });
+        console.log('1111', getBatch);
         this.batchOptions = getBatch.batches.map((item) => {
           return {
             value: item.value,
             label: item.label,
           };
         });
+        console.log('2222', this.batchOptions);
+        this.batchOptions.forEach((item) => {
+          const year = item.label.substring(0, 4);
+          if (item.label.includes('12-01')) {
+            item.label = `${year}冬季`;
+          } else if (item.label.includes('06-01')) {
+            item.label = `${year}夏季`;
+          } else if (item.label.includes('09-01')) {
+            item.label = `${year}夏季`;
+          } else if (item.label.includes('03-01')) {
+            item.label = `${year}春季`;
+          }
+        });
         // const getCollege = await defHttp.get({ url: this.Url.getCollege });
 
         // this.collegeOptions = getCollege.colleges;
@@ -253,6 +267,7 @@
       },
       // 查询数据
       async query() {
+        this.getBatch();
         let resultData = null;
         try {
           //如果this.batch为null则先赋个值