bug修复

acf28595 · H.wb.wang.peixun · e8bdac80 · acf28595 · acf28595 · acf28595
Commit acf28595 authored Aug 01, 2023 by H.wb.wang.peixun
Showing with 42 additions and 18 deletions

src/views/school-paper/questionBank/index.vue
+11 -7

src/views/school-paper/testPaper/index.vue
+2 -6

src/views/school-paper/testPaperRecord/index.vue
+26 -4

src/views/system/user/index.vue
+1 -0

vue.config.js
+2 -1

No files found.
--- a/src/views/school-paper/questionBank/index.vue
+++ b/src/views/school-paper/questionBank/index.vue
@@ -223,7 +223,7 @@
                </el-select>
              </el-form-item>
              <el-form-item label="年级阶段：" prop="phaseId">
-                <el-select clearable v-model="form.phaseId" placeholder="请选择阶段" >
+                <el-select clearable v-model="form.phaseId" placeholder="请选择阶段">
                  <el-option v-for="item in PhaseList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
                  </el-option>
                </el-select>
@@ -241,7 +241,7 @@
              </el-form-item>
              <el-form-item label="习题种类：" prop="species">
                <!-- 1填空，2选择，3解答 -->
-                <el-select clearable v-model="form.species" placeholder="请选择习题种类" >
+                <el-select clearable v-model="form.species" placeholder="请选择习题种类">
                  <el-option v-for="item in [
                    { label: '填空', value: 1 },
                    { label: '选择', value: 2 },
@@ -257,7 +257,9 @@
              </el-form-item>
              <template v-if="[1, '1', 3, '3'].includes(form.species)">
                <el-form-item label="答案" prop="answer">
-                  <editor v-model="form.answer" :min-height="192" :iconType="['image']" />
+                  <!-- <editor v-model="form.answer" :min-height="192" :iconType="['image']" /> -->
+                  <el-input type="textarea"  placeholder="请输入内容" v-model="form.answer">
+                  </el-input>
                </el-form-item>
                <el-form-item label="答案图片" prop="rightAnswersPic">
                  <imageUpload :limit="9" v-model="form.rightAnswersPic" />
@@ -667,7 +669,7 @@ export default {
      this.title = "添加题库主";
      this.initleRules();
    },
-    /** 修改按钮操作 */
+    /** 编辑按钮操作 */
    handleUpdate(row) {
      let self = this
      let arr = [
@@ -707,7 +709,8 @@ export default {
        this.open = true;
        // 判断是否是填空题
        if (self.form.species == 1 || self.form.species == 3) {
-          self.form.answer = self.form.rightAnswers
+          // self.form.answer = self.form.rightAnswers
+          self.$set(self.form,'answer',self.form.rightAnswers)
          if (self.form.rightAnswersPic) {
            let arr = self.form.rightAnswersPic.split(','),
              brr = [];
@@ -721,7 +724,8 @@ export default {
        }
        // 判断是否是解答题
        if (self.form.species == 3) {
-          self.form.answer = self.form.rightAnswers
+          // self.form.answer = self.form.rightAnswers
+          self.$set(self.form,'answer',self.form.rightAnswers)
        }
        if (this.form.type == 1) {
          self.form.type = true
@@ -740,7 +744,7 @@ export default {
          // })
          brr.push({
            url: self.form.resolveVideo,
-              name:self.form.resolveVideoName
+            name: self.form.resolveVideoName
          })
          self.form.resolveVideo = brr
          // self.$refs['refFileupload'].fileList = brr

--- a/src/views/school-paper/testPaper/index.vue
+++ b/src/views/school-paper/testPaper/index.vue
@@ -4,8 +4,8 @@
      <el-form-item label="审批阅卷" prop="testName">
        <el-input v-model="queryParams.testName" placeholder="请输入试卷名称搜索" clearable />
      </el-form-item>
-      <el-form-item label="年级" prop="categoryId">
+      <el-form-item label="年级" prop="phaseId">
-        <el-select v-model="value" placeholder="请选择">
+        <el-select v-model="queryParams.phaseId" placeholder="请选择">
          <el-option v-for="item in PhaseList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
          </el-option>
        </el-select>
@@ -250,11 +250,7 @@ export default {
        pageNum: 1,
        pageSize: 10,
        testName: undefined,
-        categoryId: undefined,
        phaseId: undefined,
-        classId: undefined,
-        totalPoints: undefined,
-        status: undefined,
      },
      query: {
        pageNum: 1,

--- a/src/views/school-paper/testPaperRecord/index.vue
+++ b/src/views/school-paper/testPaperRecord/index.vue
@@ -183,7 +183,8 @@
        </template> -->
        <!-- </el-col> -->
        <el-form-item label="分数" prop="score">
-          <el-input v-model="form.score" placeholder="请输入总得分" :disabled="reviewed" />
+          <el-input-number v-model="form.score" placeholder="请输入总得分" :disabled="reviewed" :max="form.topicScore"
+            :min="0" />
        </el-form-item>
        <el-form-item label="优秀答案" prop="good">
          <el-switch v-model="form.good" active-color="#13ce66" inactive-color="#ff4949" :disabled="reviewed">
@@ -230,6 +231,7 @@ export default {
      reviewed: false,
      PhaseList: [], // 阶段
      value: '',
+      fdsa: 4,
      typePaper: 1,
      // 按钮loading
      buttonLoading: false,
@@ -331,7 +333,6 @@ export default {
        this.$refs["form"].validate(valid => {
          if (valid) {
            if (self.query.pageNum < self.pages) {
-              self.query.pageNum++
              let good
              if (self.form.good == true) {
                good = 0
@@ -344,7 +345,10 @@ export default {
                good: good
              }
              updateTestPaperRecord(params).then(response => {
+                if (response.code == 200) {
+                  self.query.pageNum++
                  self.handleUpdate(val)
+                }
              })
            }
          }
@@ -356,16 +360,34 @@ export default {
        }
      }
    },
-    clickComplete() {
+    clickComplete(val) {
      let self = this
+      // this.nextQuestion(val)
+      // return
      this.$refs["form"].validate(valid => {
        if (valid) {
+          let good
+          if (self.form.good == true) {
+            good = 0
+          } else {
+            good = 1
+          }
+          let params = {
+            id: val.id,
+            score: self.form.score,
+            good: good
+          }
+          updateTestPaperRecord(params).then(response => {
+            if (response.code == 200) {
              completeReadOver({ id: self.form.recordId }).then((res) => {
                self.open = false;
                self.$modal.msgSuccess("批卷完成");
                self.getList();
              })
            }
+          })
+        }
      });
    },
    // 典例精讲
@@ -496,6 +518,7 @@ export default {
        if (response.rows.length && response.rows) {
          self.$nextTick(() => {
            self.form = response.rows[0];
+            self.form.topicScore = Number(self.form.topicScore)
            if (self.form.good == 1) {
              self.form.good = false
            } else if (self.form.good == 0) {
@@ -504,7 +527,6 @@ export default {
            self.title = titlesiz + self.form.studentName + "的" + '（' + self.form.testName + '）' + '试卷';
            // self.$set(self.form, 'rightAnswers', 3)
            self.open = true;
          })
        } else {
          self.$modal.msgSuccess("暂无数据");

--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -453,6 +453,7 @@ export default {
    /** 查询用户列表 */
    getList() {
      this.loading = true;
+      this.$set(this.queryParams,'nickName',this.queryParams.userName)
      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
        this.userList = response.rows;
        this.total = response.total;

--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,8 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        target: `http://farming.nyinhong.com/api`,
+        target: `http://farming.nyinhong.com`, //打包 prod
+        // target: `http://farming.nyinhong.com/api/`, //本地测试
        // target: `http://192.168.0.169:8111/`,
        // target: `http://192.168.0.165:8111/`,
        changeOrigin: true,