From 530dbf241d35a71300268e6a813b8b7659ccf9ed Mon Sep 17 00:00:00 2001
From: joshen <445497689@qq.com>
Date: Fri, 12 Jul 2024 14:23:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E4=BC=81=E4=B8=9A=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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

From 67aeffad5f5b596724f801511691d0851b6b6f8c Mon Sep 17 00:00:00 2001
From: zhangsir <z1823137@163.com>
Date: Tue, 16 Jul 2024 15:54:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Study/manager.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 7fca576d..8b133fd9 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -260,8 +260,8 @@
               </el-table-column>
               <el-table-column prop="status" label="状态">
                 <template slot-scope="scope">
-                  <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 v-if="scope.row.contentName.split('--')[1]=='考试'">{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span> -->
+                  <span>{{scope.row.status == 9? '已完成':scope.row.status == 2?'进行中':'未开始'}}</span>
                 </template>
               </el-table-column>
               <el-table-column prop="duration" label="进度">
@@ -286,6 +286,7 @@
           <el-select v-model="learningSituation.status" clearable placeholder="状态">
             <el-option label="未开始" :value="1"></el-option>
             <el-option label="已开始" :value="2"></el-option>
+            <el-option label="进行中" :value="3"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>