zhangjie hace 2 años
padre
commit
d8e77f2dfd

+ 1 - 1
src/constants/staticMenu.js

@@ -18,7 +18,7 @@ export default [
     enable: true,
   },
   {
-    id: "h010101",
+    id: "0",
     name: "待办任务",
     url: "WaitTask",
     type: "MENU",

+ 15 - 8
src/modules/base/components/ExamBackupEdit.vue

@@ -1,10 +1,19 @@
 <template>
   <div class="exam-backup-edit inline-block">
-    <el-input-number
+    <el-select
+      v-model="type"
+      :disabled="disabled"
       class="mr-1"
+      size="small"
+      @change="typeChange"
+    >
+      <el-option value="count" label="按固定分数设置"></el-option>
+      <el-option value="percent" label="按比例设置"></el-option>
+    </el-select>
+    <el-input-number
       v-model="backupCount"
       size="small"
-      :min="0"
+      :min="1"
       :max="type === 'count' ? 200 : 99"
       :step="1"
       step-strictly
@@ -13,10 +22,7 @@
       :disabled="disabled"
       @change="emitChange"
     ></el-input-number>
-    <el-radio-group v-model="type" :disabled="disabled" @change="typeChange">
-      <el-radio-button label="count">份</el-radio-button>
-      <el-radio-button label="percent">%</el-radio-button>
-    </el-radio-group>
+    <span class="ml-1">{{ type === "count" ? "份" : "%" }}</span>
   </div>
 </template>
 
@@ -38,8 +44,9 @@ export default {
       immediate: true,
       handler(val) {
         if (!val) {
-          this.backupCount = 0;
+          this.backupCount = 1;
         } else {
+          this.type = val >= 0 && val < 1 ? "percent" : "count";
           this.backupCount = val;
           if (this.type === "percent") {
             this.backupCount = val * 100;
@@ -51,7 +58,7 @@ export default {
   data() {
     return {
       type: "count",
-      backupCount: 0,
+      backupCount: 1,
     };
   },
   methods: {

+ 2 - 2
src/modules/base/components/ModifyCourse.vue

@@ -54,7 +54,7 @@
           <el-button class="btn-primary" type="text" @click="toSelectTeacher"
             >选择</el-button
           >
-
+          <br />
           <el-tag v-for="item in teachList" :key="item.id">
             {{ item.name }}({{ item.orgName }})
           </el-tag>
@@ -89,7 +89,7 @@ const initModalForm = {
   courseCode: "",
   teachingRoomId: "",
   clazzIdSet: "",
-  teachIdSet: "",
+  teachIdSet: [],
 };
 
 export default {

+ 24 - 2
src/modules/base/components/ModifyExamConfigDetail.vue

@@ -159,7 +159,18 @@
                 :label="val"
               ></el-option>
             </el-select>
-            <exam-backup-edit v-model="item.backupCount"></exam-backup-edit>
+            <el-input-number
+              class="mr-1"
+              v-model="item.backupCount"
+              size="small"
+              :min="0"
+              :max="200"
+              :step="1"
+              step-strictly
+              :controls="false"
+              style="width: 60px"
+            ></el-input-number>
+            <span>份</span>
           </div>
         </el-form-item>
         <!-- <h4 class="part-box-tips">普通印品:</h4> -->
@@ -200,7 +211,18 @@
                 :label="val"
               ></el-option>
             </el-select>
-            <exam-backup-edit v-model="item.backupCount"></exam-backup-edit>
+            <el-input-number
+              class="mr-1"
+              v-model="item.backupCount"
+              size="small"
+              :min="0"
+              :max="200"
+              :step="1"
+              step-strictly
+              :controls="false"
+              style="width: 60px"
+            ></el-input-number>
+            <span>份</span>
           </div>
         </el-form-item>
       </div>

+ 8 - 0
src/modules/base/views/CourseManage.vue

@@ -110,6 +110,11 @@
             <more-text :data="scope.row.clazzNames" :show-count="3"></more-text>
           </span>
         </el-table-column>
+        <el-table-column prop="teachList" label="授课老师" min-width="120">
+          <span slot-scope="scope">
+            <more-text :data="scope.row.teachNames" :show-count="3"></more-text>
+          </span>
+        </el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="170">
           <span slot-scope="scope">{{
             scope.row.createTime | timestampFilter
@@ -245,6 +250,9 @@ export default {
       const data = await courseListPage(datas);
       this.courses = data.records.map((item) => {
         item.clazzNames = item.clazzList.map((org) => org.name);
+        item.teachNames = item.teachList.map(
+          (user) => `${user.name}(${user.orgName})`
+        );
         return item;
       });
       this.total = data.total;

+ 9 - 7
src/modules/exam/views/ActionLogManage.vue

@@ -17,10 +17,10 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="操作人姓名:">
+          <el-form-item label="操作人账号:">
             <el-input
               v-model.trim="filter.operatorName"
-              placeholder="操作人姓名"
+              placeholder="操作人账号"
               clearable
             ></el-input>
           </el-form-item>
@@ -59,12 +59,14 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="detail" label="日志内容"> </el-table-column>
-        <el-table-column prop="operatorId" label="操作人ID" width="120">
+        <el-table-column prop="operatorName" label="操作人账号" width="140">
         </el-table-column>
-        <el-table-column prop="operatorName" label="操作人姓名">
-        </el-table-column>
-        <el-table-column prop="ip" label="IP"> </el-table-column>
-        <el-table-column prop="customizedOperationTypeName" label="操作类型">
+        <el-table-column prop="ip" label="IP" width="140"> </el-table-column>
+        <el-table-column
+          prop="customizedOperationTypeName"
+          label="操作类型"
+          width="120"
+        >
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="170">
           <span slot-scope="scope">

+ 23 - 5
src/modules/print/components/ModifyPrintPlan.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     :title="title"
     top="10px"
-    width="600px"
+    width="700px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
@@ -169,10 +169,19 @@
                 :label="val"
               ></el-option>
             </el-select>
-            <exam-backup-edit
+            <el-input-number
+              class="mr-1"
               v-model="item.backupCount"
+              size="small"
+              :min="0"
+              :max="200"
+              :step="1"
+              step-strictly
+              :controls="false"
               disabled
-            ></exam-backup-edit>
+              style="width: 60px"
+            ></el-input-number>
+            <span>份</span>
           </div>
         </el-form-item>
       </div>
@@ -218,10 +227,19 @@
                 :label="val"
               ></el-option>
             </el-select>
-            <exam-backup-edit
+            <el-input-number
+              class="mr-1"
               v-model="item.backupCount"
+              size="small"
+              :min="0"
+              :max="200"
+              :step="1"
+              step-strictly
+              :controls="false"
               disabled
-            ></exam-backup-edit>
+              style="width: 60px"
+            ></el-input-number>
+            <span>份</span>
           </div>
         </el-form-item>
       </div>