xjc 2 anni fa
parent
commit
18a8514675

+ 4 - 2
src/filters/index.js

@@ -13,9 +13,11 @@ const sex = value => {
   }
 }
 const upload_status = value => {
-  if (value === false) {
+  if (value === 0) {
     return "待上传";
-  } else if (value === true) {
+  } else if (value === 1) {
+    return "上传中";
+  }else if (value === 2) {
     return "已上传";
   } else {
     return value;

+ 2 - 2
src/layout/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="root" @touchmove.prevent>
     <div class="top-bar">
-      <div class="logo"></div>
-      <div class="title">云阅评管理系统</div>
+      <!-- <div class="logo"></div>
+      <div class="title">云阅评管理系统</div> -->
       <div class="right-menu">
         <!-- <el-dropdown class="theme-container" @command="handleTheme" trigger="click">
           <span class="el-dropdown-link">

+ 7 - 1
src/views/menu3/menu3-1/index.vue

@@ -239,7 +239,7 @@ import { sysApi } from "@/api/system";
 import { DictsApi } from "@/api/dict";
 export default {
   name: "menu3-1",
-  metaDataType: ["schools", "grades", "classes", "roles", "subjects"],
+  metaDataType: ["schools", "grades", "classes", "subjects"],
   computed: {},
   data() {
     return {
@@ -377,8 +377,14 @@ export default {
   },
   created() {
     this.getList();
+    this.getRoles();
   },
   methods: {
+    getRoles(){
+      DictsApi.roles({ platform: "teacher" }).then((res) => {
+        this.metaData["roles"] = res.data;
+      });
+    },
     getList(size, page) {
       TeacherApi.getList(
         Object.assign(this.listQuery, {

+ 3 - 3
src/views/menu5/cutPage/cutPage.vue

@@ -381,7 +381,7 @@ export default {
     ];
   },
   async mounted() {
-    debugger;
+    // debugger;
     await this.init();
     await this.leftClick(0);
     this.getDetail();
@@ -539,7 +539,7 @@ export default {
         });
     },
     formatReqData(list) {
-      debugger;
+      // debugger;
       let ques = JSON.parse(JSON.stringify(list));
       if (ques[ques.length - 1].ele.length <= 0) {
         ques.pop();
@@ -815,7 +815,7 @@ export default {
       this.isDragging = false;
     },
     enter(item, img, css) {
-      debugger;
+      // debugger;
       if (!img) {
         this.previewIMG = "";
         this.previewTop = "25%";

+ 1 - 1
src/views/menu5/menu5-2/index.vue

@@ -289,7 +289,7 @@ export default {
           {
             id: "2",
             label: "状态",
-            prop: "is_completed",
+            prop: "status",
             filter: "upload_status",
             show: true,
           },

+ 3 - 2
src/views/menu7/menu7-2/index.vue

@@ -36,8 +36,9 @@
       <el-form ref="form" :model="form" label-width="80px" :rules="rules">
         <el-form-item label="角色类型" prop="platform">
           <el-select v-model="form.platform" placeholder="请选择角色类型">
-            <el-option :label="'用户账号'" :value="'pc'"> </el-option>
-            <el-option :label="'管理员账号'" :value="'admin'"> </el-option>
+            <el-option :label="'管理员'" :value="'admin'"> </el-option>
+            <el-option :label="'学生'" value="student"> </el-option>
+            <el-option :label="'教师'" value="teacher"> </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="角色名称" prop="name">