zhangjie vor 4 Jahren
Ursprung
Commit
cd1b326403

+ 4 - 1
src/features/invigilation/ExamReport/ReportAbsent.vue

@@ -3,7 +3,10 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column type="index" label="排序"></el-table-column>
       <el-table-column prop="examName" label="批次名称(ID)"></el-table-column>
-      <el-table-column prop="examActivityId" label="场次ID"></el-table-column>
+      <el-table-column
+        prop="examActivityCode"
+        label="场次代码"
+      ></el-table-column>
       <el-table-column prop="roomName" label="考场名称(代码)">
         <span slot-scope="scope"
           >{{ scope.row.roomName }}({{ scope.row.roomCode }})</span

+ 4 - 1
src/features/invigilation/ExamReport/ReportBreach.vue

@@ -3,7 +3,10 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column type="index" label="排序"></el-table-column>
       <el-table-column prop="examName" label="批次名称(ID)"></el-table-column>
-      <el-table-column prop="examActivityId" label="场次ID"></el-table-column>
+      <el-table-column
+        prop="examActivityCode"
+        label="场次代码"
+      ></el-table-column>
       <el-table-column prop="examroom" label="考场名称(代码)">
         <span slot-scope="scope"
           >{{ scope.row.roomName }}({{ scope.row.roomCode }})</span

+ 4 - 1
src/features/invigilation/ExamReport/ReportCancalBreach.vue

@@ -3,7 +3,10 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column type="index" label="排序"></el-table-column>
       <el-table-column prop="examName" label="批次名称(ID)"></el-table-column>
-      <el-table-column prop="examActivityId" label="场次ID"></el-table-column>
+      <el-table-column
+        prop="examActivityCode"
+        label="场次代码"
+      ></el-table-column>
       <el-table-column prop="examroom" label="考场名称(代码)">
         <span slot-scope="scope"
           >{{ scope.row.roomName }}({{ scope.row.roomCode }})</span

+ 4 - 1
src/features/invigilation/ExamReport/ReportException.vue

@@ -3,7 +3,10 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column type="index" label="排序"></el-table-column>
       <el-table-column prop="examName" label="批次名称(ID)"></el-table-column>
-      <el-table-column prop="examActivityId" label="场次ID"></el-table-column>
+      <el-table-column
+        prop="examActivityCode"
+        label="场次代码"
+      ></el-table-column>
       <el-table-column prop="examroom" label="考场名称(代码)">
         <span slot-scope="scope"
           >{{ scope.row.roomName }}({{ scope.row.roomCode }})</span

+ 4 - 1
src/features/invigilation/ExamReport/ReportReexam.vue

@@ -3,7 +3,10 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column type="index" label="排序"></el-table-column>
       <el-table-column prop="examName" label="批次名称(ID)"></el-table-column>
-      <el-table-column prop="examActivityId" label="场次ID"></el-table-column>
+      <el-table-column
+        prop="examActivityCode"
+        label="场次代码"
+      ></el-table-column>
       <el-table-column prop="examroom" label="考场名称(代码)">
         <span slot-scope="scope"
           >{{ scope.row.roomName }}({{ scope.row.roomCode }})</span

+ 4 - 1
src/features/invigilation/ExamReport/ReportStatistics.vue

@@ -3,7 +3,10 @@
     <el-table ref="TableList" :data="dataList">
       <el-table-column type="index" label="排序"></el-table-column>
       <el-table-column prop="examName" label="批次名称(ID)"></el-table-column>
-      <el-table-column prop="examActivityId" label="场次ID"></el-table-column>
+      <el-table-column
+        prop="examActivityCode"
+        label="场次代码"
+      ></el-table-column>
       <el-table-column prop="roomName" label="考场名称(代码)">
         <span slot-scope="scope"
           >{{ scope.row.roomName }}({{ scope.row.roomCode }})</span

+ 11 - 1
src/features/invigilation/WarningManage/WarningManage.vue

@@ -130,7 +130,11 @@
           </el-form-item>
         </el-form>
         <div class="part-filter-form-action">
-          <el-button type="primary" icon="icon icon-clean" @click="cleanUnread"
+          <el-button
+            type="primary"
+            icon="icon icon-clean"
+            @click="cleanUnread"
+            v-if="!IS_ADMIN"
             >清除未阅</el-button
           >
           <!-- <el-button type="danger" icon="icon icon-warning" @click="batchAction"
@@ -250,6 +254,12 @@ export default {
     IS_INVIGILATE() {
       return this.user.roleCodes.includes("INVIGILATE");
     },
+    IS_ADMIN() {
+      return (
+        this.user.roleCodes.includes("ADMIN") ||
+        this.user.roleCodes.includes("SUPER_ADMIN")
+      );
+    },
   },
   mounted() {
     this.initData();