Merge branch 'develop' of ssh://gitlab.dongwu-inc.com:10022/BOE/fe-manage into develop

2025-12-10 11:26:45 +08:00 · 2022-12-11 11:55:07 +08:00
parent 65fbc3eba4 d1bec65923
commit 1b9f976f55
35 changed files with 3285 additions and 1437 deletions
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@@ -1,17 +1,29 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-10 15:22:22
+ * @FilePath: /fe-manage/public/index.html
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <!DOCTYPE html>
 <html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
+
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <title>京东方大学堂</title>
+</head>
+
+<body>
+  <noscript>
+    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
+        Please enable it to continue.</strong>
+  </noscript>
+  <div id="app"></div>
+  <!-- built files will be auto injected -->
+</body>
+
+</html>
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
    const store = useStore();
    const isLogin = ref(false);
    // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.8------------");
+    console.log("版本0.9.9------------");
    const routes = computed(() => {
      return router.getRoutes().filter((e) => e.meta?.isLink);
    });
@@ -86,7 +86,7 @@ export default defineComponent({

    async function getUserInfo() {
      const userInfo = await api2.userInfo();
-      store.commit("SET_USER", userInfo);
+      store.commit("SET_USER", userInfo.data.data);
    }

    async function initDict(key, localStory = false) {
--- a/src/api/ThirdApi.js
+++ b/src/api/ThirdApi.js
@@ -0,0 +1,8 @@
+export const BASE = 'https://pre.boe.com'
+export const BASE_DEV = 'https://u-pre.boe.com'
+
+export const USER_LIST = '/userbasic/user/list post'
+export const ORG_LIST = '/userbasic/org/list post'
+export const ORG_CHILD_LIST = '/userbasic/org/info post'
+
+export const AUDIENCE_LIST = '/userbasic/audience/list post'
--- 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-09 14:39:01
+ * @LastEditTime: 2022-12-10 10:37:11
 * @FilePath: /fe-manage/src/api/config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
--- a/src/api/index1.js
+++ b/src/api/index1.js
@@ -44,7 +44,7 @@ import qs from "qs";

 //上传文件
 export const uploadFile = (obj) =>
-	http.post("/test/testRequest", qs.stringify({ obj }));
+    http.post("/test/testRequest", qs.stringify({obj}));

 // 接口-请求

@@ -56,7 +56,7 @@ export const getLearnPath = (obj) => http.post("/admin/router/list", obj);
 export const handleLearnPath = (obj) => http.post("/admin/router/handle", obj);
 //获取路径图统计数据
 export const getLearnCount = (routerId) =>
-	http.get("/admin/router/getCount", { params: { routerId: routerId } });
+    http.get("/admin/router/getCount", {params: {routerId: routerId}});

 //新建或编辑关卡
 export const editChapter = (obj) => http.post("/admin/router/editChapter", obj);
@@ -66,20 +66,20 @@ export const setConfig = (obj) => http.post("/admin/router/setConfig", obj);
 export const getStudent = (obj) => http.post("/admin/router/studentList", obj);
 //获取路径图详情-包含关卡及任务列表
 export const getRouterDetail = (routerId) =>
-	http.get("/admin/router/detail", {
-		params: {
-			routerId: routerId,
-		},
-	});
+    http.get("/admin/router/detail", {
+        params: {
+            routerId: routerId,
+        },
+    });
 //添加学员
 export const addStudent = (obj) => http.post("/admin/router/addStudent", obj);
 //删除学员
 export const delStudent = (obj) =>
-	http.post("/admin/router/deleteStudent", obj);
+    http.post("/admin/router/deleteStudent", obj);

 // 获取学员路径图进度明细
 export const stuProgress = (obj) =>
-	http.post("/admin/router/studentProcess", obj);
+    http.post("/admin/router/studentProcess", obj);
 //编辑学习路径基本信息
 export const editLearnInfo = (obj) => http.post('/admin/router/editInfo', obj)

@@ -92,7 +92,6 @@ export const billboard = (obj) => http.post("/admin/project/billboard", obj);
 //项目基础信息-----------------------------------


-
 //课程----------------------------------------------

 // //提交审核
@@ -121,7 +120,7 @@ export const optionAuthPerm = (obj) => http.post('/admin/AuthPerm/optionAuthPerm
 //获取学员列表
 export const getStuList = (obj) => http.post('/admin/orgStruct/getStudentRef', obj)
 //获取用户登录
-export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true })
+export const getUser = () => http.post('/admin/CheckUser/login', {withCredentials: true})
 //公共信息---------------------------------------------------

 //添加项目学员
@@ -131,14 +130,16 @@ export const addStudentCourse = (obj) => http.post("/admin/offcourse/addStudent"

 // 获取组织结构树
 export const orgtree = () => http.get("/org/tree");
+export const saveStu = obj => http.post("/admin/student/addStudent", obj);
+export const validateName = obj => http.post("/admin/validate/validateName", obj);

 //获取积分列表
 export const noticeList = (projectId) =>
-	http.post(
-		`/admin/project/noticeList?projectId=` +
-		projectId +
-		``
-	);
+    http.post(
+        `/admin/project/noticeList?projectId=` +
+        projectId +
+        ``
+    );

 // 测试方法
 // import * as api from '../../api/index'
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -1,4 +1,5 @@
 import * as api from './index1'
+
 function formatNumber(n) {
    n = n.toString();
    return n[1] ? n : "0" + n;
@@ -192,31 +193,33 @@ const setCookie = (name, value, perpetual) => {

 //先写一个方法
 function getCookie(name) {
+    return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`,'') || ''
    //1.获取cookie字符串
-    var cookies = document.cookie;
-    //通过；来分割字符串
-    var cookie = cookies.split("; ");
-    // console.log('cookie', cookie)
-    //遍历，使键值对匹配上
-    for (var i = 0; i < cookie.length; i++) {
-        var arr = cookie[i].split("token=");
-        // console.log('arr', arr)
-        console.log('name', name)
-        // if (arr[0] == name) {
-        //   console.log('arr[1]', arr[1])
-        //   return arr[1];
-        // }
-        // console.log('arr[1]', arr[1])
-        return arr[1]
-    }
-    return "";
+    // const cookies = document.cookie;
+    // console.log('cookies',cookies)
+    // //通过；来分割字符串
+    // const cookie = cookies.split(";");
+    // // console.log('cookie', cookie)
+    // //遍历，使键值对匹配上
+    // for (var i = 0; i < cookie.length; i++) {
+    //     var arr = cookie[i].split("token=");
+    //     // console.log('arr', arr)
+    //     console.log('name', name)
+    //     // if (arr[0] == name) {
+    //     //   console.log('arr[1]', arr[1])
+    //     //   return arr[1];
+    //     // }
+    //     // console.log('arr[1]', arr[1])
+    //     return arr[1]
+    // }
+    // return "";
 }


 //滚动加载信息
 const scrollLoad = (e) => {
    // console.log("滚动", e, b);
-    const { target } = e;
+    const {target} = e;
    const scrllHeight = target.scrollHeight - target.scrollTop;
    const clientHeight = target.clientHeight;
    // console.log("scrllHeight", scrllHeight, clientHeight);
@@ -226,6 +229,7 @@ const scrollLoad = (e) => {
        return 2
    }
 };
+
 //添加归属权
 function changeOwnership(classify, selectProjectId, selectPeopleArr) {
    let obj = {
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -0,0 +1,169 @@
+import {reactive, ref, toRefs, watch} from "vue";
+import axios from 'axios';
+import {getCookie} from "@/api/method";
+
+
+export function useBoeApiPage(_url, params = {}, config = {
+    init: true,
+    result: res => res.result,
+    totalPage: res => res.result.totalPage,
+    total: res => res.result.totalElement
+}) {
+
+    const state = reactive({
+        data: [],
+        loading: false,
+        page: 1,
+        pageSize: 10,
+        totalPage: 0,
+        total: 0
+    })
+
+    function fetch() {
+        console.log('params', params)
+        state.loading = true
+        return request(_url, params).then(r => {
+            state.data = config.result(r)
+            state.totalPage = config.totalPage(r)
+            state.total = config.total(r)
+            state.loading = false
+            state.page = params.page
+        })
+    }
+
+    config.init && fetch()
+    return {
+        ...toRefs(state),
+        fetch,
+    };
+}
+
+export function useBoeApi(_url, params = {}, config = {
+    init: true,
+    result: res => res.result,
+}) {
+
+    const state = reactive({
+        data: [],
+        loading: false,
+    })
+    watch(() => params, () => {
+        fetch()
+    })
+
+    function fetch() {
+        state.loading = true
+        return request(_url, params).then(r => {
+            state.data = config.result(r)
+            state.loading = false
+        })
+    }
+
+    config.init && fetch()
+    return {
+        ...toRefs(state),
+        fetch,
+    };
+}
+
+export function usePage(_url, params = {}, init = true) {
+
+    const state = reactive({
+        data: [],
+        loading: false
+    })
+
+    watch(params, () => {
+        fetch()
+    })
+
+    function fetch() {
+        state.loading = true
+        return request(_url, params).then(r => {
+            console.log('fetch')
+            console.log(r)
+            state.data = r.result
+            state.loading = false
+        })
+    }
+
+    init && fetch()
+    return {
+        ...toRefs(state),
+        fetch,
+    };
+}
+
+export function useRequest(_url, params = {}, init = true) {
+
+    const data = ref({})
+    const loading = ref(false)
+
+    watch(params, () => {
+        fetchData()
+    })
+
+    function fetchData() {
+        loading.value = true
+        request(_url, params).then(r => {
+            data.value = r
+            loading.value = false
+        })
+    }
+
+    init && fetchData()
+    return {
+        data,
+        loading,
+        fetchData,
+    };
+}
+
+export async function request(_url, params) {
+    const s = _url.split(' ')
+    let url = s[0]
+    const method = s[1] || 'get'
+    if (method === 'get') {
+        let paramsArray = [];
+        //拼接参数
+        if (params) {
+            Object.keys(params).forEach(key => paramsArray.push(key + '=' + params[key]))
+            if (url.search(/\?/) === -1) {
+                url += '?' + paramsArray.join('&')
+            } else {
+                url += '&' + paramsArray.join('&')
+            }
+        }
+    }
+    const body = method !== 'get' ? params || {} : {}
+    console.log('token', getCookie('token'))
+    return axios({
+        url,
+        method,
+        headers: {
+            token: getCookie('token'),
+            ...method !== 'get' ? {'Content-Type': 'application/json'} : {}
+        },
+        baseURL: '',
+        ...method !== 'get' ? {data: JSON.stringify(body)} : {}
+    }).then(resp => resp.data).then(response => {
+        console.log(response)
+        // if (response.status !== 200 && response.code !== 0) {
+        //     if (response.code === 3 || response.code === 4 || response.code === 100) {
+//                router.push({path: '/login'})
+//                 return
+//             } else {
+//                response.showMsg &&  notification.open({
+//                    message: response.showMsg,
+//                    duration: 2,
+//                });
+//                 return
+//             }
+//         }
+        return response
+    }).catch(e => {
+        console.log(2222)
+        console.log(e)
+        // router.push({path: '/login'})
+    })
+}
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -196,6 +196,22 @@ export default {
            },
          ];
        }
+        if (
+          n.indexOf("/onlinemanage") !== -1 ||
+          n.indexOf("/OnlineManage") !== -1
+        ) {
+          state.list = [
+            {
+              name: "课程库",
+              href: "",
+              // href: "#/coursewaremanage",
+            },
+            {
+              name: "在线管理",
+              href: "",
+            },
+          ];
+        }
        if (
          n.indexOf("/coursewaremanage") !== -1 ||
          n.indexOf("/CoursewareManage") !== -1
@@ -205,7 +221,7 @@ export default {
              name: "课程库",
            },
            {
-              name: "课程管理",
+              name: "面授管理",
            },
          ];
        }
--- a/src/components/NavLeft.vue
+++ b/src/components/NavLeft.vue
@@ -132,7 +132,7 @@
                circle: selectedKeys[0] === 'sub3-1' ? false : true,
              }"
            ></span>
-            <router-link to="/coursemanage">课件管理</router-link>
+            <router-link to="/coursewaremanage">面授管理</router-link>
          </a-menu-item>
          <a-menu-item key="sub3-2">
            <span
@@ -141,11 +141,20 @@
                circle: selectedKeys[0] === 'sub3-2' ? false : true,
              }"
            ></span>
-            <router-link to="/coursewaremanage">课程管理</router-link>
+            <router-link to="/onlinemanage">在线管理</router-link>
+          </a-menu-item>
+          <a-menu-item key="sub3-3">
+            <span
+              :class="{
+                circleActive: selectedKeys[0] === 'sub3-3' ? true : false,
+                circle: selectedKeys[0] === 'sub3-3' ? false : true,
+              }"
+            ></span>
+            <router-link to="/coursemanage">课件管理</router-link>
          </a-menu-item>
        </a-sub-menu>
-
-        <a-menu-item key="sub4" @titleClick="titleClick">
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub4" @titleClick="titleClick">
          <div class="imgBox">
            <img
              style="width: 19px; height: 19px"
@@ -153,8 +162,7 @@
            />
          </div>
          <span>考试中心</span>
-        </a-menu-item>
-
+        </a-menu-item> -->
        <a-menu-item key="sub5" @titleClick="titleClick">
          <div class="imgBox">
            <img
@@ -164,8 +172,8 @@
          </div>
          <router-link to="/researchmanage">评估管理</router-link>
        </a-menu-item>
-
-        <a-menu-item key="sub6" @titleClick="titleClick">
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub6" @titleClick="titleClick">
          <div class="imgBox">
            <img
              style="width: 17px; height: 15px"
@@ -173,9 +181,9 @@
            />
          </div>
          <span>报表中心</span>
-        </a-menu-item>
-
-        <a-menu-item key="sub7" @titleClick="titleClick">
+        </a-menu-item> -->
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub7" @titleClick="titleClick">
          <div class="imgBox">
            <img
              style="width: 17px; height: 18px"
@@ -183,9 +191,9 @@
            />
          </div>
          <span>教师管理</span>
-        </a-menu-item>
-
-        <a-menu-item key="sub8" @titleClick="titleClick">
+        </a-menu-item> -->
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub8" @titleClick="titleClick">
          <div class="imgBox">
            <img
              style="width: 20px; height: 20px"
@@ -193,18 +201,17 @@
            />
          </div>
          <span>证书中心</span>
-          <!-- <router-link to="/certificatecenter">证书中心</router-link> -->
-        </a-menu-item>
-        <a-menu-item key="sub9" @titleClick="titleClick">
+        </a-menu-item> -->
+        <!-- <a-menu-item key="sub9" @titleClick="titleClick">
          <div class="imgBox">
            <img
              style="width: 19px; height: 18px"
              src="../assets/images/navleft/system.png"
            />
          </div>
-          <span>系统管理</span>
-          <!-- <router-link to="/systemmanage">系统管理</router-link> -->
-        </a-menu-item>
+          <span>系统管理</span> -->
+        <!-- <router-link to="/systemmanage">系统管理</router-link> -->
+        <!-- </a-menu-item> -->
      </a-menu>
    </div>
    <div
@@ -234,16 +241,16 @@
        <a-menu-item key="sub3" @titleClick="titleClick">
          <router-link to="/coursewaremanage">课程</router-link>
        </a-menu-item>
-
-        <a-menu-item key="sub4" @titleClick="titleClick">
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub4" @titleClick="titleClick">
          <span>考试</span>
-        </a-menu-item>
+        </a-menu-item> -->

        <a-menu-item key="sub5" @titleClick="titleClick">
          <span>评估</span>
        </a-menu-item>
-
-        <a-menu-item key="sub6" @titleClick="titleClick">
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <a-menu-item key="sub6" @titleClick="titleClick">
          <span>报表</span>
        </a-menu-item>

@@ -256,7 +263,7 @@
        </a-menu-item>
        <a-menu-item key="sub9" @titleClick="titleClick">
          <span>系统</span>
-        </a-menu-item>
+        </a-menu-item> -->
      </a-menu>
    </div>
  </div>
@@ -370,17 +377,23 @@ export default {
          selectedKeys: "sub2-2",
          pagename: "查看",
        },
-        {
-          href: "/coursemanage",
-          openKeys: "sub3",
-          selectedKeys: "sub3-1",
-          pagename: "课件管理",
-        },
        {
          href: "/coursewaremanage",
          openKeys: "sub3",
+          selectedKeys: "sub3-1",
+          pagename: "面授管理",
+        },
+        {
+          href: "/onlinemanage",
+          openKeys: "sub3",
          selectedKeys: "sub3-2",
-          pagename: "课程管理",
+          pagename: "在线管理",
+        },
+        {
+          href: "/coursemanage",
+          openKeys: "sub3",
+          selectedKeys: "sub3-3",
+          pagename: "课件管理",
        },
        {
          href: "/certificatecenter",
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -2,8 +2,8 @@
  <div class="navTop">
    <div class="navTopMain">
      <img
-          style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
-          src="../assets/images/navtop/logo.png"
+        style="width: 205px; height: 29px; margin-left: 37px; margin-top: 22px"
+        src="../assets/images/navtop/logo.png"
      />
      <div class="navTopRight">
        <div class="role">
@@ -11,10 +11,10 @@
          <div class="roleArrow"></div>
          <div class="roleItems">
            <div
-                v-for="(value, index) in roleList"
-                :key="index"
-                class="roleItem"
-                @click="changeRole(value)"
+              v-for="(value, index) in roleList"
+              :key="index"
+              class="roleItem"
+              @click="changeRole(value)"
            >
              {{ value.name }}
            </div>
@@ -22,14 +22,14 @@
        </div>
        <div class="user">
          <img
-              style="
+            style="
              width: 40px;
              height: 40px;
              margin-left: 8px;
              border-radius: 15px;
              margin-right: 10px;
            "
-              :src="avatar"
+            :src="avatar"
          />
          <div style="margin-right: 20px">{{ username }}</div>
        </div>
@@ -47,18 +47,18 @@
        </div> -->
        <div class="signOutMain" @click="logOut">
          <img
-              style="width: 27px; height: 27px"
-              src="../assets/images/navtop/signout.png"
+            style="width: 27px; height: 27px"
+            src="../assets/images/navtop/signout.png"
          />
          <span class="signOut">登出</span>
        </div>
      </div>
    </div>
  </div>
-  <down-load v-model:downloadVisible="visible"/>
+  <down-load v-model:downloadVisible="visible" />
 </template>
 <script>
-import {reactive, toRefs} from "vue";
+import { reactive, toRefs } from "vue";
 import DownLoad from "../components/drawers/DownLoad";
 import * as api from "../api/index1";

@@ -71,7 +71,7 @@ export default {
    const state = reactive({
      selectRole: "管理员",
      username: "",
-      avatar: null,
+      avatar: require("../assets/images/avatar.png"),
      roleList: [
        {
          id: 1,
@@ -101,32 +101,32 @@ export default {
    };
    const getUser = () => {
      api
-          .getUser()
-          .then((res) => {
-            console.log("获取登录信息成功", res);
-            if (res.data.code === 200) {
-              state.username = res.data.data.realName;
-              // state.avatar = res.data.data.avatar
-              //   ? res.data.data.avatar
-              //   : require("../assets/images/avatar.png");
-              state.avatar = require("../assets/images/avatar.png");
-            }
-          })
-          .catch((err) => {
-            console.log("获取登录信息失败", err);
-          });
+        .getUser()
+        .then((res) => {
+          console.log("获取登录信息成功", res);
+          if (res.data.code === 200) {
+            state.username = res.data.data.realName;
+            // state.avatar = res.data.data.avatar
+            //   ? res.data.data.avatar
+            //   : require("../assets/images/avatar.png");
+            state.avatar = require("../assets/images/avatar.png");
+          }
+        })
+        .catch((err) => {
+          console.log("获取登录信息失败", err);
+        });
    };
    getUser();

    const logOut = () => {
-      localStorage.removeItem('faceclassPic');
-      localStorage.removeItem('faceclassClass');
-      localStorage.removeItem('faceclassScene');
-      localStorage.removeItem('projectLevel');
-      localStorage.removeItem('projectSys');
-      localStorage.removeItem('pathmapPic');
-      localStorage.removeItem('projectClass');
-      localStorage.removeItem('projectPic');
+      localStorage.removeItem("faceclassPic");
+      localStorage.removeItem("faceclassClass");
+      localStorage.removeItem("faceclassScene");
+      localStorage.removeItem("projectLevel");
+      localStorage.removeItem("projectSys");
+      localStorage.removeItem("pathmapPic");
+      localStorage.removeItem("projectClass");
+      localStorage.removeItem("projectPic");
      window.open("https://u-pre.boe.com/web/", "_self");
    };
    return {
@@ -144,6 +144,7 @@ export default {
  height: 80px;
  // display: flex;
  background-color: rgba(255, 255, 255, 1);
+
  // box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
  .navTopMain {
    width: 100%;
@@ -151,7 +152,7 @@ export default {
    display: flex;
    justify-content: space-between;
    background-color: rgba(255, 255, 255, 1);
-
+    // background-color: #0078fc;
    .navTopRight {
      display: flex;
    }
@@ -161,7 +162,8 @@ export default {
      align-items: center;
      font-size: 16px;
      font-weight: 400;
-      color: #333330;
+      font-family: "Menlo", "苹方-简" !important;
+      color: #000;
      line-height: 36px;
      cursor: pointer;
      position: relative;
@@ -204,9 +206,9 @@ export default {
      display: block;
    }

-    .role:hover .roleArrow {
-      background-image: url(../assets/images/navtop/up.png);
-    }
+    // .role:hover .roleArrow {
+    //   background-image: url(../assets/images/navtop/up.png);
+    // }

    .user {
      margin-left: 37px;
@@ -214,8 +216,10 @@ export default {
      align-items: center;
      font-size: 14px;
      font-weight: 400;
-      color: #b3bdc4;
+      // color: #b3bdc4;
+      color: #000;
      line-height: 36px;
+      font-family: "Menlo", "苹方-简" !important;
    }

    .signOutMain {
@@ -228,9 +232,10 @@ export default {
    .signOut {
      font-size: 16px;
      font-weight: 400;
-      color: #242424;
+      color: #000;
      line-height: 22px;
      margin-left: 5px;
+      font-family: "Menlo", "苹方-简" !important;
    }
  }
 }
--- a/src/components/common/FJUpload.vue
+++ b/src/components/common/FJUpload.vue
@@ -24,7 +24,7 @@
        <div class="file_img"></div>
        <div class="file_detail">
          <div class="file_name">
-            <span style="color: #6f6f6f；width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
+            <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">
              {{ item.name.indexOf('-')!==-1?item.name.slice(0,item.name.indexOf('-')) + item.name.slice(item.name.indexOf('.')) :item.name }}
            </span>
          </div>
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -232,7 +232,7 @@
              </a-checkbox>
            </div>
          </div>
-           -->       
+           -->

          <div class="main_item">
            <div class="signbox">
@@ -351,7 +351,9 @@
            </div>
            <div class="btnbox">
              <a-tag closable color="processing" @close="logT">
-                <span style="font-size: 14px; line-height: 33px">{{testName}}</span>
+                <span style="font-size: 14px; line-height: 33px">{{
+                  testName
+                }}</span>
              </a-tag>
            </div>
          </div>
@@ -398,8 +400,8 @@ import ProjectManager from "@/components/project/ProjectManagerNew";

 import { detail } from "../../api/indexCourse";
 import { queryAppraiseDetailById } from "../../api/indexInvist";
-import {queryWorkDetailById} from "@/api/indexWork";
-import {queryExaminationDetailById} from "@/api/indexExam";
+import { queryWorkDetailById } from "@/api/indexWork";
+import { queryExaminationDetailById } from "@/api/indexExam";
 export default {
  name: "AddFaceteach",
  components: {
@@ -734,7 +736,7 @@ export default {
        await ProjectEditTask(editObj)
          .then(() => {
            console.log("props.EditFaceId", props.EditFaceId);
-           // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
+            // message.success(`${props.edit ? "编辑" : "新增"}阶段任务成功`);
          })
          .catch(() => {
            //message.error(`${props.EditFaceId ? "编辑" : "新增"}阶段任务失败`);
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -25,14 +25,25 @@
              <div class="fi_input">
                <a-input
                  v-model:value="inputV1"
-                  style="width: 240px; height: 40px; border-radius: 8px"
+                  style="
+                    width: 280px;
+                    height: 40px;
+                    border-radius: 8px;
+                    padding-right: 49px;
+                  "
                  placeholder="请输入课程名称"
                  maxlength="20"
                />
+                <div class="inp_num" style="position: absolute; right: 7px">
+                  <span style="color: #c7cbd2">
+                    {{ inputV1 ? inputV1.length : 0 }}/20
+                  </span>
+                </div>
              </div>
            </div>
-            <div class="mii_ipt">
-              <div class="ipt_name"></div>
+            <!-- 2022-12-10注释 后面放开 李晓鸽 -->
+            <!-- <div class="mii_ipt">
+              <div class="ipt_name">课程分类：</div>
              <div class="select">
                <a-select
                  v-model:value="selectV"
@@ -44,7 +55,7 @@
                  showSearch
                />
              </div>
-            </div>
+            </div> -->
          </div>
          <div class="mi_btns">
            <div class="btn btn1" @click="searchList()">
--- a/src/components/drawers/MemberList.vue
+++ b/src/components/drawers/MemberList.vue
@@ -430,6 +430,7 @@ export default {
        pageNo: 1,
        pageSize: 10,
        projectId: props.projectId,
+        groupId: props.chooseGroupId,
        topFlag: "",
      };
      //重新获取列表
--- a/src/components/drawers/ProjCheckPower.vue
+++ b/src/components/drawers/ProjCheckPower.vue
@@ -77,8 +77,7 @@
                  </div>
                </div> -->
                  <div class="chooseLeft">
-                    <div class="boeTree">
-                      <div class="boeTreeTitle">BOE组织树</div>
+                    <div class="boeTree" style="margin-top: 20px">
                      <a-tree
                          v-model:value="valueSelectboe"
                          class="treeMain"
@@ -179,7 +178,6 @@
                    </div> -->
                  </div>
                  <div class="boeTree">
-                    <div class="boeTreeTitle">BOE组织树</div>
                    <a-tree
                        v-if="!isSearchOrg"
                        class="treeMain treeMain2"
@@ -417,7 +415,7 @@
                <div
                    class="chose"
                    v-for="item in chooseorganization1"
-                    :key="item.key"
+                    :key="item.id"
                >
                  <div>{{ item.name }}</div>
                  <div class="ch" @click="deleteChoosePeople1(item)"></div>
@@ -575,15 +573,11 @@
 import {reactive, toRefs, onMounted, onUnmounted, computed} from "vue";
 import elementResizeDetectorMaker from "element-resize-detector";
 import {message} from "ant-design-vue";
-// import { toDate } from "../../api/method";
 import {useStore} from "vuex";
 import {
  traverseArr,
-  // deepClone,
-  // batchLoadList,
 } from "../../utils/utils";
 import * as api from "../../api/index1";
-import {getStuList} from "../../api/index1";

 export default {
  name: "ProjCheckShip",
@@ -810,9 +804,9 @@ export default {
    };
    const afterVisibleChange = (bool) => {
      console.log("state", bool);
-      if (bool) {
-        props.type === 1 ? optionAuthPerm() : getStuentList()
-      }
+      // if (bool) {
+      //   props.type === 1 ? optionAuthPerm() : getStuentList()
+      // }
    };
    //获取组织树
    state.treeData = computed(() => {
@@ -903,26 +897,8 @@ export default {
      console.log("selectedRowKeys changed: ", selectedRowKeys, item);
      console.log("choosepeople : ", state.choosepeople);
      state.selectedRowKeys = selectedRowKeys;
-      const se = state.studentList.map(e => e.id).join(',') || ''
-      const addItem = item.filter(e => (e && !se.includes(e.id + '')))
-      addItem.forEach(e => {
-        e.name = e.realName
-      })
-      const selectStr = selectedRowKeys.join(',')
-      console.log(selectStr)
-      state.studentList = state.studentList.filter(e => selectStr.includes(e.id + ''))
-      console.log(state.studentList)
-      state.choosepeople = [...addItem.reverse(), ...state.studentList];
+      state.choosepeople = item.map(e => ({...e, name: e.realName})).reverse()
      selectedsHeight();
-      // if (selectedRowKeys.length > 0 && item.length > 0) {
-      //   state.selectedRowKeys.push(selectedRowKeys[selectedRowKeys.length - 1]);
-      //   state.choosepeople.unshift(item[item.length - 1]);
-      //   // console.log(
-      //   //   "selectedRowKeys changed22222: ",
-      //   //   state.selectedRowKeys,
-      //   //   state.choosepeople
-      //   // );
-      // }
    };
    //单个删除选中的人
    const deleteChoosePeople = (item) => {
@@ -1059,18 +1035,18 @@ export default {
      // if (state.isSearchOrg) {
      //   searchOrg(e[0]);
      // }
-      if (!k.node.treeChildList) {
-        state.selectedKeys1 = e.reverse();
-        if (k.selected) {
-          state.chooseorganization.unshift(k.node);
-        } else {
-          for (let i = 0; i < state.chooseorganization.length; i++) {
-            if (state.chooseorganization[i].key === k.node.key) {
-              state.chooseorganization.splice(i, 1);
-            }
-          }
-        }
-      }
+      state.selectedKeys1 = e.reverse();
+      state.chooseorganization = k.selectedNodes.reverse()
+      state.chooseorganization1 = k.selectedNodes.reverse()
+      // if (k.selected) {
+      //   state.chooseorganization.unshift(k.node);
+      // } else {
+      //   for (let i = 0; i < state.chooseorganization.length; i++) {
+      //     if (state.chooseorganization[i].key === k.node.key) {
+      //       state.chooseorganization.splice(i, 1);
+      //     }
+      //   }
+      // }
      console.log("选中的部门2", state.selectedKeys1, state.chooseorganization);
    };
    //点击确认添加-判断是否显示确定弹窗
@@ -1342,15 +1318,15 @@ export default {
      closeDrawer();
    };
    //获取学员列表
-    const getStuentList = () => {
-      getStuList({
-        refType: {learnPath: 1, project: 2, course: 3, addstudent: 2}[props.classify],
-        refId: props.selectProjectId,
-        extId: 0
-      }).then(res => {
-        initResp(res)
-      })
-    }
+    // const getStuentList = () => {
+    //   getStuList({
+    //     refType: {learnPath: 1, project: 2, course: 3, addstudent: 2}[props.classify],
+    //     refId: props.selectProjectId,
+    //     extId: 0
+    //   }).then(res => {
+    //     initResp(res)
+    //   })
+    // }

    function initResp(res) {
      let studentArr = res.data.data.studentList;
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -0,0 +1,63 @@
+<template>
+  <a-input
+      v-model:value="modelV"
+      :placeholder="placeholder"
+      :show-count="showCount"
+      :maxlength="maxlength"
+      @blur="validateProName"
+  />
+  <div style="color:red;font-size: 10px" v-if="value && !validate">名称重复，请重新输入</div>
+</template>
+<script setup>
+import {defineProps, defineEmits, watch, ref} from "vue";
+import {validateName} from "@/api/index1";
+
+const props = defineProps({
+  value: {
+    type: String,
+  },
+  validate: {
+    type: Boolean,
+    default: true
+  },
+  id: {
+    type: String,
+  },
+  placeholder: {
+    type: String,
+  },
+  type: {
+    type: Number,
+    default: 1
+  },
+  maxlength: {
+    type: Number,
+    default: 30
+  },
+  showCount: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits({})
+
+const modelV = ref()
+
+watch(() => props.value, () => {
+  if (props.value !== modelV.value) {
+    modelV.value = props.value
+  }
+})
+
+watch(modelV, () => {
+  emit('update:value', modelV.value)
+})
+
+function validateProName() {
+  props.value && validateName({name: props.value, type: props.type, id: props.id}).then(res => {
+    emit('update:validate', res.data.data !== 1)
+  })
+}
+
+</script>
--- a/src/components/project/ProjectLevel.vue
+++ b/src/components/project/ProjectLevel.vue
@@ -34,7 +34,7 @@ const props = defineProps({
 })

 const id = computed(() => {
-  return props.value
+  return props.value || null
 })

 const emit = defineEmits({})
--- a/src/components/project/ProjectManager.vue
+++ b/src/components/project/ProjectManager.vue
@@ -69,7 +69,7 @@ export default {

    onMounted(() => {
      console.log("onMounted");
-      init()
+      init();
    });

    function getMember() {
--- a/src/components/project/ProjectManagerNew.vue
+++ b/src/components/project/ProjectManagerNew.vue
@@ -8,7 +8,6 @@
      v-model:value="managerArray"
      :placeholder="placeholder"
      :filterOption="false"
-      style="width: 100%"
      :options="isOpen?options:selectOptions"
      allowClear
      showSearch
@@ -19,6 +18,8 @@
      :open="isOpen"
      @change="change"
      @blur="blur"
+      :show-arrow="false"
+      style="width: 100%"
  >
    <template v-if="loading" #notFoundContent>
      <a-spin size="small"/>
@@ -78,7 +79,6 @@ onMounted(() => {


 function getMemberData() {
-  console.log(memberParam)
  if (!memberParam.value.keyWord) {
    return
  }
@@ -93,9 +93,12 @@ function getMemberData() {
      return;
    }
    const list = res.data.data.rows.filter(e => !(props.value + '').includes(e.id)).map(e => ({
-      label: e.realName,
+      label: e.realName + e.userNo,
      value: e.id,
-      deptId: e.departId
+      deptId: e.departId,
+      departName: e.departName,
+      userNo: e.userNo,
+      name: e.realName
    }));
    memberParam.value.pageNo === 1 && props.value ? (options.value = list) : options.value.push(...list)
    loading.value = false
@@ -125,10 +128,10 @@ function blur() {
 function change(e, l) {
  isOpen.value = false
  Array.isArray(l) && (selectOptions.value = l)
-  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId)
+  Array.isArray(selectOptions.value) && emit('onChange', e, l, selectOptions.value.find(e => e.deptId)?.deptId, selectOptions.value.find(e => e.deptId)?.departName)
  if (Array.isArray(l)) {
    emit('update:name', l.map(t => t.label).join(','))
-    emit('update:value', l.map(t => t.value).join(','))
+    emit('update:value', l.map(t => t.label).join(','))
  } else {
    emit('update:name', l?.label)
    emit('update:value', l?.value)
--- a/src/components/student/CommonStudent.vue
+++ b/src/components/student/CommonStudent.vue
@@ -0,0 +1,481 @@
+<template>
+  <a-drawer
+      :visible="visiableState"
+      class="drawerStyle ProjCheckship"
+      placement="right"
+      width="45%"
+  >
+    <div class="drawerMain" id="ProjCheckship">
+      <div class="header">
+        <div class="headerTitle">
+          {{ {1: '查看权', 2: '管理权', 3: '添加学员'}[type] || '' }}
+        </div>
+        <img
+            style="width: 29px; height: 29px; cursor: pointer"
+            src="../../assets/images/basicinfo/close.png"
+            @click="closeDrawer"
+        />
+      </div>
+      <div style="width:100%;display: grid;grid-template-columns: 750px auto;">
+        <div class="tabs">
+          <a-tabs v-model:activeKey="activeKey">
+            <a-tab-pane :key="1" tab="快速选人">
+              <div :style="{ height: screenHeight - 235 + 'px' }">
+                <div class="tab1">
+                  <a-form-item label="姓名">
+                    <a-input
+                        v-model:value="nameSearch.keyword"
+                        style="width: 270px; height: 40px; border-radius: 8px"
+                        placeholder="请输入姓名"
+                    />
+                    <a-button type="primary" @click="onSearchStu" style="margin-left: 20px;border-radius: 4px">
+                      <template #icon>
+                        <SearchOutlined/>
+                      </template>
+                      搜索
+                    </a-button>
+                    <a-button @click="resetStu" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                  </a-form-item>
+                </div>
+                <div class="chooseLeft" style="display: grid;grid-template-columns: 250px auto">
+                  <div :style="{ height: screenHeight - 235 + 'px' ,overflowY:'auto'}">
+                    <a-tree
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="treeData"
+                        :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
+                        @select="stuStuOrgSelect"
+                    >
+                    </a-tree>
+                  </div>
+                  <div class="tableBox tabb">
+                    <a-table
+                        :columns="stuColumns"
+                        :data-source="stuData"
+                        :pagination="stuPagination"
+                        :loading="stuLoading"
+                        row-key="id"
+                        :row-selection="stuRowSelection"
+                    />
+                  </div>
+                </div>
+              </div>
+            </a-tab-pane>
+            <a-tab-pane :key="2" tab="添加组织">
+              <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+              >
+                <div class="tab2">
+                  <a-form-item label="组织：">
+                    <a-input
+                        v-model:value="searchOrgName.keyword"
+                        style="width: 230px; height: 40px; border-radius: 8px"
+                        placeholder="请输入组织"
+                    />
+                    <a-button type="primary" @click="searchOrg" style="margin-left: 20px;border-radius: 4px">
+                      <template #icon>
+                        <SearchOutlined/>
+                      </template>
+                      搜索
+                    </a-button>
+                    <a-button @click="resetOrg" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                  </a-form-item>
+                </div>
+                <div class="boeTree">
+                  <a-tree
+                      :tree-data="searchOrgName.keyword ? orgData : treeData"
+                      @select="onOrgSelectChange"
+                      :fieldNames="{
+                          children: 'treeChildList',
+                          key: 'id',
+                          title: 'name',
+                          value: 'name',
+                        }"
+                      row-key="id"
+                      :row-selection="orgRowSelection"
+                      multiple
+                  >
+                  </a-tree>
+                  <!--                  <div>-->
+                  <!--                    <a-table-->
+                  <!--                        :columns="stuColumns"-->
+                  <!--                        :data-source="stuData"-->
+                  <!--                        :pagination="stuPagination"-->
+                  <!--                        :loading="orgLoading"-->
+                  <!--                        row-key="id"-->
+                  <!--                        :row-selection="stuRowSelection"-->
+                  <!--                    />-->
+                  <!--                  </div>-->
+                </div>
+              </div>
+            </a-tab-pane>
+            <a-tab-pane :key="3" tab="受众关联">
+              <div
+                  :style="{ height: screenHeight - 235 + 'px' }"
+              >
+                <div>
+                  <a-form-item label="受众名称：">
+                    <a-input
+                        v-model:value="audienceName.keyword"
+                        style="width: 260px; height: 40px; border-radius: 8px"
+                        placeholder="请输入受众名称"
+                    />
+                    <a-button type="primary" @click="searchAudi" style="margin-left: 20px;border-radius: 4px">
+                      <template #icon>
+                        <SearchOutlined/>
+                      </template>
+                      搜索
+                    </a-button>
+                    <a-button @click="resetAudienceInfo" style="margin-left: 20px;border-radius: 4px">重置</a-button>
+                  </a-form-item>
+                </div>
+                <div class="tableBox tabb">
+                  <a-table
+                      style="border: 1px solid #f2f6fe"
+                      row-key="id"
+                      :columns="audiColums"
+                      :data-source="audiData"
+                      :loading="audiLoading"
+                      :pagination="auditPagination"
+                      :row-selection="auditRowSelection"
+                  />
+                </div>
+              </div>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+        <div style="padding:100px 0 0 20px;display: grid;grid-template-rows: auto auto auto;">
+          <div>
+            <div style="margin-top: 20px">快速选人</div>
+            <a-tag :closable="true" color="#409eff" @close="stuDel(i)" v-for="(item,i) in selectsData.studentList"
+                   :key="i" style="margin-top:20px">
+              {{ item.realName }}
+            </a-tag>
+          </div>
+          <div>
+            <div style="margin-top: 20px">组织添加</div>
+            <a-tag :closable="true" color="#409eff" @close="orgDel(i)" v-for="(item,i) in selectsData.deptList" :key="i"
+                   style="margin-top:20px">
+              {{ item.name }}
+            </a-tag>
+          </div>
+          <div>
+            <div style="margin-top: 20px">受众添加</div>
+            <a-tag :closable="true" color="#409eff" @close="AuditDel(i)" v-for="(item,i) in selectsData.groupList"
+                   :key="i" style="margin-top:20px">
+              {{ item.audienceName }}
+            </a-tag>
+          </div>
+        </div>
+      </div>
+      <div class="btnn">
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="submitAuth">确定</button>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+<script setup>
+import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {useStore} from "vuex";
+import {useBoeApi, useBoeApiPage} from "@/api/request";
+import {AUDIENCE_LIST, ORG_LIST, USER_LIST} from "@/api/ThirdApi";
+import {saveStu} from "@/api/index1";
+
+const store = useStore();
+const emit = defineEmits({})
+const props = defineProps({
+  type: Number,
+  visiable: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const visiableState = computed(() => props.visiable)
+
+const activeKey = ref(1)
+const selectsData = ref({
+  studentList: [],
+  deptList: [],
+  groupList: []
+})
+const nameSearch = ref({
+  keyword: '',
+  departId: null,
+  page: 1,
+  pageSize: 10
+})
+const audienceName = ref({
+  keyword: '',
+  page: 1,
+  pageSize: 10
+})
+const searchOrgName = ref({
+  keyword: '',
+  page: 1,
+  pageSize: 10
+})
+
+const {
+  data: stuData,
+  fetch: searchStu,
+  page: stuPageNo,
+  pageSize: stuPageSize,
+  loading: stuLoading,
+  total: stuTotal
+} = useBoeApiPage(USER_LIST, nameSearch.value, {
+  init: true,
+  result: res => res.result.userInfoList,
+  totalPage: res => res.result.totalPage,
+  total: res => res.result.totalElement
+})
+
+const {
+  data: orgData,
+  fetch: searchOrg,
+} = useBoeApi(ORG_LIST, searchOrgName.value)
+
+const {
+  data: audiData,
+  fetch: searchAudi,
+  page: audiPageNo,
+  pageSize: audiPageSize,
+  loading: audiLoading,
+  total: audiTotal
+} = useBoeApiPage(AUDIENCE_LIST, audienceName.value, {
+  init: true,
+  result: res => res.result.audienceList,
+  totalPage: res => res.result.totalPage,
+  total: res => res.result.totalElement
+})
+
+const stuColumns = ref([
+  {
+    title: "姓名",
+    dataIndex: "realName",
+    key: "realName",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "工号",
+    dataIndex: "userNo",
+    key: "userNo",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "归属组织",
+    dataIndex: "orgName",
+    key: "orgName",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "部门",
+    dataIndex: "departName",
+    key: "departName",
+    width: 80,
+    align: "center",
+    className: "h",
+    ellipsis: true,
+  },
+])
+const audiColums = ref([{
+  title: "id",
+  dataIndex: "id",
+  key: "id",
+  width: 35,
+  align: "center",
+  className: "h",
+},
+  {
+    title: "受众名称",
+    dataIndex: "audienceName",
+    key: "audienceName",
+    width: 30,
+    align: "left",
+    className: "h",
+    ellipsis: true,
+  },
+  {
+    title: "人数",
+    dataIndex: "totalMember",
+    key: "totalMember",
+    width: 30,
+    align: "center",
+    className: "h",
+  },
+  {
+    title: "类型",
+    dataIndex: "audienceType",
+    key: "audienceType",
+    width: 40,
+    align: "center",
+    className: "h",
+  },
+])
+const stuSelectKeys = ref([])
+const orgSelectKeys = ref([])
+const auditSelectKeys = ref([])
+const screenHeight = ref(document.body.clientHeight)
+const stuRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: stuSelectKeys.value,
+  onChange: onStuSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+const orgRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: orgSelectKeys.value,
+  onChange: onOrgSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+
+const stuPagination = computed(() => ({
+  total: stuTotal.value,
+  showSizeChanger: false,
+  current: stuPageNo.value,
+  pageSize: stuPageSize.value,
+  onChange: changePagination
+}))
+
+const auditPagination = computed(() => ({
+  total: audiTotal.value,
+  showSizeChanger: false,
+  current: audiPageNo.value,
+  pageSize: audiPageSize.value,
+  onChange: auditChangePagination
+}))
+
+const auditRowSelection = computed(() => ({
+  columnWidth: 20,
+  selectedRowKeys: auditSelectKeys.value,
+  onChange: onAuditSelectChange,
+  preserveSelectedRowKeys: true,
+}))
+
+onMounted(() => {
+});
+
+const closeDrawer = () => {
+
+};
+//获取组织树
+const treeData = computed(() => {
+  return store.state.orgtreeList ? store.state.orgtreeList : [];
+});
+
+function onSearchStu() {
+  nameSearch.value.page = 1
+  searchStu()
+}
+
+function stuStuOrgSelect(e) {
+  nameSearch.value.departId = e.join('')
+  searchStu()
+}
+
+function stuDel(i) {
+  stuSelectKeys.value = stuSelectKeys.value.filter(e => e !== selectsData.value.studentList[i].id)
+  selectsData.value.studentList.splice(i, 1)
+}
+
+function AuditDel(i) {
+  auditSelectKeys.value = auditSelectKeys.value.filter(e => e !== selectsData.value.groupList[i].id)
+  selectsData.value.groupList.splice(i, 1)
+}
+//
+// function orgSelect(key, obj) {
+//   console.log(obj)
+//   request(ORG_CHILD_LIST, {orgId: null}).then(res => {
+//     console.log(res.result)
+//   })
+// }
+
+function onStuSelectChange(e, l) {
+  stuSelectKeys.value = e
+  selectsData.value.studentList = l
+}
+
+function onOrgSelectChange(e, l) {
+  orgRowSelection.value = e
+  selectsData.value.deptList = l.selectedNodes
+}
+
+function onAuditSelectChange(e, l) {
+  auditSelectKeys.value = e
+  selectsData.value.groupList = l
+}
+
+// const stuDepartmentSelect = (e) => {
+//   nameSearch.value.orgId = e.join('')
+//   searchStu()
+// };
+
+//分页获取学员
+const changePagination = (page) => {
+  nameSearch.value.page = page;
+  searchStu()
+};
+
+const auditChangePagination = (page) => {
+  console.log(1111111111)
+  console.log(page)
+  audienceName.value.page = page;
+  searchAudi()
+};
+
+//重置
+const resetStu = () => {
+  deleteDepSelect();
+  nameSearch.value = {keyword: '', page: 1, pageSize: 10}
+};
+//清空选择部门信息
+const deleteDepSelect = () => {
+  stuSelectKeys.value = []
+};
+
+//重置组织
+const resetOrg = () => {
+  searchOrgName.value = {keyword: '', page: 1, pageSize: 10}
+};
+
+//重置受众
+const resetAudienceInfo = () => {
+  audienceName.value = {keyword: '', page: 1, pageSize: 10}
+};
+
+//全部清除
+// const deleteAll = () => {
+//   selectsData.value = {
+//     studentList: [],
+//     deptList: [],
+//     groupList: []
+//   }
+// };
+//确定添加授权
+const submitAuth = () => {
+  emit('update:visiable', false)
+  saveStu(selectsData.value)
+};
+
+
+</script>
+<style>
+.ant-btn-primary {
+  background-color: #409eff !important;
+}
+</style>
--- a/src/views/courselibrary/CoursewareManage.vue
+++ b/src/views/courselibrary/CoursewareManage.vue
@@ -39,7 +39,7 @@
            </a-select>
          </div>
          <div class="select fitems">
-            <a-select
+            <!-- <a-select
              v-model:value="categoryId"
              dropdownClassName="dropdown-style"
              style="width: 200px"
@@ -47,21 +47,39 @@
              :options="options2"
              allowClear
              showSearch
-            ></a-select>
+            ></a-select> -->
+            <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="categoryId"
+              show-search
+              style="width: 200px"
+              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+              placeholder="请选择内容分类"
+              allow-clear
+              tree-default-expand-all
+              :tree-data="options2222"
+            >
+              <template #title="{ value: val, title }">
+                <b v-if="val === '11111'" style="color: #08c">sss</b>
+                <template v-else>{{ title }}</template>
+              </template>
+            </a-tree-select>
          </div>
          <div class="select fitems">
-            <a-range-picker
-              v-model:value="projectTime"
-              :show-time="{
-                defaultValue: [
-                  moment('00:00:00', 'HH:mm:ss'),
-                  moment('23:59:59', 'HH:mm:ss'),
-                ],
-              }"
-              valueFormat="X"
-              separator="至"
-              :placeholder="['        开始时间', '        结束时间']"
-            />
+            <div class="select addTimeBox">
+              <div class="addTime">创建时间：</div>
+              <a-range-picker
+                v-model:value="projectTime"
+                style="width: 420px"
+                valueFormat="X"
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+              />
+            </div>
          </div>
        </div>
      </div>
@@ -75,10 +93,10 @@
          <div class="btnText">重置</div>
        </div>
        <!-- 2022-11-30注释 后面放开 -->
-        <div class="btn btn3" @click="openMessage">
+        <!-- <div class="btn btn3" @click="openMessage">
          <div class="search"></div>
          <div class="btnText">导出</div>
-        </div>
+        </div> -->
        <div class="btn btn4" @click="of_hShow">
          <div class="search"></div>
          <div class="btnText">新建课程</div>
@@ -117,16 +135,24 @@
                </div>
                <span style="margin-right: 3px">课程名称：</span>
              </div>
-              <div class="b_input">
-                <a-input
-                  v-model:value="xzinputV1"
-                  maxlength="20"
-                  style="width: 440px; height: 40px; border-radius: 8px"
+              <div class="in b_input">
+                <NameInput
                  placeholder="请输入课程名称"
-                />
-                <div class="inp_num">
-                  <span style="color: #c7cbd2">{{ xzinputV1.length }}/20</span>
-                </div>
+                  v-model:value="xzinputV1"
+                  v-model:validate="validate"
+                  :maxlength="20"
+                  show-count
+                  :type="2"
+                ></NameInput>
+                <!--                <a-input-->
+                <!--                  v-model:value="xzinputV1"-->
+                <!--                  maxlength="20"-->
+                <!--                  style="width: 440px; height: 40px; border-radius: 8px"-->
+                <!--                  placeholder="请输入课程名称"-->
+                <!--                />-->
+                <!--                <div class="inp_num">-->
+                <!--                  <span style="color: #c7cbd2">{{ xzinputV1.length }}/20</span>-->
+                <!--                </div>-->
              </div>
            </div>
            <div class="b_sub">
@@ -197,10 +223,11 @@
              <a-radio-group v-model:value="valueE1">
                <div class="bc_box">
                  <div class="bc_boxl">
-                    <div class="ol_checkbox">
+                    <div class="ol_checkbox" @click="expectOnline">
                      <a-radio
                        v-model:checked="checked"
                        :value="1"
+                        disabled="true"
                        @click="bs_hShow"
                      >
                        线上
@@ -320,14 +347,22 @@
                    <span style="margin-right: 14px">课程名称</span>
                  </div>
                  <div class="item_inp">
-                    <div class="i1_input">
-                      <a-input
-                        aria-readonly="true"
-                        v-model:value="qdms_inputV1"
-                        maxlength="90"
-                        style="width: 440px; height: 40px; border-radius: 8px"
+                    <div class="in i1_input">
+                      <!--                      <a-input-->
+                      <!--                        aria-readonly="true"-->
+                      <!--                        v-model:value="qdms_inputV1"-->
+                      <!--                        maxlength="90"-->
+                      <!--                        style="width: 440px; height: 40px; border-radius: 8px"-->
+                      <!--                        placeholder="请输入课程名称"-->
+                      <!--                      />-->
+                      <NameInput
                        placeholder="请输入课程名称"
-                      />
+                        v-model:value="qdms_inputV1"
+                        v-model:validate="validate"
+                        :maxlength="20"
+                        show-count
+                        :type="2"
+                      ></NameInput>
                      <div class="inp_num">
                        <span style="color: #c7cbd2">
                          {{ qdms_inputV1.length }}/90
@@ -493,7 +528,7 @@
                  </div>
                  <div class="item_inp">
                    <div class="select i6_input">
-                      <a-select
+                      <!-- <a-select
                        :getPopupContainer="
                          (triggerNode) => {
                            return triggerNode.parentNode || document.body;
@@ -506,7 +541,30 @@
                        :options="options2"
                        allowClear
                        showSearch
-                      ></a-select>
+                      ></a-select> -->
+                      <a-tree-select
+                        :getPopupContainer="
+                          (triggerNode) => {
+                            return triggerNode.parentNode || document.body;
+                          }
+                        "
+                        v-model:value="fen_lei"
+                        show-search
+                        style="width: 440px"
+                        :dropdown-style="{
+                          maxHeight: '400px',
+                          overflow: 'auto',
+                        }"
+                        placeholder="请选择内容分类"
+                        allow-clear
+                        tree-default-expand-all
+                        :tree-data="options2222"
+                      >
+                        <template #title="{ value: val, title }">
+                          <b v-if="val === '11111'" style="color: #08c">sss</b>
+                          <template v-else>{{ title }}</template>
+                        </template>
+                      </a-tree-select>
                    </div>
                  </div>
                </div>
@@ -630,7 +688,17 @@
                        <span style="color: #6f6f6f">{{ item.name }}</span>
                      </div> -->
                      <div class="file_name">
-                        <span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span>
+                        <span
+                          style="
+                            color: #6f6f6f;
+                            width: 140px;
+                            display: block;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                          "
+                          >{{ item.slice(item.lastIndexOf("/") + 1) }}</span
+                        >
                      </div>
                      <!-- 条件渲染 s -->
                      <!-- <div class="file_size">
@@ -731,6 +799,7 @@
            "
          >
            <span
+              style="margin-right: 24px"
              :class="[
                String(record.courseform) === '1'
                  ? 'disabled table-operation'
@@ -829,6 +898,7 @@
            "
          >
            <span
+              style="margin-right: 24px"
              :class="[
                String(record.courseform) === '1'
                  ? 'disabled table-operation'
@@ -919,6 +989,7 @@
            "
          >
            <span
+              style="margin-right: 24px"
              :class="[
                String(record.courseform) === '1'
                  ? 'disabled table-operation'
@@ -1048,6 +1119,7 @@
            "
          >
            <span
+              style="margin-right: 24px"
              :class="[
                String(record.courseform) === '1'
                  ? 'disabled table-operation'
@@ -1184,6 +1256,7 @@
            "
          >
            <span
+              style="margin-right: 24px"
              :class="[
                String(record.courseform) === '1'
                  ? 'disabled table-operation'
@@ -1641,7 +1714,8 @@
                <template #bodyCell="{ record, column }">
                  <template v-if="column.key === 'operation'">
                    <span class="table-operation">
-                      <a
+                      <!-- 2022-12-10注释 后面放开 -->
+                      <!-- <a
                        @click="
                          () => {
                            //QR_hs = true;
@@ -1658,7 +1732,8 @@
                        "
                      >
                        签到
-                      </a>
+                      </a> -->
+
                      <a
                        @click="
                          () => {
@@ -1698,7 +1773,8 @@
                            >
                              删除
                            </a-menu-item>
-                            <a-menu-item
+                            <!-- 2022-12-10注释 后面放开 -->
+                            <!-- <a-menu-item
                              @click="
                                () => {
                                  //QR_hs = true;
@@ -1715,7 +1791,7 @@
                              "
                            >
                              二维码
-                            </a-menu-item>
+                            </a-menu-item> -->
                          </a-menu>
                        </template>
                        <a>
@@ -1805,7 +1881,7 @@
                style="width: 440px; height: 40px; border-radius: 8px"
                placeholder="请输入详细地点"
              />
-              <div class="inp_num">
+              <div class="inp_num" style="right: 164px">
                <span style="color: #c7cbd2">{{ xjkkinputV2.length }}/50</span>
              </div>
            </div>
@@ -1975,7 +2051,17 @@
              <div class="file_img"></div>
              <div class="file_detail">
                <div class="file_name">
-                  <span style="color: #6f6f6f;width:140px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;">{{ item.slice(item.lastIndexOf('/')+1) }}</span>
+                  <span
+                    style="
+                      color: #6f6f6f;
+                      width: 140px;
+                      display: block;
+                      overflow: hidden;
+                      white-space: nowrap;
+                      text-overflow: ellipsis;
+                    "
+                    >{{ item.slice(item.lastIndexOf("/") + 1) }}</span
+                  >
                </div>
                <!-- 条件渲染 s -->
                <!-- <div class="file_size">
@@ -2691,6 +2777,7 @@ import { useRouter, useRoute } from "vue-router";
 import addOnlineCourse from "../../components/Modals/addOnlineCourse.vue";

 import ProjOwnerShip from "../../components/drawers/ProjectOwn";
+import NameInput from "../../components/project/NameInput";
 import ProjPowerList from "../../components/drawers/ProjPowerList";
 import ProjCheckShip from "../../components/drawers/ProjCheckPower";
 import AssessmentList from "../../components/drawers/AssessmentList.vue";
@@ -2734,21 +2821,21 @@ import TwoDimensionalCode from "../../components/TwoDimensionalCode.vue";
 import { codeUrl, toDate } from "../../api/method";
 //列表表格
 const columns1 = [
-  {
-    title: "序号",
-    width: 100,
-    dataIndex: "num",
-    key: "num",
-    align: "center",
-    customRender: ({ index, record }) => {
-      const pageNum =
-        Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
-      return index + 1 + pageNum;
-    },
-  },
+  // {
+  //   title: "序号",
+  //   width: 100,
+  //   dataIndex: "num",
+  //   key: "num",
+  //   align: "center",
+  //   customRender: ({ index, record }) => {
+  //     const pageNum =
+  //       Number(record.pageNo) - 1 > 0 ? (Number(record.pageNo) - 1) * 10 : 0;
+  //     return index + 1 + pageNum;
+  //   },
+  // },
  {
    title: "名称",
-    width: 200,
+    width: 400,
    dataIndex: "name",
    key: "name",
    ellipsis: true,
@@ -2910,7 +2997,7 @@ const columns1 = [
    dataIndex: "operation",
    key: "operation",
    fixed: "right",
-    align: "center",
+    align: "right",
  },
 ];
 //列表操作在线面授管理
@@ -3244,6 +3331,7 @@ export default defineComponent({
    ProjPowerList,
    ProjCheckShip,
    AssessmentList,
+    NameInput,
    // VNodes: (_, {attrs}) => {
    //   return attrs.vnodes;
    // },
@@ -3295,7 +3383,6 @@ export default defineComponent({
      ],
      //在线面授管理学习记录
      tableData3: [
-        
        {
          key: 1,
          projectName: "刘莉",
@@ -3431,7 +3518,7 @@ export default defineComponent({
      value4: "",
      //选择线上还是面授
      xzinputV1: "",
-      valueE1:2,
+      valueE1: 2,
      valueE2: "",
      //确定面授
      ft_eidt: false,
@@ -3475,6 +3562,7 @@ export default defineComponent({

      imageUrl: "",
      imgList: [],
+      validate: true,

      pageSize2: 10,
      currentPage2: 0,
@@ -3521,6 +3609,130 @@ export default defineComponent({
      codevisible: false, //二维码弹窗
      codeInfo: null, //二维码内容
      codeUrl: codeUrl,
+      // 课程三级分类
+      options2222: [
+        {
+          title: "领导力",
+          value: "100",
+          selectable: false,
+          children: [
+            {
+              title: "领导业务",
+              value: "1001",
+            },
+            {
+              title: "领导团队",
+              value: "1002",
+            },
+            {
+              title: "领导自我",
+              value: "1003",
+            },
+          ],
+        },
+        {
+          title: "专业力",
+          value: "200",
+          selectable: false,
+          children: [
+            {
+              title: "研发",
+              value: "2001",
+            },
+            {
+              title: "产品和解决方案",
+              value: "2002",
+            },
+            {
+              title: "生产技术与制造",
+              value: "2003",
+            },
+            {
+              title: "供应链",
+              value: "2004",
+            },
+            {
+              title: "营销",
+              value: "2005",
+            },
+            {
+              title: "品质",
+              value: "2006",
+            },
+            {
+              title: "战略与企划",
+              value: "2007",
+            },
+            {
+              title: "流程管理",
+              value: "2008",
+            },
+            {
+              title: "业绩管理",
+              value: "2009",
+            },
+            {
+              title: "项目管理",
+              value: "20010",
+            },
+            {
+              title: "信息技术",
+              value: "20011",
+            },
+            {
+              title: "环境与安全",
+              value: "20012",
+            },
+            {
+              title: "人力资源",
+              value: "20013",
+            },
+            {
+              title: "企业文化",
+              value: "20014",
+            },
+            {
+              title: "品牌",
+              value: "20015",
+            },
+            {
+              title: "财务",
+              value: "20016",
+            },
+            {
+              title: "法务",
+              value: "20017",
+            },
+            {
+              title: "行政",
+              value: "20018",
+            },
+            {
+              title: "医工",
+              value: "20019",
+            },
+          ],
+        },
+        {
+          title: "通用力",
+          value: "300",
+          selectable: false,
+          children: [
+            {
+              title: "职业操守与道德",
+              value: "3001",
+            },
+            {
+              title: "职业素养与技能",
+              value: "3002",
+            },
+            {
+              title: "规章制度",
+              value: "3003",
+            },
+          ],
+        },
+      ],
    });

    const showStuAdd = (record) => {
@@ -3742,15 +3954,35 @@ export default defineComponent({
        },
        true
      );
+
+      // datas.forEach((itm) => {
+      //   itm.pageNo = pageNo;
+      //   for (let item of options2.value) {
+      //     if (String(item.value) === String(itm.content)) {
+      //       itm.contentTxt = item.label;
+      //       return false;
+      //     }
+      //   }
+      // });
+
      datas.forEach((itm) => {
        itm.pageNo = pageNo;
-        for (let item of options2.value) {
-          if (String(item.value) === String(itm.content)) {
-            itm.contentTxt = item.label;
-            return false;
+        console.log(itm);
+        for (let i = 0; i < options2.value.length; i++) {
+          for (let j = 0; j < options2.value[i].children.length; j++) {
+            if (
+              String(options2.value[i].children[j].value) ===
+              String(itm.categoryId)
+            ) {
+              console.log();
+              itm.contentTxt = options2.value[i].children[j].title;
+              return false;
+            }
          }
        }
      });
+
+      console.log(datas, options2.value);
      state.tableData1 = datas;
    };
    getTableDate();
@@ -3984,15 +4216,16 @@ export default defineComponent({
              // }
            }
            if (param === "faceclassClass") {
-              let arr = res.data.data.rows;
-              let newArr = [];
-              arr.forEach((item) => {
-                newArr.push({
-                  value: item.dictCode,
-                  label: item.dictName,
-                });
-              });
-              options2.value = newArr;
+              // let arr = res.data.data.rows;
+              // let newArr = [];
+              // arr.forEach((item) => {
+              //   newArr.push({
+              //     value: item.dictCode,
+              //     label: item.dictName,
+              //   });
+              // });
+              // console.log(newArr)
+              options2.value = state.options2222;
            }
            if (param === "faceclassScene") {
              let arr = res.data.data.rows;
@@ -4267,14 +4500,27 @@ export default defineComponent({
        state.valueE1 = "";
      }
    };
+    // 弹框提示敬请期待
+    const expectOnline = () => {
+      message.destroy();
+      message.success("功能正在开发中，敬请期待。");
+    };
    //新建面授课
    const createft = () => {
      if (!state.xzinputV1) {
        message.destroy();
        return message.warning("请输入必填项");
      }
-      console.log("state.bs_hs && state.valueE1 == 2",state.bs_hs , state.valueE1 == 2);
-     
+      if (!state.validate) {
+        message.destroy();
+        return message.warning("路径图名称重复");
+      }
+      console.log(
+        "state.bs_hs && state.valueE1 == 2",
+        state.bs_hs,
+        state.valueE1 == 2
+      );
+
      if (state.valueE1 === 2) {
        state.of_hs = false;
        // state.ft_hs = true;
@@ -4382,7 +4628,10 @@ export default defineComponent({
      } else {
        state.addLoading = true;
      }
-
+      if (!state.validate) {
+        message.destroy();
+        return message.warning("路径图名称重复");
+      }
      edit(postData).then((res) => {
        if (res.data.code === 200) {
          getTableDate();
@@ -5156,7 +5405,7 @@ export default defineComponent({
          //   size: file.size,
          // });
          // console.log(state.filesList);
-          console.log(res.data.data)
+          console.log(res.data.data);
          state.filesList = [res.data.data];
          // state.hasImgName = res.data.data;
        }
@@ -5379,6 +5628,7 @@ export default defineComponent({
      of_exit,
      hideShow,
      bs_hShow,
+      expectOnline,
      createft,
      ft_exit,
      ft_exit_1,
@@ -5461,6 +5711,27 @@ export default defineComponent({
 });
 </script>
 <style lang="scss">
+.addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+
+  .ant-picker {
+    padding-left: 85px;
+  }
+
+  .ant-picker-range .ant-picker-active-bar {
+    margin-left: 85px;
+  }
+}
+
 .aeLoading {
  z-index: 10000;
 }
@@ -5499,15 +5770,15 @@ export default defineComponent({
      .btn {
        padding: 0px 26px 0px 26px;
        height: 38px;
-        background: rgba(64, 158, 255, 0);
+        background: #409eff;
        border-radius: 8px;
        border: 1px solid rgba(64, 158, 255, 1);
        display: flex;
        align-items: center;
+        cursor: pointer;
        justify-content: center;
        margin-right: 14px;
        flex-shrink: 0;
-        cursor: pointer;

        .search {
          background-size: 100%;
@@ -5516,7 +5787,7 @@ export default defineComponent({
        .btnText {
          font-size: 14px;
          font-weight: 400;
-          color: rgba(64, 158, 255, 1);
+          color: #ffffff;
          line-height: 36px;
          margin-left: 5px;
        }
@@ -5526,7 +5797,7 @@ export default defineComponent({
        .search {
          width: 15px;
          height: 17px;
-          background-image: url("../../assets/images/courseManage/search1.png");
+          background-image: url("../../assets/images/courseManage/search0.png");
        }
      }

@@ -5534,7 +5805,7 @@ export default defineComponent({
        .search {
          width: 16px;
          height: 18px;
-          background-image: url("../../assets/images/courseManage/reset1.png");
+          background-image: url("../../assets/images/courseManage/reset0.png");
        }
      }

@@ -5542,7 +5813,7 @@ export default defineComponent({
        .search {
          width: 17px;
          height: 18px;
-          background-image: url("../../assets/images/coursewareManage/export.png");
+          background-image: url("../../assets/images/coursewareManage/export1.png");
        }
      }

@@ -5552,12 +5823,12 @@ export default defineComponent({
        .search {
          width: 17px;
          height: 18px;
-          background-image: url("../../assets/images/courseManage/add1.png");
+          background-image: url("../../assets/images/courseManage/add0.png");
        }
      }

      .btn1:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);

        .search {
          background-image: url("../../assets/images/courseManage/search0.png");
@@ -5569,7 +5840,7 @@ export default defineComponent({
      }

      .btn2:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);

        .search {
          background-image: url("../../assets/images/courseManage/reset0.png");
@@ -5581,7 +5852,7 @@ export default defineComponent({
      }

      .btn3:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);

        .search {
          background-image: url("../../assets/images/coursewareManage/export1.png");
@@ -5593,7 +5864,7 @@ export default defineComponent({
      }

      .btn4:hover {
-        background: rgba(64, 158, 255, 1);
+        background: rgba(64, 158, 255, 0.76);

        .search {
          background-image: url("../../assets/images/courseManage/add0.png");
@@ -5609,6 +5880,17 @@ export default defineComponent({
  .tableBox {
    margin: 20px 38px 30px;

+    th {
+      background-color: #eff4fc !important;
+      text-align: center !important;
+    }
+
+    .ant-table-tbody
+      > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+      > td {
+      background: #f6f9fd;
+    }
+
    .operation {
      display: flex;
      justify-content: center;
@@ -5812,7 +6094,8 @@ export default defineComponent({

 .createschooltime {
  z-index: 999;
-  width: 679px;
+  width: 879px;
+  height: 740px;
  background: #ffffff;
  box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.21);
  position: absolute;
@@ -5832,7 +6115,7 @@ export default defineComponent({

  .cst_main {
    width: 100%;
-    max-height: 600px;
+    max-height: 700px;
    overflow-y: auto;
    position: relative;

@@ -7366,7 +7649,12 @@ export default defineComponent({
              }

              .ant-table-thead > tr > th {
-                background-color: rgba(239, 244, 252, 1);
+                font-size: 14px;
+                font-weight: 400;
+                color: #999ba3;
+                line-height: 36px;
+                padding: 5px 16px;
+                background-color: #eff4fc !important;
              }

              th.h {
@@ -7667,7 +7955,12 @@ export default defineComponent({
                }

                .ant-table-thead > tr > th {
-                  background-color: rgba(239, 244, 252, 1);
+                  font-size: 14px;
+                  font-weight: 400;
+                  color: #999ba3;
+                  line-height: 36px;
+                  padding: 5px 16px;
+                  background-color: #eff4fc !important;
                }

                th.h {
--- a/src/views/courselibrary/OnlineManage.vue
+++ b/src/views/courselibrary/OnlineManage.vue
@@ -0,0 +1,53 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-11-09 09:26:26
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-11-25 17:37:05
+ * @FilePath: /fe-manage/src/views/courselibrary/CourseManage.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<!-- 课件管理页面 -->
+  <!--   sandbox="allow-forms allow-scripts allow-same-origin allow-popups" -->
+  <template>
+    <div class="courseManage">
+      <iframe
+        id="iframe"
+        style="width: 100%; height: 100%"
+        :src="iframeUrl + '/course/manages'"
+        frameborder="0"
+        name="myframe"
+        security="restricted"
+        sandbox="allow-forms allow-scripts allow-same-origin allow-popups"
+      ></iframe>
+    </div>
+  </template>
+  <script>
+  import { reactive, toRefs, onMounted } from "vue";
+  import { iframeUrl } from "../../api/method";
+  export default {
+    name: "OnlineManage",
+  
+    setup() {
+      const state = reactive({
+        iframeUrl: iframeUrl,
+      });
+  
+      onMounted(() => {
+        // console.log("执行");
+      });
+  
+      return {
+        ...toRefs(state),
+      };
+    },
+  };
+  </script>
+  <style lang="scss">
+  .courseManage {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+  </style>
+  
--- a/src/views/courselibrary/components/seeModal.vue
+++ b/src/views/courselibrary/components/seeModal.vue
@@ -265,6 +265,129 @@ export default defineComponent({
    console.log(props);
    const state = reactive({
      imgList: [],
+      options2222: [
+        {
+          title: '领导力',
+          value: '100',
+          selectable:false,
+          children: [
+            {
+              title: '领导业务',
+              value: '1001',
+            },
+            {
+              title: '领导团队',
+              value: '1002',
+            },
+            {
+              title: '领导自我',
+              value: '1003',
+            },
+          ],
+        },
+        {
+          title: '专业力',
+          value: '200',
+          selectable:false,
+          children: [
+            {
+              title: '研发',
+              value: '2001',
+            },
+            {
+              title: '产品和解决方案',
+              value: '2002',
+            },
+            {
+              title: '生产技术与制造',
+              value: '2003',
+            },
+            {
+              title: '供应链',
+              value: '2004',
+            },
+            {
+              title: '营销',
+              value: '2005',
+            },
+            {
+              title: '品质',
+              value: '2006',
+            },
+            {
+              title: '战略与企划',
+              value: '2007',
+            },
+            {
+              title: '流程管理',
+              value: '2008',
+            },
+            {
+              title: '业绩管理',
+              value: '2009',
+            },
+            {
+              title: '项目管理',
+              value: '20010',
+            },
+            {
+              title: '信息技术',
+              value: '20011',
+            },
+            {
+              title: '环境与安全',
+              value: '20012',
+            },
+            {
+              title: '人力资源',
+              value: '20013',
+            },
+            {
+              title: '企业文化',
+              value: '20014',
+            },
+            {
+              title: '品牌',
+              value: '20015',
+            },
+            {
+              title: '财务',
+              value: '20016',
+            },
+            {
+              title: '法务',
+              value: '20017',
+            },
+            {
+              title: '行政',
+              value: '20018',
+            },
+            {
+              title: '医工',
+              value: '20019',
+            }
+          ],
+        },
+        {
+          title: '通用力',
+          value: '300',
+          selectable:false,
+          children: [
+            {
+              title: '职业操守与道德',
+              value: '3001',
+            },
+            {
+              title: '职业素养与技能',
+              value: '3002',
+            },
+            {
+              title: '规章制度',
+              value: '3003',
+            },
+          ], 
+        }
+      ]
    });

    const filterTxt = (txt) => {
@@ -277,11 +400,13 @@ export default defineComponent({
    const filterClassTxt = (txt) => {
      let str = "-";
      if (txt) {
-        options2.value.forEach((item) => {
-          if (item.value === String(txt)) {
-            str = item.label;
+        for(let i =0; i<options2.value.length;i++){
+          for(let j=0;j<options2.value[i].children.length;j++){
+            if (String(options2.value[i].children[j].value) === String(txt)) {
+              str = options2.value[i].children[j].title;
+            }
          }
-        });
+        }
      }
      return str;
    };
@@ -323,7 +448,7 @@ export default defineComponent({
                  label: item.dictName,
                });
              });
-              options2.value = newArr;
+              options2.value = state.options2222;
            }
            if (param === "faceclassScene") {
              let arr = res.data.data.rows;
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -1,29 +1,29 @@
 <!-- 确定新建面授课弹窗 -->
 <template>
  <a-modal
-    v-model:visible="ft_hs"
-    title="Title"
-    :footer="null"
-    :closable="false"
-    wrapClassName="modalStyle facteachModal"
-    width="80%"
-    @cancel="visibleClose"
-    @ok="handlePush"
+      v-model:visible="ft_hs"
+      title="Title"
+      :footer="null"
+      :closable="false"
+      wrapClassName="modalStyle facteachModal"
+      width="80%"
+      @cancel="visibleClose"
+      @ok="handlePush"
  >
    <div class="modalHeader">
      <div class="headerLeft">
        <img
-          style="width: 17px; height: 18px; margin-right: 8px"
-          src="@/assets/images/basicinfo/add.png"
+            style="width: 17px; height: 18px; margin-right: 8px"
+            src="@/assets/images/basicinfo/add.png"
        />
        <span v-if="ft_eidt" class="headerLeftText">编辑面授课</span>
        <span v-else class="headerLeftText">新建面授课</span>
      </div>
      <div style="margin-right: 57px; cursor: pointer">
        <img
-          @click="noEditClose"
-          style="width: 22px; height: 22px"
-          src="@/assets/images/basicinfo/close22.png"
+            @click="noEditClose"
+            style="width: 22px; height: 22px"
+            src="@/assets/images/basicinfo/close22.png"
        />
      </div>
    </div>
@@ -42,25 +42,27 @@
                <div class="item_nam">
                  <div class="asterisk_icon">
                    <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt="asterisk"
                    />
                  </div>
                  <span style="margin-right: 14px">课程名称</span>
                </div>
                <div class="item_inp">
                  <div class="i1_input">
-                    <a-input
-                      v-model:value="qdms_inputV1"
-                      maxlength="90"
-                      style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入课程名称"
-                    />
-                    <div class="inp_num">
-                      <span style="color: #c7cbd2">
-                        {{ qdms_inputV1.length }}/90
-                      </span>
-                    </div>
+                    <NameInput placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate"
+                               :maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
+<!--                    <a-input-->
+<!--                        v-model:value="qdms_inputV1"-->
+<!--                        maxlength="90"-->
+<!--                        style="width: 440px; height: 40px; border-radius: 8px"-->
+<!--                        placeholder="请输入课程名称"-->
+<!--                    />-->
+<!--                    <div class="inp_num">-->
+<!--                      <span style="color: #c7cbd2">-->
+<!--                        {{ qdms_inputV1.length }}/90-->
+<!--                      </span>-->
+<!--                    </div>-->
                  </div>
                </div>
              </div>
@@ -70,19 +72,19 @@
                    <span style="color: #999ba3">课程命名规则</span>
                  </div>
                  <div
-                    class="i2_right"
-                    @click="hideShow"
-                    style="cursor: pointer"
+                      class="i2_right"
+                      @click="hideShow"
+                      style="cursor: pointer"
                  >
                    <div
-                      class="b_zk"
-                      :style="{ display: hideshow ? 'block' : 'none' }"
+                        class="b_zk"
+                        :style="{ display: hideshow ? 'block' : 'none' }"
                    >
                      <span style="color: #4ea6ff">收起</span>
                    </div>
                    <div
-                      class="b_sq"
-                      :style="{ display: hideshow ? 'none' : 'block' }"
+                        class="b_sq"
+                        :style="{ display: hideshow ? 'none' : 'block' }"
                    >
                      <span style="color: #4ea6ff">展开</span>
                    </div>
@@ -90,14 +92,14 @@
                  </div>
                </div>
                <div
-                  class="i2_detail"
-                  :style="{ display: hideshow ? 'block' : 'none' }"
+                    class="i2_detail"
+                    :style="{ display: hideshow ? 'block' : 'none' }"
                >
                  <span style="color: #999ba3">
-                    1、课程名称统一不加书名号。<br />
+                    1、课程名称统一不加书名号。<br/>
                    2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
                    之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
-                    看到的是课程内容主题。<br />
+                    看到的是课程内容主题。<br/>
                    3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
                    版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
                  </span>
@@ -107,14 +109,25 @@
                <div class="item_nam">
                  <div class="asterisk_icon">
                    <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt=""
                    />
                  </div>
                  <span style="margin-right: 14px">封面图</span>
                </div>
                <div class="item_inp">
-                  <a-select
+                  <div style="width:440px;height:70px;display: flex;justify-content: flex-start;align-items: center;">
+                    <img
+                        v-for="(item, index) in optionsUrl"
+                        :key="index"
+                        class="choiceoptionurl"
+                        :style="item.value==feng_mian_1?'border:3px solid rgb(78, 166, 255);':''"
+                        :src="item.value"
+                        :alt="item.label"
+                        @click="choicePic(item.value)"
+                    />
+                  </div>
+                  <!-- <a-select
                    :getPopupContainer="
                      (triggerNode) => {
                        return triggerNode.parentNode || document.body;
@@ -127,12 +140,13 @@
                    :options="optionsUrl"
                    allowClear
                    showSearch
-                  />
+                  /> -->
                  <img
-                    class="i_upload_img"
-                    v-if="feng_mian_1"
-                    :src="feng_mian_1"
-                    alt="avatar"
+                      class="i_upload_img"
+                      v-if="feng_mian_1"
+                      :src="feng_mian_1"
+                      style="width:220px;height:120px;border-radius: 8px;"
+                      alt="avatar"
                  />
                  <div class="i_bottom">
                    <span style="color: #999ba3">
@@ -145,9 +159,9 @@
                <div class="item_nam">
                  <div class="asterisk_icon">
                    <img
-                      style="width: 10px; height: 10px"
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                        style="width: 10px; height: 10px"
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt=""
                    />
                  </div>
                  <span style="margin-right: 14px">目标人群</span>
@@ -155,10 +169,10 @@
                <div class="item_inp">
                  <div class="i1_input">
                    <a-input
-                      v-model:value="qdms_inputV2"
-                      maxlength="50"
-                      style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入目标人群"
+                        v-model:value="qdms_inputV2"
+                        maxlength="50"
+                        style="width: 440px; height: 40px; border-radius: 8px"
+                        placeholder="请输入目标人群"
                    />
                    <div class="inp_num">
                      <span style="color: #c7cbd2">
@@ -168,52 +182,65 @@
                  </div>
                </div>
              </div>
-              <div class="mbl_items">
-                <div class="item_nam">
-                  <span style="margin-right: 14px">课程价值</span>
-                </div>
-                <div class="item_inp">
-                  <div class="i1_input">
-                    <a-input
-                      v-model:value="qdms_inputV3"
-                      maxlength="200"
-                      style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入课程价值"
-                    />
-                    <div class="inp_num">
-                      <span style="color: #c7cbd2">
-                        {{ qdms_inputV3.length }}/200
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
              <div class="mbl_items">
                <div class="item_nam">
                  <div class="asterisk_icon">
                    <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt="asterisk"
                    />
                  </div>
                  <span style="margin-right: 14px">内容分类</span>
                </div>
                <div class="item_inp">
                  <div class="select i6_input">
-                    <a-select
-                      :getPopupContainer="
-                        (triggerNode) => {
-                          return triggerNode.parentNode || document.body;
-                        }
-                      "
-                      v-model:value="fen_lei"
-                      dropdownClassName="dropdown-style"
-                      style="width: 440px"
-                      placeholder="请选择"
-                      :options="options2"
-                      allowClear
-                      showSearch
+                    <!--                    <a-select-->
+                    <!--                        :getPopupContainer="-->
+                    <!--                        (triggerNode) => {-->
+                    <!--                          return triggerNode.parentNode || document.body;-->
+                    <!--                        }-->
+                    <!--                      "-->
+                    <!--                        v-model:value="fen_lei"-->
+                    <!--                        dropdownClassName="dropdown-style"-->
+                    <!--                        style="width: 440px"-->
+                    <!--                        placeholder="请选择"-->
+                    <!--                        :options="options2"-->
+                    <!--                        allowClear-->
+                    <!--                        showSearch-->
+                    <!--                    />-->
+                    <a-tree-select
+                        style="width: 440px"
+                        placeholder="请选择内容分类"
+                        :treeDefaultExpandAll="true"
+                        :getPopupContainer="
+                          (triggerNode) => {
+                            return triggerNode.parentNode || document.body;
+                          }
+                        "
+                        v-model:value="fen_lei"
+                        :tree-data="options2222"
+                    >
+                    </a-tree-select>
+                  </div>
+                </div>
+              </div>
+              <div class="mbl_items">
+                <div class="item_nam" style="margin-bottom:110px;">
+                  <span style="margin-right: 14px">课程价值</span>
+                </div>
+                <div class="item_inp">
+                  <div class="i1_input">
+                    <a-textarea
+                        v-model:value="qdms_inputV3"
+                        maxlength="200"
+                        style="width: 440px; height: 140px; border-radius: 8px"
+                        placeholder="请输入课程价值"
                    />
+                    <div class="inp_num" style="top:110px;">
+                      <span style="color: #c7cbd2;">
+                        {{ qdms_inputV3.length }}/200
+                      </span>
+                    </div>
                  </div>
                </div>
              </div>
@@ -224,18 +251,18 @@
                <div class="item_inp">
                  <div class="select i7_input">
                    <a-select
-                      :getPopupContainer="
+                        :getPopupContainer="
                        (triggerNode) => {
                          return triggerNode.parentNode || document.body;
                        }
                      "
-                      v-model:value="chang_jin"
-                      dropdownClassName="dropdown-style"
-                      style="width: 440px"
-                      placeholder="请选择"
-                      :options="options3"
-                      allowClear
-                      showSearch
+                        v-model:value="chang_jin"
+                        dropdownClassName="dropdown-style"
+                        style="width: 440px"
+                        placeholder="请选择"
+                        :options="options3"
+                        allowClear
+                        showSearch
                    />
                  </div>
                </div>
@@ -246,17 +273,17 @@
                </div>
                <div class="item_inp">
                  <a-input
-                    v-model:value="tags_val_single"
-                    style="width: 440px; height: 40px; border-radius: 8px"
-                    placeholder="请输入按回车键创建成功"
-                    @pressEnter="handleTagChange"
+                      v-model:value="tags_val_single"
+                      style="width: 440px; height: 40px; border-radius: 8px"
+                      placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。"
+                      @pressEnter="handleTagChange"
                  />
                  <div class="tag-content">
                    <a-tag
-                      v-for="(item, index) in tags_val"
-                      :key="index"
-                      closable
-                      @close="handleTagClose(item)"
+                        v-for="(item, index) in tags_val"
+                        :key="index"
+                        closable
+                        @close="handleTagClose(item)"
                    >
                      {{ item }}
                    </a-tag>
@@ -266,11 +293,11 @@
            </div>
            <div class="mb_right">
              <div class="mbl_items">
-                <div class="item_nam">
+                <div class="item_nam" style="margin-top:5px;">
                  <div class="asterisk_icon">
                    <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
+                        src="@/assets/images/coursewareManage/asterisk.png"
+                        alt="asterisk"
                    />
                  </div>
                  <!-- 授课教师1 -->
@@ -279,8 +306,8 @@
                <div class="item_inp">
                  <div class="i1_input">
                    <ProjectManager
-                      v-model:value="member.value"
-                      v-model:name="member.name"
+                        v-model:value="member.value"
+                        v-model:name="member.name"
                    />
                  </div>
                </div>
@@ -292,10 +319,10 @@
                <div class="item_inp">
                  <div class="i10_textarea">
                    <a-textarea
-                      v-model:value="qdms_inputV6"
-                      maxlength="150"
-                      style="width: 440px; height: 100px; border-radius: 8px"
-                      placeholder="请输入"
+                        v-model:value="qdms_inputV6"
+                        maxlength="150"
+                        style="width: 440px; height: 100px; border-radius: 8px"
+                        placeholder="请输入"
                    />
                    <div class="inp_num">
                      <span style="color: #c7cbd2">
@@ -310,7 +337,7 @@
                  <span style="margin-right: 10px">附件</span>
                </div>
                <div class="item_inp">
-                  <FJUpload v-model:value="attach" />
+                  <FJUpload v-model:value="attach"/>
                </div>
              </div>
            </div>
@@ -322,17 +349,17 @@
            <div class="fotarea">
              <div style="border: 1px solid #ccc">
                <Toolbar
-                  style="border-bottom: 1px solid #ccc"
-                  :editor="editorRef"
-                  :defaultConfig="toolbarConfig"
-                  :mode="mode"
+                    style="border-bottom: 1px solid #ccc"
+                    :editor="editorRef"
+                    :defaultConfig="toolbarConfig"
+                    :mode="mode"
                />
                <Editor
-                  style="height: 250px; overflow-y: hidden"
-                  v-model="valueHtml"
-                  :defaultConfig="editorConfig"
-                  :mode="mode"
-                  @onCreated="handleCreated"
+                    style="height: 250px; overflow-y: hidden"
+                    v-model="valueHtml"
+                    :defaultConfig="editorConfig"
+                    :mode="mode"
+                    @onCreated="handleCreated"
                />
              </div>
            </div>
@@ -363,33 +390,37 @@ import {
  // onMounted,
  onUnmounted,
 } from "vue";
-import { message } from "ant-design-vue";
-import { edit, detail, handle } from "@/api/indexCourse";
-import { fileUp } from "../../api/indexEval";
+import {message} from "ant-design-vue";
+import {edit, detail, handle} from "@/api/indexCourse";
+import {fileUp} from "../../api/indexEval";
 import * as api1 from "../../api/index1";
 import "@wangeditor/editor/dist/css/style.css";
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
+import {Editor, Toolbar} from "@wangeditor/editor-for-vue";
 import ProjectManager from "@/components/project/ProjectManagerNew";
+import NameInput from "@/components/project/NameInput";
 import FJUpload from "@/components/common/FJUpload";
 import * as moment from "moment";
 import * as api2 from "../../api/indexAudit";
+
 export default defineComponent({
  components: {
    Editor,
    Toolbar,
    FJUpload,
+    NameInput,
    ProjectManager,
  },
-  setup(props, { expose, emit }) {
+  setup(props, {expose, emit}) {
    const state = reactive({
      hideshow: true,
      ft_eidt: false,
      attach: "",
+      validate: true,
      ft_hs: false,
      addLoading: false,
      statusJuJue: 0,
      statusTingQi: 1,
-      member: { name: "", value: "" },
+      member: {name: "", value: ""},

      offcourseId: null,
      qdms_inputV1: "",
@@ -403,6 +434,131 @@ export default defineComponent({
      qdms_inputV6: "",
      imgList: [],
      auditDescription: "",
+      contentClassify: [],
+      // 课程三级分类
+      options2222: [
+        {
+          title: '领导力',
+          value: '100',
+          selectable: false,
+          children: [
+            {
+              title: '领导业务',
+              value: '1001',
+            },
+            {
+              title: '领导团队',
+              value: '1002',
+            },
+            {
+              title: '领导自我',
+              value: '1003',
+            },
+          ],
+        },
+        {
+          title: '专业力',
+          value: '200',
+          selectable: false,
+          children: [
+            {
+              title: '研发',
+              value: '2001',
+            },
+            {
+              title: '产品和解决方案',
+              value: '2002',
+            },
+            {
+              title: '生产技术与制造',
+              value: '2003',
+            },
+            {
+              title: '供应链',
+              value: '2004',
+            },
+            {
+              title: '营销',
+              value: '2005',
+            },
+            {
+              title: '品质',
+              value: '2006',
+            },
+            {
+              title: '战略与企划',
+              value: '2007',
+            },
+            {
+              title: '流程管理',
+              value: '2008',
+            },
+            {
+              title: '业绩管理',
+              value: '2009',
+            },
+            {
+              title: '项目管理',
+              value: '20010',
+            },
+            {
+              title: '信息技术',
+              value: '20011',
+            },
+            {
+              title: '环境与安全',
+              value: '20012',
+            },
+            {
+              title: '人力资源',
+              value: '20013',
+            },
+            {
+              title: '企业文化',
+              value: '20014',
+            },
+            {
+              title: '品牌',
+              value: '20015',
+            },
+            {
+              title: '财务',
+              value: '20016',
+            },
+            {
+              title: '法务',
+              value: '20017',
+            },
+            {
+              title: '行政',
+              value: '20018',
+            },
+            {
+              title: '医工',
+              value: '20019',
+            }
+          ],
+        },
+        {
+          title: '通用力',
+          value: '300',
+          selectable: false,
+          children: [
+            {
+              title: '职业操守与道德',
+              value: '3001',
+            },
+            {
+              title: '职业素养与技能',
+              value: '3002',
+            },
+            {
+              title: '规章制度',
+              value: '3003',
+            },
+          ],
+        }
+      ],
    });

    const visibleOpen = (offcourseId, name) => {
@@ -442,7 +598,7 @@ export default defineComponent({
      state.addLoading = false;
      state.statusJuJue = 0;
      state.statusTingQi = 1;
-      state.member = { name: "", value: "" };
+      state.member = {name: "", value: ""};

      state.offcourseId = null;
      state.qdms_inputV1 = "";
@@ -456,7 +612,7 @@ export default defineComponent({
      state.qdms_inputV6 = "";
      state.imgList = [];
      state.attach = "";
-      state.auditDescription="";
+      state.auditDescription = "";

      // valueHtml.value = "";
    };
@@ -481,7 +637,7 @@ export default defineComponent({
    const toolbarConfig = {
      excludeKeys: ["insertVideo", "insertImage"],
    };
-    const editorConfig = { placeholder: "请输入内容...", MENU_CONF: {} };
+    const editorConfig = {placeholder: "请输入内容...", MENU_CONF: {}};
    editorConfig.MENU_CONF["uploadImage"] = {
      // 自定义上传
      async customUpload(file, insertFn) {
@@ -510,6 +666,11 @@ export default defineComponent({
    });
    //  富文本 eeeeeeeeeeeeee

+    // 点击图片选择图片
+    const choicePic = (value) => {
+      state.feng_mian_1 = value;
+    }
+
    //获取分类、场景、封面图、-----------字典配置-------------------------------
    const optionsUrl = ref([]);
    const options2 = ref([]);
@@ -522,52 +683,66 @@ export default defineComponent({
        setCode: param,
      };
      api1
-        .getDict(obj)
-        .then((res) => {
-          console.log("获取字典成功", res);
-          if (res.data.code === 200) {
-            if (param === "faceclassPic") {
-              let arr = res.data.data.rows;
-              let newArr = [];
-              arr.forEach((item) => {
-                newArr.push({
-                  value: item.dictValue,
-                  label: item.dictName,
+          .getDict(obj)
+          .then((res) => {
+            console.log("获取字典成功", res);
+            if (res.data.code === 200) {
+              if (param === "faceclassPic") {
+                let arr = res.data.data.rows;
+                let newArr = [];
+                arr.forEach((item) => {
+                  newArr.push({
+                    value: item.dictValue,
+                    label: item.dictName,
+                  });
                });
-              });
-              optionsUrl.value = newArr;
-            }
-            if (param === "faceclassClass") {
-              let arr = res.data.data.rows;
-              let newArr = [];
-              arr.forEach((item) => {
-                newArr.push({
-                  value: item.dictCode,
-                  label: item.dictName,
+                optionsUrl.value = newArr;
+              }
+              if (param === "faceclassClass") {
+                let arr = res.data.data.rows;
+                let newArr = [];
+                arr.forEach((item) => {
+                  newArr.push({
+                    value: item.dictCode,
+                    label: item.dictName,
+                  });
                });
-              });
-              options2.value = newArr;
-            }
-            if (param === "faceclassScene") {
-              let arr = res.data.data.rows;
-              let newArr = [];
-              arr.forEach((item) => {
-                newArr.push({
-                  value: item.dictCode,
-                  label: item.dictName,
+                options2.value = newArr;
+              }
+              if (param === "faceclassScene") {
+                let arr = res.data.data.rows;
+                let newArr = [];
+                arr.forEach((item) => {
+                  newArr.push({
+                    value: item.dictCode,
+                    label: item.dictName,
+                  });
                });
-              });
-              options3.value = newArr;
+                options3.value = newArr;
+              }
+              if (param === "contentClassify") {
+                state.contentClassify = dealDickTree(res.data.data.rows) || []
+              }
            }
-          }
-        })
-        .catch((err) => {
-          console.log("获取字典失败", err);
-        });
+          })
+          .catch((err) => {
+            console.log("获取字典失败", err);
+          });
    };
+
+    function dealDickTree(data, level = 1) {
+      return data?.filter(e => e.levelId == level).map(({dictName, dictCode}) => ({
+        title: dictName,
+        value: dictCode,
+        key: dictCode,
+        children: dealDickTree(data, dictCode)
+      }))
+    }
+
    getDictList("faceclassClass");
    getDictList("faceclassScene");
    getDictList("faceclassPic");
+    getDictList("contentClassify");
    //获取分类、场景、封面图、----------------字典配置---------------------------

    const hideShow = () => {
@@ -669,8 +844,8 @@ export default defineComponent({
          if (res.data.code === 200) return res.data.data;
        });
        if (res.rows && res.rows.length > 0) {
-          let i =res.rows.length;
-            state.auditDescription =  res.rows[i-1].description?res.rows[i-1].description :"-";
+          let i = res.rows.length;
+          state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
        }
      }

@@ -682,12 +857,12 @@ export default defineComponent({
      state.chang_jin = String(item.sceneId);
      state.tags_val = item.tips ? item.tips.split(",") : [];
      state.qdms_inputV6 = item.intro;
-      state.member = { value: item.teacherId, name: item.teacher };
+      state.member = {value: item.teacherId, name: item.teacher};
      valueHtml.value = item.outline;
      let arrss = item.attach.split(',')
-      let str =''
-      for(let i=0;i<arrss.length;i++){
-        i == arrss.length -1 ?  str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) : str += arrss[i].slice(arrss[i].lastIndexOf('/')+1) + ','
+      let str = ''
+      for (let i = 0; i < arrss.length; i++) {
+        i == arrss.length - 1 ? str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) : str += arrss[i].slice(arrss[i].lastIndexOf('/') + 1) + ','
      }
      console.log(str)
      state.attach = str;
@@ -749,6 +924,7 @@ export default defineComponent({
      toolbarConfig,
      editorConfig,
      handleCreated,
+      choicePic
    };
  },
 });
@@ -1151,5 +1327,12 @@ export default defineComponent({
  .statusJuJue {
    margin-bottom: 20px;
  }
+
+  .choiceoptionurl {
+    width: 60px;
+    height: 60px;
+    margin-right: 10px;
+    border-radius: 8px;
+  }
 }
 </style>
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -65,7 +65,7 @@
          <a-table
            :columns="columns1"
            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+            :loading="loading"
            expandRowByClick="true"
            @expand="expandTable"
            :scroll="{ x: 1300 }"
@@ -203,9 +203,7 @@ export default {
          title: "内容分类",
          dataIndex: "content",
          key: "content",
-          align: "center",
-          customRender: ({ text }) =>
-            state.calssifyList.find((e) => e.value == text)?.label,
+          align: "center"
        },
        {
          title: "审核状态",
@@ -245,7 +243,7 @@ export default {
                style="color:#387DF7;cursor:pointer;"
                onClick={() => {
                  console.log(value);
-                  showProjAuditModal(value.record.auditLogDtoList);
+                  showProjAuditModal(value.record.auditLogDtoList.length!==0?value.record.auditLogDtoList.slice(0,1):[]);
                }}
              >
                审核日志
@@ -269,8 +267,149 @@ export default {
      //审核记录的数据
      tableDataAudit: [],
      projAuditModal: false,
+      loading:false,
+      // 课程三级分类
+      options2222:[
+        {
+          title: '领导力',
+          value: '100',
+          selectable:false,
+          children: [
+            {
+              title: '领导业务',
+              value: '1001',
+            },
+            {
+              title: '领导团队',
+              value: '1002',
+            },
+            {
+              title: '领导自我',
+              value: '1003',
+            },
+          ],
+        },
+        {
+          title: '专业力',
+          value: '200',
+          selectable:false,
+          children: [
+            {
+              title: '研发',
+              value: '2001',
+            },
+            {
+              title: '产品和解决方案',
+              value: '2002',
+            },
+            {
+              title: '生产技术与制造',
+              value: '2003',
+            },
+            {
+              title: '供应链',
+              value: '2004',
+            },
+            {
+              title: '营销',
+              value: '2005',
+            },
+            {
+              title: '品质',
+              value: '2006',
+            },
+            {
+              title: '战略与企划',
+              value: '2007',
+            },
+            {
+              title: '流程管理',
+              value: '2008',
+            },
+            {
+              title: '业绩管理',
+              value: '2009',
+            },
+            {
+              title: '项目管理',
+              value: '20010',
+            },
+            {
+              title: '信息技术',
+              value: '20011',
+            },
+            {
+              title: '环境与安全',
+              value: '20012',
+            },
+            {
+              title: '人力资源',
+              value: '20013',
+            },
+            {
+              title: '企业文化',
+              value: '20014',
+            },
+            {
+              title: '品牌',
+              value: '20015',
+            },
+            {
+              title: '财务',
+              value: '20016',
+            },
+            {
+              title: '法务',
+              value: '20017',
+            },
+            {
+              title: '行政',
+              value: '20018',
+            },
+            {
+              title: '医工',
+              value: '20019',
+            }
+          ],
+        },
+        {
+          title: '通用力',
+          value: '300',
+          selectable:false,
+          children: [
+            {
+              title: '职业操守与道德',
+              value: '3001',
+            },
+            {
+              title: '职业素养与技能',
+              value: '3002',
+            },
+            {
+              title: '规章制度',
+              value: '3003',
+            },
+          ], 
+        }
+      ],
    });
+
+   // 课程三级分类回显
+   const sHX = (data) => {
+      let str = '-'
+      let sdata = state.options2222
+      for(let i =0; i<sdata.length;i++){
+          for(let j=0;j<sdata[i].children.length;j++){
+            if (String(sdata[i].children[j].value) === String(data)) {
+               str = sdata[i].children[j].title;
+            }
+          }
+      }
+      return str
+    }
+
    const getList = () => {
+      state.loading=true
      let objn = {
        auditStatus: 0,
        categoryId: Number(state.valueproj),
@@ -285,6 +424,7 @@ export default {
          console.log("获取已审核课程成功", res.data.data);
          state.total = res.data.data.total;
          setTableData(res.data.data.rows);
+          state.loading=false
        })
        .catch((err) => {
          console.log("获取已审核课程失败", err);
@@ -302,7 +442,7 @@ export default {
          number: n + 1 + (state.currentPage - 1) * 10,
          name: item.name || "- ",
          type: item.type == 1 ? "线上" : "线下",
-          content: item.categoryId,
+          content: sHX(item.categoryId),
          status:
            item.auditStatus == 0
              ? "未提交"
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -64,7 +64,7 @@
          <a-table
            :columns="columns1"
            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+            :loading="loading"
            expandRowByClick="true"
            @expand="expandTable"
            :scroll="{ x: 1300 }"
@@ -181,6 +181,7 @@ export default {
  },
  setup() {
    const state = reactive({
+      loading:false,
      optionsproj: [
        {
          value: "jack",
@@ -231,9 +232,7 @@ export default {
          title: "内容分类",
          dataIndex: "content",
          key: "content",
-          align: "center",
-          customRender: ({ text }) =>
-            state.calssifyList.find((e) => e.value == text)?.label,
+          align: "center"
        },
        {
          title: "状态",
@@ -301,8 +300,146 @@ export default {
      //审核在线课嵌套页面
      onlineClassesVisible: false,
      iframeUrl: iframeUrl,
+      // 课程三级分类
+      options2222:[
+        {
+          title: '领导力',
+          value: '100',
+          selectable:false,
+          children: [
+            {
+              title: '领导业务',
+              value: '1001',
+            },
+            {
+              title: '领导团队',
+              value: '1002',
+            },
+            {
+              title: '领导自我',
+              value: '1003',
+            },
+          ],
+        },
+        {
+          title: '专业力',
+          value: '200',
+          selectable:false,
+          children: [
+            {
+              title: '研发',
+              value: '2001',
+            },
+            {
+              title: '产品和解决方案',
+              value: '2002',
+            },
+            {
+              title: '生产技术与制造',
+              value: '2003',
+            },
+            {
+              title: '供应链',
+              value: '2004',
+            },
+            {
+              title: '营销',
+              value: '2005',
+            },
+            {
+              title: '品质',
+              value: '2006',
+            },
+            {
+              title: '战略与企划',
+              value: '2007',
+            },
+            {
+              title: '流程管理',
+              value: '2008',
+            },
+            {
+              title: '业绩管理',
+              value: '2009',
+            },
+            {
+              title: '项目管理',
+              value: '20010',
+            },
+            {
+              title: '信息技术',
+              value: '20011',
+            },
+            {
+              title: '环境与安全',
+              value: '20012',
+            },
+            {
+              title: '人力资源',
+              value: '20013',
+            },
+            {
+              title: '企业文化',
+              value: '20014',
+            },
+            {
+              title: '品牌',
+              value: '20015',
+            },
+            {
+              title: '财务',
+              value: '20016',
+            },
+            {
+              title: '法务',
+              value: '20017',
+            },
+            {
+              title: '行政',
+              value: '20018',
+            },
+            {
+              title: '医工',
+              value: '20019',
+            }
+          ],
+        },
+        {
+          title: '通用力',
+          value: '300',
+          selectable:false,
+          children: [
+            {
+              title: '职业操守与道德',
+              value: '3001',
+            },
+            {
+              title: '职业素养与技能',
+              value: '3002',
+            },
+            {
+              title: '规章制度',
+              value: '3003',
+            },
+          ], 
+        }
+      ],
    });

+    // 课程三级分类回显
+    const sHX = (data) => {
+      let str = '-'
+      let sdata = state.options2222
+      for(let i =0; i<sdata.length;i++){
+          for(let j=0;j<sdata[i].children.length;j++){
+            if (String(sdata[i].children[j].value) === String(data)) {
+               str = sdata[i].children[j].title;
+            }
+          }
+      }
+      return str
+    }
+
    /*
     * 获取字典列表
     * param faceclassPic | faceclassClass | faceclassScene
@@ -317,6 +454,7 @@ export default {
        .then((res) => res.data.data.rows);

    const getFaceList = () => {
+      state.loading=true
      let objn = {
        auditStatus: 1,
        categoryId: state.valueproj,
@@ -341,6 +479,7 @@ export default {
          } else {
            setFaceData([]);
          }
+          state.loading=false
        })
        .catch((err) => {
          console.log("获取面授列表失败", err);
@@ -430,7 +569,7 @@ export default {
          number: i + 1 + (state.currentPage - 1) * 10,
          name: item.name,
          type: item.type == 1 ? "线上" : "线下",
-          content: item.categoryId,
+          content: sHX(item.categoryId),
          status:
            item.status == 0
              ? "未提交"
@@ -543,6 +682,7 @@ export default {
      contentList11,
      sceneist11,
      onEditorFocus,
+      sHX
    };
  },
 };
--- a/src/views/examine/ProjectReviewed.vue
+++ b/src/views/examine/ProjectReviewed.vue
@@ -81,7 +81,7 @@
          <a-table
            :columns="columns1"
            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+            :loading="loading"
            expandRowByClick="true"
            @expand="expandTable"
            :scroll="{ x: 1300 }"
@@ -155,6 +155,7 @@ export default {

  setup() {
    const state = reactive({
+      loading:false,
      optionsproj: [
        {
          value: "jack",
@@ -260,7 +261,7 @@ export default {
              <div>
                <span
                  onClick={() => {
-                    showProjAuditModal(value.record.auditList);
+                    showProjAuditModal(value.record.auditList.length!==0?value.record.auditList.slice(value.record.auditList.length-1):[]);
                  }}
                  style="cursor:pointer;color:#387DF7"
                >
@@ -310,6 +311,7 @@ export default {
      tableData1: [],
    });
    const getProjList = () => {
+      state.loading=true
      let objn = {
        beginTime: state.valueDate ? state.valueDate[0] : "",
        endTime: state.valueDate ? state.valueDate[1] : "",
@@ -332,6 +334,7 @@ export default {
        });

        state.tableData1 = numdata;
+        state.loading=false
      });
    };
    const changePagination = (pagina) => {
--- a/src/views/examine/ProjectReviewedN.vue
+++ b/src/views/examine/ProjectReviewedN.vue
@@ -71,7 +71,7 @@
          <a-table
            :columns="columns1"
            :data-source="tableData1"
-            :loading="tableDataTotal === -1 ? true : false"
+            :loading="loading"
            expandRowByClick="true"
            @expand="expandTable"
            :pagination="false"
@@ -114,6 +114,7 @@ export default {
  components: { ProjectAudit },
  setup() {
    const state = reactive({
+      loading:false,
      optionsproj: [
        {
          value: "jack",
@@ -216,6 +217,7 @@ export default {
      state.chooseCreater = creater;
    };
    const getProjList = () => {
+      state.loading=true
      let objn = {
        beginTime:
          state.valueDate == undefined ? "" : Date.parse(state.valueDate[0]),
@@ -243,7 +245,7 @@ export default {
          });

          state.tableData1 = numdata;
-
+          state.loading=false
          // setProjList(result.rows);
        })
        .catch((err) => {
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
--- a/src/views/learningpath/LevelAdd.vue
+++ b/src/views/learningpath/LevelAdd.vue
@@ -441,6 +441,7 @@
                      </div>
                    </div>
                    <div class="operations">
+                      <!-- 2022-12-2注释 后面放开 -->
                      <!-- <div
                        class="operation"
                        style="cursor: pointer"
--- a/src/views/projectcenter/LibraryAdd.vue
+++ b/src/views/projectcenter/LibraryAdd.vue
@@ -534,7 +534,7 @@
                    <div class="setc_name"><span>资源归属：</span></div>
                    <div class="setc_main">
                      <span style="color: #999999">{{
-                        projectInfo.sourceBelong
+                        projectInfo.sourceBelongName
                      }}</span>
                    </div>
                  </div>
@@ -559,17 +559,13 @@
                  <div class="set_content">
                    <div class="setc_name"><span>项目级别：</span></div>
                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.level
-                      }}</span>
+                      <ProjectLevel :value="projectInfo.level" :tag="true"></ProjectLevel>
                    </div>
                  </div>
                  <div class="set_content">
                    <div class="setc_name"><span>培训体系：</span></div>
                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.systemId
-                      }}</span>
+                      <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                    </div>
                  </div>
                  <div class="set_content">
@@ -712,8 +708,14 @@ import { message } from "ant-design-vue";
 import * as api from "@/api/indexTemplate";
 import { useRouter } from "vue-router";
 import { scoreRule, setScoreRule } from "@/api/indexTaskadd";
+import ProjectLevel from "@/components/project/ProjectLevel";
+import TrainClass from "@/components/project/TrainClass";
 export default defineComponent({
  name: "LibraryAdd",
+  components: {
+    ProjectLevel,
+    TrainClass,
+  },
  setup() {
    const state = reactive({
      //任务大纲列表
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -3,13 +3,13 @@
  <div class="projectAdd">
    <div class="header">
      <span class="title"
-        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+      >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
      >
      <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/projectmanage"
+          class="goback"
      >
        <span class="return"></span><span class="returntext">返回</span>
      </div>
@@ -19,8 +19,8 @@
        <div class="name" v-if="projectInfo.parentName">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">项目归属</div>
          </div>
@@ -33,182 +33,111 @@
        <div class="name">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">项目名称</div>
          </div>
          <div class="in">
-            <a-input
-              v-model:value="projectInfo.name"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-              :disabled="viewDetail ? true : false"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
          </div>
        </div>
        <div class="name flex-top">
          <div class="namebox" style="margin-top: 10px">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">封面图</div>
          </div>
-          <div class="in select" style="flex: 1">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="picUrlName"
-              dropdownClassName="dropdown-style"
-              style="width: 440px"
-              placeholder="请选择"
-              :options="projectPic"
-              @change="handleChangeSelect"
-              allowClear
-            ></a-select>
-            <img
-              style="
+          <div class="in select" style="flex: 1; display: flex">
+            <div
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                style="
                width: 100px;
                height: 100px;
-                margin-top: 20px;
-                border-radius: 8px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
              "
-              v-if="projectInfo.picUrl"
-              :src="projectInfo.picUrl"
-              alt="avatar"
-            />
-            <div class="i_bottom">
-              <span style="color: #999ba3">
-                高宽比为16:9 (如:800*450) png或jpg图片
-              </span>
+                v-for="(src, index) in projectPic"
+                :key="index"
+                @click="() => (projectInfo.picUrl = src.value)"
+            >
+              <img
+                  style="
+                  width: 100px;
+                  height: 100px;
+                  margin-bottom: 4px;
+                  margin-right: 4px;
+                "
+                  :src="src.value"
+                  alt="avatar"
+              />
            </div>
          </div>
        </div>
        <div class="name">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">项目时间</div>
          </div>

          <div class="in">
            <a-range-picker
-              show-time
-              separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
-              @change="timeChange"
-              :disabled="viewDetail ? true : false"
+                show-time
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+                @change="timeChange"
+                :disabled="viewDetail ? true : false"
            />
          </div>
        </div>
        <div class="name">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">项目经理</div>
          </div>
          <div class="in">
            <ProjectManager
-              v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
-              @onChange="managerChange"
-              mode="multiple"
+                v-model:value="projectInfo.managerId"
+                v-model:name="projectInfo.manager"
+                @onChange="managerChange"
+                mode="multiple"
            ></ProjectManager>
          </div>
        </div>
        <div class="name">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">资源归属</div>
          </div>

          <div class="in select">
            <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
            ></OrgClass>
          </div>
        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname" style="margin-top: 13px">项目说明</div>
-          </div>
-          <div class="in">
-            <a-textarea
-              v-model:value="projectInfo.remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-checkbox
-              v-model:checked="courseSyncFlag"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
-            >
-            <!-- <a-switch
-              v-model:checked="projectInfo.courseSyncFlag"
-              :checkedValue="1"
-              :unCheckedValue="0"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-switch
-            > -->
-          </div>
-        </div>
        <div class="name">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">项目级别</div>
          </div>
@@ -219,8 +148,8 @@
        <div class="name">
          <div class="namebox">
            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">培训分类</div>
          </div>
@@ -230,51 +159,74 @@
        </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"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
            />
            <div class="inname">是否BOEU实施</div>
          </div>
          <div class="in">
-            <!-- <a-switch
-                v-model:checked="projectInfo.boeFlag"
-                :checkedValue="1"
-                :unCheckedValue="0"
-                :disabled="viewDetail ? true : false"
-            ></a-switch> -->
            <a-radio-group
-              v-model:value="projectInfo.boeFlag"
-              :disabled="viewDetail ? true : false"
+                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 class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                :disabled="viewDetail ? true : false"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">项目说明</div>
+          </div>
+          <div class="in">
+            <a-textarea
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
+            />
+          </div>
+        </div>
      </div>
      <div class="template">
        <div class="name">
          <div class="inname" style="width: 50px">模版</div>
          <div class="in select" style="margin-left: 2px">
            <a-select
-              :getPopupContainer="
+                :getPopupContainer="
                (triggerNode) => {
                  return triggerNode.parentNode || document.body;
                }
              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-              :fieldNames="{
+                placeholder="请选择模版"
+                :size="size"
+                style="width: 100%"
+                :options="classifyList5"
+                @change="classificationChange5"
+                @popupScroll="templateScroll"
+                :fieldNames="{
                label: 'name',
                value: 'projectTemplateId',
              }"
@@ -286,34 +238,42 @@
    </div>
    <div class="footer">
      <div class="btn">
-        <a-button v-on:click="createProject" type="primary" class="btn1"
-          >确定
-        </a-button>
        <a-button @click="backPage" class="btn2">取消</a-button>
+        <a-button
+            v-on:click="createProject"
+            type="primary"
+            class="btn1"
+            style="margin-left: 20px"
+        >确定
+        </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 ProjectClass from "@/components/project/ProjectClass";
+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/ProjectManagerNew";
+import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import { changeOwnership, scrollLoad } from "@/api/method";
-import { storage } from "../../api/storage";
+import {changeOwnership, scrollLoad} from "@/api/method";
+import {storage} from "../../api/storage";
+
 export default {
  name: "projectAdd",
  components: {
    ProjectManager,
    ProjectLevel,
-    ProjectClass,
+    // ProjectClass,
    TrainClass,
+    NameInput,
    OrgClass,
  },
  setup() {
@@ -335,7 +295,6 @@ export default {
      },
      classifyList5: [],
      courseSyncFlag: false,
-      picUrlName: "请选择封面图",
    });

    // 封面图选择
@@ -360,40 +319,26 @@ export default {
    });

    function getProjectInfo() {
-      if (!routers.query.projectId) {
-        state.projectInfo = {
-          parentName: routers.query.parentName,
-          parentId: routers.query.parentId,
-        };
-        return;
-      }
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
+      state.projectInfo.projectId = routers.query.projectId;
+      (state.projectInfo.projectId || state.projectInfo.parentId) &&
      api
-        .getProjectDetail({ projectId: routers.query.projectId })
-        .then((res) => {
-          state.projectInfo = res.data.data.projectInfo;
-
-          console.log(res);
-          let picurl = res.data.data.projectInfo.picUrl;
-          let dates = store.state.projectPic.map((e) => ({
-            value: e.dictValue,
-            label: e.dictName,
-          }));
-          console.log(dates, picurl);
-          for (let i = 0; i < dates.length; i++) {
-            if (dates[i].value == picurl) {
-              state.picUrlName = dates[i].label;
-            }
-          }
-
-          state.projectInfo.rangeTime = [
-            state.projectInfo.beginTime,
-            state.projectInfo.endTime,
-          ];
-          state.projectInfo.parentName = routers.query.parentName;
-          state.courseSyncFlag = state.projectInfo.courseSyncFlag
-            ? true
-            : false;
-        });
+          .getProjectDetail({
+            projectId:
+                state.projectInfo.projectId || state.projectInfo.parentId,
+          })
+          .then((res) => {
+            state.projectInfo = {
+              ...res.data.data.projectInfo,
+              ...state.projectInfo,
+            };
+            state.projectInfo.rangeTime = [
+              state.projectInfo.beginTime,
+              state.projectInfo.endTime,
+            ];
+            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+          });
    }

    const backPage = () => {
@@ -440,8 +385,7 @@ export default {

    const errorMsgs = {
      name: "请输入项目名称",
-      category: "请选择项目分类",
-      picUrl: "请上传项目封面图",
+      picUrl: "请选择项目封面图",
      beginTime: "请选择项目开始时间",
      endTime: "请选择项目结束时间",
      manager: "请选择项目经理",
@@ -475,26 +419,34 @@ export default {
      if (!validate(state.projectInfo, errorMsgs)) {
        return;
      }
+      if (!state.projectInfo.validate) {
+        message.destroy();
+        message.warning('项目名称重复，请修改名称！');
+        return;
+      }
      state.projectInfo.type = 3;
      state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
      api.createProject(state.projectInfo).then((res) => {
        state.projectInfo.projectId ||
-          changeOwnership("project", res.data.data.projectId, [
-            { id: res.data.data.createId, name: res.data.data.createName },
-          ]);
+        changeOwnership("project", res.data.data.projectId, [
+          {id: res.data.data.createId, name: res.data.data.createName},
+        ]);
        message.destroy();
        message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
        // router.back();
        router.push({
          path: "/taskpage",
-          query: { projectId: res.data.data.projectId },
+          query: {projectId: res.data.data.projectId},
        });
        storage.set("projectId", res.data.data.projectId);
      });
    };

    function managerChange(e, l, d) {
-      state.projectInfo.sourceBelongId = d;
+      !state.projectInfo.sourceBelongId &&
+      (state.projectInfo.sourceBelongId = d);
+      !state.projectInfo.sourceBelongId &&
+      (state.projectInfo.sourceBelongName = d);
    }

    return {
@@ -567,7 +519,7 @@ export default {
  }

  .active {
-    border: 1px solid rgba(78, 166, 255, 1);
+    border: 2px solid rgba(78, 166, 255, 1);
  }

  .content {
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -179,13 +179,7 @@
            </div>
            <div class="inname">项目名称:</div>
            <div class="in">
-              <a-input
-                v-model:value="projectInfo.name"
-                show-count
-                :maxlength="30"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px"
-              />
+              <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
            </div>
          </div>
          <div class="name">
@@ -195,9 +189,9 @@
                src="../../assets/images/basicinfo/asterisk.png"
              />
            </div>
-            <div class="inname">分类:</div>
+            <div class="inname">培训分类:</div>
            <div class="in select">
-              <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
+              <TrainClass v-model:value="projectInfo.systemId"></TrainClass>
            </div>
          </div>
          <div class="name">
@@ -691,34 +685,34 @@
      </div>
    </a-modal>
    <!-- 创建项目提示框 -->
-    <a-modal
-      v-model:visible="reminderModal"
-      :footer="null"
-      :closable="closeBack"
-      wrapClassName="CopyModal"
-      centered="true"
-    >
-      <div class="delete">
-        <div class="del_header"></div>
-        <div class="del_main">
-          <div class="header">
-            <div class="icon"></div>
-            <span>温馨提示</span>
-            <div class="close_exit" @click="closeReminderModal"></div>
-          </div>
-          <div class="body">
-            <div style="margin-left: 60px; margin-right: 60px">
-              请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同
-            </div>
-          </div>
-          <div class="del_btnbox">
-            <div class="del_btn btn2" @click="okReminderModal">
-              <div class="btnText">好的</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </a-modal>
+<!--    <a-modal-->
+<!--      v-model:visible="reminderModal"-->
+<!--      :footer="null"-->
+<!--      :closable="closeBack"-->
+<!--      wrapClassName="CopyModal"-->
+<!--      centered="true"-->
+<!--    >-->
+<!--      <div class="delete">-->
+<!--        <div class="del_header"></div>-->
+<!--        <div class="del_main">-->
+<!--          <div class="header">-->
+<!--            <div class="icon"></div>-->
+<!--            <span>温馨提示</span>-->
+<!--            <div class="close_exit" @click="closeReminderModal"></div>-->
+<!--          </div>-->
+<!--          <div class="body">-->
+<!--            <div style="margin-left: 60px; margin-right: 60px">-->
+<!--              请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          <div class="del_btnbox">-->
+<!--            <div class="del_btn btn2" @click="okReminderModal">-->
+<!--              <div class="btnText">好的</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </a-modal>-->
    <!-- 项目提交审核弹窗 -->
    <a-modal
      v-model:visible="reviewModal"
@@ -822,11 +816,13 @@ import * as api from "../../api/index";
 import * as api1 from "../../api/index1";
 import { storage } from "../../api/storage";
 import ProjectManager from "@/components/project/ProjectManagerNew";
-import ProjectClass from "@/components/project/ProjectClass";
+// import ProjectClass from "@/components/project/ProjectClass";
+import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import dayjs from "dayjs";
 import * as moment from "moment";
 import { changeOwnership } from "@/api/method";
+import NameInput from "@/components/project/NameInput";

 export default {
  name: "projectManage",
@@ -834,9 +830,11 @@ export default {
    ProjOwnerShip,
    ProjPowerList,
    ProjCheckShip,
+    NameInput,
    ProjectManager,
-    ProjectClass,
+    // ProjectClass,
    OrgClass,
+    TrainClass,
    // ProjManageShip
  },
  setup() {
@@ -956,13 +954,18 @@ export default {
      // 接口需要传递的参数信息
      const errorMsgs = {
        name: "请输入项目名称",
-        category: "请选择项目分类",
+        systemId: "请选择培训分类",
        manager: "请选择项目经理",
        sourceBelongId: "请选择资源归属",
      };
      if (!validate(state.projectInfo, errorMsgs)) {
        return;
      }
+      if (!state.projectInfo.validate) {
+        message.destroy();
+        message.warning('项目名称重复，请修改名称！');
+        return;
+      }
      api.createProject(state.projectInfo).then((res) => {
        state.doublepro = false;
        message.destroy();
@@ -1304,7 +1307,7 @@ export default {
        title: "项目名称",
        dataIndex: "name",
        key: "name",
-        width: 280,
+        width: 480,
        // align: "center",
        ellipsis: true,
        // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -1316,8 +1319,9 @@ export default {
      {
        title: "项目经理",
        dataIndex: "manager",
+        ellipsis: true,
        key: "manager",
-        width: 100,
+        width: 300,
        align: "center",
      },
      {
@@ -1394,7 +1398,7 @@ export default {
        dataIndex: "operation",
        key: "operation",
        width: 300,
-        align: "center",
+        align: "right",
        fixed: "right",
        customRender: (value) => {
          // console.log("value", value.record.type, value.record.status);
@@ -1540,9 +1544,15 @@ export default {
                    state.projectInfo = {
                      parentName: value.record.name,
                      parentId: value.record.projectId,
+                      name: value.record.name,
+                      sourceBelongId: value.record.sourceBelongId,
+                      sourceBelongame: value.record.sourceBelongName,
+                      manager: value.record.manager,
+                      managerId: value.record.managerId,
+                      systemId: value.record.systemId,
                      type: 2,
                    };
-                    state.reminderModal = true;
+                    state.estabish = true;
                  }}
                >
                  创建子项目
@@ -1712,7 +1722,7 @@ export default {
    };
    const showModal1 = () => {
      state.projectInfo = {};
-      state.reminderModal = true;
+      state.estabish = true;
    };
    const closeModal1 = () => {
      state.estabish = false;
@@ -1783,7 +1793,10 @@ export default {
    );

    function managerChange(e, l, d) {
-      state.projectInfo.sourceBelongId = d;
+      !state.projectInfo.sourceBelongId &&
+        (state.projectInfo.sourceBelongId = d);
+      !state.projectInfo.sourceBelongId &&
+        (state.projectInfo.sourceBelongName = d);
    }

    return {
--- a/src/views/projectcenter/TaskPage.vue
+++ b/src/views/projectcenter/TaskPage.vue
@@ -11,11 +11,12 @@
        <div class="fort">起止时间：{{ startTime }}至{{ endTime }}</div>
      </div>
      <div class="right">
-        <img
+        <!-- 2022-12-10注释 后面放开 -->
+        <!-- <img
          class="img1"
          src="../../assets/images/leveladd/ma.png"
          @click="showCodeModel2()"
-        />
+        /> -->
        <div
          class="line"
          v-if="
@@ -592,13 +593,14 @@
                        >
                          考勤
                        </div> -->
-                        <div
+                        <!-- 2022-12-10注释 后面放开 -->
+                        <!-- <div
                          class="operation"
                          style="cursor: pointer"
                          @click="showCodeModel(item)"
                        >
                          二维码
-                        </div>
+                        </div> -->
                        <!-- 2022-11-30注释 后面放开 -->
                        <!-- <div
                          class="operation"