zhangjie 2 년 전
부모
커밋
faf69ec99a

+ 18 - 3
src/modules/admin/views/SchoolManage.vue

@@ -44,14 +44,29 @@
         <el-table-column
           prop="code"
           label="学校代码"
-          min-width="100"
+          width="150"
         ></el-table-column>
         <el-table-column
           prop="code"
           label="学校域名"
-          min-width="100"
+          width="150"
         ></el-table-column>
-        <el-table-column class-name="action-column" label="操作" width="120">
+        <el-table-column
+          prop="accessKey"
+          label="accessKey"
+          width="300"
+        ></el-table-column>
+        <el-table-column
+          prop="accessSecret"
+          label="accessSecret"
+          width="300"
+        ></el-table-column>
+        <el-table-column
+          class-name="action-column"
+          label="操作"
+          fixed="right"
+          width="100"
+        >
           <template slot-scope="scope">
             <el-button
               class="btn-primary"

+ 1 - 1
src/modules/exam/views/DataTaskManage.vue

@@ -133,7 +133,7 @@
               >重新生成PDF</el-button
             >
             <el-button
-              v-if="!scope.row.resetCreatePdf && checkPriv('link', 'download')"
+              v-if="scope.row.hasResultFile && checkPriv('link', 'download')"
               class="btn-primary"
               type="text"
               :disabled="loading"

+ 4 - 1
src/modules/stmms/components/markParam/ModifyObjectiveAnswer.vue

@@ -23,7 +23,10 @@
         <el-button @click="cancel">取消</el-button>
       </div>
     </div>
-
+    <p class="tips-info mb-1">
+      <i class="el-icon-warning"></i> 客观题标答只能输入大写字母ABCDE...
+      ,判断题正确请输入A,错误输入B
+    </p>
     <el-table
       ref="TableList"
       :data="tableData"

+ 5 - 0
src/modules/stmms/views/UploadStructure.vue

@@ -51,6 +51,11 @@
           width="100"
         ></el-table-column>
         <el-table-column prop="statusStr" label="状态" width="100">
+          <span
+            slot-scope="scope"
+            :class="{ 'color-danger': scope.row.status === 'INIT' }"
+            >{{ scope.row.statusStr }}</span
+          >
         </el-table-column>
         <el-table-column
           class-name="action-column"

+ 2 - 2
src/plugins/filters.js

@@ -40,10 +40,10 @@ Vue.filter("templateTypeFilter", function(val) {
   return TEMPLATE_TYPE[val] || DEFAULT_FIELD;
 });
 Vue.filter("orgsFilter", function(val) {
-  return val.map(item => item.name).join(",");
+  return val.map(item => item.name).join();
 });
 Vue.filter("rolesFilter", function(val) {
-  return val.map(item => item.name).join(",");
+  return val.map(item => item.name).join();
 });
 Vue.filter("coursesFilter", function(val) {
   return val.map(item => `${item.name}(${item.code})`).join(",");

+ 6 - 0
src/views/HomePage.vue

@@ -253,6 +253,12 @@ export default {
     },
     toDo(item) {
       console.log(item);
+      if (item.type === "stmms") {
+        this.$router.push({
+          name: "UploadStructure"
+        });
+        return;
+      }
       this.$ls.set(`wait_task_${item.type}`, item);
       this.$router.push({
         name: "WaitTask",