hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-11 20:06:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwy_0716_line' into dev0515

Browse Source
This commit is contained in:
lu
2024-07-17 09:13:09 +08:00
parent 6af37ca54c 67aeffad5f
commit d9b10f8176
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/Study/manager.vue
View File

@@ -260,8 +260,8 @@
</el-table-column> </el-table-column>
<el-table-column prop="status" label="状态"> <el-table-column prop="status" label="状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span> <!-- <span v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span> -->
<span v-else>{{scope.row.status == 9? '已完成':'未开始'}}</span> <span>{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="duration" label="进度"> <el-table-column prop="duration" label="进度">
@@ -286,6 +286,7 @@
<el-select v-model="learningSituation.status" clearable placeholder="状态"> <el-select v-model="learningSituation.status" clearable placeholder="状态">
<el-option label="未开始" :value="1"></el-option> <el-option label="未开始" :value="1"></el-option>
<el-option label="已开始" :value="2"></el-option> <el-option label="已开始" :value="2"></el-option>
<el-option label="进行中" :value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

9
src/store/modules/user.js
View File

@@ -41,10 +41,11 @@ const user = {
sessionStorage.setItem("curIdentity", iden); sessionStorage.setItem("curIdentity", iden);
}, },
SET_UserInfo: (state, uinfo) => { SET_UserInfo: (state, uinfo) => {
// 内部用户和外部用户测试用 // 内部用户和外部用户 测试外部企业ID：1811380709626150912 生产外部wyhgID：1811640937932288000
uinfo.role = uinfo.departFullName.indexOf('京东方科技集团股份有限公司')!=-1?1:2 uinfo.role = uinfo.departId === "1811640937932288000"? 2 : 1;
if(uinfo.name === '尹晓钦') uinfo.role = 2 // uinfo.role = uinfo.departFullName.indexOf('京东方科技集团股份有限公司')!=-1?1:2
console.log('uinfo::',uinfo) //if(uinfo.name === '尹晓钦') uinfo.role = 2
// console.log('uinfo::',uinfo)
state.info = uinfo state.info = uinfo
}, },
SET_PERMISSIONS: (state, permissions) => { SET_PERMISSIONS: (state, permissions) => {