Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main.js

src/main.js

@@ -15,7 +15,7 @@ import store from "./store";
 // import { Cell, CellGroup } from "vant";
 // import { Cell, CellGroup } from "vant";
 import { Form, Field, Uploader,DatetimePicker,Calendar } from "vant";
 import { Form, Field, Uploader,DatetimePicker,Calendar } from "vant";
 // import { Picker } from "vant";
 // import { Picker } from "vant";
-// import { Popup } from "vant";
+import { Popup } from "vant";
 // import { Toast } from "vant";
 // import { Toast } from "vant";
 // import { Empty } from "vant";
 // import { Empty } from "vant";
 // import { Dialog } from "vant";
 // import { Dialog } from "vant";
@@ -60,7 +60,7 @@ app
   // .use(CellGroup)
   // .use(CellGroup)
   // .use(Form)
   // .use(Form)
   // .use(Picker)
   // .use(Picker)
-  // .use(Popup)
+  .use(Popup)
   // .use(Field)
   // .use(Field)
   // .use(Uploader)
   // .use(Uploader)
   // .use(Toast)
   // .use(Toast)

src/service/studentCourseSelection.js

@@ -4,16 +4,29 @@
 
 
 import axios from "../utils/axios";
 import axios from "../utils/axios";
 
 
+//学生选课信息查询
+export function getStudentInfo(id) {
+    return axios.get(`/wx/course/getCourseInfo/${id}`);
+}
+//获取数据字典
+export function getDicts(type) {
+    let url = `/system/dict/data/type/${type}`;
+    let result = axios.get(url);
+    return result;
+}
+
 //查询个人成绩信息
 //查询个人成绩信息
 export function getPersonGrade(id) {
 export function getPersonGrade(id) {
-    return axios.get('/wx/course/achievement/' + id );
+    return axios.get(`/wx/course/achievement/${id}` );
 }
 }
 
 
 //根据学生3门选课查询
 //根据学生3门选课查询
 export function getSelectGrade(data) {
 export function getSelectGrade(data) {
-    return axios.post('/wx/course/studenttypeview' ,{
-        ...data
-    } );
+    return axios.get('/wx/course/studenttypeview' ,{
+        params:data
+    }
+
+ );
 }
 }
 
 
 //保存选课信息
 //保存选课信息

src/views/login/login.vue

@@ -224,7 +224,7 @@ export default {
       console.log("asdasd",result);
       console.log("asdasd",result);
       if (result.data) {
       if (result.data) {
         console.log(router);
         console.log(router);
-        router.push({
+        router.replace({
           path: "/main",
           path: "/main",
         });
         });
       }
       }
@@ -316,7 +316,7 @@ export default {
         setParentTelephone(state.parentTelephone);
         setParentTelephone(state.parentTelephone);
         setTotyp(state.loginType);
         setTotyp(state.loginType);
 
 
-        router.push({
+        router.replace({
           path: "/main",
           path: "/main",
           query: {
           query: {
             studentName: state.studentName,
             studentName: state.studentName,

src/views/parent/studentCourseSelection/index.vue

@@ -22,36 +22,35 @@
             type="textarea"
             type="textarea"
         />
         />
         <van-field
         <van-field
+            class="selectionTime"
             readonly
             readonly
             label="选课日期:"
             label="选课日期:"
             v-model="state.selectionTime"
             v-model="state.selectionTime"
             rows="1"
             rows="1"
             autosize
             autosize
             type="textarea"
             type="textarea"
-        />
+        ></van-field>
 
 
         <van-field name="radio1" label="选课方式">
         <van-field name="radio1" label="选课方式">
           <template #input>
           <template #input>
-            <van-radio-group v-model="checkedType" direction="horizontal">
-              <van-radio icon-size="18px" name="1">夏季</van-radio>
-              <van-radio icon-size="18px" name="2">春季</van-radio>
-              <van-radio icon-size="18px" name="3">艺体</van-radio>
+            <van-radio-group v-for="(item,index) in typeColumn" :key="item.dictValue" v-model="checkedType"
+                             direction="horizontal">
+              <van-radio icon-size="18px" :name="item.dictValue">{{ item.dictLabel }}</van-radio>
             </van-radio-group>
             </van-radio-group>
           </template>
           </template>
         </van-field>
         </van-field>
         <!-- 夏季 -->
         <!-- 夏季 -->
-        <van-field v-if="checkedType == 1" name="radio2" label=" ">
+        <van-field v-if="checkedType == 2" name="radio" label=" ">
           <template #input>
           <template #input>
-            <van-radio-group v-model="checkedSub" direction="horizontal">
-              <van-radio icon-size="18px" name="1" shape="square" @click="materialization">物政化</van-radio>
-              <van-radio icon-size="18px" name="2" shape="square" @click="monomasa">物政生</van-radio>
-              <van-radio icon-size="18px" name="3" shape="square" @click="matsuki">物政地</van-radio>
-              <van-radio icon-size="18px" name="4" shape="square" @click="physicalChemistry">物理化</van-radio>
+            <van-radio-group style="display: flex;flex-wrap: wrap" v-model="checkedSub" direction="horizontal">
+              <van-radio v-for="(item) in selectionColumn" :key="item.dictValue" icon-size="18px" :name="item.dictValue"
+                         shape="square" @click="toSubjectGrade(item.dictLabel,item.dictValue)">{{ item.dictLabel }}
+              </van-radio>
             </van-radio-group>
             </van-radio-group>
           </template>
           </template>
         </van-field>
         </van-field>
         <!-- 春季 -->
         <!-- 春季 -->
-        <div style="margin-left: 60px;margin-right: 50px" v-if="checkedType == 2">
+        <div style="margin-left: 60px;margin-right: 50px" v-if="checkedType == 1">
           <!-- 第一志愿 -->
           <!-- 第一志愿 -->
           <van-field
           <van-field
               v-model="state.firstChoice"
               v-model="state.firstChoice"
@@ -157,23 +156,20 @@
         </div>
         </div>
         <!-- 艺体 -->
         <!-- 艺体 -->
         <div v-if="checkedType == 3">
         <div v-if="checkedType == 3">
-          <van-field class="art" name="radio2" label=" ">
+          <van-field class="art" name="radio" label=" ">
             <template #input>
             <template #input>
-              <van-radio-group v-model="checkedArt" direction="horizontal">
-                <van-radio icon-size="18px" name="1" shape="square">音乐</van-radio>
-                <van-radio icon-size="18px" name="2" shape="square">美术</van-radio>
-                <van-radio icon-size="18px" name="3" shape="square">田径</van-radio>
-                <van-radio icon-size="18px" name="4" shape="square">舞蹈</van-radio>
+              <van-radio-group v-for="(item,index) in artColumn" :key="item.dictValue" v-model="checkedArt"
+                               direction="horizontal">
+                <van-radio icon-size="18px" :name="item.dictValue" shape="square">{{ item.dictLabel }}</van-radio>
               </van-radio-group>
               </van-radio-group>
             </template>
             </template>
           </van-field>
           </van-field>
-          <van-field v-if="checkedType == 3" name="radio2" label=" ">
+          <van-field v-if="checkedType == 3" name="radio" label=" ">
             <template #input>
             <template #input>
               <van-radio-group v-model="checkedArtSub" direction="horizontal">
               <van-radio-group v-model="checkedArtSub" direction="horizontal">
-                <van-radio icon-size="18px" name="1" shape="square">物政化</van-radio>
-                <van-radio icon-size="18px" name="2" shape="square">物政生</van-radio>
-                <van-radio icon-size="18px" name="3" shape="square">物政地</van-radio>
-                <van-radio icon-size="18px" name="4" shape="square">物理化</van-radio>
+                <van-radio v-for="(item,index) in selectionColumn" :key="item.dictValue" icon-size="18px"
+                           :name="item.dictValue" shape="square">{{ item.dictLabel }}
+                </van-radio>
               </van-radio-group>
               </van-radio-group>
             </template>
             </template>
           </van-field>
           </van-field>
@@ -185,89 +181,724 @@
           </van-button>
           </van-button>
         </div>
         </div>
       </van-form>
       </van-form>
-<!--      <div style="text-align: left;margin-left: 15px">-->
-<!--        <p>填写说明：</p>-->
-<!--        <div style="margin-left: 20px">-->
-<!--          <p>选择夏考的时候自动带出夏考的课程，20种情况选一个</p>-->
-<!--          <p>选择春考的时候自动带出21个专业，多选只能选6个</p>-->
-<!--          <p>选课结束之后就是查看页面，只查看结果</p>-->
-<!--          <p>艺体先选艺体科目然后再选文化课科目</p>-->
-<!--        </div>-->
-
-<!--      </div>-->
+
     </div>
     </div>
   </div>
   </div>
+
+  <!-- 弹框 -->
+  <van-popup v-model:show="isShowDialog.show" title="学科成绩" confirm-button-text="关闭"
+              style="height: 80% ;width:80%;overflow: auto" @open="confirmDialog" ref="scrollDiv"
+              :closeable="true" :round="true"
+  >
+      <!-- 物政化-->
+      <div v-if="params.name == '物政化'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年级排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物政生-->
+      <div v-if="params.name == '物政生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物政地-->
+      <div v-if="params.name == '物政地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物政历-->
+      <div v-if="params.name == '物政历'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年纪排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物历化-->
+      <div v-if="params.name == '物历化'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物历生-->
+      <div v-if="params.name == '物历生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物地化-->
+      <div v-if="params.name == '物地化'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物地生-->
+      <div v-if="params.name == '物地生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物化生-->
+      <div v-if="params.name == '物化生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 物历地-->
+      <div v-if="params.name == '物历地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>物理:<span>{{ item.physics }}</span></div>
+          <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 化政地-->
+      <div v-if="params.name == '化政地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 化政历-->
+      <div v-if="params.name == '化政历'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 化政生-->
+      <div v-if="params.name == '化政生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 化历地-->
+      <div v-if="params.name == '化历地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 化历生-->
+      <div v-if="params.name == '化历生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 化地生-->
+      <div v-if="params.name == '化地生'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>化学:<span>{{ item.chemistry }}</span></div>
+          <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 生政地-->
+      <div v-if="params.name == '生政地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 生历地-->
+      <div v-if="params.name == '生历地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 生政历-->
+      <div v-if="params.name == '生政历'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>生物:<span>{{ item.biology }}</span></div>
+          <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+      </div>
+
+      <!-- 政历地-->
+      <div v-if="params.name == '政历地'"
+           v-for="(item,index) in subjectColumn" :key="index"
+           class="c_main_list"
+           style="padding: 18px 12px 15px 17px"
+      >
+        <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+        <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+        <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+        <div class="totalScore">
+          <div>总成绩:<span>{{ item.totalScore }}</span></div>
+          <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>政治:<span>{{ item.politics }}</span></div>
+          <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>历史:<span>{{ item.history }}</span></div>
+          <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+        </div>
+        <div class="subject">
+          <div>地理:<span>{{ item.geography }}</span></div>
+          <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+        </div>
+      </div>
+
+
+  </van-popup>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import {onMounted, ref, onUpdated, reactive, toRefs} from "vue";
+import {onMounted, ref, onUpdated, reactive, toRefs, nextTick} from "vue";
 import {Dialog, Toast} from "vant";
 import {Dialog, Toast} from "vant";
-import {useRouter} from "vue-router";
+import { formatDatetime, formatDate } from "@/utils/time.js";
+
+const VanDialog = Dialog.Component;//这句是重点
+import {useRoute, useRouter} from "vue-router";
 import {useStore} from "vuex";
 import {useStore} from "vuex";
 import {
 import {
-  getPersonGrade, //查询个人成绩信息
   getSelectGrade,//根据学生3门选课查询
   getSelectGrade,//根据学生3门选课查询
+  getDicts,  //获取数据字典
+  getStudentInfo,//学生选课信息查询
   saveSelectInfo,//保存选课信息
   saveSelectInfo,//保存选课信息
 } from "@/service/studentCourseSelection";
 } from "@/service/studentCourseSelection";
 
 
 const router = useRouter();
 const router = useRouter();
+const route = useRoute();
 const store = useStore();
 const store = useStore();
-console.log('store',store)
+console.log('store', store)
 const state = reactive({
 const state = reactive({
   studentName: store.state.userInfo.studentName, //学生姓名
   studentName: store.state.userInfo.studentName, //学生姓名
   selectionTime: "", //选课日期
   selectionTime: "", //选课日期
-  firstChoice:"", //第一志愿
-  secondChoice:"",//第二志愿
-  thirdChoice:"", //第三志愿
-  forthChoice:"", //第四志愿
-  fifthChoice:"", //第五志愿
-  sixChoice:"", //第六志愿
+  firstChoice: "", //第一志愿
+  secondChoice: "",//第二志愿
+  thirdChoice: "", //第三志愿
+  forthChoice: "", //第四志愿
+  fifthChoice: "", //第五志愿
+  sixChoice: "", //第六志愿
+});
+const startTime = ref();
+const endTime = ref();
+const isShowDialog = reactive({
+  show: false, //弹窗
+});
+//课程类型 1-春季选课，2-夏季选课，3-艺体
+const typeColumn = ref([]);
+//已选课程 物理化。。
+const selectionColumn = ref([]);
+//艺体所选科目
+const artColumn = ref([]);
+//志愿下拉框
+const volunteerColumn = ref([]);
+//志愿提交数组
+const volunteerIndex = ref([]);
+const id = ref('')
+
+onMounted(async () => {
+  console.log('isShowDialog', isShowDialog.show)
+  console.log('route666', route.query)
+  console.log('store', store.state.userInfo.studentId)
+  if (route.query.type == '2') {
+    checkedType.value = '2';
+    checkedSub.value = route.query.value
+  }
+  let result = await getStudentInfo(store.state.userInfo.studentId)
+  console.log('result66', result)
+  if (result.code == 200) {
+    startTime.value = result.data.startTime
+    endTime.value = result.data.endTime
+    state.selectionTime = result.data.startTime + '-' + result.data.endTime
+    id.value = result.data.id
+  }
+  //课程类型 1-春季选课，2-夏季选课，3-艺体
+  let courseType = await getDicts('course_type')
+  console.log('courseType', courseType)
+  if (courseType.code == 200) {
+    courseType.data.forEach(item => {
+      typeColumn.value.push({
+        dictValue: item.dictValue,
+        dictLabel: item.dictLabel
+      })
+    })
+    console.log('typeColumn', typeColumn.value)
+  }
+  //已选课程 物理化。。。
+  let selectionType = await getDicts('section_type')
+  console.log('selectionType', selectionType)
+  if (selectionType.code == 200) {
+    selectionType.data.forEach(item => {
+      selectionColumn.value.push({
+        dictValue: item.dictValue,
+        dictLabel: item.dictLabel
+      })
+    })
+  }
+  //志愿下拉框
+  let specialty = await getDicts('specialty')
+  console.log('specialty', specialty)
+  if (specialty.code == 200) {
+    specialty.data.forEach(item => {
+      volunteerColumn.value.push(
+          {
+            text: item.dictLabel,
+            value: item.dictValue
+          }
+      )
+    })
+    console.log('volunteerColumn.value', volunteerColumn.value)
+  }
+  //艺体所选科目
+  let artSubject = await getDicts('art_subject')
+  console.log('artSubject', artSubject)
+  if (artSubject.code == 200) {
+    artSubject.data.forEach(item => {
+      artColumn.value.push({
+        dictLabel: item.dictLabel,
+        dictValue: item.dictValue,
+      })
+    })
+
+  }
+
+
 });
 });
 //成绩查看按钮
 //成绩查看按钮
 const checkGrade = () => {
 const checkGrade = () => {
   router.push({
   router.push({
     path: "/totalScoreView",
     path: "/totalScoreView",
-    query:{
-      id:store.state.userInfo.studentId
-    }
-  })
-};
-//物政化点击事件
-const materialization = () => {
-  router.push({
-    path: "/subjectAchievement",
     query: {
     query: {
-      name:'物政化'
-    },
-  })
-};
-//物政生点击事件
-const monomasa = () => {
-  router.push({
-    path: "/subjectAchievement",
-    query: {
-      name:'物政生'
-    },
-  })
-};
-//物政地点击事件
-const matsuki = () => {
-  router.push({
-    path: "/subjectAchievement",
-    query: {
-      name:'物政地'
-    },
+      id: store.state.userInfo.studentId
+    }
   })
   })
 };
 };
-//物理化点击事件
-const physicalChemistry = () => {
-  router.push({
-    path: "/subjectAchievement",
-    query: {
-      name:'物理化'
-    },
-  })
+const subjectColumn = ref([])
+const params = reactive({
+  name: ''
+})
+// nextTick(() => {
+//   console.log('scrollDiv',scrollDiv.value)
+// })
+//物政化等学科点击事件
+const toSubjectGrade = async (name, value) => {
+
+  console.log('name', name)
+  console.log('params.name', params.name)
+
+  params.name = name;
+  // const scrollDiv = document.getElementById('scrollDiv')
+  // scrollDiv.scrollTop = 0
+  console.log('isShowDialog', isShowDialog.show)
+  const data = {
+    studentId: store.state.userInfo.studentId,
+    selectedCourse: value
+  }
+  console.log('data', data)
+  let result = await getSelectGrade(data)
+  console.log('result66', result)
+  if (result.code == 200) {
+    subjectColumn.value = result.data
+  }
+  isShowDialog.show = true;
+  // router.replace({
+  //   path: "/subjectAchievement",
+  //   query: {
+  //     name: name,
+  //     value: value
+  //   },
+  // })
 };
 };
+const scrollDiv = ref(null)
+//确认弹框事件
+const confirmDialog = () => {
+  console.log('scrollDiv',scrollDiv.value)
+  scrollDiv.value.scrollTop = 0
+}
 // 提交表单
 // 提交表单
 const checkForm = ref(null);
 const checkForm = ref(null);
 // 加载效果
 // 加载效果
@@ -281,8 +912,7 @@ const checkedArt = ref('1');
 //艺体-物政化等
 //艺体-物政化等
 const checkedArtSub = ref('1');
 const checkedArtSub = ref('1');
 // const result = ref('');
 // const result = ref('');
-//春季志愿下拉框全数据
-const columns = ['杭州', '宁波', '温州', '嘉兴', '湖州', '山东','上海', '北京'];
+
 //六个下拉框已经选中的数据
 //六个下拉框已经选中的数据
 const selectArr = ref([]);
 const selectArr = ref([]);
 
 
@@ -296,22 +926,24 @@ const showFirst = () => {
   //   return item != state.secondChoice && item != state.thirdChoice && item != state.forthChoice
   //   return item != state.secondChoice && item != state.thirdChoice && item != state.forthChoice
   // })
   // })
   //把其他下拉框已选择的过滤出去
   //把其他下拉框已选择的过滤出去
-  firstDropDown.value = columns.filter(item => {
-    if(!selectArr.value.includes(item)){
+  firstDropDown.value = volunteerColumn.value.filter(item => {
+    console.log('item.value', item.text)
+    if (!selectArr.value.includes(item.text)) {
       return item
       return item
     }
     }
   })
   })
-  console.log('state.secondChoice',state.secondChoice)
-  console.log('columns',columns)
-  console.log('firstDropDown.value',firstDropDown.value)
+  console.log('state.secondChoice', state.secondChoice)
+  console.log('firstDropDown.value', firstDropDown.value)
   showPickerFirst.value = true;
   showPickerFirst.value = true;
 };
 };
 //第一志愿选择确认按钮事件
 //第一志愿选择确认按钮事件
-const onConfirmFirst = (value) => {
-  state.firstChoice = value;
+const onConfirmFirst = (value, index) => {
+  console.log('value', value)
+  state.firstChoice = value.text;
   showPickerFirst.value = false;
   showPickerFirst.value = false;
-  selectArr.value[0] = value
-  console.log('selectArr.value',selectArr.value)
+  selectArr.value[0] = value.text;
+  volunteerIndex.value[0] = value.value
+  console.log('selectArr.value', selectArr.value)
 };
 };
 
 
 //第二志愿下拉框显示的数据
 //第二志愿下拉框显示的数据
@@ -324,8 +956,8 @@ const showSecond = () => {
   //   return item != state.firstChoice && item != state.thirdChoice && item != state.forthChoice
   //   return item != state.firstChoice && item != state.thirdChoice && item != state.forthChoice
   // })
   // })
   //把其他下拉框已选择的过滤出去
   //把其他下拉框已选择的过滤出去
-  secondDropDown.value = columns.filter(item => {
-    if(!selectArr.value.includes(item)){
+  secondDropDown.value = volunteerColumn.value.filter(item => {
+    if (!selectArr.value.includes(item.text)) {
       return item
       return item
     }
     }
   })
   })
@@ -333,10 +965,11 @@ const showSecond = () => {
 };
 };
 //第二志愿选择确认按钮事件
 //第二志愿选择确认按钮事件
 const onConfirmSecond = (value) => {
 const onConfirmSecond = (value) => {
-  state.secondChoice = value;
+  state.secondChoice = value.text;
   showPickerSecond.value = false;
   showPickerSecond.value = false;
-  selectArr.value[1] = value
-  console.log('selectArr.value',selectArr.value)
+  selectArr.value[1] = value.text;
+  volunteerIndex.value[1] = value.value
+  console.log('selectArr.value', selectArr.value)
 };
 };
 
 
 //第三志愿下拉框显示的数据
 //第三志愿下拉框显示的数据
@@ -349,8 +982,8 @@ const showThird = () => {
   //   return item != state.firstChoice && item != state.secondChoice && item != state.forthChoice
   //   return item != state.firstChoice && item != state.secondChoice && item != state.forthChoice
   // })
   // })
   //把其他下拉框已选择的过滤出去
   //把其他下拉框已选择的过滤出去
-  thirdDropDown.value = columns.filter(item => {
-    if(!selectArr.value.includes(item)){
+  thirdDropDown.value = volunteerColumn.value.filter(item => {
+    if (!selectArr.value.includes(item.text)) {
       return item
       return item
     }
     }
   })
   })
@@ -358,10 +991,11 @@ const showThird = () => {
 };
 };
 //第三志愿选择确认按钮事件
 //第三志愿选择确认按钮事件
 const onConfirmThird = (value) => {
 const onConfirmThird = (value) => {
-  state.thirdChoice = value;
+  state.thirdChoice = value.text;
   showPickerThird.value = false;
   showPickerThird.value = false;
-  selectArr.value[2] = value
-  console.log('selectArr.value',selectArr.value)
+  selectArr.value[2] = value.text;
+  volunteerIndex.value[2] = value.value;
+  console.log('selectArr.value', selectArr.value)
 };
 };
 
 
 //第四志愿下拉框显示的数据
 //第四志愿下拉框显示的数据
@@ -374,8 +1008,8 @@ const showForth = () => {
   //   return item != state.firstChoice && item != state.secondChoice && item != state.thirdChoice
   //   return item != state.firstChoice && item != state.secondChoice && item != state.thirdChoice
   // })
   // })
   // 把其他下拉框已选择的过滤出去
   // 把其他下拉框已选择的过滤出去
-  forthDropDown.value = columns.filter(item => {
-    if(!selectArr.value.includes(item)){
+  forthDropDown.value = volunteerColumn.value.filter(item => {
+    if (!selectArr.value.includes(item.text)) {
       return item
       return item
     }
     }
   })
   })
@@ -383,10 +1017,11 @@ const showForth = () => {
 };
 };
 //第四志愿选择确认按钮事件
 //第四志愿选择确认按钮事件
 const onConfirmForth = (value) => {
 const onConfirmForth = (value) => {
-  state.forthChoice = value;
+  state.forthChoice = value.text;
   showPickerForth.value = false;
   showPickerForth.value = false;
-  selectArr.value[3] = value
-  console.log('selectArr.value',selectArr.value)
+  selectArr.value[3] = value.text;
+  volunteerIndex.value[3] = value.value;
+  console.log('selectArr.value', selectArr.value)
 };
 };
 
 
 //第五志愿下拉框显示的数据
 //第五志愿下拉框显示的数据
@@ -399,8 +1034,8 @@ const showFifth = () => {
   //   return item != state.firstChoice && item != state.secondChoice && item != state.thirdChoice
   //   return item != state.firstChoice && item != state.secondChoice && item != state.thirdChoice
   // })
   // })
   //把其他下拉框已选择的过滤出去
   //把其他下拉框已选择的过滤出去
-  fifthDropDown.value = columns.filter(item => {
-    if(!selectArr.value.includes(item)){
+  fifthDropDown.value = volunteerColumn.value.filter(item => {
+    if (!selectArr.value.includes(item.text)) {
       return item
       return item
     }
     }
   })
   })
@@ -408,10 +1043,11 @@ const showFifth = () => {
 };
 };
 //第五志愿选择确认按钮事件
 //第五志愿选择确认按钮事件
 const onConfirmFifth = (value) => {
 const onConfirmFifth = (value) => {
-  state.fifthChoice = value;
+  state.fifthChoice = value.text;
   showPickerfifth.value = false;
   showPickerfifth.value = false;
-  selectArr.value[4] = value
-  console.log('selectArr.value',selectArr.value)
+  selectArr.value[4] = value.text;
+  volunteerIndex.value[4] = value.value;
+  console.log('selectArr.value', selectArr.value)
 };
 };
 
 
 //第六志愿下拉框显示的数据
 //第六志愿下拉框显示的数据
@@ -423,8 +1059,8 @@ const showSix = () => {
   //   return item != state.firstChoice && item != state.secondChoice && item != state.thirdChoice
   //   return item != state.firstChoice && item != state.secondChoice && item != state.thirdChoice
   // })
   // })
   //把其他下拉框已选择的过滤出去
   //把其他下拉框已选择的过滤出去
-  sixDropDown.value = columns.filter(item => {
-    if(!selectArr.value.includes(item)){
+  sixDropDown.value = volunteerColumn.value.filter(item => {
+    if (!selectArr.value.includes(item.text)) {
       return item
       return item
     }
     }
   })
   })
@@ -432,29 +1068,104 @@ const showSix = () => {
 };
 };
 //第六志愿选择确认按钮事件
 //第六志愿选择确认按钮事件
 const onConfirmSix = (value) => {
 const onConfirmSix = (value) => {
-  state.sixChoice = value;
+  state.sixChoice = value.text;
   showPickerSix.value = false;
   showPickerSix.value = false;
-  selectArr.value[5] = value
-  console.log('selectArr.value',selectArr.value)
+  selectArr.value[5] = value.text;
+  volunteerIndex.value[5] = value.value
+  console.log('selectArr.value', selectArr.value)
 };
 };
-onMounted(async () => {
-  console.log("3- 组件挂在完毕执行 --- onMounted");
-  //获取路由跳转过来的参数
-  // console.log('router1',JSON.parse(router.currentRoute.value.query.item))
-  // console.log('router.currentRoute.value.query',router.currentRoute.value.query)
-
-});
 
 
 
 
 //确定提交按钮
 //确定提交按钮
 const onSubmit = async () => {
 const onSubmit = async () => {
+  console.log('checkedType', checkedType)
+  console.log('volunteerIndex.value', volunteerIndex.value)
+  const volunteerString = volunteerIndex.value.toString()
+  console.log('volunteerString', volunteerString)
+  //春季选课
+  if (checkedType.value == '1') {
+    if (volunteerIndex.value.length == 6) {
+      const data = {
+        studentId: store.state.userInfo.studentId,
+        curriculaId: id.value,
+        courseType: checkedType.value,
+        curriculaTime:formatDatetime(new Date()),
+        curriculaState: '2',
+        //志愿
+        selectedMajor: volunteerString,
+      }
+      console.log('data', data)
+
+      let result = await saveSelectInfo(data)
+      console.log('result', result)
+      if (result.code == 200) {
+        Toast("选课成功");
+        router.back()
+      }
+    } else {
+      Toast("志愿未填报完成");
+
+    }
+
+  }
+  //夏季选课
+  if (checkedType.value == '2') {
+    const data = {
+      studentId: store.state.userInfo.studentId,
+      curriculaId: id.value,
+      courseType: checkedType.value,
+      curriculaTime:formatDatetime(new Date()),
+      curriculaState: '2',
+      //物理化学科
+      selectedCourse: checkedSub.value,
+    }
+    console.log('data', data)
+    let result = await saveSelectInfo(data)
+    console.log('result', result)
+    if (result.code == 200) {
+      Toast("选课成功");
+      router.back()
+      // router.replace({
+      //   path: "/main"
+      // });
+    }
+  }
+  //艺体
+  if (checkedType.value == '3') {
+    const data = {
+      studentId: store.state.userInfo.studentId,
+      curriculaId: id.value,
+      courseType: checkedType.value,
+      curriculaTime:formatDatetime(new Date()),
+      curriculaState: '2',
+      //物理化学科
+      selectedCourse: checkedArtSub.value,
+      // 艺考
+      selectedSubject: checkedArt.value,
+    }
+    console.log('data', data)
+    let result = await saveSelectInfo(data)
+    console.log('result', result)
+    if (result.code == 200) {
+      Toast("选课成功");
+      router.back()
+      // router.replace({
+      //   path: "/main"
+      // });
+    }
+  }
+
+  //saveSelectInfo
   // console.log(ryFk.value);
   // console.log(ryFk.value);
   // let result = await postfz(detail.id, { ryFk: ryFk.value });
   // let result = await postfz(detail.id, { ryFk: ryFk.value });
   // Toast("反馈成功");
   // Toast("反馈成功");
   // router.back();
   // router.back();
 };
 };
 const goback = (g) => {
 const goback = (g) => {
-  router.back();
+  router.back()
+  // router.replace({
+  //   path: "/main"
+  // });
 };
 };
 
 
 </script>
 </script>
@@ -591,13 +1302,37 @@ const goback = (g) => {
   margin-bottom: 10px !important;
   margin-bottom: 10px !important;
 
 
 }
 }
+
 ::v-deep .main .art .van-radio.van-radio--horizontal {
 ::v-deep .main .art .van-radio.van-radio--horizontal {
   margin-right: 9px !important;
   margin-right: 9px !important;
 }
 }
-::v-deep .main .van-cell.van-field.van-field--label-right.art{
+
+::v-deep .main .van-cell.van-field.van-field--label-right.art {
   padding-bottom: 0 !important;
   padding-bottom: 0 !important;
-  .van-cell__value.van-field__value{
+
+  .van-cell__value.van-field__value {
     border-bottom: 1px solid !important;
     border-bottom: 1px solid !important;
   }
   }
 }
 }
+
+::v-deep .selectionTime.van-cell {
+  padding-right: 0px;
+}
+
+.totalScore {
+  font-size: 14px;
+  display: flex;
+  justify-content: space-around;
+  margin: 20px 0 10px 0;
+  padding-bottom: 15px;
+  border-bottom: 1px solid silver;
+}
+
+.subject {
+  font-size: 14px;
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 10px;
+
+}
 </style>
 </style>

src/views/parent/studentCourseSelection/subjectAchievement.vue

 <!--学科成绩-->
 <!--学科成绩-->
 <template>
 <template>
-  <van-nav-bar
-      title="学科成绩"
-      left-text="返回"
-      left-arrow
-      @click-left="goback"
-  />
-  <!-- 物政化一模-->
-  <div v-if="query == '物政化'"
-      class="c_main_list"
-      style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">一模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 物政化二模-->
-  <div v-if="query == '物政化'"
-      class="c_main_list"
-      style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">二模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 物政化三模-->
-  <div v-if="query == '物政化'"
-      class="c_main_list"
-      style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">三模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
 
 
-  <!-- 物政生一模-->
-  <div v-if="query == '物政生'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">一模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>生物:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 物政生二模-->
-  <div v-if="query == '物政生'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">二模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>生物:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 物政生三模-->
-  <div v-if="query == '物政生'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">三模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>生物:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
+  <!--  <van-nav-bar-->
+  <!--      title="学科成绩"-->
+  <!--      left-text="返回"-->
+  <!--      left-arrow-->
+  <!--      @click-left="goback"-->
+  <!--  />-->
 
 
-  <!-- 物政地一模-->
-  <div v-if="query == '物政地'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">一模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+    <!-- 物政化-->
+    <div v-if="query.name == '物政化'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年级排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 物政地二模-->
-  <div v-if="query == '物政地'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">二模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物政生-->
+    <div v-if="query.name == '物政生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物政地-->
+    <div v-if="query.name == '物政地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物政历-->
+    <div v-if="query.name == '物政历'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年纪排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
     </div>
     </div>
-  </div>
-  <!-- 物政地三模-->
-  <div v-if="query == '物政地'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">三模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
+
+    <!-- 物历化-->
+    <div v-if="query.name == '物历化'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物历生-->
+    <div v-if="query.name == '物历生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物地化-->
+    <div v-if="query.name == '物地化'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物地生-->
+    <div v-if="query.name == '物地生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-  </div>
 
 
-  <!-- 物理化一模-->
-  <div v-if="query == '物理化'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">一模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
+    <!-- 物化生-->
+    <div v-if="query.name == '物化生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 物历地-->
+    <div v-if="query.name == '物历地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>物理:<span>{{ item.physics }}</span></div>
+        <div>年级排名：<span>{{ item.wlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 化政地-->
+    <div v-if="query.name == '化政地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 化政历-->
+    <div v-if="query.name == '化政历'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
     </div>
     </div>
-  </div>
-  <!-- 物政地二模-->
-  <div v-if="query == '物理化'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">二模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
+
+    <!-- 化政生-->
+    <div v-if="query.name == '化政生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 化历地-->
+    <div v-if="query.name == '化历地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 化历生-->
+    <div v-if="query.name == '化历生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 化地生-->
+    <div v-if="query.name == '化地生'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>化学:<span>{{ item.chemistry }}</span></div>
+        <div>年纪排名：<span>{{ item.hxRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
     </div>
     </div>
-  </div>
-  <!-- 物政地三模-->
-  <div v-if="query == '物理化'"
-       class="c_main_list"
-       style="padding: 18px 12px 15px 17px"
-  >
-    <div style="text-align: center;font-size: 20px" class="title">三模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
+
+    <!-- 生政地-->
+    <div v-if="query.name == '生政地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 生历地-->
+    <div v-if="query.name == '生历地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 生政历-->
+    <div v-if="query.name == '生政历'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>生物:<span>{{ item.biology }}</span></div>
+        <div>年纪排名：<span>{{ item.swRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
     </div>
     </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+
+    <!-- 政历地-->
+    <div v-if="query.name == '政历地'"
+         v-for="(item,index) in subjectColumn" :key="index"
+         class="c_main_list"
+         style="padding: 18px 12px 15px 17px"
+    >
+      <div v-if="index == 0" style="text-align: center;font-size: 20px" class="title">一模</div>
+      <div v-if="index == 1" style="text-align: center;font-size: 20px" class="title">二模</div>
+      <div v-if="index == 2" style="text-align: center;font-size: 20px" class="title">三模</div>
+      <div class="totalScore">
+        <div>总成绩:<span>{{ item.totalScore }}</span></div>
+        <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>政治:<span>{{ item.politics }}</span></div>
+        <div>年级排名：<span>{{ item.zzRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>历史:<span>{{ item.history }}</span></div>
+        <div>年级排名：<span>{{ item.lsRanking }}</span></div>
+      </div>
+      <div class="subject">
+        <div>地理:<span>{{ item.geography }}</span></div>
+        <div>年纪排名：<span>{{ item.dlRanking }}</span></div>
+      </div>
     </div>
     </div>
-  </div>
+
+
 </template>
 </template>
 
 
 <script setup>
 <script setup>
+import {
+  getSelectGrade,//根据学生3门选课查询
+} from "@/service/studentCourseSelection";
 import {onMounted, ref, onUpdated, reactive, toRefs} from "vue";
 import {onMounted, ref, onUpdated, reactive, toRefs} from "vue";
-import {useRouter,useRoute} from "vue-router";
+import {useRouter, useRoute} from "vue-router";
 import {useStore} from "vuex";
 import {useStore} from "vuex";
+
 const router = useRouter();
 const router = useRouter();
 const route = useRoute();
 const route = useRoute();
 const store = useStore();
 const store = useStore();
-const query = route.query.name;
-const state = reactive({
-
-});
-onMounted( () => {
+const query = route.query;
+const subjectColumn = ref([])
 
 
+onMounted(async () => {
+  const data = {
+    studentId: store.state.userInfo.studentId,
+    selectedCourse: query.value
+  }
+  console.log('data', data)
+  let result = await getSelectGrade(data)
+  console.log('result', result)
+  if (result.code == 200) {
+    subjectColumn.value = result.data
+  }
 })
 })
-const goback = (g) => {
-  router.back();
+const goback = () => {
+  router.replace({
+    path: "/studentCourseSelection",
+    query: {
+      type: '2',
+      name: query.name,
+      value: query.value,
+    }
+  });
 };
 };
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-.totalScore{
+.totalScore {
   font-size: 14px;
   font-size: 14px;
-  display:flex;
+  display: flex;
   justify-content: space-around;
   justify-content: space-around;
   margin: 20px 0 10px 0;
   margin: 20px 0 10px 0;
   padding-bottom: 15px;
   padding-bottom: 15px;
-  border-bottom:1px solid silver;
+  border-bottom: 1px solid silver;
 }
 }
-.subject{
+
+.subject {
   font-size: 14px;
   font-size: 14px;
-  display:flex;
+  display: flex;
   justify-content: space-around;
   justify-content: space-around;
   margin-bottom: 10px;
   margin-bottom: 10px;
 
 

src/views/parent/studentCourseSelection/totalScoreView.vue

@@ -7,232 +7,166 @@
       left-arrow
       left-arrow
       @click-left="goback"
       @click-left="goback"
   />
   />
-  <!-- 一模-->
-  <div
-       class="c_main_list card"
-        :class=" collapsFirst ? 'isCollaps': ''"
-  >
-    <!--折叠-->
-    <div class="collaps" @click="isCollaps(1)" v-if="collapsFirst == false">展开</div>
-    <div class="collaps" @click="isCollaps(1)" v-else>折叠</div>
-    <div style="text-align: center;font-size: 20px" class="title">一模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>语文:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>数学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>英语:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>历史:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>生物:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 二模-->
-  <div
-      class="c_main_list card"
-      :class=" collapsSecond ? 'isCollaps': ''"
-  >
-    <!--折叠-->
-    <div class="collaps" @click="isCollaps(2)" v-if="collapsSecond == false">展开</div>
-    <div class="collaps" @click="isCollaps(2)" v-else>折叠</div>
-    <div style="text-align: center;font-size: 20px" class="title">二模</div>
-    <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>语文:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>数学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>英语:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>历史:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>生物:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-    <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
-    </div>
-  </div>
-  <!-- 三模-->
   <div
   <div
+      v-for="(item,index) in column"
       class="c_main_list card"
       class="c_main_list card"
-      :class=" collapsThird ? 'isCollaps': ''"
+      :class=" item.isShow ? 'isCollaps': ''"
   >
   >
-    <!--折叠-->
-    <div class="collaps" @click="isCollaps(3)" v-if="collapsThird == false">展开</div>
-    <div class="collaps" @click="isCollaps(3)" v-else>折叠</div>
-    <div style="text-align: center;font-size: 20px" class="title">三模</div>
+    <div class="collaps" @click="isCollaps(item,index)" v-if="item.isShow == false">展开</div>
+    <div class="collaps" @click="isCollaps(index)" v-else>折叠</div>
+    <div style="text-align: center;font-size: 20px" class="title" v-if="index == 0">一模</div>
+    <div style="text-align: center;font-size: 20px" class="title" v-if="index == 1">二模</div>
+    <div style="text-align: center;font-size: 20px" class="title" v-if="index == 2">三模</div>
     <div class="totalScore">
     <div class="totalScore">
-      <div>总成绩:<span>600</span></div>
-      <div>总成绩年纪排名：<span>5000</span></div>
+      <div>总成绩:<span>{{ item.totalScore }}</span></div>
+      <div>总成绩年级排名：<span>{{ item.ranking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>语文:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>语文:<span>{{ item.language }}</span></div>
+      <div>年级排名：<span>{{ item.ywRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>数学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>数学:<span>{{ item.math }}</span></div>
+      <div>年级排名：<span>{{ item.sxRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>英语:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>英语:<span>{{ item.english }}</span></div>
+      <div>年级排名：<span>{{ item.yyRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>历史:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>历史:<span>{{ item.history }}</span></div>
+      <div>年级排名：<span>{{ item.lsRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>地理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>地理:<span>{{ item.geography }}</span></div>
+      <div>年级排名：<span>{{ item.dlRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>生物:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>生物:<span>{{ item.biology }}</span></div>
+      <div>年级排名：<span>{{ item.swRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>物理:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>物理:<span>{{ item.physics }}</span></div>
+      <div>年级排名：<span>{{ item.wlRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>化学:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>化学:<span>{{ item.chemistry }}</span></div>
+      <div>年级排名：<span>{{ item.hxRanking }}</span></div>
     </div>
     </div>
     <div class="subject">
     <div class="subject">
-      <div>政治:<span>600</span></div>
-      <div>年纪排名：<span>5000</span></div>
+      <div>政治:<span>{{ item.politics }}</span></div>
+      <div>年级排名：<span>{{ item.zzRanking }}</span></div>
     </div>
     </div>
+
   </div>
   </div>
 </template>
 </template>
 
 
 <script setup>
 <script setup>
 import {onMounted, ref, onUpdated, reactive, toRefs} from "vue";
 import {onMounted, ref, onUpdated, reactive, toRefs} from "vue";
-import {useRouter,useRoute} from "vue-router";
+import {useRouter, useRoute} from "vue-router";
 import {useStore} from "vuex";
 import {useStore} from "vuex";
 import {
 import {
   getPersonGrade, //查询个人成绩信息
   getPersonGrade, //查询个人成绩信息
-
 } from "@/service/studentCourseSelection";
 } from "@/service/studentCourseSelection";
+
 const router = useRouter();
 const router = useRouter();
 const route = useRoute();
 const route = useRoute();
 const store = useStore();
 const store = useStore();
 const query = route.query;
 const query = route.query;
-const state = reactive({
-});
-const collapsFirst = ref(false);
-const collapsSecond = ref(false);
-const collapsThird = ref(false);
-const isCollaps = (num) => {
-  if(num == 1){
-    collapsFirst.value = !collapsFirst.value
-  }
-  if(num == 2){
-    collapsSecond.value = !collapsSecond.value
-  }
-  if(num == 3){
-    collapsThird.value = !collapsThird.value
-  }
+const column = ref([]);
+const isCollaps = (item, num) => {
+  // if (num == 0) {
+  //   collapsFirst.value = !collapsFirst.value
+  // }
+  // if (num == 1) {
+  //   collapsSecond.value = !collapsSecond.value
+  // }
+  // if (num == 2) {
+  //   collapsThird.value = !collapsThird.value
+  // }
+  item.isShow = true
 };
 };
-onMounted( async () => {
-  console.log('query.id',query.id)
+onMounted(async () => {
+  console.log('query.id', query.id)
   let result = await getPersonGrade(query.id)
   let result = await getPersonGrade(query.id)
-  console.log('result',result)
+  console.log('result', result)
+  if (result.code == 200) {
+    column.value = result.data.map(item => {
+      return {
+        totalScore: item.totalScore, //总成绩
+        ranking: item.ranking,   //总成绩年纪排名
+        language: item.language, //语文
+        ywRanking: item.ywRanking, //	语文年级排名
+        math: item.math, //数学
+        sxRanking: item.sxRanking, //数学年级排名
+        english: item.english, //英语
+        yyRanking: item.yyRanking, //英语年级排名
+        history: item.history, //历史
+        lsRanking: item.lsRanking, //历史年级排名
+        geography: item.geography, //地理
+        dlRanking: item.dlRanking,//地理年级排名
+        biology: item.biology,//生物
+        swRanking: item.swRanking, //生物年级排名
+        physics: item.physics,//物理
+        wlRanking: item.wlRanking,//物理年级排名
+        chemistry: item.chemistry, //化学
+        hxRanking: item.hxRanking,//化学年级排名
+        politics: item.politics, //政治
+        zzRanking: item.zzRanking, //政治年级排名
+        isShow: false
+      }
+    })
+    console.log('column', column.value)
+  }
 })
 })
 const goback = (g) => {
 const goback = (g) => {
-  router.back();
+  router.back()
+  // router.replace({
+  //   path: "/studentCourseSelection",
+  // });
 };
 };
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
-.totalScore{
+.totalScore {
   font-size: 14px;
   font-size: 14px;
-  display:flex;
+  display: flex;
   justify-content: space-around;
   justify-content: space-around;
   margin: 20px 0 10px 0;
   margin: 20px 0 10px 0;
   padding-bottom: 15px;
   padding-bottom: 15px;
-  border-bottom:1px solid silver;
+  border-bottom: 1px solid silver;
 }
 }
-.subject{
+
+.subject {
   font-size: 14px;
   font-size: 14px;
-  display:flex;
+  display: flex;
   justify-content: space-around;
   justify-content: space-around;
   margin-bottom: 10px;
   margin-bottom: 10px;
 
 
 }
 }
-.card{
+
+.card {
   spadding: 18px 12px 15px 17px;
   spadding: 18px 12px 15px 17px;
-  position:relative;
+  position: relative;
   height: 160px;
   height: 160px;
   overflow-y: hidden
   overflow-y: hidden
 }
 }
-.collaps{
-  text-align:center;
+
+.collaps {
+  text-align: center;
   height: 30px;
   height: 30px;
   line-height: 30px;
   line-height: 30px;
   width: 80px;
   width: 80px;
   font-size: 14px;
   font-size: 14px;
-  position:absolute;
+  position: absolute;
   right: 0;
   right: 0;
   top: 0;
   top: 0;
   background: #4ea0fc;
   background: #4ea0fc;
   border-radius: 5px;
   border-radius: 5px;
   color: #ffffff;
   color: #ffffff;
 }
 }
-.isCollaps{
+
+.isCollaps {
   height: 350px !important;
   height: 350px !important;
 }
 }
 
 

src/views/tabbar/main/index.vue

@@ -184,7 +184,7 @@
           />
           />
           <span class="item_text">教师信息</span>
           <span class="item_text">教师信息</span>
         </van-grid-item>
         </van-grid-item>
-        <van-grid-item icon="photo-o" text="学生选课" url=" #/studentCourseSelection">
+        <van-grid-item icon="photo-o" text="学生选课"  url=" #/studentCourseSelection">
           <van-image
           <van-image
               style="width: 48px"
               style="width: 48px"
               :src="require('@/assets/index/rkls.png')"
               :src="require('@/assets/index/rkls.png')"
@@ -533,6 +533,7 @@ export default {
     const getpic = (img) => {
     const getpic = (img) => {
       return axios.defaults.baseURL + img;
       return axios.defaults.baseURL + img;
     };
     };
+
     const loadData = async () => {
     const loadData = async () => {
       console.log("加载数据", store);
       console.log("加载数据", store);
       goCalendar();
       goCalendar();