.

src/components/testPaperDetail/index.vue

@@ -31,7 +31,8 @@
                     <p class="val" v-html="item.questionStem"></p>
                     <div class="media" :id="item.mediaEleId"></div>
                 </div>
-                <div class="meta">
+                <template v-if="active != 5">
+                    <div class="meta" v-if="active != 3">
                         <p class="key">选项：</p>
                         <div class="val">
                             <p v-for="(option,i) in item.options" :key="i">{{i}}.{{item.options[i]}}</p>
@@ -43,6 +44,7 @@
                             <p class="val">{{item.answer}}</p>
                         </div>
                     </div>
+                </template>
                 <div class="meta">
                     <p class="key">答案解析：</p>
                     <p class="val" v-html="item.answerAnalysis"></p>

src/layouts/navbar/index.vue

@@ -65,11 +65,6 @@ export default {
                     index: '/index/list',
                     title: '我的首页'
                 },
-                {
-                    icon: 'el-icon-user',
-                    index: '/student/list',
-                    title: '学生管理'
-                },
                 {
                     icon: 'el-icon-notebook-1',
                     index: '/quesBank/list',
@@ -95,15 +90,20 @@ export default {
                     index: '/achievement/list',
                     title: '成绩管理'
                 },
-                {
-                    icon: 'el-icon-setting',
-                    index: '/system/list',
-                    title: '系统设置'
-                },
                 {
                     icon: 'el-icon-chat-dot-round',
                     index: '/messageBoard/list',
                     title: '交流互动'
+                },
+                {
+                    icon: 'el-icon-user',
+                    index: '/student/list',
+                    title: '学生管理'
+                },
+                {
+                    icon: 'el-icon-setting',
+                    index: '/system/list',
+                    title: '系统设置'
                 }
             ],
             menus: []
@@ -129,13 +129,7 @@ export default {
         initMenu(){
             if(Setting.dynamicRoute){
                 let routes = this.routes
-                let menus = [
-                    {
-                        icon: 'el-icon-folder-checked',
-                        index: '/index/list',
-                        title: '我的首页'
-                    }
-                ]
+                let menus = []
                 this.defaultMenus.map(e => {
                     routes.find(n => n.path == e.index) && menus.push(e)
                 })

src/libs/route/addRoutes.js

@@ -31,7 +31,7 @@ export default function(data,path){
     // routes[1].children = [...routes[1].children,...newRoutes]
     store.dispatch('auth/addRoutes',newRoutes)
     // router.addRoutes(routes)
-    // setTimeout(() => {
-    //     !newRoutes.find(n => n.name == '/index/list') && router.push(newRoutes[0].path)
-    // },10)
+    setTimeout(() => {
+        !newRoutes.find(n => n.name == '/index/list') && router.push(newRoutes[0].path)
+    },10)
 }

src/libs/util.js

@@ -89,6 +89,20 @@ const util = {
   getFileExt(fileName) {
     return fileName.substring(fileName.lastIndexOf('.') + 1)
   },
+  // 传入文件名和路径，下载图片视频，支持跨域，a标签加download不支持跨域
+  downloadFile(fileName,url) {
+    var x = new XMLHttpRequest()
+    x.open("GET", url, true)
+    x.responseType = 'blob'
+    x.onload=function(e) {
+        var url = window.URL.createObjectURL(x.response)
+        var a = document.createElement('a')
+        a.href = url
+        a.download = fileName
+        a.click()
+    }
+    x.send()
+  },
 }
 
 export default util

src/main.js

@@ -16,9 +16,12 @@ import Setting from '@/setting';
 
 // 插件
 import plugins from '@/plugins';
+import filters from '@/plugins/filters'
 
 Vue.use(plugins);
 
+Object.keys(filters).forEach(item => Vue.filter(item,filters[item]))
+
 Vue.prototype.api = api;
 Vue.prototype.$get = get;
 Vue.prototype.$post = post;

src/mixins/file/index.js

@@ -1,4 +1,5 @@
 import util from '@/libs/util'
+import { Loading } from 'element-ui'
 export default {
     data() {
         return {
@@ -7,15 +8,16 @@ export default {
             iframeSrc: '',
             pdfVisible: false,
             pdfSrc: '',
-            imgName: '',
-            imgSrc: ''
+            isDownload: 0,
+            loadIns: null,
         }
     },
     mounted() {
         this.insertScript()
     },
     methods: {
-        preview(url,isVideo){
+        preview(url,isVideo,isDownload){
+            this.isDownload = isDownload
             let ext = util.getFileExt(url)
             if(isVideo){
                 this.$get(`${this.api.getPlayAuth}/${url}`).then(res => {
@@ -63,15 +65,23 @@ export default {
             this.playAuth = ''
             this.player.pause()
         },
-        download(fileName,url){
+        download(fileName,url,isVideo){
+            if(isVideo){
+                this.loadIns = Loading.service()
+                this.preview(url,isVideo,1)
+                setTimeout(() => {
+                    util.downloadFile(fileName,document.querySelector('#player video').src)
+                    this.loadIns.close()
+                    this.playAuth = ''
+                },1000)
+            }else{
                 let ext = util.getFileExt(url)
                 if(util.isImg(ext)){
-                this.imgName = fileName
-                this.imgSrc = url
-                this.$refs.picLink.click()
+                    util.downloadFile(fileName,url)
                 }else{
                     window.open(url)
                 }
             }
         }
+    }
 }

src/pages/achievement/list/practiceResults.vue

@@ -62,9 +62,21 @@
                 </el-table-column>
                 <el-table-column prop="userName" label="真实姓名" align="center"></el-table-column>
                 <el-table-column prop="workNumber" label="学号" align="center"></el-table-column>
-                <el-table-column prop="max" label="最高分" align="center"></el-table-column>
-                <el-table-column prop="min" label="最低分" align="center"></el-table-column>
-                <el-table-column prop="avg" label="平均分" align="center"></el-table-column>
+                <el-table-column prop="max" label="最高分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.max | defaultShow}}</p>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="min" label="最低分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.min | defaultShow}}</p>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="avg" label="平均分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.avg | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="showDetail(scope.row)" v-auth="'/achievement/list:练习成绩:查看详情'">查看详情</el-button>
@@ -110,7 +122,11 @@
                 </el-table-column>
                 <el-table-column prop="paperName" label="练习试卷名称" align="center"></el-table-column>
                 <el-table-column prop="examTime" label="开始时间" align="center"></el-table-column>
-                <el-table-column prop="score" label="得分" align="center"></el-table-column>
+                <el-table-column prop="score" label="得分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.score | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="show(scope.row)">查看</el-button>

src/pages/achievement/list/wrongBook.vue

@@ -22,7 +22,7 @@
                 </el-form>
                 <div>
                     <el-input
-                        placeholder="请输入学生姓名或学号"
+                        placeholder="请输入题干"
                         prefix-icon="el-icon-search"
                         v-model="keyword"
                         clearable

src/pages/assessment/detail/index.vue

@@ -64,13 +64,13 @@
                         <template v-if="item.fileUrl">
                             <div v-for="(url,fileName) in item.fileUrl" :key="fileName">
                                 <el-button type="text" @click="preview(url,0)">{{fileName}}</el-button>
-                                <el-button type="primary" size="mini" @click="download(fileName,url)">下载</el-button>
+                                <el-button type="primary" size="mini" @click="download(fileName,url,0)">下载</el-button>
                             </div>
                         </template>
                         <template v-if="item.videoAudio">
                             <div v-for="(url,fileName) in item.videoAudio" :key="fileName">
                                 <el-button type="text" @click="preview(url,1)">{{fileName}}</el-button>
-                                <!-- <el-button type="primary" size="mini" @click="download(url)">下载</el-button> -->
+                                <el-button type="primary" size="mini" @click="download(fileName,url,1)">下载</el-button>
                             </div>
                         </template>
                     </div>
@@ -82,13 +82,12 @@
             </div>
         </div>
 
-        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{active: playAuth}" style="z-index: 2000">
+        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{over: isDownload}" style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
             <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i class="el-icon-circle-close" style="color: #fff"></i></span>
             <div class="player" id="player"></div>
         </div>
         <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.png" :href="imgSrc">下载图片</a>
     </div>
 </template>
 <script>
@@ -296,6 +295,9 @@ export default {
             }
         }
     }
+    .over{
+        top: 5000px;
+    }
     .player{
         position: absolute;
         top: 50%;

src/pages/assessment/doReview/index.vue

@@ -15,7 +15,7 @@
                 <span class="val">100</span>
             </div>
             <div>
-                <span class="name">练习时长：</span>
+                <span class="name">考试时长：</span>
                 <span class="val">{{duration}}</span>
             </div>
         </div>
@@ -49,13 +49,13 @@
                         <template v-if="item.fileUrl">
                             <div v-for="(url,fileName) in item.fileUrl" :key="fileName">
                                 <el-button type="text" @click="preview(url,0)">{{fileName}}</el-button>
-                                <el-button type="primary" size="mini" @click="download(fileName,url)">下载</el-button>
+                                <el-button type="primary" size="mini" @click="download(fileName,url,0)">下载</el-button>
                             </div>
                         </template>
                         <template v-if="item.videoAudio">
                             <div v-for="(url,fileName) in item.videoAudio" :key="fileName">
                                 <el-button type="text" @click="preview(url,1)">{{fileName}}</el-button>
-                                <!-- <el-button type="primary" size="mini" @click="download(url)">下载</el-button> -->
+                                <el-button type="primary" size="mini" @click="download(fileName,url,1)">下载</el-button>
                             </div>
                         </template>
                     </div>
@@ -84,13 +84,12 @@
             <button type="button" @click="save(0)">保存</button>
         </div>
 
-        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{active: playAuth}" style="z-index: 2000">
+        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{over: isDownload}" style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
             <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i class="el-icon-circle-close" style="color: #fff"></i></span>
             <div class="player" id="player"></div>
         </div>
         <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.png" :href="imgSrc">下载图片</a>
     </div>
 </template>
 <script>
@@ -327,6 +326,9 @@ export default {
             }
         }
     }
+    .over{
+        top: 5000px;
+    }
     .player{
         position: absolute;
         top: 50%;

src/pages/assessment/list/index.vue

@@ -188,6 +188,7 @@
                     >{{scope.$index + (page - 1) * pageSize + 1}}</template>
                 </el-table-column>
                 <el-table-column prop="name" label="试卷名称" align="center"></el-table-column>
+                <el-table-column prop="courses" label="所属课程" align="center"></el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="preview(scope.row)">预览</el-button>
@@ -296,7 +297,7 @@ export default {
     },
     mounted() {
         this.getData()
-        this.addInterval()
+        // this.addInterval()
     },
     watch: {
         keyword: function(val) {
@@ -510,6 +511,12 @@ export default {
         addAss(){
             this.stuCompKey++
             this.isAdd = true
+            let now = util.formatDate('yyyy-MM-dd hh:mm:ss',new Date(new Date().getTime() + 60000))
+            let second = util.formatDate('yyyy-MM-dd hh:mm:ss',new Date(new Date().getTime() + 86460000))
+            this.time = [now,second]
+            this.form.startTime = now
+            this.form.endTime = second
+            console.log(11,this.form)
             this.addVisible = true
         },
         save(){

src/pages/assessment/list/studentSide.vue

@@ -54,6 +54,7 @@ export default {
             let classId = this.classId ? this.classId.split(',') : []
             let studentId = this.studentId
             let classList = []
+            console.log(22,this.classId)
             this.$get(this.api.queryStudentProfessionalArchitecture,data).then(res => {
                 let StaffProfessionalArchitectureList = res.data.StaffProfessionalArchitectureList
                 StaffProfessionalArchitectureList.map(n => {

src/pages/assessment/scoreQuery/index.vue

@@ -69,7 +69,11 @@
                 </el-table-column>
                 <el-table-column prop="stuName" label="真实姓名" align="center"></el-table-column>
                 <el-table-column prop="stuNo" label="学号" align="center"></el-table-column>
-                <el-table-column prop="thisScore" label="得分" align="center"></el-table-column>
+                <el-table-column prop="thisScore" label="得分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.thisScore | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="timeSpent" label="用时（分钟）" align="center"></el-table-column>
                 <el-table-column prop="openingTime" label="考试时间" align="center"></el-table-column>
                 <el-table-column label="操作" align="center">
@@ -189,6 +193,11 @@ export default {
         },
         toStat(){
             if(this.listData.length){
+                let invalid = false
+                this.listData.map(n => {
+                    if(n.thisScore == null) invalid = true
+                })
+                if(invalid) return this.$message.warning('考核未全部批阅完，无法统计成绩，请先批阅')
                 this.setAssDetailInfo({
                     id: this.listData[0].paperId,
                     assessmentId: this.assessmentId,

src/pages/practice/detail/index.vue

@@ -60,13 +60,13 @@
                         <template v-if="item.fileUrl">
                             <div v-for="(url,fileName) in item.fileUrl" :key="fileName">
                                 <el-button type="text" @click="preview(url,0)">{{fileName}}</el-button>
-                                <el-button type="primary" size="mini" @click="download(fileName,url)">下载</el-button>
+                                <el-button type="primary" size="mini" @click="download(fileName,url,0)">下载</el-button>
                             </div>
                         </template>
                         <template v-if="item.videoAudio">
                             <div v-for="(url,fileName) in item.videoAudio" :key="fileName">
                                 <el-button type="text" @click="preview(url,1)">{{fileName}}</el-button>
-                                <!-- <el-button type="primary" size="mini" @click="download(url)">下载</el-button> -->
+                                <el-button type="primary" size="mini" @click="download(fileName,url,1)">下载</el-button>
                             </div>
                         </template>
                     </div>
@@ -78,13 +78,12 @@
             </div>
         </div>
 
-        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{active: playAuth}" style="z-index: 2000">
+        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{over: isDownload}" style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
             <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i class="el-icon-circle-close" style="color: #fff"></i></span>
             <div class="player" id="player"></div>
         </div>
         <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.png" :href="imgSrc">下载图片</a>
     </div>
 </template>
 <script>
@@ -306,6 +305,9 @@ export default {
             }
         }
     }
+    .over{
+        top: 5000px;
+    }
     .player{
         position: absolute;
         top: 50%;

src/pages/practice/doReview/index.vue

@@ -49,13 +49,13 @@
                         <template v-if="item.fileUrl">
                             <div v-for="(url,fileName) in item.fileUrl" :key="fileName">
                                 <el-button type="text" @click="preview(url,0)">{{fileName}}</el-button>
-                                <el-button type="primary" size="mini" @click="download(fileName,url)">下载</el-button>
+                                <el-button type="primary" size="mini" @click="download(fileName,url,0)">下载</el-button>
                             </div>
                         </template>
                         <template v-if="item.videoAudio">
                             <div v-for="(url,fileName) in item.videoAudio" :key="fileName">
                                 <el-button type="text" @click="preview(url,1)">{{fileName}}</el-button>
-                                <!-- <el-button type="primary" size="mini" @click="download(url)">下载</el-button> -->
+                                <el-button type="primary" size="mini" @click="download(fileName,url,1)">下载</el-button>
                             </div>
                         </template>
                     </div>
@@ -84,13 +84,12 @@
             <button type="button" @click="save(0)">保存</button>
         </div>
 
-        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{active: playAuth}" style="z-index: 2000">
+        <div v-show="playAuth" class="el-image-viewer__wrapper" :class="{over: isDownload}" style="z-index: 2000">
             <div class="el-image-viewer__mask"></div>
             <span class="el-image-viewer__btn el-image-viewer__close" @click="closePlayer"><i class="el-icon-circle-close" style="color: #fff"></i></span>
             <div class="player" id="player"></div>
         </div>
         <pdf :visible.sync="pdfVisible" :src.sync="pdfSrc"></pdf>
-        <a ref="picLink" style="display: none;" crossOrigin="anonymous" download="用户上传图片.png" :href="imgSrc">下载图片</a>
     </div>
 </template>
 <script>
@@ -196,7 +195,7 @@ export default {
             let totalScore = 0
             this.list.map(n => {
                 n.questionScore !== '' && n.isSub && data.review.push({
-                    detailId: Number(n.detailId)  ,
+                    detailId: Number(n.detailId),
                     score: Number(n.questionScore)
                 })
                 totalScore += Number(n.questionScore)
@@ -321,6 +320,9 @@ export default {
             }
         }
     }
+    .over{
+        top: 5000px;
+    }
     .player{
         position: absolute;
         top: 50%;

src/pages/practice/list/index.vue

@@ -25,7 +25,7 @@
                 <el-table-column prop="practiseName" label="练习名称" align="center"></el-table-column>
                 <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
                 <el-table-column prop="className" label="练习班级" align="center"></el-table-column>
-                <el-table-column label="操作" width="250">
+                <el-table-column label="操作" width="280">
                     <template slot-scope="scope">
                         <el-popover
                             placement="bottom"
@@ -129,6 +129,7 @@
                     >{{scope.$index + (page - 1) * pageSize + 1}}</template>
                 </el-table-column>
                 <el-table-column prop="name" label="试卷名称" align="center"></el-table-column>
+                <el-table-column prop="courses" label="所属课程" align="center"></el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="preview(scope.row)">预览</el-button>

src/pages/practice/result/index.vue

@@ -34,7 +34,7 @@
                 <el-table-column prop="workNumber" label="学号" align="center"></el-table-column>
                 <el-table-column prop="examTime" label="开始时间" align="center"></el-table-column>
                 <el-table-column prop="timeCost" label="答题用时（分钟）" align="center"></el-table-column>
-                <el-table-column prop="workNumber" label="考试状态" align="center">
+                <el-table-column prop="workNumber" label="练习状态" align="center">
                     <template slot-scope="scope">
                         {{getExamStatusName(scope.row.state)}}
                     </template>

src/pages/practice/scoreQuery/index.vue

@@ -63,9 +63,21 @@
                 </el-table-column>
                 <el-table-column prop="userName" label="真实姓名" align="center"></el-table-column>
                 <el-table-column prop="workNumber" label="学号" align="center"></el-table-column>
-                <el-table-column prop="max" label="最高分" align="center"></el-table-column>
-                <el-table-column prop="min" label="最低分" align="center"></el-table-column>
-                <el-table-column prop="avg" label="平均分" align="center"></el-table-column>
+                <el-table-column prop="max" label="最高分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.max | defaultShow}}</p>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="min" label="最低分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.min | defaultShow}}</p>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="avg" label="平均分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.avg | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="showDetail(scope.row)">查看详情</el-button>
@@ -111,7 +123,11 @@
                 </el-table-column>
                 <el-table-column prop="paperName" label="练习试卷名称" align="center"></el-table-column>
                 <el-table-column prop="examTime" label="开始时间" align="center"></el-table-column>
-                <el-table-column prop="score" label="得分" align="center"></el-table-column>
+                <el-table-column prop="score" label="得分" align="center">
+                    <template slot-scope="scope">
+                        <p>{{scope.row.score | defaultShow}}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column label="操作" align="center">
                     <template slot-scope="scope">
                         <el-button type="text" @click="show(scope.row)">查看</el-button>

src/pages/quesBank/list/myQuesBank.vue

@@ -69,7 +69,6 @@
                         <el-button type="text" @click="edit(scope.row)" v-auth="'/quesBank/list:我上传的题库:修改'">修改</el-button>
                         <el-button type="text" @click="delData(scope.row)" v-auth="'/quesBank/list:我上传的题库:删除'">删除</el-button>
                         <el-button v-if="!scope.row.myShare" type="text" @click="share(scope.row)" v-auth="'/quesBank/list:我上传的题库:共享'">共享</el-button>
-                        <el-button v-else type="text" @click="cancelShare(scope.row)" v-auth="'/quesBank/list:我上传的题库:共享'">取消共享</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -273,7 +272,8 @@ export default {
                 .then(() => {
                     let data = {
                         userId: this.userId,
-                        ids: shareList
+                        ids: shareList,
+                        source: 2
                     }
                     this.$post(this.api.batchSave,data).then(res => {
                         this.multipleSelection = [];

src/pages/quesBank/list/quesBankType.vue

@@ -28,7 +28,7 @@
                 </el-table-column>
                 <el-table-column label="操作" width="200">
                     <template slot-scope="scope">
-                        <el-button type="text" v-if="scope.row.parentId == 0" @click="addSecond(scope.row)" v-auth="'/quesBank/list:题库分类:添加'">添加</el-button>
+                        <el-button type="text" v-if="scope.row.parentId == 0 && scope.row.source == 2" @click="addSecond(scope.row)" v-auth="'/quesBank/list:题库分类:添加'">添加</el-button>
                         <el-button type="text" @click="editType(scope.row)" v-auth="'/quesBank/list:题库分类:编辑'">编辑</el-button>
                         <el-button type="text" @click="handleDelete(scope.row)" v-auth="'/quesBank/list:题库分类:删除'">删除</el-button>
                     </template>

src/pages/quesBank/list/quesDialog.vue

@@ -49,6 +49,7 @@
                     > 
                         <el-button type="primary" class="ml20">上传视频/音频</el-button>
                     </el-upload>
+                    <span class="m-l-10" v-if="topicForm.videoAudio">已上传</span>
                 </el-form-item>
                 <el-form-item label="题干" prop="questionStem">
                     <quill :border="true" :readonly="isDetail" :key="isDetail" v-model="topicForm.questionStem" :minHeight="150" :height="150" />

src/pages/system/list/role.vue

@@ -33,10 +33,10 @@
                 <el-table-column label="操作" width="180">
                     <template slot-scope="scope">
                         <el-button type="text" @click="showRole(scope.row)" v-auth="'/system/list:角色权限:查看'">查看</el-button>
-                        <!-- <template v-if="scope.row.id != 1"> -->
+                        <template v-if="scope.row.id != 1">
                             <el-button type="text" @click="editRole(scope.row)" v-auth="'/system/list:角色权限:编辑'">编辑</el-button>
                             <el-button type="text" @click="handleDelete(scope.row)" v-auth="'/system/list:角色权限:删除'">删除</el-button>
-                        <!-- </template> -->
+                        </template>
                     </template>
                 </el-table-column>
             </el-table>

src/pages/system/list/staff.vue

@@ -398,7 +398,7 @@ export default {
                 this.teacherForm.phone = user.phone
                 this.teacherForm.email = user.email
                 this.teacherForm.userAccount = user.account
-                this.originalAccount = Number(user.account)
+                this.originalAccount = user.account
                 this.teacherForm.userId = user.userId
                 this.teacherForm.schoolId = user.schoolId
                 this.teacherForm.roleValue = user.roleId

src/pages/testPaper/add/index.vue

@@ -582,8 +582,11 @@ export default {
         },
         getQuesBank() {
             let data = {
+                keyword: '',
                 pageNum: 1,
-                pageSize: 10000
+                pageSize: 10000,
+                schoolId: this.clientId,
+                source: 2
             }
             this.$post(this.api.listByPage,data)
             .then(res => {

src/plugins/filters/index.js

@@ -0,0 +1,12 @@
+/**
+ * @description 返回缺省值
+ * 传入的如果是null，就返回'--'
+ * 用例：<Tag :default="val">text</Tag> 或者：<Tag>{{val | default}}</Tag>
+ * */
+const defaultShow = (val) => {
+    return val == null ? '--' : val
+}
+
+module.exports = {
+    defaultShow
+}

src/store/modules/assessment.js

@@ -92,7 +92,7 @@ export default {
             return id != null ? state.stateList.find(n => n.id == id).name : ''
         },
         getReviewStatusName: state => id => {
-            return id != null ? state.reviewStatusList.find(n => n.id == id).name : ''
+            return id != null ? state.reviewStatusList.find(n => n.id == id).name : '--'
         },
         getExamStatusName: state => id => {
             return id != null ? state.examStatusList.find(n => n.id == id).name : ''

src/store/modules/user.js

@@ -59,7 +59,7 @@ export default {
                 get(api.logins,{ account: username.trim(), password: password }).then(res => {
                     if(res.success){
                         let user = res.data.userInfo
-                        if(user.isPort == 0 || user.isPort == 2){
+                        if((user.isPort == 0 || user.isPort == 2) && user.roleId != 4){
                             let routes = res.data.permissions[0].children
                             commit('SET_INFO',{
                                 avatar: user.userAvatars,