Merge branch 'master' of https://gitlab.ezijing.com/webapp/x-training-new

src/modules/user-study/views/Index.vue

@@ -213,12 +213,13 @@ export default {
     },
     initQuestions(questions, selection) {
       questions.forEach((item, index) => {
-        let selectItem
+        let selectArr
         if (selection.length) {
-          selectItem = selection.find(it => it.question_id === item.id)
+          selectArr = selection.filter(it => it.question_id === item.id)
         }
-        if (selectItem) {
-          const opt = item.options.filter(it => it.id === selectItem.id)
+        if (selectArr) {
+          const selectIds = selectArr.map(it => it.id)
+          const opt = item.options.filter(it => selectIds.includes(it.id))
           item.selection = [...opt]
         } else {
           item.selection = []

src/modules/works-show/views/List.vue

@@ -5,7 +5,11 @@
         <el-table :data="prod.data" style="width: 100%" :header-row-style="{background:'#ededed',color:'#4d4d4d'}" :header-cell-style="{background: 'transparent'}">
           <el-table-column type="index" :index="prod.tableIndex" label="序号" width="50" />
           <el-table-column prop="case_info.name" label="案例名称" min-width="160" />
-          <el-table-column prop="score" label="分数" min-width="120" />
+          <el-table-column prop="score" label="分数" min-width="120" >
+            <template slot-scope="scope">
+              {{scope.row.is_complete ? scope.row.score : ''}}
+            </template>
+          </el-table-column>
           <el-table-column prop="updated_at" label="保存时间" min-width="160" />
           <el-table-column label="操作" width="100">
             <template slot-scope="scope">
@@ -21,7 +25,11 @@
         <el-table :data="user.data" style="width: 100%" :header-row-style="{background:'#ededed',color:'#4d4d4d'}" :header-cell-style="{background: 'transparent'}">
           <el-table-column type="index" :index="user.tableIndex" label="序号" width="50" />
           <el-table-column prop="case_info.name" label="案例名称" min-width="160" />
-          <el-table-column prop="score" label="分数" min-width="120" />
+          <el-table-column prop="score" label="分数" min-width="120" >
+            <template slot-scope="scope">
+              {{scope.row.is_complete ? scope.row.score : ''}}
+            </template>
+          </el-table-column>
           <el-table-column prop="updated_at" label="保存时间" min-width="160" />
           <el-table-column label="操作" width="100">
             <template slot-scope="scope">
@@ -37,7 +45,11 @@
         <el-table :data="tool.data" style="width: 100%" :header-row-style="{background:'#ededed',color:'#4d4d4d'}" :header-cell-style="{background: 'transparent'}">
           <el-table-column type="index" :index="tool.tableIndex" label="序号" width="50" />
           <el-table-column prop="case_info.name" label="案例名称" min-width="160" />
-          <el-table-column prop="score" label="分数" min-width="120" />
+          <el-table-column prop="type" label="类型" min-width="120" >
+            <template slot-scope="scope">
+              {{scope.row.type | toolTypeFilter}}
+            </template>
+          </el-table-column>
           <el-table-column prop="updated_at" label="保存时间" min-width="160" />
           <el-table-column label="操作" width="100">
             <template slot-scope="scope">
@@ -55,6 +67,7 @@
 <script>
 import { getProdRecords, getUserRecords, getToolRecords } from '../api'
 import { selectCase } from '@/api/base'
+const toolTypeMap = { 1: '抖音' }
 export default {
   data() {
     return {
@@ -87,6 +100,11 @@ export default {
       return this.$store.state.case
     }
   },
+  filters: {
+    toolTypeFilter(val) {
+      return toolTypeMap[val]
+    }
+  },
   created() {
     this.tabActive = this.$route.query.type
     this.fetchProdRecords()