Merge remote-tracking branch 'origin/master'

package.json

@@ -11,9 +11,9 @@
   },
   "dependencies": {
     "@tinymce/tinymce-vue": "^3.2.8",
-    "axios": "^0.25.0",
+    "axios": "^0.26.0",
     "blueimp-md5": "^2.19.0",
-    "clipboard": "^2.0.8",
+    "clipboard": "^2.0.10",
     "element-ui": "^2.15.6",
     "query-string": "^7.1.1",
     "vue": "^2.6.14",
@@ -22,17 +22,16 @@
   },
   "devDependencies": {
     "ali-oss": "^6.17.1",
-    "chalk": "^5.0.0",
-    "cross-env": "^7.0.3",
+    "chalk": "^4.1.2",
     "eslint": "^8.8.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-vue": "^8.4.1",
-    "sass": "1.49.7",
-    "vite": "^2.8.0",
-    "vite-plugin-checker": "^0.4.0",
+    "eslint-plugin-vue": "^8.5.0",
+    "sass": "1.49.9",
+    "vite": "^2.8.5",
+    "vite-plugin-checker": "^0.4.2",
     "vite-plugin-vue2": "^1.9.3",
     "vue-template-compiler": "^2.6.14"
   }

src/modules/paper/components/AddPaper.vue

 <template>
-  <el-drawer title="添加试卷试题" size="70%" v-bind="$attrs" v-on="$listeners">
+  <el-drawer title="添加试卷试题" size="80%" v-bind="$attrs" v-on="$listeners">
     <div style="margin: 0 20px">
       <!-- 选题组卷添加试卷第一步 -->
       <div v-show="step === 1">
@@ -18,7 +18,7 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="您此次选择的试题总数：">{{ multipleSelection.length }}</el-form-item>
-          <el-form-item label="此次试卷总分：">{{ data.paper_total_score }}</el-form-item>
+          <el-form-item label="此次试卷总分：">{{ data.paper_total_score - addedQuestionsScore }}</el-form-item>
           <el-form-item label="已设置试题总分：">{{ addedQuestionsScore }}</el-form-item>
           <el-divider></el-divider>
           <template v-if="setMethod === 1">

src/modules/paper/components/AutomaticPaper.vue

 <template>
-  <el-drawer title="试卷列表" size="80%" v-bind="$attrs" v-on="$listeners">
+  <el-drawer title="自动组卷" size="80%" v-bind="$attrs" v-on="$listeners">
     <div style="margin: 0 20px">
       <el-form :model="form">
         <!-- 组卷题库 -->
@@ -53,14 +53,14 @@
                   v-model="row.question_num"
                   :min="0"
                   :max="row.max_question_num"
-                  :step-strictly="true"
+                  step-strictly
                 ></el-input-number>
               </template>
             </el-table-column>
 
             <el-table-column align="center" label="每题分值">
               <template slot-scope="{ row }">
-                <el-input-number v-model="row.question_score" :min="0" :step-strictly="true"></el-input-number>
+                <el-input-number v-model="row.question_score" :min="0" step-strictly></el-input-number>
               </template>
             </el-table-column>
 
@@ -160,6 +160,19 @@ export default {
       questionList: [{ ...defaultItem }]
     }
   },
+  watch: {
+    data: {
+      immediate: true,
+      handler(data) {
+        if (data.paper_contents) {
+          this.form = Object.assign({}, this.form, data.paper_contents)
+        }
+        if (data.paper_contents && data.paper_contents.rules) {
+          this.questionList = data.paper_contents.rules
+        }
+      }
+    }
+  },
   computed: {
     // 试题数量总数
     questionTotalNum() {

src/modules/paper/components/BatchSetting.vue

@@ -6,15 +6,18 @@
     append-to-body
     :close-on-click-modal="false"
     width="400px"
+    center
   >
-    <el-form :model="form" :rules="rules" ref="form">
-      <el-form-item label="单选题"></el-form-item>
+    <el-form :model="form" :rules="rules" ref="form" hide-required-asterisk label-width="100px" label-suffix=":">
+      <el-form-item label="试题类型">{{ data.question_type_name }}</el-form-item>
       <el-form-item label="数量">{{ data.total }}</el-form-item>
-      <el-form-item label="每道试题分值" prop="score"><el-input v-model="form.score"></el-input></el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="handleSubmit">保存</el-button>
+      <el-form-item label="每道试题分值" prop="score">
+        <el-input-number v-model="form.score" :min="0" step-strictly :controls="false" />
       </el-form-item>
     </el-form>
+    <template #footer>
+      <el-button type="primary" @click="handleSubmit">保存</el-button>
+    </template>
   </el-dialog>
 </template>
 

src/modules/paper/components/QuestionListItem.vue

@@ -11,7 +11,14 @@
             <div class="question-type">{{ questionTypeText }}</div>
             <div class="question-score">
               <p>分数：</p>
-              <el-input v-model="data.score" :disabled="disableScore" style="width: 100px"></el-input>
+              <el-input-number
+                v-model="data.score"
+                step-strictly
+                :controls="false"
+                :min="0"
+                :disabled="disableScore"
+                style="width: 80px"
+              ></el-input-number>
             </div>
           </div>
           <!-- 题干 -->
@@ -37,7 +44,7 @@
             </template>
             <!-- 问答题 -->
             <template v-if="questionType === 3">
-              <v-editor></v-editor>
+              <v-editor :value="data.question_analysis"></v-editor>
             </template>
             <!-- 判断题 -->
             <template v-if="questionType === 6">

src/modules/paper/views/Update.vue

@@ -54,7 +54,6 @@
           <el-form-item label="试卷总分" prop="paper_total_score">
             <el-input-number
               :controls="false"
-              :step="1"
               v-model="form.paper_total_score"
               :min="0"
               :max="200"
@@ -68,7 +67,6 @@
           <el-form-item label="及格分数" prop="pass_score">
             <el-input-number
               :controls="false"
-              :step="1"
               v-model="form.pass_score"
               :min="0"
               :max="200"
@@ -254,14 +252,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-:v-deep .el-input-number .el-input-number__decrease {
-  display: none;
-}
-:v-deep .el-input-number .el-input-number__increase {
-  display: none;
-}
 ::v-deep .el-input-number .el-input__inner {
-  padding-left: 15px;
   text-align: left;
 }
 </style>

src/modules/question/components/Detail.vue

@@ -46,7 +46,7 @@
           <div class="pop" @click="dialogVisible = true"></div>
         </div>
       </el-form-item>
-      <el-form-item label="知识点" prop="knowledge_point">
+      <el-form-item label="知识点">
         <el-select
           v-model="ruleForm.knowledge_point"
           filterable

src/modules/question/components/QTypeSituation.vue

@@ -52,7 +52,7 @@
           <el-button type="primary" @click="dialogConfirm">确 定</el-button>
         </span>
       </el-dialog>
-      <el-form-item label="知识点" prop="knowledge_point">
+      <el-form-item label="知识点">
         <el-select
           v-model="ruleForm.knowledge_point"
           filterable

src/modules/question/components/QuestionsChidren.vue

 <template>
   <div>
-    <el-form :disabled="!!($route.query.type === 'view')" :model="data" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+    <el-form :rules="rules" :disabled="!!($route.query.type === 'view')" :model="data" ref="ruleForm" label-width="100px" class="demo-ruleForm">
       <div v-for="(ruleForm, index) in chidrenList" :key="index">
         <el-divider content-position="center" class="divider">子题目{{ index + 1 }}</el-divider>
         <el-form-item style="text-align: right;" v-if="!!!($route.query.type === 'view')">

vite.config.js

@@ -29,8 +29,8 @@ export default defineConfig(({ mode }) => {
           rewrite: path => path.replace(/^\/api\/qbs/, '')
         },
         '/api/exam': {
-          // target: 'https://x-exam-admin-api.ezijing.com',
-          target: 'http://localhost-exam-admin.ezijing.com',
+          target: 'https://x-exam-admin-api.ezijing.com',
+          // target: 'http://localhost-exam-admin.ezijing.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api\/exam/, '')
         },