.env.development

@@ -2,6 +2,7 @@
 ENV = 'development'
 
 # 名学金榜学习系统/生产环境
-VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
+#VUE_APP_BASE_API = 'https://front.mingxuejinbang.com/prod-api'
+VUE_APP_BASE_API = '/prod-api'
 VUE_APP_MOBILE = "https://h5.mingxuejinbang.com"
 

README.md

@@ -1,30 +1,33 @@
-## 开发
-
-```bash
-# 克隆项目
-git clone https://gitee.com/y_project/RuoYi-Vue
-
-# 进入项目目录
-cd ruoyi-ui
-
-# 安装依赖
-npm install
-
-# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
-npm install --registry=https://registry.npm.taobao.org
-
-# 启动服务
-npm run dev
-```
-
-浏览器访问 http://localhost:80
-
-## 发布
-
-```bash
-# 构建测试环境
-npm run build:stage
-
-# 构建生产环境
-npm run build:prod
-```
+## 开发
+
+```bash
+# 克隆项目
+git clone https://gitee.com/y_project/RuoYi-Vue
+
+# 进入项目目录
+cd ruoyi-ui
+
+# 安装依赖
+npm install
+
+# 建议不要直接使用 cnpm 安装依赖，会有各种诡异的 bug。可以通过如下操作解决 npm 下载速度慢的问题
+npm install --registry=https://registry.npm.taobao.org
+
+# 启动服务
+npm run dev
+```
+
+浏览器访问 http://localhost:80
+
+## 发布
+
+```bash
+# 构建测试环境
+npm run build:stage
+
+# 构建生产环境
+npm run build:prod
+```
+
+## 原型
+[线上预览地址](https://front.mingxuejinbang.com/mxjbPrototype/index.html)

src/api/webApi/webQue.js

@@ -1,733 +1,741 @@
-import request from '@/utils/request'
-// 题库中心接口
-// 教学阶段列表
-export function pharseList() {
-  return request({
-    url: '/front/v2/pharse/list',
-    method: 'get',
-  })
-}
-
-// 课程列表
-export function subjectList() {
-  return request({
-    url: '/front/v2/papers/subjects',
-    method: 'get',
-  })
-}
-
-//  练习-课程列表
-export function smartSubjectList() {
-  return request({
-    url: '/front/v2/subject/list',
-    method: 'get',
-  })
-}
-
-// 试卷学册列表
-export function paperGrade(query) {
-  return request({
-    url: '/front/v2/papers/grades',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 练习 -- 年级列表
-export function smartGradeList(query) {
-  return request({
-    url: '/front/v2/grade/list',
-    method: 'get',
-    params: query
-  })
-}
-// 年级列表
-export function gradeList(query) {
-  return request({
-    url: '/front/v2/papers/listGrade',
-    method: 'get',
-    params: query
-  })
-}
-
-// 版本列表
-export function editionList(query) {
-  return request({
-    url: '/front/v2/edition/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 版本列表 新
-export function newEditionList(query) {
-  return request({
-    url: '/front/v2/edition/listOrdered',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获得章节树 
-export function treeList(query) {
-  return request({
-    url: '/front/v2/chapterTree/list',
-    method: 'get',
-    params: query
-  })
-}
-// 根据章节获取题库列表
-export function listByChapter(query) {
-  return request({
-    url: '/front/v2/questions/listByChapter',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 获取类型列表 
-export function papersTypes(query) {
-  return request({
-    url: '/front/v2/papers/types',
-    method: 'get',
-    params: query
-  })
-}
-// 获取地区列表 
-export function papersAreas(query) {
-  return request({
-    url: '/front/v2/papers/areas',
-    method: 'get',
-    params: query
-  })
-}
-// 获取试卷列表 
-export function papersList(query) {
-  return request({
-    url: '/front/v2/papers/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 预览试卷  
-export function preview(query) {
-  return request({
-    url: 'front/v2/papers/preview',
-    method: 'get',
-    params: query
-  })
-}
-// 收藏试卷 
-export function papersCollect(query) {
-  return request({
-    url: '/front/v2/papers/collect',
-    method: 'post',
-    params: query
-  })
-}
-// 取消收藏试卷 
-export function papersCancelCollect(query) {
-  return request({
-    url: '/front/v2/papers/cancelCollect',
-    method: 'post',
-    params: query
-  })
-}
-
-// 年份列表
-export function papersYears(query) {
-  return request({
-    url: '/front/v2/papers/years',
-    method: 'get',
-    params: query
-  })
-}
-
-// 根据科目查找题型  /front/v2/questions/listQuestionTypesBySubject
-export function qtBySubject(query) {
-  return request({
-    url: '/front/v2/questions/listQuestionTypesBySubject',
-    method: 'get',
-    params: query
-  })
-}
-//  获取知识点分类树
-export function knowledgeTree(query) {
-  return request({
-    url: '/front/v2/knowledgeTree/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 根据知识点获取题库列表 
-export function listByKnowledge(query) {
-  return request({
-    url: '/front/v2/questions/listByKnowledge',
-    method: 'get',
-    params: query
-  })
-}
-// 根据章节获取题库类型和数量
-export function countByChapter(query) {
-  return request({
-    url: '/front/v2/questions/countByChapter',
-    method: 'get',
-    params: query
-  })
-}
-
-// 根据知识点获取题型数量
-export function countByKnowledge(query) {
-  return request({
-    url: '/front/v2/questions/countByKnowledge',
-    method: 'get',
-    params: query
-  })
-}
-
-
-
-// 根据章节获取题目数量
-export function getQuestionsNumByChapter(query) {
-  return request({
-    url: '/front/v2/smartPractice/getQuestionsNumByChapter',
-    method: 'get',
-    params: query
-  })
-}
-// 根据知识点获取题目数量
-export function getQuestionsNumByKnowledge(query) {
-  return request({
-    url: '/front/v2/smartPractice/getQuestionsNumByKnowledge',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 根据章节获取题目用来练习
-export function getQuestionsByChapter(query) {
-  return request({
-    url: '/front/v2/smartPractice/getQuestionsByChapter',
-    method: 'get',
-    params: query
-  })
-}
-
-
-// 根据知识点获取题目用来练习
-export function getQuestionsByKnowledge(query) {
-  return request({
-    url: '/front/v2/smartPractice/getQuestionsByKnowledge',
-    method: 'get',
-    params: query
-  })
-}
-
-// 保存练习
-export function savePractice(query) {
-  return request({
-    url: '/front/v2/smartPractice/savePractice',
-    method: 'post',
-    params: query
-  })
-}
-
-
-// 取消收藏试题
-export function queCancelCollect(query) {
-  return request({
-    url: '/front/v2/questions/cancelCollect',
-    method: 'post',
-    params: query
-  })
-}
-
-// 收藏试题
-export function queCollect(query) {
-  return request({
-    url: '/front/v2/questions/collect',
-    method: 'post',
-    params: query
-  })
-}
-
-
-// 查询组卷记录
-export function paperRecords(query) {
-  return request({
-    url: '/front/v2/papers/paperRecords',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取试题蓝记录
-export function getQuestionCardList(query) {
-  return request({
-    url: '/front/v2/papers/getQuestionCardList',
-    method: 'get',
-    params: query
-  })
-}
-// 保存试题栏
-export function editQuestionCard(query) {
-  return request({
-    url: '/front/v2/papers/editQuestionCard',
-    method: 'post',
-    data: query,
-  })
-}
-// 清空试题栏
-export function deleteQuestionCard(query) {
-  return request({
-    url: '/front/v2/papers/deleteQuestionCard',
-    method: 'post',
-    data: query,
-  })
-}
-
-
-// 清空试题栏
-export function deletePaper(query) {
-  return request({
-    url: '/front/v2/papers/deletePaper',
-    method: 'post',
-    params: query,
-  })
-}
-
-// 收藏涉及的学科, type: question/paper
-
-export function favSubjects(query) {
-  return request({
-    url: '/front/v2/favorites/subjects',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 收藏涉及的题型
-export function favQueTypes(query) {
-  return request({
-    url: '/front/v2/favorites/qtypes',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 收藏的问题列表
-export function favQuestions(query) {
-  return request({
-    url: '/front/v2/favorites/questions',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 收藏的试卷列表
-export function favPapers(query) {
-  return request({
-    url: '/front/v2/favorites/papers',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-// 错题涉及的题型
-export function wrongTypes(query) {
-  return request({
-    url: '/front/v2/wrongBook/qtypes',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 错题涉及的学科
-export function wrongSubjects(query) {
-  return request({
-    url: '/front/v2/wrongBook/subjects',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-// 错题列表
-export function wrongQuestions(query) {
-  return request({
-    url: '/front/v2/wrongBook/wrongQuestions',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 删除错题
-export function deleteWrongQuestion(query) {
-  return request({
-    url: '/front/v2/wrongBook/deleteWrongQuestion',
-    method: 'post',
-    params: query,
-  })
-}
-
-// 数据统计（总）
-export function summary(query) {
-  return request({
-    url: '/front/v2/studyRecord/summary',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-// 数据统计-做题数量-按天
-export function questionStatsByDay(query) {
-  return request({
-    url: '/front/v2/studyRecord/questionStatsByDay',
-    method: 'get',
-    params: query,
-  })
-}
-
-//  数据统计-做题数量-按学科
-export function questionStatsBySubject(query) {
-  return request({
-    url: '/front/v2/studyRecord/questionStatsBySubject',
-    method: 'get',
-    params: query,
-  })
-}
-// 数据统计-视频观看时长 - 按天
-export function videoStatsByDay(query) {
-  return request({
-    url: '/front/v2/studyRecord/videoStatsByDay',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 数据统计-视频观看时长 - 按学科
-export function videoStatsBySubject(query) {
-  return request({
-    url: '/front/v2/studyRecord/videoStatsBySubject',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-// 视频学习记录
-export function videoWatchRecords(query) {
-  return request({
-    url: '/front/v2/studyRecord/videoWatchRecords',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 知识点诊断记录
-export function knowRecords(query) {
-  return request({
-    url: '/front/v2/studyRecord/knowledgeDiagnoseRecords',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 知识点诊断记录
-export function isCollected(query) {
-  return request({
-    url: '/front/v2/papers/isCollected',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 添加题目到试题栏
-export function addToQuestionCard(query) {
-  return request({
-    url: '/front/v2/papers/addToQuestionCard',
-    method: 'post',
-    params: query,
-  })
-}
-
-// 获取最底层的知识点
-export function listBottoms(query) {
-  return request({
-    url: '/front/v2/knowledgeTree/listBottoms',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 保存试卷
-export function savePaperInfo(query) {
-  return request({
-    url: '/front/v2/papers/savePaperInfo',
-    method: 'post',
-    data: query,
-  })
-}
-
-// 根据题目类型和数量获取题目
-export function getQuestionsByQTypeAndNum(data) {
-  return request({
-    url: '/front/v2/papers/getQuestionsByQTypeAndNum',
-    method: 'post',
-    data: data,
-  })
-}
-
-// 根据章节获取知识点
-export function knowByChapter(query) {
-  return request({
-    url: '/front/v2/knowledgeTree/listByChapter',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 获取诊断记录
-export function diagnosticRecords(query) {
-  return request({
-    url: '/front/v2/smartPractice/diagnosticRecords',
-    method: 'get',
-    params: query,
-  })
-}
-
-// /prod-api/web/student/resources/getResources
-// 前端 学生资源库列表
-export function getResources(query) {
-  return request({
-    url: '/web/student/resources/getResources',
-    method: 'get',
-    params: query,
-  })
-}
-
-// 根据数组获取题目
-export function getQuestionsByIds(query) {
-  return request({
-    url: '/front/v2/questions/getQuestionsByIds',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-//诊断详情
-export function diagnosticRecordsDetail(query) {
-  return request({
-    url: '/front/v2/smartPractice/diagnosticRecordsDetail',
-    method: 'get',
-    params: query,
-  })
-}
-//获取题目信息
-export function getQuestionInfo(query) {
-  return request({
-    url: '/front/v2/questions/getQuestionInfo',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function xkcxlist(query) {
-  return request({
-    url: '/front/syzy/xkcx/list',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-export function drawInferences(query) {
-  return request({
-    url: '/front/v2/smartPractice/drawInferences',
-    method: 'get',
-    params: query,
-  })
-}
-
-
-export function xkcxYears(query) {
-  return request({
-    url: '/front/syzy/xkcx/years',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function collectAdd(query) {
-  return request({
-    url: '/front/syzy/xkcx/collect/add',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function collectRemove(query) {
-  return request({
-    url: '/front/syzy/xkcx/collect/remove',
-    method: 'get',
-    params: query,
-  })
-}
-export function universityFilters(query) {
-  return request({
-    url: '/front/university/filters',
-    method: 'get',
-    params: query,
-  })
-}
-export function marjorsList(query) {
-  return request({
-    url: '/front/marjors/list',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function xkcxScheme(query) {
-  return request({
-    url: '/front/syzy/xkcx/scheme',
-    method: 'get',
-    params: query,
-  })
-}
-export function schemeAdd(query) {
-  return request({
-    url: '/front/syzy/xkcx/scheme/add',
-    method: 'post',
-    data: query,
-  })
-}
-
-export function getMyXkcx(query) {
-  return request({
-    url: '/front/syzy/xkcx/my',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function schemeDf(query) {
-  return request({
-    url: '/front/syzy/xkcx/scheme/df',
-    method: 'get',
-    params: query,
-  })
-}
-export function schemeDfRemove(query) {
-  return request({
-    url: '/front/syzy/xkcx/scheme/remove',
-    method: 'get',
-    params: query,
-  })
-}
-
-// /prod-api/front/v2/papers/saveToPersonResources
-// 保存到个人资料库(课件资源)
-export function saveToPersonResources(paperId) {
-  return request({
-    url: '/front/v2/papers/saveToPersonResources',
-    method: 'post',
-    params: {
-      paperId
-    },
-  })
-}
-
-// /prod-api/front/v2/papers/listCustomerPaperQeustions
-// 查询组卷题目
-export function listCustomerPaperQeustions(paperId) {
-  return request({
-    url: '/front/v2/papers/listCustomerPaperQeustions',
-    method: 'get',
-    params: {
-      paperId
-    },
-  })
-}
-
-// /prod-api/front/v2/papers/download
-// 下载试卷
-export function download(paperId, period) {
-  const baseURL = process.env.VUE_APP_BASE_API
-  const downloadUrl = baseURL + '/front/v2/papers/download?paperId=' + paperId + "&period=" + period
-  window.location.href = downloadUrl
-}
-
-
-
-// /prod-api/front/v2/papers/updateNameById
-// 修改试卷标题
-export function updateNameById(paperId, paperName) {
-  return request({
-    url: '/front/v2/papers/updateNameById',
-    method: 'post',
-    params: {
-      paperId: paperId,
-      name: paperName
-    },
-  })
-}
-
-// .填报批次
-export function zytbBatches(query) {
-  return request({
-    url: '/front/syzy/zytb/batches',
-    method: 'get',
-    params: query,
-  })
-}
-
-// .填报批次
-export function zytbMarjor(query) {
-  return request({
-    url: '/front/syzy/zytb/marjor',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function zytbUniversity(query) {
-  return request({
-    url: '/front/syzy/zytb/university',
-    method: 'get',
-    params: query,
-  })
-}
-
-export function zytbSave(data) {
-  return request({
-    url: '/front/syzy/zytb/save',
-    method: 'post',
-    data: data,
-  })
-}
-
-export function zytbFilter(batch) {
-  return request({
-    url: '/front/syzy/zytb/university/filters',
-    method: 'get',
-    params: { batch }
-  })
-}
-
-// /prod-api/front/v2/papers/downloadRealPaper
-// 下载真題试卷
-export function downloadRealPaper(paperId, period) {
-  const baseURL = process.env.VUE_APP_BASE_API
-  const downloadUrl = baseURL + '/front/v2/papers/downloadRealPaper?paperId=' + paperId + "&period=" + period
-  window.location.href = downloadUrl
-}
-
-
+import request from '@/utils/request'
+// 题库中心接口
+// 教学阶段列表
+export function pharseList() {
+  return request({
+    url: '/front/v2/pharse/list',
+    method: 'get',
+  })
+}
+
+// 课程列表
+export function subjectList() {
+  return request({
+    url: '/front/v2/papers/subjects',
+    method: 'get',
+  })
+}
+
+//  练习-课程列表
+export function smartSubjectList() {
+  return request({
+    url: '/front/v2/subject/list',
+    method: 'get',
+  })
+}
+
+// 试卷学册列表
+export function paperGrade(query) {
+  return request({
+    url: '/front/v2/papers/grades',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 练习 -- 年级列表
+export function smartGradeList(query) {
+  return request({
+    url: '/front/v2/grade/list',
+    method: 'get',
+    params: query
+  })
+}
+// 年级列表
+export function gradeList(query) {
+  return request({
+    url: '/front/v2/papers/listGrade',
+    method: 'get',
+    params: query
+  })
+}
+
+// 版本列表
+export function editionList(query) {
+  return request({
+    url: '/front/v2/edition/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 版本列表 新
+export function newEditionList(query) {
+  return request({
+    url: '/front/v2/edition/listOrdered',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得章节树
+export function treeList(query) {
+  return request({
+    url: '/front/v2/chapterTree/list',
+    method: 'get',
+    params: query
+  })
+}
+// 根据章节获取题库列表
+export function listByChapter(query) {
+  return request({
+    url: '/front/v2/questions/listByChapter',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 获取类型列表
+export function papersTypes(query) {
+  return request({
+    url: '/front/v2/papers/types',
+    method: 'get',
+    params: query
+  })
+}
+// 获取地区列表
+export function papersAreas(query) {
+  return request({
+    url: '/front/v2/papers/areas',
+    method: 'get',
+    params: query
+  })
+}
+// 获取试卷列表
+export function papersList(query) {
+  return request({
+    url: '/front/v2/papers/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 预览试卷
+export function preview(query) {
+  return request({
+    url: 'front/v2/papers/preview',
+    method: 'get',
+    params: query
+  })
+}
+// 收藏试卷
+export function papersCollect(query) {
+  return request({
+    url: '/front/v2/papers/collect',
+    method: 'post',
+    params: query
+  })
+}
+// 取消收藏试卷
+export function papersCancelCollect(query) {
+  return request({
+    url: '/front/v2/papers/cancelCollect',
+    method: 'post',
+    params: query
+  })
+}
+
+// 年份列表
+export function papersYears(query) {
+  return request({
+    url: '/front/v2/papers/years',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据科目查找题型  /front/v2/questions/listQuestionTypesBySubject
+export function qtBySubject(query) {
+  return request({
+    url: '/front/v2/questions/listQuestionTypesBySubject',
+    method: 'get',
+    params: query
+  })
+}
+//  获取知识点分类树
+export function knowledgeTree(query) {
+  return request({
+    url: '/front/v2/knowledgeTree/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据知识点获取题库列表
+export function listByKnowledge(query) {
+  return request({
+    url: '/front/v2/questions/listByKnowledge',
+    method: 'get',
+    params: query
+  })
+}
+// 根据章节获取题库类型和数量
+export function countByChapter(query) {
+  return request({
+    url: '/front/v2/questions/countByChapter',
+    method: 'get',
+    params: query
+  })
+}
+
+// 根据知识点获取题型数量
+export function countByKnowledge(query) {
+  return request({
+    url: '/front/v2/questions/countByKnowledge',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+// 根据章节获取题目数量
+export function getQuestionsNumByChapter(query) {
+  return request({
+    url: '/front/v2/smartPractice/getQuestionsNumByChapter',
+    method: 'get',
+    params: query
+  })
+}
+// 根据知识点获取题目数量
+export function getQuestionsNumByKnowledge(query) {
+  return request({
+    url: '/front/v2/smartPractice/getQuestionsNumByKnowledge',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 根据章节获取题目用来练习
+export function getQuestionsByChapter(query) {
+  return request({
+    url: '/front/v2/smartPractice/getQuestionsByChapter',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 根据知识点获取题目用来练习
+export function getQuestionsByKnowledge(query) {
+  return request({
+    url: '/front/v2/smartPractice/getQuestionsByKnowledge',
+    method: 'get',
+    params: query
+  })
+}
+
+// 保存练习
+export function savePractice(query) {
+  return request({
+    url: '/front/v2/smartPractice/savePractice',
+    method: 'post',
+    params: query
+  })
+}
+
+
+// 取消收藏试题
+export function queCancelCollect(query) {
+  return request({
+    url: '/front/v2/questions/cancelCollect',
+    method: 'post',
+    params: query
+  })
+}
+
+// 收藏试题
+export function queCollect(query) {
+  return request({
+    url: '/front/v2/questions/collect',
+    method: 'post',
+    params: query
+  })
+}
+
+
+// 查询组卷记录
+export function paperRecords(query) {
+  return request({
+    url: '/front/v2/papers/paperRecords',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获取试题蓝记录
+export function getQuestionCardList(query) {
+  return request({
+    url: '/front/v2/papers/getQuestionCardList',
+    method: 'get',
+    params: query
+  })
+}
+// 保存试题栏
+export function editQuestionCard(query) {
+  return request({
+    url: '/front/v2/papers/editQuestionCard',
+    method: 'post',
+    data: query,
+  })
+}
+// 清空试题栏
+export function deleteQuestionCard(query) {
+  return request({
+    url: '/front/v2/papers/deleteQuestionCard',
+    method: 'post',
+    data: query,
+  })
+}
+
+
+// 清空试题栏
+export function deletePaper(query) {
+  return request({
+    url: '/front/v2/papers/deletePaper',
+    method: 'post',
+    params: query,
+  })
+}
+
+// 收藏涉及的学科, type: question/paper
+
+export function favSubjects(query) {
+  return request({
+    url: '/front/v2/favorites/subjects',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 收藏涉及的题型
+export function favQueTypes(query) {
+  return request({
+    url: '/front/v2/favorites/qtypes',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 收藏的问题列表
+export function favQuestions(query) {
+  return request({
+    url: '/front/v2/favorites/questions',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 收藏的试卷列表
+export function favPapers(query) {
+  return request({
+    url: '/front/v2/favorites/papers',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+// 错题涉及的题型
+export function wrongTypes(query) {
+  return request({
+    url: '/front/v2/wrongBook/qtypes',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 错题涉及的学科
+export function wrongSubjects(query) {
+  return request({
+    url: '/front/v2/wrongBook/subjects',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+// 错题列表
+export function wrongQuestions(query) {
+  return request({
+    url: '/front/v2/wrongBook/wrongQuestions',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 删除错题
+export function deleteWrongQuestion(query) {
+  return request({
+    url: '/front/v2/wrongBook/deleteWrongQuestion',
+    method: 'post',
+    params: query,
+  })
+}
+
+// 数据统计（总）
+export function summary(query) {
+  return request({
+    url: '/front/v2/studyRecord/summary',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+// 数据统计-做题数量-按天
+export function questionStatsByDay(query) {
+  return request({
+    url: '/front/v2/studyRecord/questionStatsByDay',
+    method: 'get',
+    params: query,
+  })
+}
+
+//  数据统计-做题数量-按学科
+export function questionStatsBySubject(query) {
+  return request({
+    url: '/front/v2/studyRecord/questionStatsBySubject',
+    method: 'get',
+    params: query,
+  })
+}
+// 数据统计-视频观看时长 - 按天
+export function videoStatsByDay(query) {
+  return request({
+    url: '/front/v2/studyRecord/videoStatsByDay',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 数据统计-视频观看时长 - 按学科
+export function videoStatsBySubject(query) {
+  return request({
+    url: '/front/v2/studyRecord/videoStatsBySubject',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+// 视频学习记录
+export function videoWatchRecords(query) {
+  return request({
+    url: '/front/v2/studyRecord/videoWatchRecords',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 知识点诊断记录
+export function knowRecords(query) {
+  return request({
+    url: '/front/v2/studyRecord/knowledgeDiagnoseRecords',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 知识点诊断记录
+export function isCollected(query) {
+  return request({
+    url: '/front/v2/papers/isCollected',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 添加题目到试题栏
+export function addToQuestionCard(query) {
+  return request({
+    url: '/front/v2/papers/addToQuestionCard',
+    method: 'post',
+    params: query,
+  })
+}
+
+// 获取最底层的知识点
+export function listBottoms(query) {
+  return request({
+    url: '/front/v2/knowledgeTree/listBottoms',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 保存试卷
+export function savePaperInfo(query) {
+  return request({
+    url: '/front/v2/papers/savePaperInfo',
+    method: 'post',
+    data: query,
+  })
+}
+
+// 根据题目类型和数量获取题目
+export function getQuestionsByQTypeAndNum(data) {
+  return request({
+    url: '/front/v2/papers/getQuestionsByQTypeAndNum',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 根据章节获取知识点
+export function knowByChapter(query) {
+  return request({
+    url: '/front/v2/knowledgeTree/listByChapter',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 获取诊断记录
+export function diagnosticRecords(query) {
+  return request({
+    url: '/front/v2/smartPractice/diagnosticRecords',
+    method: 'get',
+    params: query,
+  })
+}
+
+// /prod-api/web/student/resources/getResources
+// 前端 学生资源库列表
+export function getResources(query) {
+  return request({
+    url: '/web/student/resources/getResources',
+    method: 'get',
+    params: query,
+  })
+}
+
+// 根据数组获取题目
+export function getQuestionsByIds(query) {
+  return request({
+    url: '/front/v2/questions/getQuestionsByIds',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+//诊断详情
+export function diagnosticRecordsDetail(query) {
+  return request({
+    url: '/front/v2/smartPractice/diagnosticRecordsDetail',
+    method: 'get',
+    params: query,
+  })
+}
+//获取题目信息
+export function getQuestionInfo(query) {
+  return request({
+    url: '/front/v2/questions/getQuestionInfo',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function xkcxlist(query) {
+  return request({
+    url: '/front/syzy/xkcx/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function xkcxlistByMarjors(query) {
+  return request({
+    url: '/front/syzy/xkcx/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+export function drawInferences(query) {
+  return request({
+    url: '/front/v2/smartPractice/drawInferences',
+    method: 'get',
+    params: query,
+  })
+}
+
+
+export function xkcxYears(query) {
+  return request({
+    url: '/front/syzy/xkcx/years',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function collectAdd(query) {
+  return request({
+    url: '/front/syzy/xkcx/collect/add',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function collectRemove(query) {
+  return request({
+    url: '/front/syzy/xkcx/collect/remove',
+    method: 'get',
+    params: query,
+  })
+}
+export function universityFilters(query) {
+  return request({
+    url: '/front/university/filters',
+    method: 'get',
+    params: query,
+  })
+}
+export function marjorsList(query) {
+  return request({
+    url: '/front/marjors/list',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function xkcxScheme(query) {
+  return request({
+    url: '/front/syzy/xkcx/scheme',
+    method: 'get',
+    params: query,
+  })
+}
+export function schemeAdd(query) {
+  return request({
+    url: '/front/syzy/xkcx/scheme/add',
+    method: 'post',
+    data: query,
+  })
+}
+
+export function getMyXkcx(query) {
+  return request({
+    url: '/front/syzy/xkcx/my',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function schemeDf(query) {
+  return request({
+    url: '/front/syzy/xkcx/scheme/df',
+    method: 'get',
+    params: query,
+  })
+}
+export function schemeDfRemove(query) {
+  return request({
+    url: '/front/syzy/xkcx/scheme/remove',
+    method: 'get',
+    params: query,
+  })
+}
+
+// /prod-api/front/v2/papers/saveToPersonResources
+// 保存到个人资料库(课件资源)
+export function saveToPersonResources(paperId) {
+  return request({
+    url: '/front/v2/papers/saveToPersonResources',
+    method: 'post',
+    params: {
+      paperId
+    },
+  })
+}
+
+// /prod-api/front/v2/papers/listCustomerPaperQeustions
+// 查询组卷题目
+export function listCustomerPaperQeustions(paperId) {
+  return request({
+    url: '/front/v2/papers/listCustomerPaperQeustions',
+    method: 'get',
+    params: {
+      paperId
+    },
+  })
+}
+
+// /prod-api/front/v2/papers/download
+// 下载试卷
+export function download(paperId, period) {
+  const baseURL = process.env.VUE_APP_BASE_API
+  const downloadUrl = baseURL + '/front/v2/papers/download?paperId=' + paperId + "&period=" + period
+  window.location.href = downloadUrl
+}
+
+
+
+// /prod-api/front/v2/papers/updateNameById
+// 修改试卷标题
+export function updateNameById(paperId, paperName) {
+  return request({
+    url: '/front/v2/papers/updateNameById',
+    method: 'post',
+    params: {
+      paperId: paperId,
+      name: paperName
+    },
+  })
+}
+
+// .填报批次
+export function zytbBatches(query) {
+  return request({
+    url: '/front/syzy/zytb/batches',
+    method: 'get',
+    params: query,
+  })
+}
+
+// .填报批次
+export function zytbMarjor(query) {
+  return request({
+    url: '/front/syzy/zytb/marjor',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function zytbUniversity(query) {
+  return request({
+    url: '/front/syzy/zytb/university',
+    method: 'get',
+    params: query,
+  })
+}
+
+export function zytbSave(data) {
+  return request({
+    url: '/front/syzy/zytb/save',
+    method: 'post',
+    data: data,
+  })
+}
+
+export function zytbFilter(batch) {
+  return request({
+    url: '/front/syzy/zytb/university/filters',
+    method: 'get',
+    params: { batch }
+  })
+}
+
+// /prod-api/front/v2/papers/downloadRealPaper
+// 下载真題试卷
+export function downloadRealPaper(paperId, period) {
+  const baseURL = process.env.VUE_APP_BASE_API
+  const downloadUrl = baseURL + '/front/v2/papers/downloadRealPaper?paperId=' + paperId + "&period=" + period
+  window.location.href = downloadUrl
+}
+
+

src/router/index.js

@@ -677,7 +677,7 @@ export const constantRoutes = [{
       },
       {
         path: '/career/subject/subjectChoice',
-        component: (resolve) => require(['@/views/career/subject/subjectChoice'], resolve),
+        component: (resolve) => require(['@/views/career/subject/subjectChoice.vue'], resolve),
         name: 'SubjectChoice',
         meta: {
           title: '由科目选专业'

src/store/modules/user.js

@@ -39,6 +39,7 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
+          console.log('xxxxxxxxxxx', res);
           const user = res.data
           user.avatar == user.avatar || require("@/assets/images/profile.jpg")
           commit('RELOAD', user)

src/views/career/subject/majorChoice.vue

@@ -13,20 +13,106 @@
       </el-breadcrumb>
     </div>
     <div class="content-box">
-      <div class="content-top-box">
-        <div class="content-box-title">招生专业的选科要求</div>
-        <div class="my-subject-button" @click="toMyPage()">我的选科方案</div>
+      <div class="xkcx-input-box">
+        <div>
+          <el-select
+            v-model="selected.selectNian"
+            @change="onChangeYear"
+            placeholder="全部年份"
+          >
+            <el-option
+              v-for="(item, index) in selected.yearList"
+              :key="index"
+              :label="item"
+              :value="item"
+            >
+            </el-option>
+          </el-select>
+        </div>
+        <div class="button-school">
+          <el-button plain @click="onChangeSchoolPopup">
+            学校
+            <i class="el-icon-my-button"></i>
+          </el-button>
+        </div>
+        <div class="button-major">
+          <el-button plain @click="onChangeMajorPopup">
+            专业<i class="el-icon-my-button"></i
+          ></el-button>
+        </div>
+        <div class="search_header">
+          <input
+            placeholder="搜索专业"
+            v-model="keyword"
+            @keyup.enter="httpGetXkcxList()"
+          />
+          <img
+            src="@/assets/images/icon_search2.png"
+            alt=""
+            @click="httpGetXkcxList()"
+          />
+        </div>
       </div>
-      <div class="content-msg">
-        新高考改革方案，志愿填报将采取“专业+学校”的填报方式，由学校平行志愿转变为专业平行志愿，每个招生专业都有相应的选考科目要求。您可以通过此功能查询各学校各专业的选考科目要求。
+      <div class="popup-box major-box">
+        <div class="popup-select">
+          <div
+            class="popup-select-item"
+            :class="selected.marjorsType == '本科' ? 'active' : ''"
+            @click="clickMarjorsType('本科')"
+          >
+            本科
+          </div>
+          <div
+            class="popup-select-item"
+            :class="selected.marjorsType == '专科' ? 'active' : ''"
+            @click="clickMarjorsType('专科')"
+          >
+            专科
+          </div>
+        </div>
+        <div class="choice-box">
+          <div class="choice-item">
+            <div
+              class="choice-item-menv"
+              v-for="(item, index) in selected.marjorsList.one"
+              :key="index"
+              :class="selected.curMarjors.one.code == item.code ? 'active' : ''"
+              @click="changeMajor(item)"
+            >
+              {{ item.name }}
+            </div>
+          </div>
+          <div class="choice-item">
+            <div
+              class="choice-item-menv"
+              v-for="(item, index) in selected.marjorsList.two"
+              :key="index"
+              :class="selected.curMarjors.two.code == item.code ? 'active' : ''"
+              @click="changeMajor(item)"
+            >
+              {{ item.name }}
+            </div>
+          </div>
+          <div class="choice-item">
+            <el-checkbox-group v-model="selected.curMarjors.three" @change="httpGetXkcxList">
+              <el-checkbox
+                class="choice-item-checkbox"
+                label="全选"
+                @change="onSelectMarjorsAll"
+              ></el-checkbox>
+              <el-checkbox
+                class="choice-item-checkbox"
+                :label="item.name"
+                v-for="(item, index) in selected.marjorsList.three"
+                :key="index"
+              ></el-checkbox>
+            </el-checkbox-group>
+          </div>
+        </div>
       </div>
 
-      <div class="table-box">
-        <mx-table
-          :rows="dataList"
-          :propDefines="propDefines"
-          @selection-change="handleSelectionChange"
-        >
+      <div class="concerned-college-container">
+        <mx-table :rows="dataList" :propDefines="propDefines">
           <template #select="{ row }">
             <img
               class="college-icon"
@@ -51,81 +137,55 @@
           @pagination="onChangePage"
         />
       </div>
-      <div class="button-box">
-        <el-button @click="httpXkcxScheme">提交选科方案</el-button>
-      </div>
-    </div>
-    <div class="major-list-box" v-if="xkcxSchemeTotal>0">
-      <div class="major-list-title">
-        如需填报以上专业，您有以下<span>{{ xkcxSchemeTotal }}</span
-        >种选科组合可以选择
-      </div>
-      <div class="major-card-list">
-        <div
-          class="divide-equally-box"
-          v-for="(item, index) in xkcxSchemeList"
-          :key="index"
-        >
-          <div class="major-card-item">
-            <div class="major-card-title">{{ item.course }}</div>
-            <div class="major-progress-box">
-              <el-progress
-                type="circle"
-                stroke-width="14"
-                width="96"
-                color="#c8eee3"
-                :percentage="item.marjorRate"
-              ></el-progress>
-              <div class="major-progress-text">
-                可报{{ item.marjorRate }}%的专业
-              </div>
-            </div>
-            <div class="major-card-bottom-box">
-              <div class="major-card-msg" v-if="item.collect">
-                <i class="el-icon-circle-check"></i> 已加入我的选科方案
-              </div>
-              <div v-else class="major-card-button" @click="onClickJoin(item)">
-                加入我的选科方案
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { xkcxScheme, schemeAdd,xkcxlist } from "@/api/webApi/webQue";
+import {xkcxYears, collectAdd, collectRemove, marjorsList, xkcxlistByMarjors} from "@/api/webApi/webQue";
 
 export default {
   data() {
     return {
+      selected: {
+        yearList: [],
+        selectNian: '',
+        marjorsType: "本科",
+        marjorsLevel: 1,
+        marjorsCode: "",
+        marjorsList: {
+          one: [], two: [], three: []
+        },
+        curMarjors: {
+          one: "", two: "", three: []
+        }
+      },
       dataList: [
       ],
       propDefines: {
-        selection: {
-          type: "selection"
-        },
         universityName: {
           label: "院校名称",
         },
         marjorName: {
           label: "专业（类）名称",
         },
-        resourcesName: {
-          label: "类中所含专业",
+        marjorBelongs: {
+          label: "专业备注",
           align: "left",
         },
         level: {
           label: "专业层次",
         },
         courseRemark0: {
-          label: "首选科目",
+          label: "首选科目范围",
           align: "left",
         },
         courseRemark1: {
-          label: "再选科目",
+          label: "再选科目范围",
+          align: "left",
+        },
+        year: {
+          label: "年份",
           align: "left",
         },
         collect: {
@@ -139,68 +199,131 @@ export default {
       pageNum: 1,
       pageSize: 10,
       total: 0,
-      xkcxSchemeTotal: 0,
-      xkcxSchemeList: [],
+      keyword: ''
     };
   },
   created() {
-    this.httpGetXkcxList();
+    this.httpGetXkcxYears();
+    this.httpGetMarjorsList();
   },
   methods: {
-    onChangePage(page) {
-      this.pageSize = page.limit;
-      this.pageNum = page.page;
-      this.httpGetXkcxList();
+    httpGetXkcxYears() {
+      xkcxYears().then((res) => {
+        this.selected.yearList = res.data || [];
+        this.selected.selectNian = this.selected.yearList[0]
+      });
     },
-    handleSelectionChange(list) {
-      let ids = [];
-      let len = list.length;
-      for (let i = 0; i < len; i++) {
-        ids.push(list[i]["id"]);
-      }
-      this.selectIds = ids;
+    onChangeYear(res) {
+      //切换学年时，取第1页
+      this.pageNum = 1;
+      this.httpGetMarjorsList();
     },
-    onClickJoin(item) {
-      this.httpSchemeAdd(item.id);
+    onChangeSchoolPopup() {
+      this.isShowSchoolPopup = !this.isShowSchoolPopup;
     },
-    httpSchemeAdd(id) {
-      schemeAdd({
-        groupId: id,
-        df: 0,
-      }).then((res) => {
-        this.httpXkcxScheme();
-        console.log(res);
-      });
+    onChangeMajorPopup() {
+      this.isShowMajorPopup = !this.isShowMajorPopup;
     },
-    toMyPage() {
-      this.$router.push("/career/subject/myChoice");
+
+    clickMarjorsType(type) {
+      this.selected.marjorsType = type;
+      this.selected.marjorsLevel = 1;
+      this.selected.marjorsCode = "";
+      this.httpGetMarjorsList();
     },
-    httpXkcxScheme() {
-      if (this.selectIds.length == 0) {
-        this.$message.error("请选择专业");
-        return;
+    onSelectMarjorsAll(res) {
+      if (res) {
+        let len = this.selected.marjorsList.three.length;
+        for (let i = 0; i < len; i++) {
+          let name = this.selected.marjorsList.three[i]["name"];
+          let index = this.selected.curMarjors.three.indexOf(name);
+          if (index < 0) {
+            this.selected.curMarjors.three.push(name);
+          }
+        }
+      } else {
+        this.selected.curMarjors.three = [];
       }
-      xkcxScheme({
-        ids: this.selectIds.toString(),
+    },
+    changeMajor(res) {
+      this.selected.curMarjors.three = [];
+      switch (res.level) {
+        case 1:
+          this.selected.curMarjors.one = res;
+          break;
+        case 2:
+          this.selected.curMarjors.two = res;
+          break;
+      }
+      this.selected.marjorsCode = res.code;
+      this.selected.marjorsLevel = res.level + 1;
+      this.httpGetMarjorsList();
+    },
+    httpGetMarjorsList() {
+      marjorsList({
+        type: this.selected.marjorsType,
+        level: this.selected.marjorsLevel,
+        code: this.selected.marjorsCode,
       }).then((res) => {
-        this.xkcxSchemeList = res.rows;
-        this.xkcxSchemeTotal = res.total;
+        switch (this.selected.marjorsLevel) {
+          case 2:
+            this.selected.marjorsList.two = res.rows;
+            this.changeMajor(res.rows[0]);
+            break;
+          case 3:
+            this.selected.marjorsList.three = res.rows;
+            this.httpGetXkcxList();
+            break;
+          default:
+            this.selected.marjorsList.one = res.rows;
+            this.changeMajor(res.rows[0]);
+            break;
+        }
       });
     },
+    // 查询结果
     httpGetXkcxList() {
-      xkcxlist({
-        collect:true,
+      if (this.selected.curMarjors.three.length<1) return;
+
+      //console.log(this.selected);return;
+      xkcxlistByMarjors({
+        level:this.selected.marjorsType.toString(),
+        keyword: this.keyword,
+        year: this.selected.selectNian.toString(),
+        marjors: this.selected.curMarjors.one.name + "," + this.selected.curMarjors.two.name + "," + this.selected.curMarjors.three.join(","),
         pageNum: this.pageNum,
         pageSize: this.pageSize,
       })
         .then((res) => {
           this.dataList = res.rows;
           this.total = res.total;
+          this.isShowTable = true;
         })
         .catch((err) => {
           console.log("请求出错！");
+          this.cleanSchoolSelect();
         });
     },
+
+    onChangePage(page) {
+      this.pageSize = page.limit;
+      this.pageNum = page.page;
+      this.httpGetXkcxList();
+    },
+    // 收藏
+    httpCollectAdd(row) {
+      row.collect = true;
+      collectAdd({
+        refId: row.id,
+      });
+    },
+    // 取消收藏
+    httpCollectRemove(row) {
+      row.collect = false;
+      collectRemove({
+        refId: row.id,
+      });
+    },
   },
 };
 </script>
@@ -215,104 +338,102 @@ export default {
   background-color: #fff;
   box-shadow: 0 1px 2px 0 rgb(0 0 0 / 5%);
 }
-.el-breadcrumb {
-  font-size: 16px !important;
-}
 .content-box {
-  padding: 60px 40px 60px 50px;
+  padding: 10px 40px 10px 50px;
 }
-.content-box-title {
-  color: #47c6a2;
-  font-size: 24px;
+.major-list-title span {
+  color: #d28140;
 }
-.content-top-box {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
+
+el-button {
+  padding: 9px 20px;
 }
-.my-subject-button {
-  color: #47c6a2;
-  cursor: pointer;
-  font-size: 14px;
-  border: 1px solid #47c6a2;
-  padding: 13px 110px;
+.button-school {
+  margin: 0 10px;
 }
-.content-msg {
-  margin: 32px 0;
+.el-icon-my-button {
+  background: url(../../../assets/images/subject/icon_shaixuan.png) center no-repeat;
+  background-size: cover;
+}
+
+.el-icon-my-button:before {
+  content: "替";
   font-size: 16px;
+  visibility: hidden;
 }
-.button-box {
-  padding: 30px;
+
+
+.major-box {
   display: flex;
-  justify-content: center;
+  margin-bottom: 30px;
 }
-.major-list-title {
-  color: #4c4c4c;
-  font-size: 24px;
-  text-align: center;
-  margin-top: 100px;
+.popup-select {
+  border-right: 1px solid #d7d7d7;
 }
-.major-list-title span {
-  color: #d28140;
+.popup-select-item {
+  cursor: pointer;
+  line-height: 30px;
+  width: 100px;
+  padding: 0 20px 0 30px;
 }
-.major-card-list {
-  margin-top: 30px;
+.popup-select-item.active {
+  color: #47c6a2;
+  border-right: 2px solid #47c6a2;
+}
+.choice-box {
   display: flex;
-  flex-wrap: wrap;
 }
-.divide-equally-box {
-  width: 33%;
-  margin: 0px auto;
+.choice-item {
+  margin: 0 10px;
+  min-width: 300px;
+  border: 1px solid #d7d7d7;
+  height: 300px;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.choice-item-menv {
+  margin: 15px 20px;
+  cursor: pointer;
 }
-.major-card-item {
-  width: 320px;
-  margin: 20px auto;
-  background: rgba(255, 255, 255, 1);
-  box-shadow: 2px 2px 10px 0px rgb(0 0 0 / 10%);
-  margin-top: 20px;
+.choice-item-menv.active {
+  color: #47c6a2;
 }
-.major-card-title {
-  text-align: center;
-  background: #47c6a2;
-  color: #fff;
-  font-size: 24px;
-  font-weight: 600;
-  padding: 25px 0px;
+.choice-item-checkbox {
+  padding: 10px 20px;
+  width: 100%;
+  box-sizing: border-box;
 }
-.major-progress-box {
-  padding: 40px 0 20px 0;
+
+
+.xkcx-input-box {
+  padding: 20px 0 0;
   display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.major-progress-text {
-  margin-top: 20px;
+  margin-bottom: 20px;
+  border-bottom: 2px solid #47c6a2;
 }
-.major-card-bottom-box {
-  border-top: 1px solid #eee;
-  margin: 0 auto;
-  width: 80%;
-  padding: 20px 0;
+.search_header {
+  margin-left: auto;
   display: flex;
-  flex-direction: column;
+  flex-direction: row;
   align-items: center;
+  justify-content: flex-end;
+  position: relative;
+  margin-right: 20px;
 }
-.major-card-button {
-  width: 100%;
-  background: #47c6a2;
-  color: #fff;
-  height: 48px;
-  text-align: center;
-  line-height: 48px;
+.search_header img {
+  position: absolute;
+  right: 20px;
   cursor: pointer;
+  top: 6px;
 }
-.major-card-msg {
-  height: 48px;
-  line-height: 48px;
-  color: #73a0fa;
-}
-/deep/ .el-progress__text {
-  font-size: 18px !important;
-  color: #73a0fa;
+.search_header input {
+  background: #f7f7ff;
+  border-radius: 20px;
+  border: 1px solid #c6cbf5;
+  outline: none;
+  width: 340px;
+  height: 32px;
+  padding-left: 24px;
 }
+
 </style>