李翔提的一小波需求点修改

src/assets/styles/pages.scss

@@ -1054,7 +1054,7 @@
     display: flex;
     justify-content: space-between;
     align-items: stretch;
-    height: 400px;
+    // height: 400px;
   }
   .struct-folder {
     width: 300px;

src/modules/card/views/CardHeadEdit.vue

@@ -3,9 +3,7 @@
     <div class="part-box">
       <div class="part-box-header">
         <h2 class="part-box-title">版头模板预选设置</h2>
-        <el-button type="danger" plain icon="icon icon-back" @click="goback"
-          >返回</el-button
-        >
+        <el-button type="danger" plain @click="goback">返回</el-button>
       </div>
       <el-form
         ref="modalFormComp"

src/modules/card/views/CardHeadManage.vue

@@ -7,9 +7,7 @@
     <div class="part-box">
       <div class="part-box-header">
         <h2 class="part-box-title">题卡规则管理</h2>
-        <el-button type="danger" plain icon="icon icon-back" @click="goBack"
-          >返回</el-button
-        >
+        <el-button type="danger" plain @click="goBack">返回</el-button>
       </div>
       <!-- 搜索 -->
       <el-form class="part-filter-form" inline :model="searchForm">

src/modules/paper/components/AuditPaperUnsubmit.vue

@@ -7,12 +7,12 @@
           placeholder="请输入提交人姓名"
         ></el-input>
       </el-form-item> -->
-      <el-form-item label="试卷名称">
+      <!-- <el-form-item label="试卷名称">
         <el-input
           v-model="filter.paperName"
           placeholder="请输入试卷名称"
         ></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>

src/modules/paper/components/BuildPaperAuto.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
 
-    <el-collapse v-model="activeNames" accordion>
+    <el-collapse v-model="activeNames">
       <el-collapse-item
         v-for="(detail, index) in details"
         :key="detail.id"
@@ -127,6 +127,9 @@ export default {
   mounted() {
     if (this.detailSource) {
       this.details = deepCopy(this.detailSource);
+      this.$nextTick(() => {
+        this.activeNames = this.details.map((item) => item.id);
+      });
     }
   },
   methods: {

src/modules/paper/components/QuestionGroupStruct.vue

@@ -10,7 +10,7 @@
       <el-checkbox v-model="useProperty" @change="setChange"
         >按课程属性抽题</el-checkbox
       >
-      <el-select
+      <!-- <el-select
         v-if="useProperty"
         v-model="curCoursePropertyId"
         class="margin-left-10"
@@ -23,7 +23,7 @@
           :label="item.name"
           :value="item.id"
         ></el-option>
-      </el-select>
+      </el-select> -->
       <span v-if="useProperty"
         >（一级属性试题数包含一级属性及子属性的总试题数）</span
       >

src/modules/paper/views/BuildPaper.vue

@@ -103,7 +103,7 @@
         </el-form>
         <el-form>
           <template v-if="modalForm.checkRepeat && !IS_MANUAL_MODE">
-            <el-form-item
+            <!-- <el-form-item
               label="校验重复率的试卷范围："
               label-width="180px"
               style="margin-bottom: 10px"
@@ -112,7 +112,7 @@
                 <el-radio-button :label="false">卷库列表试卷</el-radio-button>
                 <el-radio-button :label="true">试卷仓库试卷</el-radio-button>
               </el-radio-group>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item
               label="试卷间重复率不高于："
               label-width="180px"

src/modules/question/components/AuditQuestionUnsubmit.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="audit-question-unsubmit">
-    <el-form class="part-filter-form" inline>
+    <!-- <el-form class="part-filter-form" inline>
       <el-form-item label="提交人">
         <el-input
           v-model="filter.creatorName"
@@ -10,7 +10,7 @@
       <el-form-item>
         <el-button type="primary" @click="toPage(1)">查询</el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <div>
       <el-table

src/modules/question/components/AuditQuestionWait.vue

@@ -112,8 +112,6 @@
     <question-preview-dialog
       ref="QuestionPreviewDialog"
       :propQuestion="curQuestion"
-      @pass="questionPass"
-      @notPass="questionNotPass"
       :table-data="tableData"
     ></question-preview-dialog>
   </div>

src/modules/question/components/QuestionImportEdit.vue

@@ -32,7 +32,6 @@
             style="margin-left: 10px"
             size="small"
             type="danger"
-            icon="icon icon-back-white"
             @click="cancel"
             >返回</el-button
           >

src/modules/question/components/QuestionPreviewLoopDialog.vue

@@ -110,32 +110,49 @@
       </div>
     </div>
 
-    <div slot="footer" class="box-justify">
-      <div>
-        <el-button
-          type="default"
-          icon="el-icon-caret-left"
-          :disabled="prevDisabled"
-          @click="toPrev"
-        ></el-button>
-        <el-button
-          type="default"
-          icon="el-icon-caret-right"
-          :disabled="nextDisabled"
-          @click="toNext"
-        ></el-button>
-      </div>
-      <div>
-        <el-button
-          plain
-          class="maintain"
-          type="danger"
-          @click="$emit('notPass', question.id)"
-          >不通过</el-button
-        >
-        <el-button type="primary" @click="$emit('pass', question.id)"
-          >通过</el-button
-        >
+    <div slot="footer">
+      <el-form
+        ref="modalFormComp"
+        :model="modalForm"
+        :rules="rules"
+        label-width="80px"
+      >
+        <el-form-item label="审核意见" prop="auditRemark">
+          <el-input
+            v-model="modalForm.auditRemark"
+            type="textarea"
+            placeholder="请输入内容"
+            maxlength="200"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div class="box-justify">
+        <div>
+          <el-button
+            type="default"
+            icon="el-icon-caret-left"
+            :disabled="prevDisabled"
+            @click="toPrev"
+          ></el-button>
+          <el-button
+            type="default"
+            icon="el-icon-caret-right"
+            :disabled="nextDisabled"
+            @click="toNext"
+          ></el-button>
+        </div>
+        <div>
+          <el-button
+            plain
+            class="maintain"
+            type="danger"
+            @click="submit('NOT_PASS', question.id)"
+            >不通过</el-button
+          >
+          <el-button type="primary" @click="submit('PASS', question.id)"
+            >通过</el-button
+          >
+        </div>
       </div>
       <!-- <el-button @click="cancel">关闭</el-button> -->
     </div>
@@ -144,7 +161,7 @@
 
 <script>
 import QuestionAnswer from "./QuestionAnswer.vue";
-
+import { auditQuestionApi } from "../api";
 export default {
   name: "QuestionPreviewLoopDialog",
   components: { QuestionAnswer },
@@ -179,6 +196,25 @@ export default {
     return {
       modalIsShow: false,
       question: {},
+      modalForm: {
+        auditRemark: "",
+        auditResult: "",
+      },
+      rules: {
+        auditRemark: [
+          {
+            validator: (rule, value, callback) => {
+              console.log(value, this.modalForm.auditResult);
+              if (this.modalForm.auditResult === "NOT_PASS" && !value) {
+                return callback(new Error(`请输入审核意见`));
+              }
+
+              callback();
+            },
+            trigger: "change",
+          },
+        ],
+      },
     };
   },
   watch: {
@@ -224,6 +260,20 @@ export default {
       const typeQuestion = ["PARAGRAPH_MATCHING", "BANKED_CLOZE"];
       return typeQuestion.includes(questionType);
     },
+    async submit(type, id) {
+      this.modalForm.auditResult = type;
+      const valid = await this.$refs.modalFormComp.validate().catch(() => {});
+      if (!valid) return;
+
+      let datas = { ...this.modalForm };
+      datas.questionIds = [id].join();
+      const res = await auditQuestionApi(datas).catch(() => {});
+      if (!res) return;
+
+      this.$message.success("操作成功！");
+      this.cancel();
+      this.$bus.emit("updateBadge");
+    },
   },
 };
 </script>

src/modules/question/views/QuestionManage.vue

@@ -164,7 +164,7 @@
       <div class="question-list">
         <div class="icon-btn-group">
           <svg-btn
-            name="新增"
+            name="xinzeng"
             @click="toCreateQuestion"
             v-if="!gptQuestionEnable"
             >创建试题</svg-btn

src/modules/question/views/QuestionTypeStatistics/index.vue

@@ -3,9 +3,7 @@
     <div class="part-box page-content-main">
       <div class="part-box-header">
         <h2 class="part-box-title">{{ courseName }}</h2>
-        <el-button type="danger" plain icon="icon icon-back" @click="goBack"
-          >返回</el-button
-        >
+        <el-button type="danger" plain @click="goBack">返回</el-button>
       </div>
 
       <div class="part-box" style="flex: 1; overflow: auto">

src/modules/question/views/SourceDetailManage.vue

@@ -5,13 +5,7 @@
         <h2 class="part-box-title">
           {{ courseInfo.name }}（{{ courseInfo.code }}）
         </h2>
-        <el-button
-          type="danger"
-          plain
-          icon="icon icon-back"
-          @click="$router.back()"
-          >返回</el-button
-        >
+        <el-button type="danger" plain @click="$router.back()">返回</el-button>
       </div>
       <!-- <h2 class="part-box-title">
         {{ courseInfo.name }}（{{ courseInfo.code }}）

src/modules/questions/views/CheckDuplicateList.vue

@@ -105,12 +105,12 @@
             ></rich-text>
           </template>
         </el-table-column>
-        <el-table-column label="题型大类" width="100">
+        <!-- <el-table-column label="题型大类" width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.quesMainType | questionMainType }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="题型小类" width="100">
+        </el-table-column> -->
+        <el-table-column label="题型" width="100">
           <template slot-scope="scope">
             <span>{{ scope.row.questionType | questionType }}</span>
           </template>
@@ -141,7 +141,23 @@
               >
                 详情
               </el-button>
-              <el-dropdown>
+              <el-button
+                size="medium"
+                type="text"
+                class="normal"
+                @click="retainQuestion(scope.row.id)"
+              >
+                保留
+              </el-button>
+              <el-button
+                size="medium"
+                type="text"
+                class="normal"
+                @click="deleteQuestion(scope.row.id)"
+              >
+                删除
+              </el-button>
+              <!-- <el-dropdown>
                 <el-button type="text" size="medium" class="normal">
                   快速审核<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
@@ -167,7 +183,7 @@
                     </el-button>
                   </el-dropdown-item>
                 </el-dropdown-menu>
-              </el-dropdown>
+              </el-dropdown> -->
             </div>
           </template>
         </el-table-column>

src/modules/questions/views/EditOtherQuestion.vue

@@ -14,11 +14,7 @@
             @click="saveQues('quesModel')"
             >保存</el-button
           >
-          <el-button
-            type="danger"
-            plain
-            icon="icon icon-back"
-            @click="backToQuesList()"
+          <el-button type="danger" plain @click="backToQuesList()"
             >返回
           </el-button>
         </div>

src/modules/questions/views/EditPaper.vue

@@ -99,12 +99,7 @@
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
-            size="small"
-            type="danger"
-            plain
-            icon="icon icon-back"
-            @click="back"
+          <el-button size="small" type="danger" plain @click="back"
             >返回</el-button
           >
         </div>

src/modules/questions/views/EditPaperPendingTrial.vue

@@ -115,12 +115,7 @@
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button
-            size="small"
-            type="danger"
-            plain
-            icon="icon icon-back"
-            @click="back"
+          <el-button size="small" type="danger" plain @click="back"
             >返回</el-button
           >
         </div>

src/modules/questions/views/EditSelectQuestion.vue

@@ -14,11 +14,7 @@
             @click="submitForm('quesModel')"
             >保存</el-button
           >
-          <el-button
-            type="danger"
-            plain
-            icon="icon icon-back"
-            @click="backToQuesList()"
+          <el-button type="danger" plain @click="backToQuesList()"
             >返回
           </el-button>
         </div>

src/modules/questions/views/GenPaperDetail.vue

@@ -22,9 +22,7 @@
             @click="confirmGenPaper"
             >确定</el-button
           >
-          <el-button type="danger" plain icon="icon icon-back" @click="toback"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="toback">返回</el-button>
         </div>
       </div>
       <el-form class="part-filter-form" :inline="true" :model="genPaper">

src/modules/questions/views/ImportPaperInfo.vue

@@ -106,9 +106,7 @@
               @click="removeFile"
               >清空文件
             </el-button>
-            <el-button type="danger" plain icon="icon icon-back" @click="back"
-              >返回</el-button
-            >
+            <el-button type="danger" plain @click="back">返回</el-button>
             <div slot="tip" class="el-upload__tip">只能上传docx和zip文件</div>
           </el-upload>
         </el-form-item>

src/modules/questions/views/InsertBluePaperStructure.vue

@@ -16,9 +16,7 @@
             @click="insertDetail"
             >添加大题</el-button
           >
-          <el-button type="danger" icon="icon icon-back" plain @click="back"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="back">返回</el-button>
         </div>
       </div>
       <el-form class="part-filter-form" :inline="true" :model="blueStruct">

src/modules/questions/views/InsertBluePaperStructureInfo.vue

@@ -60,9 +60,7 @@
             @click="saveForm"
             >保存</el-button
           >
-          <el-button type="danger" icon="icon icon-back" plain @click="back"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="back">返回</el-button>
         </el-form-item>
       </el-form>
     </div>

src/modules/questions/views/InsertPaperStructure.vue

@@ -20,9 +20,7 @@
             @click="insert()"
             >新增大题</el-button
           >
-          <el-button type="danger" plain icon="icon icon-back" @click="back"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="back">返回</el-button>
         </div>
       </div>
       <el-form

src/modules/questions/views/InsertPaperStructureInfo.vue

@@ -76,9 +76,7 @@
           <el-button type="danger" plain @click="resetForm('paperUnitForm')"
             >重置</el-button
           >
-          <el-button type="danger" plain icon="icon icon-back" @click="back"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="back">返回</el-button>
         </el-form-item>
       </el-form>
     </div>

src/modules/questions/views/OrgProperty.vue

@@ -4,12 +4,8 @@
       <div class="part-box-header">
         <h1 class="part-box-title">{{ rootOrgName }}</h1>
         <div>
-          <el-button type="primary" icon="icon icon-save-white" @click="save"
-            >保存</el-button
-          >
-          <el-button type="danger" plain icon="icon icon-back" @click="back"
-            >返回</el-button
-          >
+          <el-button type="primary" @click="save">保存</el-button>
+          <el-button type="danger" plain @click="back">返回</el-button>
         </div>
       </div>
       <div class="part-tabs">

src/modules/questions/views/PropertyInfo.vue

@@ -109,9 +109,7 @@
           >
         </div> -->
         <div>
-          <el-button type="danger" plain icon="icon icon-back" @click="back"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="back">返回</el-button>
         </div>
       </div>
     </div>

src/modules/questions/views/SelectQuestion.vue

@@ -10,9 +10,7 @@
             @click="submitQues()"
             >确定</el-button
           >
-          <el-button type="danger" plain icon="icon icon-back" @click="back()"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="back()">返回</el-button>
         </div>
       </div>
       <el-form :inline="true" :model="formSearch" class="part-filter-form">

src/modules/questions/views/SynthesisPaper.vue

@@ -15,9 +15,7 @@
             @click="confirmGenPaper"
             >确定</el-button
           >
-          <el-button type="danger" plain icon="icon icon-back" @click="goback"
-            >返回</el-button
-          >
+          <el-button type="danger" plain @click="goback">返回</el-button>
         </div>
       </div>
       <el-form

src/modules/questions/views/ViewPaper.vue

@@ -34,9 +34,7 @@
           @click="releasePaper(paper.id)"
           >释放</el-button
         > -->
-        <el-button type="danger" plain icon="icon icon-back" @click="back"
-          >返回</el-button
-        >
+        <el-button type="danger" plain @click="back">返回</el-button>
       </div>
     </div>
 

src/modules/questions/views/data_previllege.vue

@@ -9,9 +9,7 @@
             <el-button type="primary" icon="icon icon-save-white" @click="save"
               >保存</el-button
             >
-            <el-button type="danger" plain icon="icon icon-back" @click="back"
-              >返回</el-button
-            >
+            <el-button type="danger" plain @click="back">返回</el-button>
           </div>
         </div>
         <el-form

src/modules/questions/views/user.vue

@@ -347,7 +347,7 @@
             placeholder="请输入密码"
           />
         </el-form-item>
-        <el-form-item v-if="isSuperAdmin" label="学校" prop="rootOrgId">
+        <!-- <el-form-item v-if="isSuperAdmin" label="学校" prop="rootOrgId">
           <el-select
             v-model="userForm.rootOrgId"
             class="dialog-input-width"
@@ -364,7 +364,7 @@
             >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="角色" prop="role">
           <el-select
             v-model="userForm.role"
@@ -653,6 +653,13 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
+        role: [
+          {
+            required: true,
+            validator: validateRoles,
+            trigger: ["blur", "change"],
+          },
+        ],
       },
       tempDownloading: false,
     };