From 78156aa614bfeabd22f95132f8efb4f055f26e80 Mon Sep 17 00:00:00 2001
From: yangzhi <765157588@qq.com>
Date: Fri, 15 Apr 2022 12:41:50 +0800
Subject: [PATCH] 级联菜单

---
 src/api/HistoryAnswer.js                | 20 +++++++++++++-------
 src/utils/routerList.js                 |  9 +++++++++
 src/views/AnswerResult/detail.vue       | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/QuestionBank/index.vue        | 40 ++++++++++++++++++++++++++++++++++++++--
 src/views/TestPaper/ManualTestPaper.vue | 59 +++++++++++++++++++++++++++++++++++++++++++++++++----------
 src/views/TestPaper/index.vue           | 35 +++++++++++++++++++++++++++++++++++
 src/views/user/userlist.vue             |  4 ++++
 7 files changed, 230 insertions(+), 19 deletions(-)
 create mode 100644 src/views/AnswerResult/detail.vue

diff --git a/src/api/HistoryAnswer.js b/src/api/HistoryAnswer.js
index 19f24f6..2929eb6 100644
--- a/src/api/HistoryAnswer.js
+++ b/src/api/HistoryAnswer.js
@@ -1,10 +1,16 @@
 import request from '@/utils/request'
- 
+
 export function GetHistoryList(params) {
-	return request({
-		url: `/HistoryAnswerInfo/GetHistoryAnswerListByUser`,
-		method: 'get',
-		params
-	})
+    return request({
+        url: `/HistoryAnswerInfo/GetHistoryAnswerListByUser`,
+        method: 'get',
+        params
+    })
 }
- 
\ No newline at end of file
+
+export function SelectQuestionBankListForHistoryId(id) {
+    return request({
+        url: `/HistoryAnswerInfo/SelectQuestionBankListForHistoryId?hid=${id}`,
+        method: 'post'
+    });
+}
\ No newline at end of file
diff --git a/src/utils/routerList.js b/src/utils/routerList.js
index 8c3a650..2bacd97 100644
--- a/src/utils/routerList.js
+++ b/src/utils/routerList.js
@@ -26,6 +26,15 @@ export function getRoutes() {
             },
 
             {
+                path: '/answerDetail',
+                name: '答题详情',
+                component: () =>
+                    import ('@/views/AnswerResult/detail.vue'),
+                hidden: true
+            },
+
+
+            {
                 path: '/',
                 component: Layout,
                 redirect: '/dashboard',
diff --git a/src/views/AnswerResult/detail.vue b/src/views/AnswerResult/detail.vue
new file mode 100644
index 0000000..a725673
--- /dev/null
+++ b/src/views/AnswerResult/detail.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="container">
+    <h3>{{ info.TestPaperName }}</h3>
+    <div class="header-opts">
+        <el-button type="text">查看回放</el-button>
+    </div>
+    <div class="questions">
+      <el-card class="box-card" v-for="item in list" :key="item.id">
+        <h4>
+          <el-tag size="mini" type="success" effect="dark">{{
+            item.QuestionClassName
+          }}</el-tag>
+          【{{ item.subjectName }}】{{ item.subject }}
+        </h4>
+        <ul v-if="item.subjectType == 1">
+          <li v-for="i in item.subjectContentObj" :key="i.option">
+            <el-tag size="mini" type="primary" effect="dark">{{
+              i.option
+            }}</el-tag>
+            {{ i.optionContent }}
+          </li>
+        </ul>
+        <p v-if="item.subjectType == 1">Ta的答案:{{ item.answer }}</p>
+        <p v-if="item.subjectType == 1">正确答案:B</p>
+      </el-card>
+    </div>
+  </div>
+</template>
+<style lang="scss" scoped>
+.container {
+  width: 80%;
+  max-width: 1200px;
+  min-width: 600px;
+  margin: 0 auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  .header-opts{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 10px;
+  }
+  .questions {
+    width: 100%;
+  }
+  li {
+    list-style: none;
+    margin-bottom: 10px;
+  }
+}
+</style>
+<script>
+import { SelectQuestionBankListForHistoryId } from "@/api/HistoryAnswer";
+export default {
+  data() {
+    return {
+      info: {},
+      list: [],
+    };
+  },
+  created() {
+    let id = this.$route.query.id;
+    this.getDetail(id);
+  },
+  methods: {
+    getDetail(id) {
+      SelectQuestionBankListForHistoryId(id).then((res) => {
+        let { info, list } = res.data.data;
+        this.info = info;
+        this.list = list.map((t) => {
+          t.subjectContentObj = JSON.parse(t.subjectContent);
+          return t;
+        });
+      });
+    },
+    getList() {},
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/QuestionBank/index.vue b/src/views/QuestionBank/index.vue
index 414e074..1945f8b 100644
--- a/src/views/QuestionBank/index.vue
+++ b/src/views/QuestionBank/index.vue
@@ -156,7 +156,7 @@
         </el-form-item>
         <el-form-item label="分类" style="padding-top: 5px">
           <el-cascader @change="changequestionclass" v-model="Dataform.QuestionClassId" style="width: 400px"
-            :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="QuestionClass">
+            :props="{ emitPath: false ,checkStrictly:true}" :clearable="true" :options="randomQuestionTypeList">
           </el-cascader>
         </el-form-item>
         <el-form-item label="题型" style="padding-top: 5px">
@@ -241,6 +241,7 @@
     },
     data() {
       return {
+        randomQuestionTypeList:[],
         FormClassType: 0,
         loading: false,
         currentEditDimension: {},
@@ -294,7 +295,9 @@
         scoreRules:['高','中','低'],
       };
     },
-    created() { },
+    created() { 
+      this.getQuestionClassListHeadler2();
+    },
     mounted() {
       let ContentAreaHight =
         window.innerHeight - document.getElementById("elRow").offsetTop - 70;
@@ -308,6 +311,39 @@
       this.getQuestionClassListHeadler();
     },
     methods: {
+      getSubTree(id, list) {
+        let result = [];
+        result = list.filter((t) => t.ParentId == id);
+        if (result.length) {
+          result = result.map((item) => {
+            item.value = item.id;
+            item.label = item.ClassificationName;
+            item.children = this.getSubTree(item.id, list);
+            if(!item.children || !item.children.length){
+              delete item.children;
+            }
+            return item;
+          });
+        }
+        return result;
+      },
+      getQuestionClassListHeadler2() {
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let alllist = res.data.data;
+          let list  = alllist.filter(t=>!t.ParentId);
+          list = list.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id,alllist);
+            if(!t.children || !t.children.length){
+              delete t.children;
+            }
+            return t;
+          });
+          this.randomQuestionTypeList = list;
+        });
+      },
       AddSubject() { 
         this.FormClassType = 0;
         // if(!this.Dataform.scoperule)
diff --git a/src/views/TestPaper/ManualTestPaper.vue b/src/views/TestPaper/ManualTestPaper.vue
index bc89f66..65ce745 100644
--- a/src/views/TestPaper/ManualTestPaper.vue
+++ b/src/views/TestPaper/ManualTestPaper.vue
@@ -125,9 +125,11 @@
       <ul class="random-list">
         <li v-for="(item,index) in randomSubjectList" :key="index">
           <span>试题分类：</span>
-          <el-select v-model="item.QuestionClassId" style="margin-left:10px;">
-            <el-option v-for="option in randomQuestionTypeList" :key="option.id" :label="option.ClassificationName" :value="option.id"></el-option>
-          </el-select>
+          <el-cascader
+          style="flex:1"
+          v-model="item.QuestionClassId"
+          :options="randomQuestionTypeList"
+          clearable></el-cascader>
           <span style="margin-left:10px;">试题数量：</span>
           <el-input-number v-model="item.Count" :min="1" :max="100" label="描述文字" style="margin-left:10px;"></el-input-number>
           <i class="el-icon-remove-outline" @click="changeSubjectCount(-1,index)" style="margin-left:10px;color:#f56c6c;"></i>
@@ -159,7 +161,7 @@
 </style>
 <script>
 import draggable from "vuedraggable";
-import { PostRandomGetQuestion, getQuestionList } from "@/api/QuestionBank";
+import { PostRandomGetQuestion, getQuestionList,getQuestionClassList } from "@/api/QuestionBank";
 import { GetQuestionClassByType } from "@/api/QuestionClass";
 import { EditTestPaper, GetToplevel } from "@/api/TestPaper";
 import { formatTime } from "@/utils/util";
@@ -275,31 +277,68 @@ export default {
     },
   },
   created() {
-    GetQuestionClassByType({ ClassType: 2 }).then((res) => {
-      console.log("GetQuestionClassByType res", res);
-      this.randomQuestionTypeList = res.data.data;
-    });
+    this.getQuestionClassListHeadler();
+    this.getQuestionClassListHeadler2();
   },
   mounted() {
     //计算页面内容区域的高度
     this.contentHeight = window.innerHeight - 90;
-    this.getQuestionClassListHeadler();
     //this.GetList();
   },
   methods: {
+    getSubTree(id, list) {
+        let result = [];
+        result = list.filter((t) => t.ParentId == id);
+        if (result.length) {
+          result = result.map((item) => {
+            item.value = item.id;
+            item.label = item.ClassificationName;
+            item.children = this.getSubTree(item.id, list);
+            if(!item.children || !item.children.length){
+              delete item.children;
+            }
+            return item;
+          });
+        }
+        return result;
+      },
+      getQuestionClassListHeadler2() {
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let alllist = res.data.data;
+          let list  = alllist.filter(t=>!t.ParentId);
+          list = list.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id,alllist);
+            if(!t.children || !t.children.length){
+              delete t.children;
+            }
+            return t;
+          });
+          this.randomQuestionTypeList = list;
+        });
+      },
     randomCancel() {
       this.dialogTableVisible = false;
     },
     randomSubmit() {
       let list = this.randomSubjectList;
-      if (list.findIndex((t) => !t.QuestionClassId || !t.Count) > -1) {
+      if (list.findIndex((t) => !t.QuestionClassId || !t.QuestionClassId.length || !t.Count) > -1) {
         this.$message.warning("参数不完整");
         return;
       }
+      list = list.map(t=>{
+        t.QuestionClassId = t.QuestionClassId.pop();
+        return t;
+      });
       PostRandomGetQuestion(list).then((res) => {
         let list = res.data.data;
         this.arr2 = list;
         this.dialogTableVisible = false;
+        if(!list.length){
+          this.$message.warning('所选分类没有试题');
+        }
       });
     },
     changeSubjectCount(type, index) {
diff --git a/src/views/TestPaper/index.vue b/src/views/TestPaper/index.vue
index b1daa87..bdfd1c6 100644
--- a/src/views/TestPaper/index.vue
+++ b/src/views/TestPaper/index.vue
@@ -192,6 +192,7 @@
     filters: {},
     data() {
       return {
+        randomQuestionTypeList:[],
         fileList: [],
         imageUrl: '',
         header: {
@@ -250,6 +251,7 @@
     },
     created() {
       this.GetList();
+      this.getQuestionClassListHeadler2();
       this.header.Authorization = getToken()
     },
     mounted() {
@@ -293,6 +295,39 @@
       }
     },
     methods: {
+      getSubTree(id, list) {
+        let result = [];
+        result = list.filter((t) => t.ParentId == id);
+        if (result.length) {
+          result = result.map((item) => {
+            item.value = item.id;
+            item.label = item.ClassificationName;
+            item.children = this.getSubTree(item.id, list);
+            if(!item.children || !item.children.length){
+              delete item.children;
+            }
+            return item;
+          });
+        }
+        return result;
+      },
+      getQuestionClassListHeadler2() {
+        let _this = this;
+        getQuestionClassList().then((res) => {
+          let alllist = res.data.data;
+          let list  = alllist.filter(t=>!t.ParentId);
+          list = list.map((t) => {
+            t.value = t.id;
+            t.label = t.ClassificationName;
+            t.children = this.getSubTree(t.id,alllist);
+            if(!t.children || !t.children.length){
+              delete t.children;
+            }
+            return t;
+          });
+          this.randomQuestionTypeList = list;
+        });
+      },
       handleRemove(file, fileList) {
         this.Dataform.subjectImg = ''
 
diff --git a/src/views/user/userlist.vue b/src/views/user/userlist.vue
index d1a01cc..4814a4c 100644
--- a/src/views/user/userlist.vue
+++ b/src/views/user/userlist.vue
@@ -174,6 +174,7 @@
         <el-table-column  label="操作">
           <template slot-scope="scope">
             <el-button type="success" @click="handleWatchLive(scope.row)">观看直播</el-button>
+            <el-button type="primary" @click="handleAnswerDetail(scope.row)">答题详情</el-button>
           </template>
         </el-table-column>
 
@@ -337,6 +338,9 @@
         console.log('handleWatchLive',item);
         this.$router.push(`/live?id=${item.StreamName}`)
       },
+      handleAnswerDetail(item){
+        window.open(`/#/answerDetail?id=${item.id}`,"_blank")
+      },
       submitForm() {
         this.dialogClassIVIsible = false;
       },
--
libgit2 0.21.4