.

src/api/index.js

@@ -49,7 +49,7 @@ export default {
   studentGetWorkNumber: `management/student/getWorkNumber`,
   exportFailureStudent: `${Setting.apiBaseURL}/management/student/exportFailure`,
   uploadFileStudent: `${Setting.apiBaseURL}/management/student/uploadFile`,
-  downloadStudentTemp: 'http://liuwanr.oss-cn-shenzhen.aliyuncs.com/xlsx/20201102/1604658660956.xlsx',
+  downloadStudentTemp: 'http://39.108.250.202/template/%E8%80%83%E8%AF%95%E5%B9%B3%E5%8F%B0%E5%AD%A6%E7%94%9F%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx',
 
   // 一级部门
   addStaffPro: `management/staffProfessionalArchitecture/addStaffProfessionalArchitecture`,
@@ -74,7 +74,7 @@ export default {
   getWorkNumber: `management/staff/getWorkNumber`,
   exportFailureStaff: `${Setting.apiBaseURL}/management/staff/exportFailure`,
   uploadFileStaff: `${Setting.apiBaseURL}/management/staff/managementUpload`,
-  downloadStaffTemp: `http://liuwanr.oss-cn-shenzhen.aliyuncs.com/xlsx/20201102/1604658763812.xlsx`,
+  downloadStaffTemp: `http://39.108.250.202/template/%E8%80%83%E8%AF%95%E5%B9%B3%E5%8F%B0%E5%91%98%E5%B7%A5%E5%AF%BC%E5%85%A5%E6%A8%A1%E6%9D%BF.xlsx`,
 
   // 角色管理
   getRole: `management/role/get`,

src/pages/assessment/list/index.vue

@@ -626,7 +626,7 @@ export default {
             this.testPaperName = ''
         },
         getCourses() {
-            this.$get(`${this.api.getCourses}?type=0`)
+            this.$get(`${this.api.getCourses}?type=0&schoolId=${this.clientId}`)
             .then(res => {
                 this.coursesList = res.data.list
             })

src/pages/practice/list/index.vue

@@ -415,7 +415,7 @@ export default {
             this.testPaperName = ''
         },
         getCourses() {
-            this.$get(`${this.api.getCourses}?type=1`)
+            this.$get(`${this.api.getCourses}?type=1&schoolId=${this.clientId}`)
             .then(res => {
                 this.coursesList = res.data.list
             })

src/pages/quesBank/list/quesBankType.vue

@@ -23,7 +23,7 @@
             <el-table :data="listData" class="table" stripe header-align="center" row-key="cid" :tree-props="treeProps" :indent="9">
                 <el-table-column prop="typeName" label="分类名称">
                     <template slot-scope="scope">
-                        <span style="display: inline-block;width: 23px;" v-if="!scope.row.secondColumn.length"></span>{{scope.row.typeName}}
+                        <span style="display: inline-block;width: 23px;" v-if="!scope.row.secondColumn.length"></span><span v-html="scope.row.typeName"></span>
                     </template>
                 </el-table-column>
                 <el-table-column label="操作" width="200">
@@ -116,8 +116,34 @@ export default {
             }
             this.$post(this.api.listByPage,data)
             .then(res => {
-                this.listData = res.data.list.list
+                let list = res.data.list.list
+                let result = []
+                list.map(n => {
+                    n.source == 1 && result.push(n)
+                })
+                list.map(n => {
+                    n.source == 2 && result.push(n)
+                })
+                this.listData = result
                 this.total = res.data.list.totalCount
+
+                let data1 = {
+                    pageNum: 1,
+                    pageSize: 10000,
+                    schoolId: this.clientId,
+                    source: 2
+                }
+                this.$post(this.api.listByPage,data1)
+                .then(res => {
+                    let original = this.listData
+                    let list = res.data.list.list
+                    original.map(n => {
+                        if(n.source == 1){
+                            if(list.find(e => e.source == 2 && e.typeName == n.typeName)) n.typeName = n.typeName + '<em class="sys">(内置)</em>'
+                        }
+                    })
+                    this.listData = original
+                }).catch(err => {})
             }).catch(err => {})
         },
         handleCurrentChange(val) {
@@ -233,5 +259,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    
+    /deep/.sys{
+        font-style: normal;
+        color: #f00;
+    }
 </style>

src/pages/quesBank/list/quesDialog.vue

@@ -260,7 +260,20 @@ export default {
             }
             this.$post(this.api.listByPage,data)
             .then(res => {
-                this.quesBankList = res.data.list.list
+                let list = res.data.list.list
+                let result = []
+                list.map(n => {
+                    n.source == 1 && result.push(n)
+                })
+                list.map(n => {
+                    n.source == 2 && result.push(n)
+                })
+                result.map(n => {
+                    if(n.source == 1){
+                        if(result.find(e => e.source == 2 && e.typeName == n.typeName)) n.typeName = n.typeName + '(内置)'
+                    }
+                })
+                this.quesBankList = result
             })
             .catch(err => {})
         },

src/pages/student/list/index.vue

@@ -118,6 +118,7 @@
                     :before-remove="beforeRemove"
                     :limit="1"
                     :on-exceed="handleExceed"
+                    :data="{schoolId: this.clientId}"
                     :action="this.api.uploadFileStudent"
                     :file-list="uploadList"
                     name="file"

src/pages/system/list/staff.vue

@@ -10,7 +10,7 @@
                     <el-card shadow="hover" class="m-b-20 teacher_tab">
                         <div class="flex j-between m-b-20">
                             <div>
-                                <el-input placeholder="请输入员工姓名/工号" v-model="keyword" prefix-icon="el-icon-search" clearable></el-input>
+                                <el-input style="width: 250px" placeholder="请输入员工姓名/工号/角色名称" v-model="keyword" prefix-icon="el-icon-search" clearable></el-input>
                             </div>
                             <div>
                                 <el-button type="primary" size="small" round @click="addTeacher" v-auth="'/system/list:员工管理:新增员工'">新增员工</el-button>
@@ -119,6 +119,7 @@
                     :on-success="uploadSuccess"
                     :before-remove="beforeRemove"
                     :limit="1"
+                    :data="{schoolId: this.clientId}"
                     :on-exceed="handleExceed"
                     :action="this.api.uploadFileStaff"
                     :file-list="uploadList"
@@ -264,7 +265,7 @@ export default {
         keyword: function(val) {
             clearTimeout(this.searchTimer)
             this.searchTimer = setTimeout(() => {
-                this.getData()
+                this.initData()
             },500)
         }
     },
@@ -306,17 +307,30 @@ export default {
             this.handleCheck(val2)
         },
         getData(){
+            let totalPage = Math.ceil((this.total - 1) / this.pageSize)
+            let currentPage = this.pageNo > totalPage ? totalPage : this.pageNo
+            this.pageNo = currentPage < 1 ? 1 : currentPage
             let data = {
                 staffProfessionalArchitectureIds: this.oneDepartmentIds,
                 staffGradeIds: this.twoDepartmentIds,
                 searchContent: this.keyword,
-                schoolId: this.clientId
+                schoolId: this.clientId,
+                pageNum: this.pageNo,
+                pageSize: this.pageSize
             }
             this.$get(`${this.api.queryStaff}/${this.pageNo}/${this.pageSize}`,data).then(res => {
-                this.listData = res.data.staffList
-                this.total = res.data.total
+                this.listData = res.data.staffList.list
+                this.total = res.data.staffList.totalCount
+                if(!this.listData.length && this.total){
+                    this.pageNo--
+                    this.getData()
+                }
             }).catch(res => {});
         },
+        initData(){
+            this.pageNo = 1
+            this.getData()
+        },
         getRoles(){
             let data = {
                 clientId: this.clientId