fix

src/api/index.js

@@ -74,6 +74,7 @@ export default {
   getDetailByAccount: `occupationlab/occupationlab/architecture/getDetailByAccount`, // 新增用户前调用：按帐户获取详细信息
   importStudent: `${host}occupationlab/occupationlab/architecture/importStudent`, // 批量导入学生
   exportFailure: `${host}occupationlab/occupationlab/architecture/exportFailure`, // 批量导入学生失败数据导出
+  excelExportStudentList: `${host}occupationlab/occupationlab/architecture/excelExportStudentList`,
   removeStudent: `occupationlab/occupationlab/architecture/removeStudent`, // 移除学生
   organizationalStudentList: `occupationlab/occupationlab/architecture/organizationalStudentList`, // 根据组织架构筛选学生列表
   studentList: `occupationlab/occupationlab/architecture/studentList`, // 学生列表

src/pages/achievement/list/index.vue

@@ -1,15 +1,12 @@
 <template>
   <div class="page">
     <div class="tabs">
-      <a class="item"
+      <a class="item" v-for="(item, index) in tabs" :key="index" :class="{ active: index == active }"
-         v-for="(item,index) in tabs"
+        @click="tabChange(index)">{{ item }}</a>
-         :key="index"
-         :class="{active: index == active}"
-         @click="tabChange(index)">{{ item }}</a>
     </div>
     <div class="page-content">
       <Course v-if="active == 'tab1'" />
-      <Project v-if="active == 'tab2'" />
+      <Project v-if="active == 'tab2' || active == 'tab3'" />
     </div>
   </div>
 </template>
@@ -32,7 +29,7 @@ export default {
       tabs: {
         tab1: '课程维度',
         tab2: '项目维度',
-        // tab3: '多维评分',
+        tab3: '我的课程',
       },
     };
   },
@@ -66,5 +63,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>

src/pages/lesson/content/index.vue

@@ -96,8 +96,8 @@
       :close-on-click-modal="false">
       <el-form ref="form" :model="sectionForm" label-width="80px" @submit.native.prevent>
         <el-form-item label="资源添加">
-          <Upload :max-size="100000" :file-list="uploadList" :on-remove="handleRemove" @beforeUpload="beforeUpload"
+          <Upload :max-size="100000" :limit="10000" :file-list="uploadList" :on-remove="handleRemove"
-            @onSuccess="uploadSuccess">
+            @beforeUpload="beforeUpload" @onSuccess="uploadSuccess">
             <template slot="tip">
               <p>视频请上传MP4格式，大小不超过150M；office文件大小不要超过10M</p>
             </template>
@@ -117,8 +117,8 @@
     <el-dialog title="更换文件" :visible.sync="switchVisible" width="540px" :close-on-click-modal="false"
       @close="closeSwitch">
       <div style="text-align: center">
-        <Upload :max-size="100000" :file-list="uploadList" :on-remove="handleRemove" @beforeUpload="beforeUpload"
+        <Upload :max-size="100000" :limit="10000" :file-list="uploadList" :on-remove="handleRemove"
-          @onSuccess="uploadSuccess">
+          @beforeUpload="beforeUpload" @onSuccess="uploadSuccess">
           <div slot="tip"></div>
         </Upload>
       </div>
@@ -389,6 +389,10 @@ export default {
       this.fileType = file.format
       this.fileUrl = file.url
       this.fileName = file.name
+      this.uploadList = [{
+        name: file.name,
+        url: file.url,
+      }]
     },
     uploadError (err, file, fileList) {
       this.$message({
@@ -586,9 +590,13 @@ export default {
     },
     // 本地上传编辑资源
     editSection () {
-      this.sectionForm.sectionName = this.curSection.name
+      const row = this.curSection
+      this.sectionForm.sectionName = row.name
       this.fileUrl = ''
-      this.uploadList = []
+      this.uploadList = [{
+        name: row.originalFileName,
+        url: row.fileUrl,
+      }]
       this.isAddSection = false
       this.sectionVisible = true
     },

src/pages/lesson/content/source.vue

@@ -63,9 +63,8 @@
               <span>资源类型</span>
             </div>
             <ul class="lines">
-              <li v-for="(item, i) in sourceType" :key="i" class="line">
+              <li v-for="(item, i) in sourceType" :key="i" :class="['line', { active: curType === item.name }]"
-                <el-checkbox v-model="item.check" :label="item.name" @change="getCourse"></el-checkbox>
+                @click="checkType(item)">{{ item.name }}</li>
-              </li>
             </ul>
           </div>
 
@@ -144,6 +143,7 @@ export default {
         tab3: '文件素材',
       },
       sourceType: SourceConst.types,
+      curType: '',
       sources: [],
       checkAll: false,
       keyword: '',
@@ -193,7 +193,7 @@ export default {
             platformId: Setting.platformId,
             type: 2,
             keyword: this.keyword,
-            displayFileType: this.sourceType.filter(e => e.check).map(e => e.name),
+            displayFileType: this.curType ? [this.curType] : [],
           })
           const list = page.records
           list.forEach(e => {
@@ -315,6 +315,11 @@ export default {
         this.sourceChange(e)
       })
     },
+    // 资源类型选择回调
+    checkType ({ name }) {
+      this.curType = name
+      this.getCourse()
+    },
     // 资源列表选择回调
     sourceChange (row) {
       const { check } = row
@@ -575,6 +580,12 @@ export default {
 
     .line {
       margin-bottom: 10px;
+      cursor: pointer;
+
+      &.active {
+        font-weight: 600;
+        color: #062c87;
+      }
     }
   }
 

src/pages/project/list/index.vue

@@ -6,7 +6,7 @@
     <div class="page">
       <h6 class="p-title">筛选</h6>
       <div class="tool mul">
-        <ul class="filter">
+        <ul class="filter" style="flex-wrap: wrap;">
           <li>
             <label>创建人</label>
             <el-select v-model="form.founder" placeholder="请选择创建人" @change="founderChange">
@@ -28,6 +28,13 @@
                 :value="item.value"></el-option>
             </el-select>
           </li>
+          <li>
+            <label>类型</label>
+            <el-radio-group v-model="form.type" @change="initData">
+              <el-radio v-for="(item, i) in projectType" :key="i" :label="item.id" border>{{ item.name
+                }}</el-radio>
+            </el-radio-group>
+          </li>
           <li>
             <label>课程</label>
             <el-cascader v-model="cid" :options="curs" :props="{ checkStrictly: true, value: 'id' }"
@@ -161,6 +168,7 @@ export default {
         cid: this.$route.query.cid ? +this.$route.query.cid : '',
         mallId: this.$route.query.mallId ? +this.$route.query.mallId : '',
         systemId: this.$route.query.systemId ? +this.$route.query.systemId : '',
+        type: 0,
       },
       status: "",
       listData: [],
@@ -180,6 +188,15 @@ export default {
           label: "竞赛"
         }
       ],
+      projectType: [
+        {
+          id: 0,
+          name: '校本课程'
+        }, {
+          id: 1,
+          name: '我的课程'
+        }
+      ],
       permissionsKeys: {
         0: "练习",
         1: "考核",

src/pages/resourse/upload.vue

@@ -4,7 +4,7 @@
     <el-form label-width="80px" style="padding: 20px">
       <el-form-item prop="userName">
         <el-upload name="file" ref="upload" class="import-file" drag :before-upload="beforeUpload"
-          :on-remove="handleRemove" :on-error="uploadError" :before-remove="beforeRemove" :limit="1"
+          :on-remove="handleRemove" :on-error="uploadError" :before-remove="beforeRemove" :limit="10000"
           :disabled="uploading" v-loading="uploading" :on-exceed="handleExceed" :file-list="uploadList" action=""
           :http-request="handleRequest">
           <!-- <img v-if="form.coverUrl" :src="form.coverUrl" class="avatar"> -->
@@ -105,6 +105,11 @@ export default {
         this.form.fileUrl = res.url
         this.form.fileName = res.name
         this.handleType(res.format)
+
+        this.uploadList = [{
+          name: res.name,
+          url: res.url
+        }]
       })
     },
     uploadError () {

src/pages/student/list/index.vue

@@ -73,6 +73,8 @@
           <el-button type="info" @click="batchGenerate">一键批量生成账号</el-button>
           <el-button type="info" v-auth="'/student/list:新增学生'" @click="addStudent">新增学生</el-button>
           <el-button type="primary" v-auth="'/student/list:批量导入'" @click="batchImport">批量导入</el-button>
+          <el-button type="primary" :loading="exporting" @click="exportData">{{ exporting ? '正在导出' : '批量导出'
+            }}</el-button>
           <el-button type="primary" v-auth="'/student/list:批量删除'" @click="delAllSelection">批量删除</el-button>
         </div>
       </div>
@@ -213,6 +215,7 @@ import Setting from '@/setting'
 import OrgTree from "@/components/org-tree/src/tree";
 import { mapState } from "vuex";
 import _ from 'lodash'
+import axios from 'axios'
 export default {
   components: { OrgTree },
   data () {
@@ -357,6 +360,8 @@ export default {
           { required: true, message: '请输入账号数', trigger: 'blur' }
         ],
       },
+
+      exporting: false,
     };
   },
   computed: {
@@ -999,7 +1004,21 @@ export default {
       this.handleClose();
       this.handleRefresh();
       this.initData();
-    }
+    },
+    // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
+    async exportData () {
+      if (this.listData.length) {
+        this.exporting = true
+        // 有选择数据，则导出已选择的，否则导出全部
+        const res = await axios.post(this.api.excelExportStudentList, this.multipleSelection.length ? this.multipleSelection : [], {
+          headers: this.headers,
+          responseType: 'blob'
+        })
+        const name = res.headers['content-disposition']
+        Util.downloadFileDirect(name ? decodeURI(name) : '学生列表.xlsx', new Blob([res.data]))
+        this.exporting = false
+      }
+    },
   }
 };
 </script>

src/pages/system/list/index.vue

@@ -1,13 +1,17 @@
 <template>
-  <div class="page" style="padding: 0">
+  <div class="page" style="padding: 10px;">
-    <div class="tabs">
+    <el-tabs v-model="active" type="card">
+      <el-tab-pane v-for="(item, i) in tabs" :key="i" :label="item.name" :name="item.id"></el-tab-pane>
+    </el-tabs>
+
+    <!-- <div class="tabs">
       <a class="item" v-for="(item, index) in tabs" :key="index" :class="{ active: index == active }"
         @click="tabChange(index)">{{ item }}</a>
-    </div>
+    </div> -->
 
-    <staff v-if="active == 'staff'"></staff>
+    <staff v-if="active === '1'"></staff>
-    <role v-if="active == 'role'"></role>
+    <role v-if="active === '2'"></role>
-    <logo v-if="active == 'logo'"></logo>
+    <logo v-if="active === '3'"></logo>
   </div>
 </template>
 
@@ -20,12 +24,21 @@ import logo from "./logo";
 export default {
   data () {
     return {
-      active: "staff",
+      active: '1',
-      tabs: {
+      tabs: [
-        staff: "教师管理",
+        {
-        role: "角色权限",
+          id: '1',
-        logo: "系统logo设置",
+          name: '教师管理'
-      }
+        },
+        {
+          id: '2',
+          name: '角色权限'
+        },
+        {
+          id: '3',
+          name: '系统logo设置'
+        },
+      ],
     };
   },
   computed: {
@@ -42,9 +55,6 @@ export default {
     Setting.dynamicRoute && this.initTabs()
   },
   methods: {
-    tabChange (index) {
-      this.active = index
-    },
     initTabs () {
       const { btns } = this
       const tab1 = btns.includes('/system/list:教师管理')

src/pages/theoryExam/index.vue

@@ -178,7 +178,7 @@ export default {
       token: Util.local.get(Setting.tokenKey),
       paperId: +this.$route.query.paperId, // 试卷id（练习专用）
       cid: +this.$route.query.cid,
-      mallId: +this.$route.query.mallId,
+      mallId: +this.$route.query.mallId || '',
       curriculumName: this.$route.query.curriculumName,
       assessmentId: this.$route.query.assessmentId, // 考核id
       classId: this.$route.query.classId,