feat:合并

src/App.vue

@@ -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) {

src/api/index1.js

@@ -131,6 +131,7 @@ 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) =>

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

src/components/drawers/MemberList.vue

@@ -430,6 +430,7 @@ export default {
         pageNo: 1,
         pageSize: 10,
         projectId: props.projectId,
+        groupId: props.chooseGroupId,
         topFlag: "",
       };
       //重新获取列表

src/components/drawers/ProjCheckPower.vue

@@ -897,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(',') || ''
+      state.choosepeople = item.map(e => ({...e, name: e.realName})).reverse()
-      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];
       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) => {

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>

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,19 +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
+            <div class="select addTimeBox">
-              v-model:value="projectTime"
+              <div class="addTime">创建时间：</div>
-              style="width: 420px"
+              <a-range-picker
-              valueFormat="X"
+                v-model:value="projectTime"
-              separator="至"
+                style="width: 420px"
-              :placeholder="[
+                valueFormat="X"
-                '        开始时间（创建时间）',
+                separator="至"
-                '        结束时间（创建时间）',
+                :placeholder="['      开始时间', '        结束时间']"
-              ]"
+              />
-            />
+            </div>
           </div>
         </div>
       </div>
@@ -73,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>
@@ -115,16 +135,24 @@
                 </div>
                 <span style="margin-right: 3px">课程名称：</span>
               </div>
-              <div class="b_input">
+              <div class="in b_input">
-                <a-input
+                <NameInput
-                  v-model:value="xzinputV1"
-                  maxlength="20"
-                  style="width: 440px; height: 40px; border-radius: 8px"
                   placeholder="请输入课程名称"
-                />
+                  v-model:value="xzinputV1"
-                <div class="inp_num">
+                  v-model:validate="validate"
-                  <span style="color: #c7cbd2">{{ xzinputV1.length }}/20</span>
+                  :maxlength="20"
-                </div>
+                  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">
@@ -319,14 +347,22 @@
                     <span style="margin-right: 14px">课程名称</span>
                   </div>
                   <div class="item_inp">
-                    <div class="i1_input">
+                    <div class="in i1_input">
-                      <a-input
+                      <!--                      <a-input-->
-                        aria-readonly="true"
+                      <!--                        aria-readonly="true"-->
-                        v-model:value="qdms_inputV1"
+                      <!--                        v-model:value="qdms_inputV1"-->
-                        maxlength="90"
+                      <!--                        maxlength="90"-->
-                        style="width: 440px; height: 40px; border-radius: 8px"
+                      <!--                        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
@@ -492,7 +528,7 @@
                   </div>
                   <div class="item_inp">
                     <div class="select i6_input">
-                      <a-select
+                      <!-- <a-select
                         :getPopupContainer="
                           (triggerNode) => {
                             return triggerNode.parentNode || document.body;
@@ -505,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>
@@ -1674,6 +1733,7 @@
                       >
                         签到
                       </a> -->
+
                       <a
                         @click="
                           () => {
@@ -2717,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";
@@ -3270,6 +3331,7 @@ export default defineComponent({
     ProjPowerList,
     ProjCheckShip,
     AssessmentList,
+    NameInput,
     // VNodes: (_, {attrs}) => {
     //   return attrs.vnodes;
     // },
@@ -3500,6 +3562,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
+      validate: true,
 
       pageSize2: 10,
       currentPage2: 0,
@@ -3546,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) => {
@@ -3767,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) {
+        console.log(itm);
-          if (String(item.value) === String(itm.content)) {
+        for (let i = 0; i < options2.value.length; i++) {
-            itm.contentTxt = item.label;
+          for (let j = 0; j < options2.value[i].children.length; j++) {
-            return false;
+            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();
@@ -4009,15 +4216,16 @@ export default defineComponent({
               // }
             }
             if (param === "faceclassClass") {
-              let arr = res.data.data.rows;
+              // let arr = res.data.data.rows;
-              let newArr = [];
+              // let newArr = [];
-              arr.forEach((item) => {
+              // arr.forEach((item) => {
-                newArr.push({
+              //   newArr.push({
-                  value: item.dictCode,
+              //     value: item.dictCode,
-                  label: item.dictName,
+              //     label: item.dictName,
-                });
+              //   });
-              });
+              // });
-              options2.value = newArr;
+              // console.log(newArr)
+              options2.value = state.options2222;
             }
             if (param === "faceclassScene") {
               let arr = res.data.data.rows;
@@ -4303,6 +4511,10 @@ export default defineComponent({
         message.destroy();
         return message.warning("请输入必填项");
       }
+      if (!state.validate) {
+        message.destroy();
+        return message.warning("路径图名称重复");
+      }
       console.log(
         "state.bs_hs && state.valueE1 == 2",
         state.bs_hs,
@@ -4416,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();
@@ -5496,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;
 }

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) => {
+        for(let i =0; i<options2.value.length;i++){
-          if (item.value === String(txt)) {
+          for(let j=0;j<options2.value[i].children.length;j++){
-            str = item.label;
+            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;

src/views/courselibrary/courseModal.vue

@@ -1,29 +1,29 @@
 <!-- 确定新建面授课弹窗 -->
 <template>
   <a-modal
-    v-model:visible="ft_hs"
+      v-model:visible="ft_hs"
-    title="Title"
+      title="Title"
-    :footer="null"
+      :footer="null"
-    :closable="false"
+      :closable="false"
-    wrapClassName="modalStyle facteachModal"
+      wrapClassName="modalStyle facteachModal"
-    width="80%"
+      width="80%"
-    @cancel="visibleClose"
+      @cancel="visibleClose"
-    @ok="handlePush"
+      @ok="handlePush"
   >
     <div class="modalHeader">
       <div class="headerLeft">
         <img
-          style="width: 17px; height: 18px; margin-right: 8px"
+            style="width: 17px; height: 18px; margin-right: 8px"
-          src="@/assets/images/basicinfo/add.png"
+            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"
+            @click="noEditClose"
-          style="width: 22px; height: 22px"
+            style="width: 22px; height: 22px"
-          src="@/assets/images/basicinfo/close22.png"
+            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"
+                        src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
+                        alt="asterisk"
                     />
                   </div>
                   <span style="margin-right: 14px">课程名称</span>
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <a-input
+                    <NameInput placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate"
-                      v-model:value="qdms_inputV1"
+                               :maxlength="20" show-count :type="2" :id="offcourseId"></NameInput>
-                      maxlength="90"
+<!--                    <a-input-->
-                      style="width: 440px; height: 40px; border-radius: 8px"
+<!--                        v-model:value="qdms_inputV1"-->
-                      placeholder="请输入课程名称"
+<!--                        maxlength="90"-->
-                    />
+<!--                        style="width: 440px; height: 40px; border-radius: 8px"-->
-                    <div class="inp_num">
+<!--                        placeholder="请输入课程名称"-->
-                      <span style="color: #c7cbd2">
+<!--                    />-->
-                        {{ qdms_inputV1.length }}/90
+<!--                    <div class="inp_num">-->
-                      </span>
+<!--                      <span style="color: #c7cbd2">-->
-                    </div>
+<!--                        {{ qdms_inputV1.length }}/90-->
+<!--                      </span>-->
+<!--                    </div>-->
                   </div>
                 </div>
               </div>
@@ -70,19 +72,19 @@
                     <span style="color: #999ba3">课程命名规则</span>
                   </div>
                   <div
-                    class="i2_right"
+                      class="i2_right"
-                    @click="hideShow"
+                      @click="hideShow"
-                    style="cursor: pointer"
+                      style="cursor: pointer"
                   >
                     <div
-                      class="b_zk"
+                        class="b_zk"
-                      :style="{ display: hideshow ? 'block' : 'none' }"
+                        :style="{ display: hideshow ? 'block' : 'none' }"
                     >
                       <span style="color: #4ea6ff">收起</span>
                     </div>
                     <div
-                      class="b_sq"
+                        class="b_sq"
-                      :style="{ display: hideshow ? 'none' : 'block' }"
+                        :style="{ display: hideshow ? 'none' : 'block' }"
                     >
                       <span style="color: #4ea6ff">展开</span>
                     </div>
@@ -90,14 +92,14 @@
                   </div>
                 </div>
                 <div
-                  class="i2_detail"
+                    class="i2_detail"
-                  :style="{ display: hideshow ? 'block' : 'none' }"
+                    :style="{ display: hideshow ? 'block' : 'none' }"
                 >
                   <span style="color: #999ba3">
-                    1、课程名称统一不加书名号。<br />
+                    1、课程名称统一不加书名号。<br/>
                     2、项目名称、属地等信息如需体现在课程名称中，请放在课程名称信息
                     之后，如“时间管理（GROW180项目）”或“时间管理（B*）”确保首先
-                    看到的是课程内容主题。<br />
+                    看到的是课程内容主题。<br/>
                     3、同一课程如先后有多个版本，原则上仅开放最新版本，旧版本应停用
                     版本如必须以年份标明，请以“沟通技巧（2022年）”的方式呈现。
                   </span>
@@ -107,23 +109,23 @@
                 <div class="item_nam">
                   <div class="asterisk_icon">
                     <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
+                        src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                        alt=""
                     />
                   </div>
                   <span style="margin-right: 14px">封面图</span>
                 </div>
                 <div class="item_inp">
                   <div style="width:440px;height:70px;display: flex;justify-content: flex-start;align-items: center;">
-                      <img
+                    <img
-                        v-for="(item, index) in optionsUrl" 
+                        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="
@@ -140,11 +142,11 @@
                     showSearch
                   /> -->
                   <img
-                    class="i_upload_img"
+                      class="i_upload_img"
-                    v-if="feng_mian_1"
+                      v-if="feng_mian_1"
-                    :src="feng_mian_1"
+                      :src="feng_mian_1"
-                    style="width:220px;height:120px;border-radius: 8px;"
+                      style="width:220px;height:120px;border-radius: 8px;"
-                    alt="avatar"
+                      alt="avatar"
                   />
                   <div class="i_bottom">
                     <span style="color: #999ba3">
@@ -157,9 +159,9 @@
                 <div class="item_nam">
                   <div class="asterisk_icon">
                     <img
-                      style="width: 10px; height: 10px"
+                        style="width: 10px; height: 10px"
-                      src="@/assets/images/coursewareManage/asterisk.png"
+                        src="@/assets/images/coursewareManage/asterisk.png"
-                      alt=""
+                        alt=""
                     />
                   </div>
                   <span style="margin-right: 14px">目标人群</span>
@@ -167,10 +169,10 @@
                 <div class="item_inp">
                   <div class="i1_input">
                     <a-input
-                      v-model:value="qdms_inputV2"
+                        v-model:value="qdms_inputV2"
-                      maxlength="50"
+                        maxlength="50"
-                      style="width: 440px; height: 40px; border-radius: 8px"
+                        style="width: 440px; height: 40px; border-radius: 8px"
-                      placeholder="请输入目标人群"
+                        placeholder="请输入目标人群"
                     />
                     <div class="inp_num">
                       <span style="color: #c7cbd2">
@@ -184,49 +186,41 @@
                 <div class="item_nam">
                   <div class="asterisk_icon">
                     <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
+                        src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
+                        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-tree-select
-                      :getPopupContainer="
+                        style="width: 440px"
-                        (triggerNode) => {
+                        placeholder="请选择内容分类"
-                          return triggerNode.parentNode || document.body;
+                        :treeDefaultExpandAll="true"
-                        }
+                        :getPopupContainer="
-                      "
+                          (triggerNode) => {
-                      v-model:value="fen_lei"
+                            return triggerNode.parentNode || document.body;
-                      show-search
+                          }
-                      style="width: 440px"
+                        "
-                      :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                        v-model:value="fen_lei"
-                      placeholder="请选择"
+                        :tree-data="options2222"
-                      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>
-
-                    <!-- <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
-                    /> -->
                   </div>
                 </div>
               </div>
@@ -237,10 +231,10 @@
                 <div class="item_inp">
                   <div class="i1_input">
                     <a-textarea
-                      v-model:value="qdms_inputV3"
+                        v-model:value="qdms_inputV3"
-                      maxlength="200"
+                        maxlength="200"
-                      style="width: 440px; height: 140px; border-radius: 8px"
+                        style="width: 440px; height: 140px; border-radius: 8px"
-                      placeholder="请输入课程价值"
+                        placeholder="请输入课程价值"
                     />
                     <div class="inp_num" style="top:110px;">
                       <span style="color: #c7cbd2;">
@@ -257,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"
+                        v-model:value="chang_jin"
-                      dropdownClassName="dropdown-style"
+                        dropdownClassName="dropdown-style"
-                      style="width: 440px"
+                        style="width: 440px"
-                      placeholder="请选择"
+                        placeholder="请选择"
-                      :options="options3"
+                        :options="options3"
-                      allowClear
+                        allowClear
-                      showSearch
+                        showSearch
                     />
                   </div>
                 </div>
@@ -279,17 +273,17 @@
                 </div>
                 <div class="item_inp">
                   <a-input
-                    v-model:value="tags_val_single"
+                      v-model:value="tags_val_single"
-                    style="width: 440px; height: 40px; border-radius: 8px"
+                      style="width: 440px; height: 40px; border-radius: 8px"
-                    placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。"
+                      placeholder="请输入内容标签按回车键添加内容标签，可添加多个内容标签。"
-                    @pressEnter="handleTagChange"
+                      @pressEnter="handleTagChange"
                   />
                   <div class="tag-content">
                     <a-tag
-                      v-for="(item, index) in tags_val"
+                        v-for="(item, index) in tags_val"
-                      :key="index"
+                        :key="index"
-                      closable
+                        closable
-                      @close="handleTagClose(item)"
+                        @close="handleTagClose(item)"
                     >
                       {{ item }}
                     </a-tag>
@@ -302,8 +296,8 @@
                 <div class="item_nam" style="margin-top:5px;">
                   <div class="asterisk_icon">
                     <img
-                      src="@/assets/images/coursewareManage/asterisk.png"
+                        src="@/assets/images/coursewareManage/asterisk.png"
-                      alt="asterisk"
+                        alt="asterisk"
                     />
                   </div>
                   <!-- 授课教师1 -->
@@ -312,8 +306,8 @@
                 <div class="item_inp">
                   <div class="i1_input">
                     <ProjectManager
-                      v-model:value="member.value"
+                        v-model:value="member.value"
-                      v-model:name="member.name"
+                        v-model:name="member.name"
                     />
                   </div>
                 </div>
@@ -325,10 +319,10 @@
                 <div class="item_inp">
                   <div class="i10_textarea">
                     <a-textarea
-                      v-model:value="qdms_inputV6"
+                        v-model:value="qdms_inputV6"
-                      maxlength="150"
+                        maxlength="150"
-                      style="width: 440px; height: 100px; border-radius: 8px"
+                        style="width: 440px; height: 100px; border-radius: 8px"
-                      placeholder="请输入"
+                        placeholder="请输入"
                     />
                     <div class="inp_num">
                       <span style="color: #c7cbd2">
@@ -343,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>
@@ -355,17 +349,17 @@
             <div class="fotarea">
               <div style="border: 1px solid #ccc">
                 <Toolbar
-                  style="border-bottom: 1px solid #ccc"
+                    style="border-bottom: 1px solid #ccc"
-                  :editor="editorRef"
+                    :editor="editorRef"
-                  :defaultConfig="toolbarConfig"
+                    :defaultConfig="toolbarConfig"
-                  :mode="mode"
+                    :mode="mode"
                 />
                 <Editor
-                  style="height: 250px; overflow-y: hidden"
+                    style="height: 250px; overflow-y: hidden"
-                  v-model="valueHtml"
+                    v-model="valueHtml"
-                  :defaultConfig="editorConfig"
+                    :defaultConfig="editorConfig"
-                  :mode="mode"
+                    :mode="mode"
-                  @onCreated="handleCreated"
+                    @onCreated="handleCreated"
                 />
               </div>
             </div>
@@ -396,45 +390,57 @@ import {
   // onMounted,
   onUnmounted,
 } from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
-import { edit, detail, handle } from "@/api/indexCourse";
+import {edit, detail, handle} from "@/api/indexCourse";
-import { fileUp } from "../../api/indexEval";
+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: "",
       qdms_inputV2: "",
       qdms_inputV3: "",
       fen_lei: null,
-      fen_lei_neirong: null,
+      feng_mian_1: null,
-      options2222:[
+      chang_jin: null,
+      tags_val_single: "",
+      tags_val: [],
+      qdms_inputV6: "",
+      imgList: [],
+      auditDescription: "",
+      contentClassify: [],
+      // 课程三级分类
+      options2222: [
         {
           title: '领导力',
           value: '100',
-          selectable:false,
+          selectable: false,
           children: [
             {
               title: '领导业务',
@@ -453,7 +459,7 @@ export default defineComponent({
         {
           title: '专业力',
           value: '200',
-          selectable:false,
+          selectable: false,
           children: [
             {
               title: '研发',
@@ -536,7 +542,7 @@ export default defineComponent({
         {
           title: '通用力',
           value: '300',
-          selectable:false,
+          selectable: false,
           children: [
             {
               title: '职业操守与道德',
@@ -550,16 +556,9 @@ export default defineComponent({
               title: '规章制度',
               value: '3003',
             },
-          ], 
+          ],
         }
       ],
-      feng_mian_1: null,
-      chang_jin: null,
-      tags_val_single: "",
-      tags_val: [],
-      qdms_inputV6: "",
-      imgList: [],
-      auditDescription: "",
     });
 
     const visibleOpen = (offcourseId, name) => {
@@ -599,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 = "";
@@ -613,7 +612,7 @@ export default defineComponent({
       state.qdms_inputV6 = "";
       state.imgList = [];
       state.attach = "";
-      state.auditDescription="";
+      state.auditDescription = "";
 
       // valueHtml.value = "";
     };
@@ -638,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) {
@@ -684,52 +683,66 @@ export default defineComponent({
         setCode: param,
       };
       api1
-        .getDict(obj)
+          .getDict(obj)
-        .then((res) => {
+          .then((res) => {
-          console.log("获取字典成功", res);
+            console.log("获取字典成功", res);
-          if (res.data.code === 200) {
+            if (res.data.code === 200) {
-            if (param === "faceclassPic") {
+              if (param === "faceclassPic") {
-              let arr = res.data.data.rows;
+                let arr = res.data.data.rows;
-              let newArr = [];
+                let newArr = [];
-              arr.forEach((item) => {
+                arr.forEach((item) => {
-                newArr.push({
+                  newArr.push({
-                  value: item.dictValue,
+                    value: item.dictValue,
-                  label: item.dictName,
+                    label: item.dictName,
+                  });
                 });
-              });
+                optionsUrl.value = newArr;
-              optionsUrl.value = newArr;
+              }
-            }
+              if (param === "faceclassClass") {
-            if (param === "faceclassClass") {
+                let arr = res.data.data.rows;
-              let arr = res.data.data.rows;
+                let newArr = [];
-              let newArr = [];
+                arr.forEach((item) => {
-              arr.forEach((item) => {
+                  newArr.push({
-                newArr.push({
+                    value: item.dictCode,
-                  value: item.dictCode,
+                    label: item.dictName,
-                  label: item.dictName,
+                  });
                 });
-              });
+                options2.value = newArr;
-              options2.value = newArr;
+              }
-            }
+              if (param === "faceclassScene") {
-            if (param === "faceclassScene") {
+                let arr = res.data.data.rows;
-              let arr = res.data.data.rows;
+                let newArr = [];
-              let newArr = [];
+                arr.forEach((item) => {
-              arr.forEach((item) => {
+                  newArr.push({
-                newArr.push({
+                    value: item.dictCode,
-                  value: item.dictCode,
+                    label: item.dictName,
-                  label: item.dictName,
+                  });
                 });
-              });
+                options3.value = newArr;
-              options3.value = newArr;
+              }
+              if (param === "contentClassify") {
+                state.contentClassify = dealDickTree(res.data.data.rows) || []
+              }
             }
-          }
+          })
-        })
+          .catch((err) => {
-        .catch((err) => {
+            console.log("获取字典失败", 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 = () => {
@@ -831,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;
+          let i = res.rows.length;
-            state.auditDescription =  res.rows[i-1].description?res.rows[i-1].description :"-";
+          state.auditDescription = res.rows[i - 1].description ? res.rows[i - 1].description : "-";
         }
       }
 
@@ -844,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 =''
+      let str = ''
-      for(let i=0;i<arrss.length;i++){
+      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) + ','
+        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;
@@ -1316,8 +1329,8 @@ export default defineComponent({
   }
 
   .choiceoptionurl {
-    width:60px;
+    width: 60px;
-    height:60px;
+    height: 60px;
     margin-right: 10px;
     border-radius: 8px;
   }

src/views/examine/CourseReviewed.vue

@@ -203,9 +203,7 @@ export default {
           title: "内容分类",
           dataIndex: "content",
           key: "content",
-          align: "center",
+          align: "center"
-          customRender: ({ text }) =>
-            state.calssifyList.find((e) => e.value == text)?.label,
         },
         {
           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,147 @@ export default {
       //审核记录的数据
       tableDataAudit: [],
       projAuditModal: false,
-      loading: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 = {
@@ -305,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
               ? "未提交"

src/views/examine/CourseReviewedN.vue

@@ -232,9 +232,7 @@ export default {
           title: "内容分类",
           dataIndex: "content",
           key: "content",
-          align: "center",
+          align: "center"
-          customRender: ({ text }) =>
-            state.calssifyList.find((e) => e.value == text)?.label,
         },
         {
           title: "状态",
@@ -302,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
@@ -433,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
               ? "未提交"
@@ -546,6 +682,7 @@ export default {
       contentList11,
       sceneist11,
       onEditorFocus,
+      sHX
     };
   },
 };

src/views/examine/ProjectReviewed.vue

@@ -261,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"
                 >

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"
+          @click="backPage"
-        style="cursor: pointer"
+          style="cursor: pointer"
-        to="/projectmanage"
+          to="/projectmanage"
-        class="goback"
+          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"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -33,33 +33,27 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目名称</div>
           </div>
           <div class="in">
-            <a-input
+            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
-              v-model:value="projectInfo.name"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-              :disabled="viewDetail ? true : false"
-            />
           </div>
         </div>
         <div class="name flex-top">
           <div class="namebox" style="margin-top: 10px">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
           <div class="in select" style="flex: 1; display: flex">
             <div
-              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-              style="
+                style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -67,19 +61,19 @@
                 position: relative;
                 overflow: hidden;
               "
-              v-for="(src, index) in projectPic"
+                v-for="(src, index) in projectPic"
-              :key="index"
+                :key="index"
-              @click="() => (projectInfo.picUrl = src.value)"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                :src="src.value"
+                  :src="src.value"
-                alt="avatar"
+                  alt="avatar"
               />
             </div>
           </div>
@@ -87,63 +81,63 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              show-time
+                show-time
-              separator="至"
+                separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
+                :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="projectInfo.rangeTime"
+                v-model:value="projectInfo.rangeTime"
-              style="width: 100%; height: 40px; border-radius: 5px"
+                style="width: 100%; height: 40px; border-radius: 5px"
-              valueFormat="YYYY-MM-DD HH:mm:ss"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
-              @change="timeChange"
+                @change="timeChange"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-              v-model:value="projectInfo.managerId"
+                v-model:value="projectInfo.managerId"
-              v-model:name="projectInfo.manager"
+                v-model:name="projectInfo.manager"
-              @onChange="managerChange"
+                @onChange="managerChange"
-              mode="multiple"
+                mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-              v-model:value="projectInfo.sourceBelongId"
+                v-model:value="projectInfo.sourceBelongId"
-              v-model:name="projectInfo.sourceBelongName"
+                v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -154,8 +148,8 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训分类</div>
           </div>
@@ -166,15 +160,15 @@
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
+                class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
             <a-radio-group
-              v-model:value="projectInfo.boeFlag"
+                v-model:value="projectInfo.boeFlag"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -187,16 +181,16 @@
           </div>
           <div class="in">
             <a-checkbox
-              v-model:checked="courseSyncFlag"
+                v-model:checked="courseSyncFlag"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
-              ><span
+            ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
+            ></a-checkbox
             >
           </div>
         </div>
@@ -206,12 +200,12 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="projectInfo.remark"
+                v-model:value="projectInfo.remark"
-              style="height: 80px"
+                style="height: 80px"
-              placeholder="请输入说明"
+                placeholder="请输入说明"
-              show-count
+                show-count
-              :maxlength="200"
+                :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -221,18 +215,18 @@
           <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;
                 }
               "
-              placeholder="请选择模版"
+                placeholder="请选择模版"
-              :size="size"
+                :size="size"
-              style="width: 100%"
+                style="width: 100%"
-              :options="classifyList5"
+                :options="classifyList5"
-              @change="classificationChange5"
+                @change="classificationChange5"
-              @popupScroll="templateScroll"
+                @popupScroll="templateScroll"
-              :fieldNames="{
+                :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -246,29 +240,31 @@
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
         <a-button
-          v-on:click="createProject"
+            v-on:click="createProject"
-          type="primary"
+            type="primary"
-          class="btn1"
+            class="btn1"
-          style="margin-left: 20px"
+            style="margin-left: 20px"
-          >确定</a-button
+        >确定
+        </a-button
         >
       </div>
     </div>
   </div>
 </template>
 <script>
-import { onMounted, reactive, toRefs, watch } from "vue";
+import {onMounted, reactive, toRefs, watch} from "vue";
-import { message } from "ant-design-vue";
+import {message} from "ant-design-vue";
-import { useRoute, useRouter } from "vue-router";
+import {useRoute, useRouter} from "vue-router";
 import * as api from "../../api/index";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
+import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import { changeOwnership, scrollLoad } from "@/api/method";
+import {changeOwnership, scrollLoad} from "@/api/method";
-import { storage } from "../../api/storage";
+import {storage} from "../../api/storage";
 
 export default {
   name: "projectAdd",
@@ -277,6 +273,7 @@ export default {
     ProjectLevel,
     // ProjectClass,
     TrainClass,
+    NameInput,
     OrgClass,
   },
   setup() {
@@ -326,10 +323,10 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.projectId = routers.query.projectId;
       (state.projectInfo.projectId || state.projectInfo.parentId) &&
-        api
+      api
           .getProjectDetail({
             projectId:
-              state.projectInfo.projectId || state.projectInfo.parentId,
+                state.projectInfo.projectId || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -422,19 +419,24 @@ 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, [
+        changeOwnership("project", res.data.data.projectId, [
-            { id: res.data.data.createId, name: res.data.data.createName },
+          {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);
       });
@@ -442,9 +444,9 @@ export default {
 
     function managerChange(e, l, d) {
       !state.projectInfo.sourceBelongId &&
-        (state.projectInfo.sourceBelongId = d);
+      (state.projectInfo.sourceBelongId = d);
       !state.projectInfo.sourceBelongId &&
-        (state.projectInfo.sourceBelongName = d);
+      (state.projectInfo.sourceBelongName = d);
     }
 
     return {

src/views/projectcenter/ProjectManage.vue

@@ -179,13 +179,7 @@
             </div>
             <div class="inname">项目名称:</div>
             <div class="in">
-              <a-input
+              <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name" v-model:validate="projectInfo.validate" :maxlength="30" show-count :id="projectInfo.projectId"></NameInput>
-                v-model:value="projectInfo.name"
-                show-count
-                :maxlength="30"
-                placeholder="请输入项目名称"
-                style="border-radius: 8px"
-              />
             </div>
           </div>
           <div class="name">
@@ -691,34 +685,34 @@
       </div>
     </a-modal>
     <!-- 创建项目提示框 -->
-    <a-modal
+<!--    <a-modal-->
-      v-model:visible="reminderModal"
+<!--      v-model:visible="reminderModal"-->
-      :footer="null"
+<!--      :footer="null"-->
-      :closable="closeBack"
+<!--      :closable="closeBack"-->
-      wrapClassName="CopyModal"
+<!--      wrapClassName="CopyModal"-->
-      centered="true"
+<!--      centered="true"-->
-    >
+<!--    >-->
-      <div class="delete">
+<!--      <div class="delete">-->
-        <div class="del_header"></div>
+<!--        <div class="del_header"></div>-->
-        <div class="del_main">
+<!--        <div class="del_main">-->
-          <div class="header">
+<!--          <div class="header">-->
-            <div class="icon"></div>
+<!--            <div class="icon"></div>-->
-            <span>温馨提示</span>
+<!--            <span>温馨提示</span>-->
-            <div class="close_exit" @click="closeReminderModal"></div>
+<!--            <div class="close_exit" @click="closeReminderModal"></div>-->
-          </div>
+<!--          </div>-->
-          <div class="body">
+<!--          <div class="body">-->
-            <div style="margin-left: 60px; margin-right: 60px">
+<!--            <div style="margin-left: 60px; margin-right: 60px">-->
-              请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同
+<!--              请您根据自身需求选择对应项目类别，多层项目与单层项目操作不同，层级不同-->
-            </div>
+<!--            </div>-->
-          </div>
+<!--          </div>-->
-          <div class="del_btnbox">
+<!--          <div class="del_btnbox">-->
-            <div class="del_btn btn2" @click="okReminderModal">
+<!--            <div class="del_btn btn2" @click="okReminderModal">-->
-              <div class="btnText">好的</div>
+<!--              <div class="btnText">好的</div>-->
-            </div>
+<!--            </div>-->
-          </div>
+<!--          </div>-->
-        </div>
+<!--        </div>-->
-      </div>
+<!--      </div>-->
-    </a-modal>
+<!--    </a-modal>-->
     <!-- 项目提交审核弹窗 -->
     <a-modal
       v-model:visible="reviewModal"
@@ -828,6 +822,7 @@ 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",
@@ -835,6 +830,7 @@ export default {
     ProjOwnerShip,
     ProjPowerList,
     ProjCheckShip,
+    NameInput,
     ProjectManager,
     // ProjectClass,
     OrgClass,
@@ -965,6 +961,11 @@ export default {
       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();
@@ -1551,7 +1552,7 @@ export default {
                       systemId: value.record.systemId,
                       type: 2,
                     };
-                    state.reminderModal = true;
+                    state.estabish = true;
                   }}
                 >
                   创建子项目
@@ -1721,7 +1722,7 @@ export default {
     };
     const showModal1 = () => {
       state.projectInfo = {};
-      state.reminderModal = true;
+      state.estabish = true;
     };
     const closeModal1 = () => {
       state.estabish = false;