From d65c17c793cd1d80d7542dc9059b04ed4d579e81 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmial.com>
Date: Sun, 28 Mar 2021 15:41:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=98=E7=9B=AE=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E5=8A=9F=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_client/src/api/question.js             |  8 ++++
 test_client/src/views/question/question.vue | 43 +++++++++++++++++----
 test_server/question/views.py               |  7 ++++
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/test_client/src/api/question.js b/test_client/src/api/question.js
index 3f6cd50..63d51f0 100644
--- a/test_client/src/api/question.js
+++ b/test_client/src/api/question.js
@@ -121,4 +121,12 @@ export function exportQuestion(query) {
     method: 'get',
     params: query
   })
+}
+
+export function enableQuestions(data) {
+  return request({
+    url: '/question/question/enable/',
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/test_client/src/views/question/question.vue b/test_client/src/views/question/question.vue
index 777cb9e..6d6049e 100644
--- a/test_client/src/views/question/question.vue
+++ b/test_client/src/views/question/question.vue
@@ -44,6 +44,9 @@
           >刷新重置</el-button>
           <div style="margin-top:10px">
             <el-button type="primary" slot="reference" @click="handleAdd()">新增</el-button>
+            <el-button
+        @click="handleEnabled"
+      >启用</el-button>
     <el-popover
   placement="top"
   width="160"
@@ -79,20 +82,27 @@
       highlight-current-row
       max-height="600"
       @sort-change="changeSort"
+      @selection-change="handleSelectionChange"
     >
-      <el-table-column type="index" width="50"></el-table-column>
-      <el-table-column align="left" label="题干" sortable="custom" prop="name">
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="题干" sortable="custom" prop="name">
         <template slot-scope="scope">{{ scope.row.name }}</template>
       </el-table-column>
-      <el-table-column align="left" label="所属题库">
+      <el-table-column label="所属题库">
         <template slot-scope="scope">{{ scope.row.questioncat_name }}</template>
       </el-table-column>
-      <el-table-column align="left" label="题型">
+      <el-table-column label="题型">
         <template slot-scope="scope">{{ scope.row.type }}</template>
       </el-table-column>
-      <el-table-column align="left" label="难易度">
+      <el-table-column label="难易度">
         <template slot-scope="scope">{{ scope.row.level }}</template>
       </el-table-column>
+      <el-table-column label="是否启用">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.enabled" type="success">是</el-tag>
+          <el-tag v-else type="danger">否</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建日期">
         <template slot-scope="scope">
           <span>{{ scope.row.create_time }}</span>
@@ -137,7 +147,7 @@
   <div>{{question.type}}</div>
   <div >{{question.name}}</div>
   <ul id="repeat">
-  <li v-for="(value,key,index) in question.options">
+  <li v-for="(value,key) in question.options" v-bind:key="key">
     {{ key }}:
     <span>{{value}}</span>
   </li>
@@ -157,7 +167,8 @@ import {
   getQuestionList,
   deleteQuestion,
   importQuestion,
-  exportQuestion
+  exportQuestion,
+  enableQuestions
 } from "@/api/question";
 import { genTree, deepClone } from "@/utils";
 import checkPermission from "@/utils/permission";
@@ -202,6 +213,7 @@ export default {
       ],
       question:{},
       questioncatC:[],
+      selects:[],
     };
   },
   computed: {},
@@ -313,6 +325,23 @@ export default {
 
       this.getList();
     },
+    handleSelectionChange(val) {
+      let selects = [];
+      for (var i = 0; i < val.length; i++) {
+        selects.push(val[i].id);
+      }
+      this.selects = selects;
+    },
+    handleEnabled() {
+      if (this.selects.length) {
+        enableQuestions({ids:this.selects}).then(res=>{
+          this.$message.success("成功");
+          this.getList();
+        })
+      } else {
+        this.$message.warning("请先选择题目");
+      }
+    }
   }
 };
 </script>
diff --git a/test_server/question/views.py b/test_server/question/views.py
index 37d6b92..4ed6fc7 100644
--- a/test_server/question/views.py
+++ b/test_server/question/views.py
@@ -143,6 +143,13 @@ class QuestionViewSet(ModelViewSet):
             i.save()
         return Response()
 
+    @action(methods=['post'], detail=False, url_name='enable_question', permission_classes=[IsAuthenticated])
+    def enable(self, request):
+        ids = request.data.get('ids',None)
+        if ids:
+            Question.objects.filter(pk__in=ids).update(enabled=True)
+            return Response(status=status.HTTP_200_OK)
+
     @action(methods=['post'], detail=False,
             url_path='import', url_name='import_question',perms_map=[{'post':'question_import'}])
     def import_question(self, request):