问卷调查

src/components/Question/drawer.vue

@@ -4,7 +4,7 @@
       ref="drawer"
       :show-close="false"
       :wrapper-closable="false"
-      :title="answerId ?'编辑答案' : '添加答案'"
+      :title="answer.answerId ?'编辑答案' : '添加答案'"
       :before-close="handleClose"
       :visible.sync="dialog"
       direction="ltr"
@@ -16,7 +16,7 @@
             <el-input v-model="form.content" placeholder="请输入答案（必填）">
               <el-select
                 slot="prepend"
-                v-model="form.option"
+                v-model="form.optCode"
                 filterable
                 allow-create
                 default-first-option
@@ -32,6 +32,9 @@
               </el-select>
             </el-input>
           </el-form-item>
+          <el-form-item label="分数：" prop="score" :label-width="formLabelWidth">
+            <el-input v-model="form.score" placeholder="请输入分数" />
+          </el-form-item>
           <el-form-item style="text-align:center">
             <el-button @click="handleClose">取 消</el-button>
             <el-button type="primary" @click="onSubmit('form')">确 定</el-button>
@@ -47,22 +50,26 @@ export default {
   props: {
     dialog: Boolean,
     questionId: String,
-    answerId: String,
-    queId: String
+    questionId: String,
+    answer: {
+      type: Object,
+      default: () => {}
+    }
   },
   data() {
     return {
       rules: {
         content: [
           { required: true, message: '请输入答案内容', trigger: 'blur' }
+        ],
+        score: [
+          { required: true, message: '请输入分数', trigger: 'blur' }
         ]
       },
       form: {
-        option: undefined,
+        optCode: undefined,
         content: undefined,
-        characterList: [],
-        sortNo: 1,
-        status: 1
+        score: undefined
       },
       formLabelWidth: '120px',
       options: [
@@ -94,67 +101,45 @@ export default {
     }
   },
   watch: {
-    answerId() {
-      if (this.answerId) {
-        getAnswerDetail(this.answerId, { queId: this.queId }).then((res) => {
-          this.form = res.data
-        })
+    answer() {
+      if (this.answer) {
+        this.form = this.answer
       }
     }
   },
   methods: {
+    // 非空判断方法
+    handelNull() {
+      if (this.form.optCode) {
+        if (this.form.content) {
+          if (Number(this.form.score) > 0) {
+            return true
+          } else {
+            this.$message('请输入分数仅限正整数')
+            return false
+          }
+        } else {
+          this.$message('请输入答案')
+          return false
+        }
+      } else {
+        this.$message('请在灰色下拉菜单中添加选项')
+        return false
+      }
+    },
     onSubmit(form) {
       this.$refs[form].validate((valid) => {
         if (valid) {
-          if (this.form.option) {
-            const data = { ...this.form }
-            switch (data.option) {
-              case 'A':
-                data.sortNo = 1
-                break
-              case 'B':
-                data.sortNo = 2
-                break
-              case 'C':
-                data.sortNo = 3
-                break
-              case 'D':
-                data.sortNo = 4
-                break
-              case 'E':
-                data.sortNo = 5
-                break
-              case 'F':
-                data.sortNo = 6
-                break
-              case 'G':
-                data.sortNo = 7
-                break
-              case 'H':
-                data.sortNo = 8
-                break
-              case 'I':
-                data.sortNo = 9
-                break
-              case 'J':
-                data.sortNo = 10
-                break
-              case 'true':
-                data.sortNo = 1
-                break
-              case 'false':
-                data.sortNo = 2
-                break
-              default:
-                break
-            }
-            if (this.answerId) {
-              UpdateAnswer(data, this.answerId).then((res) => {
+          if (this.handelNull()) {
+            const data = { ...this.form, score: Number(this.form.score) }
+            if (this.answer.answerId) {
+              UpdateAnswer(data, this.answer.answerId).then((res) => {
                 this.$message('修改成功')
                 this.$emit('handleEditDrawer', true)
                 this.form = {
-                  option: undefined,
-                  content: undefined
+                  optCode: undefined,
+                  content: undefined,
+                  score: undefined
                 }
               })
             } else {
@@ -163,13 +148,12 @@ export default {
                 this.$message('添加成功')
                 this.$emit('handleEditDrawer', true)
                 this.form = {
-                  option: undefined,
-                  content: undefined
+                  optCode: undefined,
+                  content: undefined,
+                  score: undefined
                 }
               })
             }
-          } else {
-            this.$message('请在灰色下来菜单中添加选项')
           }
         } else {
           return false
@@ -179,8 +163,9 @@ export default {
     handleClose() {
       this.$emit('handleCloseDrawer', true)
       this.form = {
-        option: undefined,
-        content: undefined
+        optCode: undefined,
+        content: undefined,
+        score: undefined
       }
     }
   }

src/components/Question/edit.vue

@@ -1,65 +1,25 @@
 <template>
   <div style="padding: 20px">
     <h2 style="text-align: center">
-      问卷题目{{ questionId!==0 ? "编辑" : "添加" }}
+      问卷题目{{ questionId ? "编辑" : "添加" }}
     </h2>
     <el-form ref="form" :model="form" label-width="90px">
       <el-form-item label="题目：">
-        <el-input v-model="form.title" placeholder="请输入问题名（必填）">
-          <el-select slot="prepend" v-model="form.optType" style="width:100px" placeholder="请选择">
-            <el-option label="单选题" value="single" />
-            <el-option label="多选题" value="many" />
-            <el-option label="判断题" value="judgment" />
+        <el-input v-model="form.content" placeholder="请输入问题名（必填）">
+          <el-select slot="prepend" v-model="form.questionType" style="width:100px" placeholder="请选择">
+            <el-option label="单选题" value="radio" />
+            <el-option label="多选题" value="checkBox" />
+            <el-option label="判断题" value="switch" />
+            <el-option label="简答题" value="textarea" />
           </el-select>
         </el-input>
-        <!-- <el-select
-          v-else
-          v-model="nowQuestionId"
-          filterable
-          default-first-option
-          style="width:100%"
-          placeholder="请选择"
-          :disabled="questionId!==0"
-        >
-          <el-option
-            v-for="item in questionList"
-            :key="item.questionId"
-            :label="item.title"
-            :value="item.questionId"
-          />
-        </el-select> -->
-      </el-form-item>
-      <el-form-item label="分数">
-        <el-input v-model="form.score" type="number" min="1" max="50" />
-      </el-form-item>
-      <el-form-item
-        v-if="questionId!==0"
-        label="正确选项："
-      >
-        <!-- filterable可搜索 multiple可多选 default-first-option回车可选-->
-        <el-select
-          v-model="form.rightAnswer"
-          disabled
-          style="width:100%"
-          multiple
-          filterable
-          default-first-option
-          placeholder="请选择"
-        >
-          <el-option
-            v-for="item in rightList"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">确定</el-button>
         <el-button @click="$router.go(-1)">返回</el-button>
       </el-form-item>
     </el-form>
-    <el-card v-if="questionId!==0" shadow="never" body-style="padding:0" class="box-card">
+    <el-card v-if="questionId && form.questionType !== 'textarea'" shadow="never" body-style="padding:0" class="box-card">
       <div slot="header" class="clearfix">
         <h3 style="float:left">答案列表</h3>
         <el-button
@@ -70,13 +30,14 @@
         >添加答案</el-button>
       </div>
       <ul style="list-style-type: none;margin:24px 0 24px -40px">
-        <li v-for="answer in answerList" :key="answer.answerId" class="answerli">
+        <li v-for="answer in form.answerList" :key="answer.answerId" class="answerli">
           <div style="flex:1;width: 100%;overflow: hidden;display: flex;" @click="handleEdit(answer)">
-            <span style="width:45px">{{ answer.option }}</span>
+            <span style="width:45px">{{ answer.optCode }}</span>
             <span style="flex:1">{{ answer.content }}</span>
+            <span style="width:30px">{{ answer.score }}分</span>
           </div>
           <el-popconfirm
-            style="width:30px"
+            style="width:30px;margin-left:8px"
             icon="el-icon-info"
             icon-color="red"
             title="确定删除这个答案吗？"
@@ -90,7 +51,7 @@
     <QuestionDrawer
       :dialog="dialog"
       :question-id="form.questionId"
-      :answer-id="answerId"
+      :answer="answer"
       :que-id="queId"
       @handleCloseDrawer="handleCloseDrawer"
       @handleEditDrawer="handleEditDrawer"
@@ -99,8 +60,8 @@
 </template>
 <script>
 
-import { saveQuestion, UpdateQuestion } from '@/api/question'
-import { getAnswerList, deleteAnswer } from '@/api/answer'
+import { saveQuestion, UpdateQuestion, getQuestionDetail } from '@/api/question'
+import { deleteAnswer } from '@/api/answer'
 import QuestionDrawer from '@/components/Question/drawer.vue'
 
 export default {
@@ -109,7 +70,7 @@ export default {
   },
   props: {
     questionId: {
-      type: Number,
+      type: String,
       required: true
     },
     queId: {
@@ -120,69 +81,56 @@ export default {
   data() {
     return {
       form: {
-        title: undefined,
-        optType: undefined,
-        rightAnswer: undefined,
+        content: undefined,
+        questionType: undefined,
         queId: undefined,
-        score: 0,
-        status: 1,
-        questionId: undefined
+        questionId: undefined,
+        answerList: []
       },
       nowQuestionId: undefined, // 当前问题id用于获取答案列表 和匹配游戏模式传入答案编辑弹窗的questionId
-      questionList: [], // 用于存储测试模式下选择问题的下拉菜单的数据源
-      // 答案列表（包括选项 内容 特征词列表）
-      answerList: [],
-      answerId: undefined,
+      answer: {},
       // 正确答案数据源
-      rightList: [],
       dialog: false
     }
   },
   watch: {
     // 用于点击左边改变右边的页面
     questionId: function() {
-      if (this.questionId !== 0) {
-        // getGameLeverQuestionDetail(this.questionId, { queId: this.queId }).then((res) => {
-        //   this.form = res.data
-        //   this.form.rightAnswer = res.data.rightAnswer?.split(',')
+      if (this.questionId) {
         this.nowQuestionId = this.questionId
-        getAnswerList({ questionId: this.questionId }).then((res) => {
-          this.answerList = res.data.records
+        getQuestionDetail(this.questionId).then((res) => {
+          this.form = res.data
         })
-        // })
       } else {
         this.form = {
-          title: undefined,
-          optType: undefined,
-          score: 0,
-          status: 1,
-          queId: undefined,
-          rightAnswer: undefined,
-          questionId: undefined
+          content: undefined,
+          questionType: undefined,
+          queId: this.queId,
+          questionId: undefined,
+          answerList: []
         }
         this.nowQuestionId = undefined
       }
     }
   },
-  // mounted: function() {
-  //   getQuestionList({ pageSize: 999 }).then((res) => { this.questionList = res.data.records })
-  // },
   methods: {
     // 添加答案
     onAddAnswer() {
-      this.answerId = undefined
+      this.answer = {}
       this.dialog = true
     },
     // 编辑答案
     handleEdit(val) {
-      this.answerId = val.answerId
+      this.answer = val
       this.dialog = true
     },
     // 删除答案
     handleDelete(val) {
       deleteAnswer(val.answerId).then((res) => {
         this.$message('删除答案成功')
-        this.handleAnswerList()
+        getQuestionDetail(this.questionId).then((res) => {
+          this.form = res.data
+        })
       })
     },
     // 关闭答案抽屉
@@ -192,12 +140,8 @@ export default {
     // 编辑答案抽屉成功重新查询列表
     handleEditDrawer(val) {
       this.handleCloseDrawer()
-      this.handleAnswerList()
-    },
-    // 查询当前问题答案列表
-    handleAnswerList() {
-      getAnswerList({ questionId: this.nowQuestionId }).then((res) => {
-        this.answerList = res.data.records
+      getQuestionDetail(this.questionId).then((res) => {
+        this.form = res.data
       })
     },
     // 转换特征数组数据格式
@@ -210,8 +154,8 @@ export default {
     },
     // 非空判断方法
     handelNull() {
-      if (this.form.optType) {
-        if (this.form.title) {
+      if (this.form.questionType) {
+        if (this.form.content) {
           return true
         } else {
           this.$message('请输入题目')
@@ -225,16 +169,13 @@ export default {
     onSubmit() {
       if (this.handelNull()) {
         const data = { ...this.form }
-        if (this.questionId === 0) {
+        if (!this.questionId) {
           saveQuestion({ ...data, queId: this.queId, questionId: this.nowQuestionId }).then((res) => {
             this.$message('添加问题成功')
             this.$emit('handleRefreshQuestion', true)
             this.$emit('handleEditQuestion', res.data.questionId)
           })
         } else {
-          if (data.rightAnswer) {
-            data.rightAnswer = data.rightAnswer.toString()
-          }
           UpdateQuestion({ ...data, queId: this.queId, questionId: this.nowQuestionId }, this.nowQuestionId).then((res) => {
             this.$message('修改问题成功')
             this.$emit('handleRefreshQuestion', true)

src/components/Question/index.vue

@@ -3,7 +3,6 @@
     <el-card class="box-card" shadow="never" body-style="padding:0">
       <div slot="header" class="clearfix">
         <h3 style="float:left">题库列表</h3>
-        <h4 style="float:left;margin-left: 10px;">总分{{ totalScore }}</h4>
         <el-button
           type="primary"
           style="float: right"
@@ -15,8 +14,8 @@
         <transition-group>
           <div v-for="item,index in tableData" :key="index" class="questionli" @click="handleEdit(item)">
             <span style="width:45px">第{{ index+1 }}题</span>
-            <span style="width:45px">{{ item.optType === 'single'?'单选题':item.optType==='many'?'多选题':'判断题' }}</span>
-            <span style="flex:1">{{ item.title }}</span>
+            <span style="width:45px">{{ item.questionType === 'radio'?'单选题':item.questionType==='checkBox'?'多选题':item.questionType==='switch'?'判断题':'简答题' }}</span>
+            <span style="flex:1">{{ item.content }}</span>
             <el-popconfirm
               style="width:30px"
               icon="el-icon-info"
@@ -62,8 +61,7 @@ export default {
       tableData: [],
       pageSize: 20,
       currentPage: 1,
-      Total: 0, // 条目总数
-      totalScore: 0
+      Total: 0 // 条目总数
     }
   },
   watch: {
@@ -76,6 +74,9 @@ export default {
       immediate: true // 页面加载时就启动
     }
   },
+  mounted() {
+    this.onSearch()
+  },
   methods: {
     // 拖拽结束事件
     onEnd() {
@@ -122,10 +123,6 @@ export default {
           this.tableData = res.data.records
           this.Total = res.data.total
           this.pageSize = res.data.size
-          this.totalScore = 0
-          res.data.records.map(item => {
-            this.totalScore += item.score
-          })
         }
       )
     }

src/views/questionnaire/edit.vue

@@ -18,8 +18,8 @@
             <Question
               ref="Question"
               :que-id="queId"
-              @handleAddQuestion="questionId = 0"
-              @handleCloseQuestion="questionId = 0"
+              @handleAddQuestion="questionId = ''"
+              @handleCloseQuestion="questionId = ''"
               @handleEditQuestion="handleEditQuestion"
             />
           </el-col>
@@ -55,7 +55,7 @@ export default {
       },
       queId: undefined,
       activeName: 'questionnaire',
-      questionId: 0 // ??
+      questionId: ''
     }
   },
   watch: {

src/views/signIn/edit.vue

@@ -108,7 +108,7 @@ export default {
       const qrcode = new QRCode('qrcode', {
         width: 200,
         height: 200, // 高度
-        text: 'http://192.168.89.76:8080/?signId=' + val
+        text: 'http://192.168.89.76:8080/signIn?signId=' + val
       })
     },
     // 下载二维码