Merge remote-tracking branch 'origin/develop' into develop

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";
@@ -30,7 +30,6 @@ import zhCN from "ant-design-vue/es/locale/zh_CN";
 import * as api from "./api/index1";
 import * as api1 from "@/api/index1";
 import * as api2 from "@/api/index";
-
 export default defineComponent({
   components: {
     NavLeft,
@@ -44,20 +43,17 @@ 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);
       }
     );
-
     const currentRouteName = computed(() => route.name);
-
     function init() {
       console.log(store);
       getUserInfo();
@@ -72,34 +68,32 @@ export default defineComponent({
       getMemberInfo();
       getOrgTree();
     }
-
     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);
+      const memberInitInfo = await api1
+        .getMemberInfo({ keyWord: "", pageNo: 1, pageSize: 10 })
+        .then((res) => res.data.data.rows);
       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({
@@ -108,7 +102,6 @@ export default defineComponent({
           setCode: param,
         })
         .then((res) => res.data.data.rows);
-
     //获取组织树
     const getOrgTree = () => {
       const orgtreeList = localStorage.getItem("orgtreeList");
@@ -136,9 +129,7 @@ export default defineComponent({
           console.log("组织树获取失败", err);
         });
     };
-
     init();
-
     return {
       isLogin,
       routes,
@@ -159,17 +150,14 @@ export default defineComponent({
   color: #2c3e50;
   height: 100%;
 }
-
 #container {
   margin: 0;
   display: flex;
   flex-direction: column;
-
   width: 100%;
   min-width: 1000px;
   min-height: 100%;
   background-color: rgba(245, 247, 250, 1);
-
   main {
     height: 0;
     flex: 1 1 auto;
@@ -185,7 +173,6 @@ export default defineComponent({
     background: #ffffff;
     box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.07);
   }
-
   // @media screen and (max-width: 1366px) {
   //   .cmMain {
   //     width: 750px;

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);
     }

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,10 +4865,15 @@ export default defineComponent({
       () => state.addAuthList,
       (res) => {
         console.log("res", res, state.addAuthList);
+        if (state.authClassify === 1 || state.authClassify === 2) {
           let obj = {
             type: 3,
             tag:
-            state.authClassify === 1 ? 3 : state.authClassify === 2 ? 4 : null,
+              state.authClassify === 1
+                ? 3
+                : state.authClassify === 2
+                ? 4
+                : null,
             opt: 3,
             deptList: res[1],
             groupList: res[2],
@@ -4888,13 +4894,15 @@ export default defineComponent({
               console.log("添加授权失败", err);
             });
         }
+      }
     );
 
     //添加学员
     watch(
-      () => state.addStudentList,
+      () => state.addAuthList,
       (res) => {
         console.log("res", res, state.addStudentList);
+        if (state.authClassify === 3) {
           let obj = {
             deptList: res[1],
             groupList: res[2],
@@ -4914,6 +4922,7 @@ export default defineComponent({
               console.log("添加学员失败", err);
             });
         }
+      }
     );
 
     const closeOnlineCoursevisible = () => {

src/views/projectcenter/ProjectAdd.vue

@@ -2,7 +2,9 @@
 <template>
   <div class="projectAdd">
     <div class="header">
-      <span class="title">{{ projectInfo.parentId ? '编辑' : '创建' }}项目</span>
+      <span class="title"
+        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+      >
       <div
         @click="backPage"
         style="cursor: pointer"
@@ -67,7 +69,7 @@
             <div class="inname">封面图</div>
           </div>
           <div
-              :class="`box ${projectInfo.picUrl == src?'active':''}`"
+            :class="`box ${projectInfo.picUrl == src ? 'active' : ''}`"
             style="
               width: 100px;
               height: 100px;
@@ -76,11 +78,13 @@
               position: relative;
               overflow: hidden;
             "
-              v-for="(src,index) in projectPic"
+            v-for="(src, index) in projectPic"
             :key="index"
-              @click="()=>{
-                projectInfo.picUrl = src
-              }"
+            @click="
+              () => {
+                projectInfo.picUrl = src;
+              }
+            "
           >
             <img
               style="
@@ -124,8 +128,11 @@
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <ProjectManager v-model:value="projectInfo.managerId" v-model:name="projectInfo.manager"
-                            mode="multiple"></ProjectManager>
+            <ProjectManager
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              mode="multiple"
+            ></ProjectManager>
           </div>
         </div>
         <div class="name">
@@ -138,7 +145,10 @@
           </div>
 
           <div class="in select">
-            <OrgClass v-model:value="projectInfo.sourceBelongId" v-model:name="projectInfo.sourceBelongName"></OrgClass>
+            <OrgClass
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
+            ></OrgClass>
           </div>
         </div>
         <div class="name name2">
@@ -173,7 +183,8 @@
                   font-size: 14px;
                 "
                 >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-switch>
+              ></a-switch
+            >
           </div>
         </div>
         <div class="name">
@@ -202,19 +213,30 @@
         </div>
         <div class="name">
           <div class="namebox">
-<!--            <img-->
-<!--                class="nameimg"-->
-<!--                src="../../assets/images/basicinfo/asterisk.png"-->
-<!--            />-->
+            <!--            <img-->
+            <!--                class="nameimg"-->
+            <!--                src="../../assets/images/basicinfo/asterisk.png"-->
+            <!--            />-->
+            <img
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
+            />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-switch
+            <!-- <a-switch
                 v-model:checked="projectInfo.boeFlag"
                 :checkedValue="1"
                 :unCheckedValue="0"
                 :disabled="viewDetail ? true : false"
-            ></a-switch>
+            ></a-switch> -->
+            <a-radio-group
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
+            >
+              <a-radio :style="radioStyle" :value="1">是</a-radio>
+              <a-radio :style="radioStyle" :value="0">否</a-radio>
+            </a-radio-group>
           </div>
         </div>
       </div>
@@ -249,25 +271,24 @@
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
           >确定
-        </a-button
-        >
+        </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
     </div>
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { onMounted, reactive, toRefs, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManager";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import {scrollLoad} from "@/api/method";
+import { scrollLoad } from "@/api/method";
 
 export default {
   name: "projectAdd",
@@ -276,7 +297,7 @@ export default {
     ProjectLevel,
     ProjectClass,
     TrainClass,
-    OrgClass
+    OrgClass,
   },
   setup() {
     const store = useStore();
@@ -295,37 +316,44 @@ export default {
         pageSize: 10,
         keyWord: "",
       },
-      classifyList5: []
+      classifyList5: [],
     });
 
     onMounted(() => {
-      state.projectPic = store.state.projectPic.map(e => e.dictValue)
-      state.viewDetail = routers.query.viewDetail
-      getProjectInfo()
-      getTemplate()
-    })
+      state.projectPic = store.state.projectPic.map((e) => e.dictValue);
+      state.viewDetail = routers.query.viewDetail;
+      getProjectInfo();
+      getTemplate();
+    });
 
     watch(routers.query, () => {
-      state.projectInfo.projectId = routers.query.projectId
-      state.projectInfo.parentName = routers.query.parentName
-      state.projectInfo.parentId = routers.query.parentId
-    })
-
+      state.projectInfo.projectId = routers.query.projectId;
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
+    });
 
     function getProjectInfo() {
       if (!routers.query.projectId) {
-        state.projectInfo = {parentName: routers.query.parentName, parentId: routers.query.parentId}
-        return
+        state.projectInfo = {
+          parentName: routers.query.parentName,
+          parentId: routers.query.parentId,
+        };
+        return;
       }
-      api.getProjectDetail({projectId: routers.query.projectId}).then(res => {
-        state.projectInfo = res.data.data.projectInfo
-        state.projectInfo.rangeTime = [state.projectInfo.beginTime, state.projectInfo.endTime]
-        state.projectInfo.parentName = routers.query.parentName
-      })
+      api
+        .getProjectDetail({ projectId: routers.query.projectId })
+        .then((res) => {
+          state.projectInfo = res.data.data.projectInfo;
+          state.projectInfo.rangeTime = [
+            state.projectInfo.beginTime,
+            state.projectInfo.endTime,
+          ];
+          state.projectInfo.parentName = routers.query.parentName;
+        });
     }
 
     const backPage = () => {
-      router.back()
+      router.back();
     };
 
     //选择分类
@@ -334,25 +362,24 @@ export default {
       state.projectType = value; //分类选择的id
     };
 
-
     const classificationChange5 = (key, option) => {
-      state.projectInfo = option
-      state.projectInfo.type = 3
-      state.projectInfo.rangeTime = [option.beginTime, option.endTime]
-      state.projectInfo.parentName = routers.query.parentName
-      state.projectInfo.parentId = routers.query.parentId
+      state.projectInfo = option;
+      state.projectInfo.type = 3;
+      state.projectInfo.rangeTime = [option.beginTime, option.endTime];
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
     };
     //获取模版列表
     const getTemplate = () => {
       let obj = {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
-        status: 1
+        status: 1,
       };
       api.getTemplate(obj).then((res) => {
         state.totalPages = Number(res.data.data.pages);
-        state.classifyList5 = res.data.data.rows
-      })
+        state.classifyList5 = res.data.data.rows;
+      });
     };
 
     //模版滚动加载模板信息
@@ -378,18 +405,19 @@ export default {
       sourceBelongId: "请选择资源归属",
       level: "请填写项目级别",
       systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOEU实施",
     };
 
     function timeChange(e) {
       if (e && e.length === 2) {
-        state.projectInfo.beginTime = e[0]
-        state.projectInfo.endTime = e[1]
+        state.projectInfo.beginTime = e[0];
+        state.projectInfo.endTime = e[1];
       }
     }
 
     function validate(obj, errorMsgs) {
       for (let i in errorMsgs) {
-        if (!obj[i]) {
+        if (!obj[i] && obj[i] !== 0) {
           message.destroy();
           message.warning(errorMsgs[i]);
           return false;
@@ -403,13 +431,12 @@ export default {
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
       }
-      state.projectInfo.type = 3
+      state.projectInfo.type = 3;
       api.createProject(state.projectInfo).then(() => {
         message.destroy();
         message.success("编辑成功");
-            router.back()
-          }
-      )
+        router.back();
+      });
     };
 
     return {
@@ -419,7 +446,7 @@ export default {
       classificationChange5,
       createProject,
       backPage,
-      templateScroll
+      templateScroll,
     };
   },
 };
@@ -523,7 +550,6 @@ export default {
           position: relative;
           margin-left: 14px;
 
-
           .box1 {
             position: absolute;
             left: 50%;

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;