From 0978dad5cbfa14ad706d389046bc626406229f4b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 26 May 2021 10:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/AddAssessment.vue |  3 ++-
 src/components/page/Project.vue       | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/components/page/AddAssessment.vue b/src/components/page/AddAssessment.vue
index fe4b818..bbaaf47 100644
--- a/src/components/page/AddAssessment.vue
+++ b/src/components/page/AddAssessment.vue
@@ -125,6 +125,7 @@ export default {
             systemId: this.$config.systemId,
             isDetail: true,
             userId: this.$store.state.userLoginId,
+            roleId: this.$store.state.userRoleId.includes(',') ? 2 : Number(this.$store.state.userRoleId),
             cacheData: this.$store.state.addClass,
             keyword: '',
             searchTimer: null,
@@ -227,7 +228,7 @@ export default {
             }).catch(res => {});
         },
         getClass(){ 
-            this.$get(`${this.api.getMineClass}?userId=${this.userId}&className=${this.keyword}`).then(res => {
+            this.$get(`${this.api.getMineClass}?userId=${this.userId}&className=${this.keyword}&role=${this.roleId == 13 ? 2 : (this.roleId == 14 ? 3 : this.roleId)}`).then(res => {
                 let list = res.list
                 list.map(n => {
                     n.id = n.classId
diff --git a/src/components/page/Project.vue b/src/components/page/Project.vue
index 7d61b6e..6e3bf9f 100644
--- a/src/components/page/Project.vue
+++ b/src/components/page/Project.vue
@@ -92,6 +92,7 @@
                 </el-table-column>
                 <el-table-column label="操作">
                     <template slot-scope="scope">
+                        <el-button type="text" v-auth @click="show(scope.row)">查看</el-button>
                         <el-button type="text" v-auth @click="edit(scope.row)" v-if="roleId == 1 || (roleId == 13 && scope.row.founder != '超级管理员') || (roleId == 14 && scope.row.founder == '老师')">编辑</el-button>
                         <el-button type="text" v-auth @click="delData(scope.row)" v-if="roleId == 1 || (roleId == 13 && scope.row.founder != '超级管理员') || (roleId == 14 && scope.row.founder == '老师')">删除</el-button>
                         <el-button type="text" @click="copyData(scope.row)">复制</el-button>
@@ -207,6 +208,7 @@ export default {
             projectNameRepeat: false,
             currentRow: {},
             projectDataAll: [],
+            submiting: false
         };
     },
     watch: {
@@ -254,6 +256,9 @@ export default {
         edit(row){
             this.$router.push(`/addproject?id=${row.projectId}`);
         },
+        show(row){
+            this.$router.push(`/addproject?id=${row.projectId}&show=true`);
+        },
         handleSelectionChange(val) {
             this.multipleSelection = val;
         },
@@ -343,10 +348,9 @@ export default {
                 })
                 this.currentRow.pooints = point
                 this.$message.warning('请修改项目名称')
-            })
+            }).catch(res => {})
         },
         copySubmit(){
-            // return console.log(11,this.projectNameRepeat)
             if(!this.projectName.length) return this.$message.warning('请填写项目名称')
             if(this.projectNameRepeat) return this.$message.warning('该项目名称已存在')
             let data = this.currentRow
@@ -357,10 +361,15 @@ export default {
             data.pooints.map(n => {
                 n.userId = this.userId
             })
+            if(this.submiting) return false
+            this.submiting = true
             this.$post(this.api.addProjectManagement,data).then((res) => {
+                this.submiting = false
                 this.$message.success('复制成功');
                 this.copyVisible = false
                 this.getData()
+            }).catch(res => {
+                this.submiting = false
             })
         },
         goback() {