From 669cadf152af308f3c938c29b19d9841274e023b Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Sun, 4 Dec 2022 13:04:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                  |  88 ++++++++--------
 src/api/config.js                            |   3 +-
 src/views/courselibrary/CoursewareManage.vue | 103 ++++++++++---------
 src/views/projectcenter/TaskAdd.vue          |   1 -
 4 files changed, 103 insertions(+), 92 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 90f631d0..ddde8c33 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,27 +1,27 @@
 <template>
   <div id="container" v-if="!isLogin">
-    <nav-top/>
+    <nav-top />
     <div style="display: flex">
-      <nav-left/>
+      <nav-left />
       <div style="flex: 1; display: flex; flex-direction: column; width: 0">
-        <open-pages/>
-        <bread-crumb/>
+        <open-pages />
+        <bread-crumb />
         <main>
           <a-config-provider :locale="zhCN">
-            <router-view/>
+            <router-view />
           </a-config-provider>
         </main>
       </div>
     </div>
   </div>
   <div id="container" v-if="isLogin">
-    <router-view/>
+    <router-view />
   </div>
 </template>
 <script>
-import {computed, defineComponent, ref, watch} from "vue";
-import {useRouter, useRoute} from "vue-router";
-import {useStore} from "vuex";
+import { computed, defineComponent, ref, watch } from "vue";
+import { useRouter, useRoute } from "vue-router";
+import { useStore } from "vuex";
 import NavLeft from "@/components/NavLeft";
 import NavTop from "@/components/NavTop";
 import OpenPages from "@/components/OpenPages";
@@ -44,16 +44,16 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.12------------");
+    console.log("版本0.13------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
 
     watch(
-        () => route.path,
-        () => {
-          route.path === "/login" && (isLogin.value = true);
-        }
+      () => route.path,
+      () => {
+        route.path === "/login" && (isLogin.value = true);
+      }
     );
 
     const currentRouteName = computed(() => route.name);
@@ -74,45 +74,47 @@ export default defineComponent({
     }
 
     async function getMemberInfo() {
-      const list = localStorage.getItem('memberInitInfo');
+      const list = localStorage.getItem("memberInitInfo");
       if (list) {
         store.commit("SET_MEMBER_INFO", JSON.parse(list));
         return;
       }
-      const memberInitInfo = await api1.getMemberInfo({keyWord: '', pageNo: 1, pageSize: 10}).then((res) => (
-          res.data.data.rows.map(e => ({
+      const memberInitInfo = await api1
+        .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
+        .then((res) =>
+          res.data.data.rows.map((e) => ({
             label: e.realName,
-            value: e.id
+            value: e.id,
           }))
-      ));
+        );
       store.commit("SET_MEMBER_INFO", memberInitInfo);
-      localStorage.setItem('memberInitInfo', JSON.stringify(memberInitInfo));
+      localStorage.setItem("memberInitInfo", JSON.stringify(memberInitInfo));
     }
 
     async function getUserInfo() {
-      const userInfo = await api2.userInfo()
+      const userInfo = await api2.userInfo();
       store.commit("SET_USER", userInfo);
     }
 
     async function initDict(key) {
       let list = localStorage.getItem(key);
       if (list) {
-        store.commit("SET_DICT", {key, data: JSON.parse(list)});
+        store.commit("SET_DICT", { key, data: JSON.parse(list) });
         return;
       }
       list = await getDictList(key);
       localStorage.setItem(key, JSON.stringify(list));
-      store.commit("SET_DICT", {key, data: list});
+      store.commit("SET_DICT", { key, data: list });
     }
 
     const getDictList = (param) =>
-        api1
-            .getDict({
-              pageNo: 1,
-              pageSize: 20,
-              setCode: param,
-            })
-            .then((res) => res.data.data.rows);
+      api1
+        .getDict({
+          pageNo: 1,
+          pageSize: 20,
+          setCode: param,
+        })
+        .then((res) => res.data.data.rows);
 
     //获取组织树
     const getOrgTree = () => {
@@ -128,18 +130,18 @@ export default defineComponent({
         pageSize: 20,
       };
       api
-          .getOrgInfo(obj)
-          .then((res) => {
-            console.log("组织树获取成功", res);
-            if (res.data.code === 200) {
-              // state.treeData = res.data.data;
-              localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
-              store.commit("getOrgtreeList", res.data.data);
-            }
-          })
-          .catch((err) => {
-            console.log("组织树获取失败", err);
-          });
+        .getOrgInfo(obj)
+        .then((res) => {
+          console.log("组织树获取成功", res);
+          if (res.data.code === 200) {
+            // state.treeData = res.data.data;
+            localStorage.setItem("orgtreeList", JSON.stringify(res.data.data));
+            store.commit("getOrgtreeList", res.data.data);
+          }
+        })
+        .catch((err) => {
+          console.log("组织树获取失败", err);
+        });
     };
 
     init();
@@ -158,7 +160,7 @@ export default defineComponent({
   // font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
   // sans-serif;
   font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Arial, sans-serif;
+    Microsoft YaHei, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
diff --git a/src/api/config.js b/src/api/config.js
index 6adc3193..e70ef6e2 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-03 19:52:09
+ * @LastEditTime: 2022-12-04 11:13:37
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -54,6 +54,7 @@ http.interceptors.response.use(
     } else {
       if (code === 1000) {
         // window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);
     }
diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue
index 10af2ccf..9c7f63bd 100644
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -2517,13 +2517,13 @@
     <!-- 学员管理-添加学员抽屉 -->
     <!-- <StuAdd v-model:Stuvisible="Stuvisible" @sure="handlePostSure" /> -->
     <!-- 添加学员抽屉 -->
-    <proj-check-ship
+    <!-- <proj-check-ship
       v-model:ProjCheckvisible="viewpowervisible"
       :selectProjectId="offcourseId"
-      v-model:addAuthList="addStudentList"
+      v-model:addStudentList="addStudentList"
       :authClassify="authClassify"
       classify="addstudent"
-    />
+    /> -->
     <!-- 新建在线课弹窗 -->
     <addOnlineCourse
       v-model:addOnlineCoursevisible="addOnlineCoursevisible"
@@ -2551,7 +2551,7 @@
       :authClassify="authClassify"
       classify="course"
     /> -->
-    <!-- 管理权抽屉 -->
+    <!--查看权抽屉 管理权抽屉 添加学员抽屉  -->
     <proj-check-ship
       v-model:ProjCheckvisible="viewpowervisible"
       :selectProjectId="selectCourseId"
@@ -3329,7 +3329,7 @@ export default defineComponent({
       selectCourseId: null, //授权选择的id
 
       viewpowervisible: false, //查看权抽屉
-      authClassify: null, //1：查看权 2：管理权
+      authClassify: null, //1：查看权 2：管理权 3：学员
       addAuthList: null,
 
       addStudentList: null, //选中列表
@@ -3339,6 +3339,7 @@ export default defineComponent({
 
     const showStuAdd = () => {
       state.viewpowervisible = true;
+      state.authClassify = 3;
     };
 
     //  富文本 sssssssssssssss
@@ -4864,55 +4865,63 @@ export default defineComponent({
       () => state.addAuthList,
       (res) => {
         console.log("res", res, state.addAuthList);
-        let obj = {
-          type: 3,
-          tag:
-            state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
-          opt: 3,
-          deptList: res[1],
-          groupList: res[2],
-          refId: state.selectCourseId,
-          pageNo: 20,
-          pageSize: 1,
-          studentList: res[0],
-          keyWord: "",
-        };
-        console.log("obj", obj);
-        api1
-          .optionAuthPerm(obj)
-          .then((res) => {
-            console.log("添加授权成功", res);
-            message.success("添加授权成功");
-          })
-          .catch((err) => {
-            console.log("添加授权失败", err);
-          });
+        if (state.authClassify === 1 || state.authClassify === 2) {
+          let obj = {
+            type: 3,
+            tag:
+              state.authClassify === 1
+                ? 3
+                : state.authClassify === 2
+                ? 4
+                : null,
+            opt: 3,
+            deptList: res[1],
+            groupList: res[2],
+            refId: state.selectCourseId,
+            pageNo: 20,
+            pageSize: 1,
+            studentList: res[0],
+            keyWord: "",
+          };
+          console.log("obj", obj);
+          api1
+            .optionAuthPerm(obj)
+            .then((res) => {
+              console.log("添加授权成功", res);
+              message.success("添加授权成功");
+            })
+            .catch((err) => {
+              console.log("添加授权失败", err);
+            });
+        }
       }
     );
 
     //添加学员
     watch(
-      () => state.addStudentList,
+      () => state.addAuthList,
       (res) => {
         console.log("res", res, state.addStudentList);
-        let obj = {
-          deptList: res[1],
-          groupList: res[2],
-          offcourseId: state.offcourseId,
-          offcoursePlanId: state.offcoursePlanId, //开课id
-          studentList: res[0],
-        };
-        console.log("obj", obj);
-        api1
-          .addStudentCourse(obj)
-          .then((res) => {
-            console.log("添加学员成功", res);
-            message.success("添加学员成功");
-            getTableDate2();
-          })
-          .catch((err) => {
-            console.log("添加学员失败", err);
-          });
+        if (state.authClassify === 3) {
+          let obj = {
+            deptList: res[1],
+            groupList: res[2],
+            offcourseId: state.offcourseId,
+            offcoursePlanId: state.offcoursePlanId, //开课id
+            studentList: res[0],
+          };
+          console.log("obj", obj);
+          api1
+            .addStudentCourse(obj)
+            .then((res) => {
+              console.log("添加学员成功", res);
+              message.success("添加学员成功");
+              getTableDate2();
+            })
+            .catch((err) => {
+              console.log("添加学员失败", err);
+            });
+        }
       }
     );
 
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index dc3b891f..0b068ca3 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -590,7 +590,6 @@
                         style="
                           width: 120px;
                           text-align: center;
-                          text-align: center;
                           overflow: hidden;
                           text-overflow: ellipsis;
                           white-space: nowrap;