From bab1a5e1d1bcef655ff15f76d244d56c0528ac79 Mon Sep 17 00:00:00 2001
From: "jialong.yu" <Yujialong.123>
Date: Tue, 25 Jan 2022 18:19:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E3=80=81=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=9A=90=E8=97=8F=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/account/login/index.vue    | 18 +++++++++++++-----
 src/pages/achievement/show/index.vue |  6 +++---
 src/pages/assessment/add/index.vue   |  4 +++-
 src/pages/assessment/list/index.vue  | 17 +++++++++++------
 src/pages/project/list/index.vue     | 28 +++++-----------------------
 src/pages/system/list/role.vue       |  2 +-
 src/setting.js                       |  4 ++--
 src/store/modules/user.js            |  6 +++++-
 8 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 0465445..5447b2a 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import { mapActions } from "vuex";
+import { mapActions, mapMutations } from "vuex";
 import vFooter from "@/layouts/footer";
 import util from "@/libs/util";
 import Setting from "@/setting";
@@ -108,6 +108,9 @@ export default {
         });
     },
     methods: {
+        ...mapMutations("user", [
+            "SET_ROLENAME"
+        ]),
         ...mapActions("user", [
             "setCustomer", "setCustomerName"
         ]),
@@ -131,15 +134,20 @@ export default {
                         this.getVerImg();
                         this.loginForm.code = "";
                         util.local.set(Setting.tokenKey, res.data.token, Setting.tokenExpires);
-                        this.queryCustomer();
-                    }).catch(res => {
-
-                    });
+                        this.getRole()
+                        this.queryCustomer()
+                    }).catch(res => {})
                 } else {
                     return util.errorMsg("请检查表单数据");
                 }
             });
         },
+        // 获取当前用户角色
+        getRole() {
+            this.$post(`${this.api.getUserAllRoleByToken}?platformId=${Setting.platformId}`).then(res => {
+                this.SET_ROLENAME(res)
+            }).catch(err => {})
+        },
         queryCustomer() { // 查询是否是客户
             this.$get(this.api.isClient).then(res => {
                 util.successMsg("登录成功");
diff --git a/src/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 1d6aee2..905d748 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -59,7 +59,7 @@
                                     {{ scope.$index + 1 }}
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="judgmentName" label="任务名称" align="center">
+                            <el-table-column prop="judgmentName" label="任务名称" align="center" min-width="200">
                             </el-table-column>
                             <el-table-column v-if='project' prop="userAnswer" label="考核点" align="center" >
                                 <template slot-scope="scope">
@@ -68,7 +68,7 @@
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="answer" label="参考答案" align="center" width="400">
+                            <el-table-column prop="answer" label="参考答案" align="center" min-width="400">
                                 <template slot-scope="scope">
                                     <div v-if=' scope.row.lcRuleRecords'>
                                         <div v-for="(item, index) in scope.row.lcRuleRecords">
@@ -80,7 +80,7 @@
                                     </div>
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="userAnswer" label="学生答案" align="center" width="400">
+                            <el-table-column prop="userAnswer" label="学生答案" align="center" min-width="400">
                                 <template slot-scope="scope">
                                     <div v-if=' scope.row.lcRuleRecords'>
                                         <div v-for="(item, index) in scope.row.lcRuleRecords">
diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue
index 970ec55..96f0f96 100644
--- a/src/pages/assessment/add/index.vue
+++ b/src/pages/assessment/add/index.vue
@@ -397,11 +397,13 @@ export default {
             });
         },
         getProjectData() {
+            const curItem = this.curriculumList.find(e => e.cid === this.form.curriculumId)
             let data={
                 pageNum:this.page,
                 pageSize:this.pageSize,
                 cid:this.form.curriculumId,
-                projectName:this.keyword
+                projectName:this.keyword,
+                systemId: curItem ? curItem.systemId : 1
             }
             this.$post(this.api.projectListByCourseId,data).then(res => {
                 let { status, data } = res;
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index 2a30f22..1ec715a 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -96,19 +96,19 @@
                     </span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="170">
+            <el-table-column label="操作" width="170">
                 <template slot-scope="scope">
-                    <template v-if="scope.row.status == 0">
+                    <template v-if="scope.row.status == 0 && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))">
                         <el-button v-if="scope.row.type == 1" type="text" @click="start(scope.row)">启动</el-button>
                         <el-button v-if="auth('修改')" type="text" @click="edit(scope.row)">修改</el-button>
                     </template>
-                    <template v-else-if="scope.row.status == 1">
+                    <template v-else-if="scope.row.status == 1 && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))">
                         <el-button v-if="auth('提前结束')" type="text" @click="finish(scope.row)">提前结束</el-button>
                     </template>
                     <template v-else-if="scope.row.status == 2">
                         <el-button v-if="auth('查看成绩')" type="text" @click="show(scope.row)">查看成绩</el-button>
                     </template>
-                    <el-button v-if="(scope.row.status == 0 || scope.row.status == 2) && auth('删除')" type="text" @click="delData(scope.row)">删除</el-button>
+                    <el-button v-if="(scope.row.status == 0 || scope.row.status == 2) && auth('删除') && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="delData(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -119,8 +119,8 @@
 </template>
 
 <script>
+import { mapState } from "vuex";
 import util from "@/libs/util";
-
 export default {
     data() {
         return {
@@ -188,9 +188,14 @@ export default {
             listLoading:false,// 列表加载
             ticker: null, // 倒计时定时器
             sss:1,
-            datassdata:0,
+            datassdata:0
         };
     },
+    computed: {
+        ...mapState("user", [
+            'roleName'
+        ])
+    },
     watch: {
         "form.month": function(val) {
             if (val) {
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 1ced0de..f09c0f6 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -87,8 +87,8 @@
                 <el-table-column label="操作">
                     <template slot-scope="scope">
                         <el-button type="text" @click="edit(scope.row,'0',queryData.founder)">查看</el-button>
-                        <el-button v-if="scope.row.founder && (isSuper || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="edit(scope.row,'1',queryData.founder)">编辑</el-button>
-                        <el-button v-if="scope.row.founder && (isSuper || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="handleDelete(scope.row.projectId)">删除</el-button>
+                        <el-button v-if="scope.row.founder && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="edit(scope.row,'1',queryData.founder)">编辑</el-button>
+                        <el-button v-if="scope.row.founder && (roleName.includes('超级') || roleName === scope.row.roleName  || (roleName === '管理员' && !scope.row.roleName.includes('超级')))" type="text" @click="handleDelete(scope.row.projectId)">删除</el-button>
                         <el-button v-if="auth('复制')" type="text" @click="copyData(scope.row.projectId)">复制</el-button>
                         <el-switch
                             v-if="auth('禁用')"
@@ -123,10 +123,8 @@
 </template>
 
 <script>
-import Setting from "@/setting";
 import { mapState, mapActions, mapMutations } from "vuex";
 import util from "@/libs/util";
-
 export default {
     data() {
         return {
@@ -202,15 +200,12 @@ export default {
             copyVisible: false,
             projectName: "",
             currentRow: {}, // 复制之后，提交到后台的数据
-            listDataAll: [],
-            isSuper: false, // 是否是超管
-            isAdmin: false, // 是否是管理员
-            roleName: '' // 当前用户角色名称
+            listDataAll: []
         };
     },
     computed: {
         ...mapState("user", [
-            "userId", "roleId"
+            "userId", "roleId", 'roleName'
         ]),
         ...mapState("project", [
             "lastSystemId", 
@@ -232,11 +227,8 @@ export default {
             deep: true
         }
     },
-    // created() {
-    //     this.queryData = this.queryDataStatus
-    // },
     mounted() {
-        this.getRole()
+        this.getSystemData()
         if(this.queryDataStatus.platformId) {
             this.queryData = this.queryDataStatus
         }
@@ -267,16 +259,6 @@ export default {
 
             });
         },
-        // 获取当前用户角色
-        getRole() {
-            this.$post(`${this.api.getUserAllRoleByToken}?platformId=${Setting.platformId}`).then(res => {
-                this.isSuper = res.includes('超级管理员')
-                this.isAdmin = res === '管理员'
-                this.roleName = res
-                this.getSystemData();
-            }).catch(err => {
-            });
-        },
         getData() {
             this.setSystemId(this.systemId);
             let data = {
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
index f3901a2..2c05b3c 100644
--- a/src/pages/system/list/role.vue
+++ b/src/pages/system/list/role.vue
@@ -26,7 +26,7 @@
                 <template slot-scope="scope">
                     <el-button v-if="auth('角色权限-查看')" type="text" @click="showRole(scope.row)">查看</el-button>
                     <el-button v-if="auth('角色权限-编辑') && scope.row.roleName !== '超级管理员'" type="text" @click="editRole(scope.row)">编辑</el-button>
-                    <el-button v-if="auth('角色权限-删除') && scope.row.roleName !== '超级管理员'" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button v-if="auth('角色权限-删除') && scope.row.roleName !== '超级管理员' && scope.row.roleName !== '管理员'" type="text" @click="handleDelete(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
diff --git a/src/setting.js b/src/setting.js
index 9736ae2..23be905 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -36,8 +36,8 @@ if (isHh) {
 } else if (isDev) {
     jumpPath = "http://192.168.31.154:8087/";
     // host = "http://www.occupationlab.com:9000/";//线上
-    host = "http://39.108.250.202:9000/"; // 中台测试服
-    // host = "http://192.168.31.151:9000/"; // 榕
+    // host = "http://39.108.250.202:9000/"; // 中台测试服
+    host = "http://192.168.31.151:9000/"; // 榕
     // host = "http://192.168.31.125:9000/"; // 坤
     // host = 'http://192.168.31.137:9000/'; // 赓
     title = "职站服务端管理系统";
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index a8811e4..78709e0 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -18,7 +18,8 @@ export default {
         userId: 3,
         userName: "",
         roleId: "",
-        dataTime: ""
+        dataTime: "",
+        roleName: ''
     },
     mutations: {
         SET_INFO: (state, info) => {
@@ -45,6 +46,9 @@ export default {
         },
         SET_USERNAME: (state, userName) => {
             state.userName = userName;
+        },
+        SET_ROLENAME: (state, roleName) => {
+            state.roleName = roleName
         }
     },
     actions: {