Merge branch 'develop' into manage-release

# Conflicts:
#	src/App.vue
#	src/api/config.js
#	src/api/method.js
#	src/components/NavTop.vue
#	src/router/index.js
#	src/views/projectcenter/templateAdd.vue

.env

@@ -0,0 +1,8 @@
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
+VUE_APP_PROXY_URL=http://111.231.196.214:30001/
+VUE_APP_LOGIN_URL=https://u-pre.boe.com/web
+
+
+VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
+VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading

.env.boe

@@ -0,0 +1,4 @@
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
+
+

.env.prod

@@ -0,0 +1,2 @@
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi

.env.release

@@ -0,0 +1,7 @@
+VUE_APP_BASE=/manage-release
+VUE_APP_BASE_API=/manageApi-release
+VUE_APP_LOGIN_URL=https://u.boe.com/web
+
+
+VUE_APP_IFRAME_URL=https://u-pre.boe.com/pc-release/iframe
+VUE_APP_IFRAME_STUDENT_URL=https://u-pre.boe.com/pc-release/loading

.env.test

@@ -0,0 +1,4 @@
+VUE_APP_BASE=/manage
+VUE_APP_BASE_API=/manageApi
+
+

.gitignore

@@ -26,3 +26,4 @@ package-lock.json
 src/api/config.js
 src/api/config.js
 src/api/config.js
+src/api/config.js

package.json

@@ -5,7 +5,10 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
-		"lint": "vue-cli-service lint"
+    "build:boe": "vue-cli-service build --mode boe",
+    "build:release": "vue-cli-service build --mode release",
+    "build:prod": "vue-cli-service build --mode prod",
+    "build:test": "vue-cli-service build --mode test"
   },
   "dependencies": {
     "@wangeditor/editor": "^5.1.23",

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.13------------");
+    console.log("版本0.9.14------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });

src/api/config.js

@@ -2,12 +2,13 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:40:35
+ * @LastEditTime: 2022-12-14 20:56:10
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 import { message } from "ant-design-vue";
 import axios from "axios";
+import router from "@/router";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
 
@@ -16,7 +17,7 @@ import axios from "axios";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: "/manageApi",
+    baseURL: process.env.VUE_APP_BASE_API,
     timeout: 1000 * 15,
     // headers: { "Content-Type": "multipart/form-data" },
     headers: { "Content-Type": "application/json" },
@@ -56,8 +57,7 @@ http.interceptors.response.use(
             return response;
         } else {
             if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
-        // window.open("http://111.231.196.214:12013/manage/login", '_self');
+                process.env.NODE_ENV === 'development' ? router.push({ path: 'login' }) : (window.location.href = process.env.VUE_APP_LOGIN_URL)
             }
             console.log("api %o", msg);
         }

src/api/method.js

@@ -276,7 +276,10 @@ const commonData = {
 const organizationalTree = []
 
 //嵌套页面
-const iframeUrl = "https://u-pre.boe.com/pc-release/iframe"
+const iframeUrl = process.env.VUE_APP_IFRAME_URL
+//学员端路由
+const studentUrl = process.env.VUE_APP_IFRAME_STUDENT_URL
+
 //二维码
 const codeUrl = "https://u-pre.boe.com"
 export {
@@ -292,5 +295,6 @@ export {
     commonData,
     organizationalTree,
     iframeUrl,
+    studentUrl,
     codeUrl,
 }

src/components/BreadCrumb.vue

@@ -70,7 +70,7 @@ export default {
               href: "/leveladd",
             },
             {
-              name: "管理",
+              name: "关卡",
             },
           ];
         }

src/components/NavTop.vue

@@ -61,7 +61,7 @@
 import { reactive, toRefs } from "vue";
 import DownLoad from "../components/drawers/DownLoad";
 import * as api from "../api/index1";
-
+import { studentUrl } from "../api/method";
 export default {
   name: "NavTop",
   components: {
@@ -76,12 +76,12 @@ export default {
         {
           id: 1,
           name: "管理员",
-          go: "/manage-release/learningpath",
+          go: "/learningpath",
         },
         {
           id: 2,
           name: "学员",
-          go: "https://u.boe.com/pc-release/uc/study/courses",
+          go: studentUrl,
         },
       ],
 

src/components/drawers/ActiveAttendance.vue

@@ -513,14 +513,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "所在岗位",
-          dataIndex: "gang",
-          key: "gang",
-          width: 50,
-          align: "center",
-          className: "h",
-        },
+       //   {
+         //   title: "所在岗位",
+         //   dataIndex: "gang",
+         //   key: "gang",
+          //  width: 50,
+          //  align: "center",
+          //  className: "h",
+        //  },
         {
           title: "签到时间",
           dataIndex: "cur",

src/components/drawers/AddDiscuss.vue

@@ -191,11 +191,12 @@ export default {
       }
     };
     const updateTask = async (res) => {
+   
+      if (props.isLevel == 1) {
         if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         await RouterEditTask({
           chapterId: props.isactive,
           courseId: res.data.data.discussId,

src/components/drawers/AddEval.vue

@@ -177,11 +177,12 @@ export default {
     };
     //向关卡或阶段渲染
     const updateTask = async (value) => {
+    
+      if (props.isLevel == 1) {
         if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         await RouterEditTask({
           chapterId: props.isactive,
           courseId: Number(value.evaluationId),

src/components/drawers/AddFaceteach.vue

@@ -702,11 +702,12 @@ export default {
     // 新增编辑或新增项目任务
     const updateTask = async (res) => {
       console.log("props.isLevel=====", props.isLevel);
+    
+      if (props.isLevel == 1) {
         if(!props.isactive){
           message.destroy();
           return message.warning("请先选中关卡");
         }
-      if (props.isLevel == 1) {
         let editObj1 = {
           chapterId: props.isactive,
           courseId: res.data.data.offcoursePlanId,

src/components/drawers/AddGroupMembers.vue

@@ -155,14 +155,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
+         // {
+          //  title: "岗位",
+          //  dataIndex: "gangw",
+          //  key: "gangw",
+          //  width: 60,
+          //  align: "center",
+          //  className: "h",
+         // },
         // {
         //   title: "进度",
         //   dataIndex: "progress",

src/components/drawers/AddInvist.vue

@@ -10,7 +10,7 @@
     <div class="drawerMain">
       <div class="header">
         <div v-if="edit" class="headerTitle">编辑评估</div>
-        <div v-else class="headerTitle">添加评估{{assessmentName}}{{assessmentId}}</div>
+        <div v-else class="headerTitle">添加评估</div>
         <img
           style="width: 29px; height: 29px; cursor: pointer"
           src="../../assets/images/basicinfo/close.png"
@@ -24,13 +24,9 @@
               v-model:assessmentVisible="assessmentVisible"
               v-model:assessmentId="assessmentId"
               v-model:assessmentName="assessmentName"
-                     
             />
-
           </div>
-         
         </div>
-    
       </div>
       <div class="main_btns">
         <button class="btn1" @click="closeDrawer">取消</button>
@@ -138,7 +134,6 @@ export default {
       // ctx.emit("changeData", false);
       localStorage.setItem("stageId", props.chooseStageId);
       localStorage.setItem("chapterId", props.isactive);
-     
     };
     const checkAssDrawer = () => {
       state.assessmentVisible = true;
@@ -151,16 +146,19 @@ export default {
         state.assessmentId = null;
         state.assessmentName = null;
       }
-   
     };
 
     const updateTask = () => {
-      console.log("state.assessmentId ",state.assessmentId ,state.assessmentName );
+      console.log(
+        "state.assessmentId ",
+        state.assessmentId,
+        state.assessmentName
+      );
       if (!state.assessmentId) {
         return message.warning("请选择评估");
       }
       let l_data_id = [];
-      l_data_id.push(Number(state.assessmentId))
+      l_data_id.push(Number(state.assessmentId));
       console.log("state.assessment", state.assessment, state.assessmentId);
       if (props.isLevel == 1) {
         if (!props.isactive) {
@@ -174,7 +172,7 @@ export default {
           type: 11,
         })
           .then((res) => {
-            console.log('shifouchongfu',res)
+            console.log("shifouchongfu", res);
             console.log("路径图中是否包含此评估了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
@@ -192,7 +190,7 @@ export default {
             } else {
               RouterEditTask({
                 chapterId: props.isactive,
-                courseTaskId: state.assessmentId,
+                courseId: state.assessmentId,
                 name: state.assessmentName,
                 routerId: props.routerId,
                 routerTaskId: props.routerTaskId || 0,
@@ -200,7 +198,9 @@ export default {
               })
                 .then(() => {
                   message.destroy();
-                  message.success(`${props.edit ? "编辑" : "新增"}关卡任务成功`);
+                  message.success(
+                    `${props.edit ? "编辑" : "新增"}关卡任务成功`
+                  );
                   ctx.emit("changeData", false);
                   closeDrawer();
                   state.addLoading = false;
@@ -210,19 +210,19 @@ export default {
                   message.error(`${props.edit ? "编辑" : "新增"}关卡任务失败`);
                 });
             }
-          }).catch(err=>{
-            console.log(err)
           })
-
-       
+          .catch((err) => {
+            console.log(err);
+          });
       } else if (props.isLevel == 2) {
         IsExistenceProject({
           courseTaskId: l_data_id,
           projectId: props.projectId,
           stageId: props.chooseStageId || 0,
           type: 11,
-        }).then(res=>{
-          console.log(res)
+        })
+          .then((res) => {
+            console.log(res);
             console.log("项目中是否包含此评估了", res);
             if (res.data.data.length) {
               let strdata = res.data.data;
@@ -256,10 +256,10 @@ export default {
                   message.error(`${props.edit ? "编辑" : "新增"}任务失败`);
                 });
             }
-        }).catch(err=>{
-          console.log(err)
           })
-        
+          .catch((err) => {
+            console.log(err);
+          });
       } else if (props.isLevel == 3) {
         IsExistenceProjectTemplate({
           courseTaskId: l_data_id,
@@ -267,7 +267,7 @@ export default {
           stageId: props.chooseStageId || 0,
           type: 11,
         }).then((res) => {
-          console.log(res)
+          console.log(res);
           console.log("项目中是否包含此评估了", res);
           if (res.data.data.length) {
             let strdata = res.data.data;
@@ -303,7 +303,6 @@ export default {
               });
           }
         });
-
       }
     };
 
@@ -313,7 +312,6 @@ export default {
       closeDrawer,
       updateTask,
       checkAssDrawer,
-    
     };
   },
 };
@@ -339,7 +337,6 @@ export default {
       }
     }
     .contentMain {
-    
       .main {
         width: 100%;
         .main_left {

src/components/drawers/AddOnline.vue

@@ -166,6 +166,9 @@
         <button class="btn2" @click="updateTask">确定</button>
       </div>
     </div>
+    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+      <a-spin :spinning="addLoading" tip="" />
+    </div>
   </a-drawer>
 </template>
 <script>
@@ -256,6 +259,7 @@ export default {
       tableDataTotal: 0,
       pageSize: 10,
       choicecourse: true,
+      ddLoading:false,
     });
     const ChoiceCourse = () => {
       state.choicecourse = false;
@@ -295,7 +299,7 @@ export default {
           title: "名称",
           dataIndex: "name",
           key: "name",
-          width: "40%",
+          width: "30%",
           ellipsis: true,
         },
         {
@@ -304,20 +308,22 @@ export default {
           key: "contenttype",
           width: "15%",
           align: "center",
+          ellipsis: true,
         },
-        {
-          title: "授课教师",
-          dataIndex: "teacher",
-          key: "teacher",
-          width: "15%",
-          align: "center",
-        },
+       //   {
+        //    title: "授课教师",
+        //    dataIndex: "teacher",
+        //    key: "teacher",
+         //   width: "15%",
+         //   align: "center",
+        //  },
         {
           title: "创建人",
           dataIndex: "sysCreateBy",
           key: "sysCreateBy",
           width: "15%x",
           align: "center",
+          ellipsis: true,
         },
      //   {
       //    title: "创建时间",
@@ -330,8 +336,9 @@ export default {
           title: "发布时间",
           dataIndex: "publishTime",
           key: "publishTime",
-          width: "15%",
+          width: "25%",
           align: "center",
+          ellipsis: true,
         },
       ];
       return columns;
@@ -462,9 +469,10 @@ export default {
         });
     };
     const updateTask = () => {
-   
+      state.addLoading =true;
       if (props.isLevel == 1) {
         if(!props.isactive){
+          state.addLoading =false;
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -495,6 +503,7 @@ export default {
               }
               message.destroy();
               message.warning("在线课（" + tipStr + "）重复添加");
+              state.addLoading =false;
               return;
             } else {
               state.addOnlineList.map((value) => {
@@ -507,16 +516,19 @@ export default {
                   routerTaskId: props.routerTaskId || 0,
                   type: 1,
                 })
-                  .then(() => {
+                  .then((res) => {
+                    if(res.data.code == 200){
                       message.destroy();
                       message.success(
                       `${props.edit ? "编辑" : "新增"}关卡任务成功`
                     );
+                    }
                     ctx.emit("changeData", false);
                     closeDrawer();
                     state.addLoading = false;
                   })
                   .catch(() => {
+                    state.addLoading =false;
                     message.destroy();
                     message.error(
                       `${props.edit ? "编辑" : "新增"}关卡任务失败`

src/components/drawers/AddProject.vue

@@ -54,7 +54,7 @@
               </div>
             </div>
           </div>
-          <div class="mi_btns" style="margin-left:0px;">
+          <div class="mi_btns" style="margin-left: 0px">
             <div class="btn btn1">
               <div class="search"></div>
               <div class="btnText" @click="searchProjectList()">搜索</div>
@@ -225,8 +225,9 @@
 import { reactive, toRefs } from "vue";
 import { RouterEditTask } from "@/api/indexTask";
 import { message } from "ant-design-vue";
-import * as apiProj from "../../api/index.js";
+// import * as apiProj from "../../api/index.js";
 import dayjs from "dayjs";
+import * as indexAudit from "../../api/indexAudit";
 
 export default {
   name: "AddProject",
@@ -400,8 +401,8 @@ export default {
     // TODO 这里后续需要给接口或者改动
     // 获取所有，确定分页位置
     const getCurrentPage = () => {
-      apiProj
-        .getProjectList({
+      indexAudit
+        .auditlist({
           createName: state.inputV1,
           manager: state.inputV2,
           name: state.inputV3,
@@ -450,8 +451,8 @@ export default {
         status: 3,
       });
 
-      apiProj
-        .getProjectList({
+      indexAudit
+        .auditlist({
           createName: state.inputV3,
           manager: state.inputV2,
           name: state.inputV1,
@@ -991,7 +992,6 @@ export default {
         color: #fff;
       }
     }
-    
   }
 }
 </style>

src/components/drawers/AddTest.vue

@@ -49,7 +49,7 @@
             <div class="btnbox">
               <a-input
                 v-model:value="test.examinationName"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 placeholder="请输入考试名称"
                 :maxlength="20"
               />
@@ -71,17 +71,11 @@
                 {{ chooseCourse ? "重选" : "选择" }}试卷
               </button>
               <div v-if="paperName != ''">
-                <a-tag
-                 
-                    closable
-                    color="processing"
-                    @close="delTag"
-                  >
+                <a-tag closable color="processing" @close="delTag">
                   <span style="font-size: 14px; line-height: 33px">{{
                     paperName
                   }}</span>
                 </a-tag>
-               
               </div>
             </div>
             <!-- 选择面授侧弹窗 -->
@@ -106,7 +100,8 @@
               <span style="margin-right: 3px">考试时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker style="width: 400px; height: 40px; border-radius: 8px;"
+              <a-range-picker
+                style="width: 400px; height: 40px; border-radius: 8px"
                 show-time
                 format="YYYY/MM/DD HH:mm"
                 v-model:value="test.chooseTime"
@@ -129,7 +124,7 @@
                 :min="0"
                 :max="300"
                 :precision="0"
-                style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
                 v-model:value="test.examinationDuration"
               ></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
@@ -170,37 +165,30 @@
                     "
                     v-model:value="test.examinationLimit"
                   ></a-input-number>
-                  <span style="color: #999999; margin-left: 8px">次,-1表示无限制</span>
+                  <span style="color: #999999; margin-left: 8px"
+                    >次,-1表示无限制</span
+                  >
                 </div>
               </div>
             </div>
           </div>
 
-
           <div class="main_item">
             <div class="signbox">
               <span style="margin-right: 3px">显示答案：</span>
             </div>
             <div class="btnbox">
-               
               <a-radio-group
                 style="margin-right: 12px"
                 v-model:value="test.showAnswers"
               >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio1"
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio1"
                   >允许查看
                 </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio1"
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >不允许查看
                 </a-radio>
               </a-radio-group>
-               
             </div>
           </div>
           <div class="main_item">
@@ -208,25 +196,17 @@
               <span style="margin-right: 3px">显示解析：</span>
             </div>
             <div class="btnbox">
-               
               <a-radio-group
                 style="margin-right: 12px"
                 v-model:value="test.showAnalysis"
               >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio2"
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio2"
                   >允许查看
                 </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio2"
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
                   >不允许查看
                 </a-radio>
               </a-radio-group>
-             
             </div>
           </div>
           <div class="main_item">
@@ -234,25 +214,17 @@
               <span style="margin-right: 3px">评分模式：</span>
             </div>
             <div class="btnbox">
-             
               <a-radio-group
                 style="margin-right: 12px"
                 v-model:value="test.scoringModel"
               >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio3"
+                <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
                   >最高一次
                 </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio3"
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio3"
                   >最后一次
                 </a-radio>
               </a-radio-group>
-              
             </div>
           </div>
           <div class="main_item">
@@ -260,11 +232,10 @@
               <span style="margin-right: 3px">及格线：</span>
             </div>
             <div class="btnbox">
-              
               <a-input
                 v-model:value="test.passLine"
                 type="number"
-                    style="width: 400px; height: 40px; border-radius: 8px;"
+                style="width: 400px; height: 40px; border-radius: 8px"
               />
 
               <span style="color: #999999; margin-left: 8px">分</span>
@@ -276,7 +247,6 @@
                 <span style="margin-right: 3px">作业要求：</span>
               </div>
               <div class="btnbox">
-              
                 <a-radio-group
                   style="margin-right: 12px"
                   v-model:value="test.questionArrangement"
@@ -306,13 +276,10 @@
                     >不乱序
                   </a-radio>
                 </a-radio-group>
-               
               </div>
             </div>
           </div>
         </div>
-    
-
       </div>
       <div class="main_btns">
         <a-button class="btn1" @click="closeDrawer2">取消</a-button>
@@ -407,9 +374,7 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      test:{
-
-      },
+      test: {},
 
       addLoading: false,
       isOuter: 1, // 是否为外部考试
@@ -433,14 +398,11 @@ export default {
       ],
     });
 
-
     const clearAll = () => {
       state.test = {};
-
     };
 
     const closeDrawer = () => {
-   
       state.statechoosedTime = "";
       ctx.emit("update:addtestVisible", false);
       ctx.emit("update:edit", false);
@@ -474,14 +436,15 @@ export default {
       state.paperName = "";
     };
     const queryTest = () => {
-      
       queryExaminationDetailById({ examinationId: props.EditTestId })
         .then((res) => {
           state.test = res.data.data;
           state.test.showAnswers = Number(state.test.showAnswers);
           state.test.showAnalysis = Number(state.test.showAnalysis);
           state.test.scoringModel = Number(state.test.scoringModel);
-          state.test.questionArrangement =Number(state.test.questionArrangement);
+          state.test.questionArrangement = Number(
+            state.test.questionArrangement
+          );
           state.test.chooseTime = [
             dayjs(res.data.data.examinationStartTime, "YYYY-MM-DD HH:mm:ss"),
             dayjs(res.data.data.examinationEndTime, "YYYY-MM-DD HH:mm:ss"),
@@ -497,8 +460,6 @@ export default {
         });
     };
     const updateTest = () => {
-      
-
       if (!state.test.examinationName) {
         message.destroy();
         return message.warning("请输入考试名称");
@@ -673,7 +634,6 @@ export default {
     };
 
     return {
-     
       afterVisibleChange,
       closeDrawer,
       closeDrawer2,

src/components/drawers/AssessmentAll.vue

@@ -1,11 +1,10 @@
 <!-- 评估列表 -->
 <template>
- 
   <div class="main_item">
     <div class="fi_input">
       <a-input
         v-model:value="inputV1"
-          style="width: 424px; height: 40px; border-radius: 8px;"
+        style="width: 424px; height: 40px; border-radius: 8px"
         placeholder="请输入评估名称"
         maxlength="20"
       />
@@ -23,18 +22,14 @@
     <div class="mntc_left">
       <div class="notice_icon"></div>
       <div v-if="assessment == null">
-                  <span class="title"
-                    >已选择 <span class="data">0</span> 条</span
-                  >
+        <span class="title">已选择 <span class="data">0</span> 条</span>
       </div>
       <div v-else>
         <div>
+          <span class="title">已选择 <span class="data">1</span> 条;</span>
           <span class="title"
-                      >已选择 <span class="data">1</span> 条;</span
-                    >
-                    <span class="title"
-                      >名称： <span class="data">{{ assessment.name }}</span>
-                    </span><!--
+            >名称： <span class="data">{{ assessment.name }}</span> </span
+          ><!--
                     <span class="title"
                       >题数： <span class="data">{{ assessment.essayQuestionVoList?Number(assessment.essayQuestionVoList.length):0
                       +Number(assessment.multipleStemVoList?assessment.multipleStemVoList.length:0)
@@ -110,12 +105,12 @@
           class="pagination"
           @change="handelChangePage"
         />
-      </div></div>
       </div>
-
+    </div>
+  </div>
 </template>
 <script>
-import { reactive, toRefs,onMounted } from "vue";
+import { reactive, toRefs, onMounted, watch } from "vue";
 import * as api from "../../api/indexInvist.js";
 import dayjs from "dayjs";
 export default {
@@ -154,7 +149,7 @@ export default {
     };
     //清空所选
     const clearLine = () => {
-      console.log("state.selectedRowKeys",state.selectedRowKeys)
+      console.log("state.selectedRowKeys", state.selectedRowKeys);
       state.selectedRowKeys = [];
       state.addOnlineList = [];
     };
@@ -168,9 +163,26 @@ export default {
         api
           .queryAppraiseDetailById({ assessmentId: props.assessmentId })
           .then((res) => {
-            console.log(res);
+            console.log("查询评估xinxi ", res);
+            let info = res.data.data;
+            let obj = {
+              assessmentId: info.assessmentId,
+              name: info.assessmentName,
+              num: info.essayQuestionVoList
+                ? Number(info.essayQuestionVoList.length)
+                : 0 + info.multipleStemVoList
+                ? Number(info.multipleStemVoList.length)
+                : 0 + info.scoringQuestionVoList
+                ? Number(info.scoringQuestionVoList.length)
+                : 0 + info.singleStemVoList
+                ? Number(info.singleStemVoList.length)
+                : 0,
+              creator: info.createUser ? info.createUser : "-",
+              time: dayjs(info.createTime).format("YYYY-MM-DD"),
+            };
             //更新讨论信息
-            state.assessment = res.data.data;
+            state.assessment = obj;
+            state.selectedRowKeys = [info.assessmentId];
             //  state.assessmentId = res.data.data.assessmentId;
           })
           .catch(() => {});
@@ -223,8 +235,7 @@ export default {
       //  ctx.emit("checkedAss", state.assessment);
       ctx.emit("update:assessmentId", state.assessment.assessmentId);
       ctx.emit("update:assessmentName", state.assessment.name);
-    }
- 
+    };
 
     const handelChangePage = (page, pageSize) => {
       state.currentPage = page;
@@ -234,21 +245,27 @@ export default {
     const getTableDate = (tableData) => {
       let data = tableData;
       let array = [];
-      data.map((value, index) => {
+      data.map((value) => {
         let obj = {
-          key: index,
+          key: value.assessmentId,
           assessmentId: value.assessmentId,
-          num: value.essayQuestionVoList?Number(value.essayQuestionVoList.length):0
-          +value.multipleStemVoList?Number(value.multipleStemVoList.length):0
-          +value.scoringQuestionVoList?Number(value.scoringQuestionVoList.length):0
-          +value.singleStemVoList?Number(value.singleStemVoList.length):0,
+          num: value.essayQuestionVoList
+            ? Number(value.essayQuestionVoList.length)
+            : 0 + value.multipleStemVoList
+            ? Number(value.multipleStemVoList.length)
+            : 0 + value.scoringQuestionVoList
+            ? Number(value.scoringQuestionVoList.length)
+            : 0 + value.singleStemVoList
+            ? Number(value.singleStemVoList.length)
+            : 0,
           name: value.assessmentName ? value.assessmentName : "-",
           creator: value.createUser ? value.createUser : "-",
           time: dayjs(value.createTime).format("YYYY-MM-DD"),
         };
         array.push(obj);
       });
-      (state.selectedRowKeys = []), (state.tableData = array);
+      state.selectedRowKeys = [];
+      state.tableData = array;
     };
     //获取全部评估信息接口
     const getAllInvistText = () => {
@@ -279,15 +296,34 @@ export default {
     };
     onMounted(() => {
       clearLine();
-      console.log("state.selectedRowKeys",state.selectedRowKeys)
+      console.log(
+        "state.selectedRowKeys",
+        state.selectedRowKeys,
+        state.assessmentId
+      );
       if (!state.assessmentId) {
         clearLine();
       }
 
       queryInfo();
       getAllInvistText();
-      
     });
+    watch(
+      () => props.assessmentId,
+      () => {
+        if (!props.assessmentId) {
+          clearLine();
+          state.assessment = null;
+        } else {
+          queryInfo();
+        }
+        console.log("props.assessmentId", props.assessmentId);
+      },
+      {
+        deep: true,
+      }
+    );
+
     return {
       ...toRefs(state),
       onSelectChange,
@@ -322,7 +358,6 @@ export default {
       }
     }
     .contentMain {
-   
       .main_left {
         padding-right: 30px;
         margin-top: 32px;

src/components/drawers/MemberList.vue

@@ -231,22 +231,22 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gangw",
-          key: "gangw",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "进度",
-          dataIndex: "progress",
-          key: "progress",
-          width: 60,
-          align: "center",
-          className: "h",
-        },
+        //  {
+         //   title: "岗位",
+         //   dataIndex: "gangw",
+         //   key: "gangw",
+         //   width: 60,
+         //  align: "center",
+         //   className: "h",
+        //  },
+        //  {
+         //   title: "进度",
+          //  dataIndex: "progress",
+         //   key: "progress",
+          //  width: 60,
+          //  align: "center",
+          //  className: "h",
+         // },
         {
           title: "操作",
           dataIndex: "operations",

src/components/drawers/SelFacet.vue

@@ -117,8 +117,8 @@
               :loading="tableDataTotal === -1 ? true : false"
               :pagination="false"
           />
-          <div class="tableBox">
-          <div class="pa" style="display:flex;justify-content:center;padding:20px;">
+          <div class="tableBox" style="margin-top:85px;">
+          <div class="pa" style="display:flex;justify-content:center;">
             <a-pagination
                 v-if="tableDataTotal > 10"
                 :showSizeChanger="false"
@@ -162,14 +162,16 @@ const columns1 = [
     width: "30%",
     dataIndex: "name",
     key: "name",
+    ellipsis: true,
     
   },
   {
     title: "内容分类",
     width: "15%",
-    dataIndex: "content",
-    key: "content",
+    dataIndex: "category",
+    key: "category",
     align: "center",
+    ellipsis: true,
   },
   {
     title: "授课教师",
@@ -177,6 +179,7 @@ const columns1 = [
     dataIndex: "teacher",
     key: "teacher",
     align: "center",
+    ellipsis: true,
   },
   {
     title: "创建人",
@@ -184,6 +187,7 @@ const columns1 = [
     dataIndex: "creator",
     key: "creator",
     align: "center",
+    ellipsis: true,
   },
   {
     title: "发布时间",
@@ -191,6 +195,7 @@ const columns1 = [
     dataIndex: "time",
     key: "time",
     align: "center",
+    ellipsis: true,
   },
 ];
 
@@ -227,6 +232,129 @@ export default {
         //   time: "2022-10-31 23:12:00",
         // }
       ],
+      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",
+            },
+          ],
+        },
+      ],
       currentPage: 1,
       tableDataTotal: null,
       pageSize: 10,
@@ -311,6 +439,7 @@ export default {
     const getClassData = (tabledata) => {
       let data = tabledata;
       let array = [];
+      let options = state.options2222;    
       data.map((value) => {
         let obj = {
           key: value.offcourseId,
@@ -320,13 +449,63 @@ export default {
           creator: value.createName || "-",
           time: value.publishTime,
           categoryId: value.categoryId,
+          category:"",
           //需要判断content
         };
+        console.log("obj",obj);
+        var breaked = false;
+        for (let i = 0; i < options.length; i++) {
+          for (let j = 0; j < options[i].children.length; j++) {
+            if (
+              String(options[i].children[j].value) ===
+              String(obj.categoryId)
+            ) {
+              console.log("obj.categoryId",obj.categoryId);
+              obj.category = options[i].children[j].title;
+              console.log("obj. obj.category ", obj.category );
+              breaked = true;
+              break;
+            }
+          }
+          if(breaked){
+            break;
+          }
+        }
+        if(!obj.category ){
+          obj.category ="-";
+        }
+        console.log("obj. obj.category22 ", obj.category );
         array.push(obj);
       });
       state.classTableData = array;
     };
+
+
+
+
    /**
+
+    const getCategory=(id)=>{
+      console.log("进来了");
+      let category="";
+      let options = state.options2222;      
+        for (let i = 0; i < options.value.length; i++) {
+          for (let j = 0; j < options.value[i].children.length; j++) {
+            if (
+              String(options.value[i].children[j].value) ===
+              String(id)
+            ) {
+              console.log();
+              category = options.value[i].children[j].title;
+             
+              return category;
+            }
+          }
+        }
+      return category;
+    }
+
+ 
      const options1 = ref([
      {
         value: 0,
@@ -378,6 +557,7 @@ export default {
       rowSelection,
       search,
       submitCourse,
+     
       // change,
     };
   },

src/components/drawers/SelectTest.vue

@@ -88,7 +88,7 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
+        <button class="btn1"  @click="closeDrawer">取消</button>
         <button class="btn2" @click="CreatSTText()">确定</button>
       </div>
     </div>
@@ -162,46 +162,50 @@ export default {
     const tableDataFunc = () => {
       {
         const columns = [
-          {
-            title: "序号",
-            dataIndex: "paperId",
-            key: "paperId",
-            width: 90,
-            align: "center",
-            className: "h head",
-          },
+         // {
+           //  title: "序号",
+            // dataIndex: "paperId",
+            // key: "paperId",
+            // width: 90,
+           //  align: "center",
+            // className: "h head",
+         //  },
           {
             title: "试卷名称",
             dataIndex: "testName",
             key: "testName",
-            width: 110,
+            width: "40%",
             align: "center",
             className: "h head",
+            ellipsis: true,
           },
           {
             title: "随机模式",
             dataIndex: "paperMode",
             key: "paperMode",
-            width: 110,
+            width: "20%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
           {
             title: "创建人",
             dataIndex: "sysCreateBy",
             key: "sysCreateBy",
-            width: 90,
-            align: "center",
-            className: "h",
-          },
-          {
-            title: "最近更新时间",
-            dataIndex: "sysUpdateTime",
-            key: "sysUpdateTime",
-            width: 150,
+            width: "20%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
+         //   {
+         //     title: "最近更新时间",
+         //     dataIndex: "sysUpdateTime",
+         //   //    key: "sysUpdateTime",
+          //    ellipsis: true,
+          //    width: "20%",
+          //    align: "center",
+           //   className: "h",
+         //   },
         ];
         return columns;
       }
@@ -248,7 +252,7 @@ export default {
         published: true,
       };
       api
-        .queryExaminationList(obj)
+        .queryExaminationPaperList(obj)
         .then((data) => {
           // getTableDate(res.data.data);
           //**   表格repaint   */
@@ -257,9 +261,9 @@ export default {
           let obj = {
           key: index + 1,
           sysCreateBy: value.sysCreateBy,
-          paperId: index + 1,
+          paperId:value.id,
           testName: value.testName,
-          paperMode: value.randomMode ? "是" : "否",
+          paperMode: value.paperMode==1?"固定试卷":"随机",
           sysUpdateTime:value.sysUpdateTime,
           id:value.id,
         };

src/components/project/NameInput.vue

@@ -12,7 +12,7 @@
   <div style="color:red;font-size: 10px" v-if="value && !validate">名称重复，请重新输入</div>
 </template>
 <script setup>
-import {defineProps, defineEmits, watch, ref} from "vue";
+import {defineProps, defineEmits, watch, ref, onMounted} from "vue";
 import {validateName} from "@/api/index1";
 
 const props = defineProps({
@@ -47,6 +47,10 @@ const emit = defineEmits({})
 
 const modelV = ref()
 
+onMounted(()=>{
+  modelV.value = props.value
+})
+
 watch(() => props.value, () => {
   if (props.value !== modelV.value) {
     modelV.value = props.value
@@ -68,12 +72,33 @@ function validateProName() {
 </script>
 <style lang="scss">
 .in{
+  .pro{
   .ant-input-affix-wrapper {
     position: relative;
     display: inline-block;
     width: 99%;
     min-width: 0;
-    padding: 0px 17px;
+    padding: 4px 8px;
+    color: rgba(0, 0, 0, 0.85);
+    font-size: 14px;
+    line-height: 1.5715;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #d9d9d9;
+    border-radius: 8px;
+    transition: all 0.3s;
+    display: inline-flex;
+  }
+  }
+}
+    
+.in{
+  .ant-input-affix-wrapper {
+    position: relative;
+    display: inline-block;
+    width: 99%;
+    min-width: 0;
+    padding: 0px 8px;
     color: rgba(0, 0, 0, 0.85);
     font-size: 14px;
     line-height: 1.5715;

src/components/project/OrgClass.vue

@@ -23,7 +23,7 @@
   </a-tree-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {computed, defineEmits, defineProps} from "vue";
 import {useStore} from "vuex";
 
 const store = useStore();

src/components/project/ProjectClass.vue

@@ -1,3 +1,11 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:48
+ * @FilePath: /fe-manage/src/components/project/ProjectClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <!-- 评估管理-创建评估页面 -->
 <template>
   <a-select
@@ -17,30 +25,30 @@
   </a-select>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
 import { useStore } from "vuex";
 
 const store = useStore();
 
 const props = defineProps({
   value: String,
-  disabled: String
-})
-const emit = defineEmits({})
+  disabled: String,
+});
+const emit = defineEmits({});
 
-const options = ref([])
+const options = computed(() =>
+  store.state.projectClass.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 const id = computed(() => {
-  return props.value
-})
-
-onMounted(() => {
-  options.value = store.state.projectClass.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+  return props.value;
+});
 
 function change(key, obj) {
-  emit('update:name', obj[0])
-  emit('update:value', key)
+  emit("update:name", obj[0]);
+  emit("update:value", key);
 }
-
 </script>

src/components/project/ProjectLevel.vue

@@ -1,6 +1,14 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:21
+ * @FilePath: /fe-manage/src/components/project/ProjectLevel.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options?.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options?.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
@@ -19,33 +27,33 @@
   </template>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
 import { useStore } from "vuex";
 
-
 const store = useStore();
 const props = defineProps({
   value: String,
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
-  }
-})
+    default: false,
+  },
+});
 
 const id = computed(() => {
-  return props.value || null
-})
+  return props.value || null;
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
-
-onMounted(() => {
-  options.value = store.state.projectLevel.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+const options = computed(() =>
+  store.state.projectLevel.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
 </script>

src/components/project/TrainClass.vue

@@ -1,6 +1,14 @@
+<!--
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2022-12-14 15:46:36
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2022-12-14 15:47:46
+ * @FilePath: /fe-manage/src/components/project/TrainClass.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
 <template>
   <template v-if="tag">
-    <div>{{ options.find(e => e.value == id)?.label || '' }}</div>
+    <div>{{ options.find((e) => e.value == id)?.label || "" }}</div>
   </template>
   <template v-else>
     <a-select
@@ -17,10 +25,9 @@
       :disabled="disabled"
     />
   </template>
-
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import { computed, defineEmits, defineProps } from "vue";
 import { useStore } from "vuex";
 
 const store = useStore();
@@ -30,24 +37,24 @@ const props = defineProps({
   disabled: String,
   tag: {
     type: Boolean,
-    default: false
-  }
-})
+    default: false,
+  },
+});
 
 const id = computed(() => {
-  return props.value
-})
+  return props.value;
+});
 
-const emit = defineEmits({})
+const emit = defineEmits({});
 
-const options = ref([])
-
-onMounted(() => {
-  options.value = store.state.projectSys.map(e => ({value: parseInt(e.dictCode), label: e.dictName}))
-})
+const options = computed(() =>
+  store.state.projectSys.map((e) => ({
+    value: parseInt(e.dictCode),
+    label: e.dictName,
+  }))
+);
 
 function change(key) {
-  emit('update:value', key)
+  emit("update:value", key);
 }
-
 </script>

src/router/index.js

@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-09 09:26:26
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-14 17:38:53
+ * @LastEditTime: 2022-11-21 17:42:59
  * @FilePath: /fe-manage/src/router/index.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -17,7 +17,7 @@ const routes = [
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory("/manage-release/"),
+	history: createWebHistory(process.env.VUE_APP_BASE),
 	routes,
 
 })

src/views/courselibrary/CoursewareManage.vue

@@ -75,7 +75,7 @@
               <a-range-picker
                 v-model:value="projectTime"
                 style="width: 420px"
-                valueFormat="X"
+                format="YYYY-MM-DD"
                 separator="至"
                 :placeholder="['      开始时间', '        结束时间']"
               />
@@ -90,10 +90,8 @@
               <div class="search"></div>
               <div class="btnText">重置</div>
             </div>
-      
           </div>
           <div class="btns">
-     
             <!-- 2022-11-30注释 后面放开 -->
             <!-- <div class="btn btn3" @click="openMessage">
               <div class="search"></div>
@@ -631,7 +629,7 @@
                     <span style="margin-right: 14px">授课教师</span>
                   </div>
                   <div class="item_inp">
-                    <div class="select" style="width:436px; " >
+                    <div class="select" style="width: 436px">
                       <ProjectManager
                         v-model:value="member.value"
                         v-model:name="member.name"
@@ -815,7 +813,8 @@
               ]"
             >
               <div class="fb">
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleEdit(record, String(record.courseform));
@@ -826,7 +825,8 @@
                   编辑
                 </div>
 
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleCopy(record, String(record.courseform));
@@ -893,7 +893,8 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleDelete(record, String(record.courseform));
@@ -921,7 +922,8 @@
               ]"
             >
               <div class="fb">
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleRejectExit(record, String(record.courseform));
@@ -931,7 +933,8 @@
                 >
                   撤回
                 </div>
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleCopy(record, String(record.courseform));
@@ -1017,7 +1020,8 @@
               ]"
             >
               <div class="fb">
-            <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleStart(record, String(record.courseform));
@@ -1027,7 +1031,8 @@
                 >
                   开课
                 </div>
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleLook(record, String(record.courseform));
@@ -1059,7 +1064,8 @@
               >
                 管理
               </div>-->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleCopy(record, String(record.courseform));
@@ -1126,7 +1132,8 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleStop(record, String(record.courseform));
@@ -1138,7 +1145,6 @@
                 </div>
               </div>
             </div>
-            
           </template>
           <template
             v-if="
@@ -1156,7 +1162,8 @@
               ]"
             >
               <div class="fb">
-            <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleStart(record, String(record.courseform));
@@ -1166,7 +1173,8 @@
                 >
                   开课
                 </div>
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleEdit(record, String(record.courseform));
@@ -1198,7 +1206,8 @@
               >
                 管理
               </div> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleCopy(record, String(record.courseform));
@@ -1265,7 +1274,8 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleOpen(record, String(record.courseform));
@@ -1275,7 +1285,8 @@
                 >
                   启用
                 </div>
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleDelete(record, String(record.courseform));
@@ -1304,7 +1315,8 @@
               ]"
             >
               <div class="fb">
-            <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleEdit(record, String(record.courseform));
@@ -1314,7 +1326,8 @@
                 >
                   编辑
                 </div>
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleCopy(record, String(record.courseform));
@@ -1381,7 +1394,8 @@
                   <down-outlined />
                 </a>
               </a-dropdown> -->
-              <div class="jc"
+                <div
+                  class="jc"
                   @click="
                     () => {
                       handleDelete(record, String(record.courseform));
@@ -1725,7 +1739,8 @@
                   <div class="btnText">
                     <span style="color: #ffffff">新建开课</span>
                   </div>
-              </div></div>
+                </div>
+              </div>
             </div>
             <!-- 无数据样式 -->
             <div class="notable" v-if="tableData6.length === 0">
@@ -1771,7 +1786,8 @@
                         签到
                       </div>
                       -->
-                      <div class="jc"
+                        <div
+                          class="jc"
                           @click="
                             () => {
                               handelEditStu(record);
@@ -1780,7 +1796,8 @@
                         >
                           编辑
                         </div>
-                      <div class="jc"
+                        <div
+                          class="jc"
                           @click="
                             () => {
                               handelGuan(record);
@@ -1792,7 +1809,7 @@
                       </div>
                       <a-dropdown>
                         <template #overlay>
-                          <a-menu style="margin-left: 20px;">
+                          <a-menu style="margin-left: 20px">
                             <a-menu-item
                               @click="
                                 () => {
@@ -1824,11 +1841,12 @@
                             </a-menu-item> -->
                           </a-menu>
                         </template>
-                        <div class="fb" style="margin-left: -20px;">
+                        <div class="fb" style="margin-left: -20px">
                           <div class="jc">
                             更多
                             <down-outlined />
-                        </div></div>
+                          </div>
+                        </div>
                       </a-dropdown>
                     </div>
                   </template>
@@ -1853,8 +1871,6 @@
           </div>
         </div>
       </div>
-
-
     </a-modal>
     <!--开课页面 -->
     <!--新建开课页面 -->
@@ -1950,7 +1966,7 @@
               </div>
               <span style="margin-right: 3px">授课教师</span>
             </div>
-            <div class="select" style="width: 440px;">
+            <div class="select" style="width: 440px">
               <ProjectManager
                 v-model:value="member.value"
                 v-model:name="member.name"
@@ -1967,6 +1983,7 @@
               </a-checkbox>
             </div>
           </div>
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">签到设置</span>
@@ -1978,12 +1995,14 @@
                     是否允许未报名的学员签到
                   </span>
                 </a-radio>
+                <!--
                 <a-radio :value="1" @click="clear_xjkkradioV1">
                   <span style="color: #6d7584">签到是否需要口令</span>
-                </a-radio>
+                </a-radio>-->
               </a-radio-group>
             </div>
           </div>
+
           <div class="cstm_items">
             <div class="signbox">
               <span style="margin-right: 3px">评估设置</span>
@@ -2095,8 +2114,16 @@
                       white-space: nowrap;
                       text-overflow: ellipsis;
                     "
-                    >{{ item.slice(item.lastIndexOf("/") + 1) }}</span
                   >
+                    {{
+                      item.indexOf("-") !== -1
+                        ? item.slice(
+                            item.lastIndexOf("/") + 1,
+                            item.lastIndexOf("-")
+                          ) + item.slice(item.lastIndexOf("."))
+                        : item
+                    }}
+                  </span>
                 </div>
                 <!-- 条件渲染 s -->
                 <!-- <div class="file_size">
@@ -2223,7 +2250,12 @@
                   <a-input
                     v-model:value="xygl_inputV1"
                     placeholder="请输入姓名"
-                    style="width: 400px; height: 40px; border-radius: 8px;margin-right:14px;"
+                    style="
+                      width: 400px;
+                      height: 40px;
+                      border-radius: 8px;
+                      margin-right: 14px;
+                    "
                   />
                   <div class="btn btn1" @click="handleSearchStu">
                     <div class="search"></div>
@@ -2280,7 +2312,7 @@
                   </div> -->
                 </div>
               </div>
-              <div class="tableBox" style="margin-top:20px;">
+              <div class="tableBox" style="margin-top: 20px">
                 <a-table
                   :columns="columns7"
                   :data-source="tableData7"
@@ -2926,26 +2958,26 @@ const columns1 = [
       return text ? text : "-";
     },
   },
-  {
-    title: "学习人数",
-    width: 130,
-    dataIndex: "stunum",
-    key: "4",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "0";
-    },
-  },
-  {
-    title: "评分",
-    width: 130,
-    dataIndex: "grade",
-    key: "5",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "0";
-    },
-  },
+ // {
+ //   title: "学习人数",
+   // width: 130,
+  //  dataIndex: "stunum",
+  //  key: "4",
+ //   align: "center",
+  //  customRender: ({ text }) => {
+  // //   return text ? text : "0";
+  //  },
+ // },
+ // {
+  //  title: "评分",
+  //  width: 130,
+  //  dataIndex: "grade",
+ //   key: "5",
+  //  align: "center",
+   // customRender: ({ text }) => {
+   //   return text ? text : "0";
+  //  },
+ // },
   {
     title: "状态",
     width: 130,
@@ -3242,16 +3274,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-  {
-    title: "岗位",
-    width: 300,
-    dataIndex: "postion",
-    key: "3",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
+  // {
+  //   title: "岗位",
+  //   width: 300,
+  //   dataIndex: "postion",
+  //   key: "3",
+  //  align: "center",
+  //  customRender: ({ text }) => {
+  //    return text ? text : "-";
+  //  },
+  // },
   {
     title: "Band",
     width: 200,
@@ -3600,7 +3632,7 @@ export default defineComponent({
 
       imageUrl: "",
       imgList: [],
-      validate:false,
+      validate:true,
 
       pageSize2: 10,
       currentPage2: 0,
@@ -3952,8 +3984,16 @@ export default defineComponent({
       let startTime = "";
       let endTime = "";
       if (state.projectTime) {
-        startTime = state.projectTime[0];
-        endTime = state.projectTime[1];
+       
+        startTime = toDate(
+          new Date(state.projectTime[0].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+        endTime = toDate(
+          new Date(state.projectTime[1].$d).getTime() / 1000,
+          "Y-M-D"
+        );
+       
       }
       let res = await list({
         pageNo: state.currentPage1,
@@ -4570,7 +4610,6 @@ export default defineComponent({
         return message.warning("请选择课程形式");
       }
 
-
       if (state.valueE1 === 2) {
         state.of_hs = false;
         // state.ft_hs = true;
@@ -4810,7 +4849,7 @@ export default defineComponent({
         .catch();
 
       console.log("res");
-      console.log(item);
+      console.log("获取面授课详情", item);
 
       state.xjkkinputV2 = item.address;
       state.checked1 = item.applyFlag === 1 ? true : false;
@@ -5997,7 +6036,6 @@ export default defineComponent({
     }
   }
 
-
   .tableBox {
     margin: 20px 38px 30px;
 
@@ -7906,7 +7944,6 @@ export default defineComponent({
               }
 
               .ant-table-thead > tr > th {
-         
                 background-color: #eff4fc !important;
               }
 
@@ -7950,7 +7987,6 @@ export default defineComponent({
               }
             }
           }
-
         }
       }
     }

src/views/courselibrary/CoursewareManage_Old.vue

@@ -3529,16 +3529,16 @@ const columns7 = [
       return text ? text : "-";
     },
   },
-  {
-    title: "岗位",
-    width: 300,
-    dataIndex: "postion",
-    key: "3",
-    align: "center",
-    customRender: ({ text }) => {
-      return text ? text : "-";
-    },
-  },
+  //  //  {
+    //  title: "岗位",
+    //  width: 300,
+    //  dataIndex: "postion",
+    //  key: "3",
+    //  align: "center",
+   //   customRender: ({ text }) => {
+    //    return text ? text : "-";
+    //  },
+  //  },
   {
     title: "Band",
     width: 200,

src/views/courselibrary/components/seeModal.vue

@@ -156,7 +156,7 @@
               <div class="mbl_items12">
                 <div
                   class="i12_box1"
-                  style="position:relative;"
+                  style="position: relative"
                   v-for="(item, index) in detail.attach"
                   :key="index"
                 >
@@ -207,21 +207,43 @@
                   <div class="file_detail">
                     <div class="file_name">
                       <!-- http://111.231.196.214:12016/7.231.196.214:12016/7-1670486854017.jpg -->
-                      <span style="color: #6f6f6f;width:200px;display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;position:absolute;top:4px;left:72px;">
-                        {{ item.indexOf('-')!==-1?item.slice(item.lastIndexOf('/')+1,item.indexOf('-')) + item.slice(item.lastIndexOf('.')) :item }}  
+                      <span
+                        style="
+                          color: #6f6f6f;
+                          width: 200px;
+                          display: block;
+                          overflow: hidden;
+                          white-space: nowrap;
+                          text-overflow: ellipsis;
+                          position: absolute;
+                          top: 4px;
+                          left: 72px;
+                        "
+                      >
+                        {{
+                          item.indexOf("-") !== -1
+                            ? item.slice(
+                                item.lastIndexOf("/") + 1,
+                                item.lastIndexOf("-")
+                              ) + item.slice(item.lastIndexOf("."))
+                            : item
+                        }}
                       </span>
                     </div>
 
                     <div class="file_updata">
                       <div class="updatabox">
                         <div class="updatacolor"></div>
-                        <div class="updataxq" style="right:-62px;">上传完成</div>
+                        <div class="updataxq" style="right: -62px">
+                          上传完成
+                        </div>
                       </div>
                       <div class="upjd">
                         <span style="margin: auto 5px">100%</span>
                       </div>
                     </div>
                   </div>
+                  <a :href="item" style="margin-left: 5px">下载</a>
                 </div>
               </div>
             </div>
@@ -262,134 +284,140 @@ export default defineComponent({
     },
   },
   setup(props, { emit }) {
-    console.log(props);
+    console.log("props", props);
     const state = reactive({
       imgList: [],
       options2222: [
         {
-          title: '领导力',
-          value: '100',
+          title: "领导力",
+          value: "100",
           selectable: false,
           children: [
             {
-              title: '领导业务',
-              value: '1001',
+              title: "领导业务",
+              value: "1001",
             },
             {
-              title: '领导团队',
-              value: '1002',
+              title: "领导团队",
+              value: "1002",
             },
             {
-              title: '领导自我',
-              value: '1003',
+              title: "领导自我",
+              value: "1003",
             },
           ],
         },
         {
-          title: '专业力',
-          value: '200',
+          title: "专业力",
+          value: "200",
           selectable: false,
           children: [
             {
-              title: '研发',
-              value: '2001',
+              title: "研发",
+              value: "2001",
             },
             {
-              title: '产品和解决方案',
-              value: '2002',
+              title: "产品和解决方案",
+              value: "2002",
             },
             {
-              title: '生产技术与制造',
-              value: '2003',
+              title: "生产技术与制造",
+              value: "2003",
             },
             {
-              title: '供应链',
-              value: '2004',
+              title: "供应链",
+              value: "2004",
             },
             {
-              title: '营销',
-              value: '2005',
+              title: "营销",
+              value: "2005",
             },
             {
-              title: '品质',
-              value: '2006',
+              title: "品质",
+              value: "2006",
             },
             {
-              title: '战略与企划',
-              value: '2007',
+              title: "战略与企划",
+              value: "2007",
             },
             {
-              title: '流程管理',
-              value: '2008',
+              title: "流程管理",
+              value: "2008",
             },
             {
-              title: '业绩管理',
-              value: '2009',
+              title: "业绩管理",
+              value: "2009",
             },
             {
-              title: '项目管理',
-              value: '20010',
+              title: "项目管理",
+              value: "20010",
             },
             {
-              title: '信息技术',
-              value: '20011',
+              title: "信息技术",
+              value: "20011",
             },
             {
-              title: '环境与安全',
-              value: '20012',
+              title: "环境与安全",
+              value: "20012",
             },
             {
-              title: '人力资源',
-              value: '20013',
+              title: "人力资源",
+              value: "20013",
             },
             {
-              title: '企业文化',
-              value: '20014',
+              title: "企业文化",
+              value: "20014",
             },
             {
-              title: '品牌',
-              value: '20015',
+              title: "品牌",
+              value: "20015",
             },
             {
-              title: '财务',
-              value: '20016',
+              title: "财务",
+              value: "20016",
             },
             {
-              title: '法务',
-              value: '20017',
+              title: "法务",
+              value: "20017",
             },
             {
-              title: '行政',
-              value: '20018',
+              title: "行政",
+              value: "20018",
             },
             {
-              title: '医工',
-              value: '20019',
-            }
+              title: "医工",
+              value: "20019",
+            },
           ],
         },
         {
-          title: '通用力',
-          value: '300',
+          title: "通用力",
+          value: "300",
           selectable: false,
           children: [
             {
-              title: '职业操守与道德',
-              value: '3001',
+              title: "职业操守与道德",
+              value: "3001",
             },
             {
-              title: '职业素养与技能',
-              value: '3002',
+              title: "职业素养与技能",
+              value: "3002",
             },
             {
-              title: '规章制度',
-              value: '3003',
+              title: "规章制度",
+              value: "3003",
             },
           ],
-        }
-      ]
+        },
+      ],
+      ceshi: "https://u-pre.boe.com/upload/测试下载ppt2-1671002026755.pptx",
+      ceshi2: "http://111.231.196.214:12016/测试下载ppt3-1671001683026.pptx",
     });
 
+    // item.slice(
+    //                             item.lastIndexOf("/") + 1,
+    //                             item.indexOf("-")
+    //                           ) + item.slice(item.lastIndexOf("."))
     const filterTxt = (txt) => {
       if (txt) {
         return txt;

src/views/courselibrary/courseModal.vue

@@ -50,7 +50,7 @@
                 </div>
                 <div class="item_inp">
                   <div class="i1_input">
-                    <NameInput placeholder="请输入课程名称" v-model:value="qdms_inputV1" v-model:validate="validate"
+                    <NameInput ref="inputRef"  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"-->
@@ -304,7 +304,7 @@
                   <span style="margin-right: 14px">授课教师</span>
                 </div>
                 <div class="item_inp">
-                  <div class="i1_input">
+                  <div class="select" style="width:88%;">
                     <ProjectManager
                         v-model:value="member.value"
                         v-model:name="member.name"
@@ -426,7 +426,7 @@ export default defineComponent({
       hideshow: true,
       ft_eidt: false,
       attach: "",
-      validate:false,
+      validate:true,
       ft_hs: false,
       addLoading: false,
       statusJuJue: 0,

src/views/examine/CourseReviewed.vue

@@ -14,6 +14,7 @@
         <div class="tmplh_inp">
           <div class="inpbox">
             <div class="inpbox1">
+            <!--
               <a-select
                 v-model:value="valueproj"
                 value-key="value"
@@ -21,7 +22,27 @@
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
                 ]"
-              />
+              />-->
+              <a-tree-select
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="valueproj"
+              show-search
+       
+              :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="inpbox1">
               <a-input
@@ -140,7 +161,7 @@ export default {
   setup() {
     const state = reactive({
       calssifyList: [], //分类字典
-      valueproj: "",
+      valueproj:null,
       valuecreater: "",
       valuename: "",
       currentPage: 1,
@@ -484,7 +505,7 @@ export default {
       console.log(data);
     };
     const reset = () => {
-      (state.valueproj = ""),
+      (state.valueproj = null),
         (state.valuecreater = null),
         (state.valuename = null),
         getList();

src/views/examine/CourseReviewedN.vue

@@ -16,7 +16,7 @@
             <div class="inpbox1">
             <!--
               <a-select
-                v-model:value="categoryId"
+                v-model:value="valueproj"
                 :options="[
                   { label: '请选择内容分类', value: '' },
                   ...calssifyList,
@@ -28,11 +28,12 @@
                   return triggerNode.parentNode || document.body;
                 }
               "
-              v-model:value="categoryId"
+              v-model:value="valueproj"
               show-search
+        
               :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
               placeholder="请选择内容分类"
-              allow-clear
+        
               tree-default-expand-all
               :tree-data="options2222"
             >
@@ -213,7 +214,7 @@ export default {
         },
       ],
       calssifyList: [], //分类字典
-      categoryId: "",
+      valueproj:null,
       valuecreater: "",
       valuename: "",
       // currentFacePage: 1,
@@ -488,7 +489,7 @@ export default {
       state.loading=true
       let objn = {
         auditStatus: 1,
-        categoryId: state.categoryId,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -557,7 +558,7 @@ export default {
     const searchList = () => {
       let objn = {
         auditStatus: 1,
-        categoryId: state.categoryId,
+        categoryId: state.valueproj,
         createName: state.valuecreater,
         name: state.valuename,
         pageNo: state.currentPage,
@@ -622,7 +623,7 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      state.categoryId = "";
+      state.valueproj = null;
       state.valuecreater = null;
       state.valuename = null;
       getFaceList();

src/views/examine/ProjectReviewedN.vue

@@ -151,14 +151,23 @@ export default {
           ellipsis: true,
           width:"20%",
         },
-        // todo 根项目保存
-        // {
-        //   title: "所属项目",
-        //   dataIndex: "sourceBelongName",
-        //   key: "sourceBelongName",
-        //   align: "center",
-        //   width: "11%",
-        // },
+        {
+          title: "所属项目",
+          dataIndex: "topName",
+          key: "topName",
+          align: "center",
+          ellipsis: true,
+          width:"20%",
+          customRender: ({ record: { gaName, faName, name } }) => (
+              <div>
+                {faName
+                    ? gaName !== null
+                        ? gaName + "/" + faName
+                        : faName
+                    : name}
+              </div>
+          ),
+        },
         {
           title: "项目经理",
           dataIndex: "manager",

src/views/learningpath/LearningPath.vue

@@ -203,6 +203,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
+            
               <div
                 @click="chooseImg(item)"
                 v-for="(item, index) in imgData"
@@ -331,6 +332,7 @@
               <!-- <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" />
             <img class="im" src="../../assets/px.jpg" /> -->
+       
               <div
                 @click="chooseImg2(item)"
                 v-for="(item, index) in imgData"
@@ -807,8 +809,8 @@ export default {
         },
         {
           id: 3,
-          value: "已停用",
-          label: "已停用",
+          value: "已结束",
+          label: "已结束",
           classify: -1,
         },
       ],
@@ -865,7 +867,7 @@ export default {
     const handleOut1 = () => {
       state.pathName = "";
       state.pathBg = "";
-      state.pathBgId = "";
+      state.pathBgId =1;
       state.organizationSelectName = null;
       state.organizationSelectId = null;
       state.pathIntro = "";
@@ -1620,14 +1622,21 @@ export default {
             state.organizationSelectId = detail.organizationId;
             state.pathIntro = detail.remark;
             state.editPathId = id;
-            // console.log("state.imgData", state.imgData);
-            let arr = imgData;
-            for (let i = 0; i < arr.length; i++) {
+            let arr = imgData.value;
+            arr.forEach((item) => {
+              if (item.dictValue === state.pathBg) {
+                state.pathBgId = item.dictCode;
+
+              }
+            });
+
+            //for (let i = 0; i < arr.length; i++) {
              //  console.log("arr[i].dictValue", arr[i].dictValue, state.pathBg);
-              if (arr[i].dictValue === state.pathBg) {
-                state.pathBgId = arr[i].dictCode;
-              }
-            }
+            //  if (arr[i].dictValue === state.pathBg) {
+             //   state.pathBgId = arr[i].dictCode;
+
+           //   }
+          //  }
           }
         })
         .catch((err) => {

src/views/learningpath/LevelAdd.vue

@@ -1483,14 +1483,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gang",
-          key: "gang",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+        //  {
+         //   title: "岗位",
+          //  dataIndex: "gang",
+         //   key: "gang",
+         //   width: 110,
+          //  align: "center",
+         //   className: "h",
+        //  },
         {
           title: "当前关卡",
           dataIndex: "cur",

src/views/learningpath/LevelAddDetail.vue

@@ -1531,14 +1531,14 @@ export default {
           align: "center",
           className: "h",
         },
-        {
-          title: "岗位",
-          dataIndex: "gang",
-          key: "gang",
-          width: 110,
-          align: "center",
-          className: "h",
-        },
+       //   {
+         //   title: "岗位",
+         //   dataIndex: "gang",
+         //   key: "gang",
+          //  width: 110,
+          //  align: "center",
+          //  className: "h",
+        //  },
         {
           title: "当前关卡",
           dataIndex: "cur",

src/views/projectcenter/LibraryAdd.vue

@@ -538,24 +538,6 @@
                       }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{
-                        projectInfo.remark
-                      }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.courseSyncFlag"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
@@ -568,14 +550,32 @@
                       <TrainClass :value="projectInfo.systemId" :tag="true"></TrainClass>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="projectInfo.courseSyncFlag" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
-                      <a-radio v-model:checked="projectInfo.boeFlag"
+                      <a-radio v-model:checked="projectInfo.boeFlag"  :disabled="true"
                         ><span style="color: #333333">BOEU实施</span></a-radio
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{
+                          projectInfo.remark
+                        }}</span>
+                    </div>
+                  </div>
                 </div>
               </div>
             </a-tab-pane>

src/views/projectcenter/ProjectAdd.vue

@@ -36,12 +36,19 @@
               class="nameimg"
               src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">项目名称</div>
+            <div class="inname">
+              {{ ptojectType == 3 ? "班级名称" : "项目名称" }}
+            </div>
           </div>
           <div class="in">
-            <NameInput placeholder="请输入项目名称" v-model:value="projectInfo.name"
-                       v-model:validate="projectInfo.validate" :maxlength="30" show-count
-                       :id="projectInfo.projectId"></NameInput>
+            <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">
@@ -211,6 +218,15 @@
             />
           </div>
         </div>
+
+        <div v-if="projectInfo.status == -5" class="name name2">
+          <div class="namebox">
+            <div class="inname" style="margin-top: 13px">审核意见</div>
+          </div>
+          <div class="description">
+            {{ auditDescription }}
+          </div>
+        </div>
       </div>
       <div class="template">
         <div class="name">
@@ -247,8 +263,7 @@
           class="btn1"
           style="margin-left: 20px"
           >确定
-        </a-button
-        >
+        </a-button>
       </div>
     </div>
   </div>
@@ -267,6 +282,8 @@ import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
 import { changeOwnership, scrollLoad } from "@/api/method";
 import { storage } from "../../api/storage";
+import * as api2 from "../../api/indexAudit";
+import { validateName } from "@/api/index1";
 
 export default {
   name: "projectAdd",
@@ -297,6 +314,7 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
+      auditDescription: "",
     });
 
     // 封面图选择
@@ -312,6 +330,8 @@ export default {
       state.viewDetail = routers.query.viewDetail;
       getProjectInfo();
       getTemplate();
+      state.ptojectType = routers.query.ptojectType;
+      // console.log("routers.query.ptojectType", routers.query.ptojectType);
     });
 
     watch(routers.query, () => {
@@ -340,6 +360,25 @@ export default {
               state.projectInfo.endTime,
             ];
             state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+            if (Number(state.projectInfo.status) === -5) {
+              let obj = {
+                project_id: state.projectInfo.projectId,
+                type: 1,
+                pageNo: 1,
+                pageSize: 1,
+              };
+              api2.auditList(obj).then((d) => {
+                if (d.data.code === 200) {
+                  let res = d.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
+                      : "-";
+                  }
+                }
+              });
+            }
           });
     }
 
@@ -416,15 +455,27 @@ export default {
       return true;
     }
 
-    const createProject = () => {
+    const createProject = async () => {
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
       }
+      /** 
       if (!state.projectInfo.validate) {
         message.destroy();
         message.warning('项目名称重复，请修改名称！');
         return;
+      }*/
+      const offName = await validateName({
+        name: state.projectInfo.name,
+        type: 1,
+        id: state.projectInfo.projectId,
+      }).then((res) => {
+        return res.data.data == 1;
+      });
+      if (offName) {
+        message.destroy();
+        return message.warning("项目名称重复，请重新填写");
       }
       state.projectInfo.type = 3;
       state.projectInfo.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
@@ -663,7 +714,10 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
-
+        .description {
+          margin-top: 14px;
+          margin-left: 11px;
+        }
         .ant-input-textarea {
           .ant-input {
             height: 88px;

src/views/projectcenter/ProjectManage.vue

@@ -47,12 +47,7 @@
           <div class="addTime">创建时间：</div>
           <a-range-picker
             v-model:value="searchParam.valueDate"
-              :show-time="{
-              defaultValue: [
-                moment('00:00:00', 'HH:mm:ss'),
-                moment('23:59:59', 'HH:mm:ss'),
-              ],
-            }"
+            format="YYYY-MM-DD"
             style="border-radius: 8px; height: 40px; margin-left: 5px"
             :placeholder="['      开始时间', '        结束时间']"
             valueFormat="X"
@@ -179,7 +174,7 @@
               />
             </div>
             <div class="inname">项目名称:</div>
-            <div class="in">
+            <div class="in pro">
               <NameInput
                 placeholder="请输入项目名称"
                 v-model:value="projectInfo.name"
@@ -831,6 +826,8 @@ import dayjs from "dayjs";
 import * as moment from "moment";
 import { changeOwnership } from "@/api/method";
 import NameInput from "@/components/project/NameInput";
+import { validateName } from "@/api/index1";
+import { toDate } from "../../api/method";
 
 export default {
   name: "projectManage",
@@ -923,7 +920,7 @@ export default {
       { value: 1, label: "审核中" },
       { value: 2, label: "审核通过" },
       { value: 3, label: "已发布" },
-      {value: -2, label: "未通过"},
+      { value: -5, label: "未通过" },
       { value: -1, label: "已结束" },
     ]);
     const searchReset = () => {
@@ -958,7 +955,7 @@ export default {
     }
 
     // 创建多层项目
-    const createStoreyProject = () => {
+    const createStoreyProject = async () => {
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
@@ -969,10 +966,22 @@ export default {
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
       }
+      /**
       if (!state.projectInfo.validate) {
         message.destroy();
         message.warning("项目名称重复，请修改名称！");
         return;
+      } */
+      const offName = await validateName({
+        name: state.qdms_inputV1,
+        type: 1,
+        id: state.projectInfo.projectId,
+      }).then((res) => {
+        return res.data.data == 1;
+      });
+      if (offName) {
+        message.destroy();
+        return message.warning("项目名称重复，请重新填写");
       }
       api.createProject(state.projectInfo).then((res) => {
         state.doublepro = false;
@@ -1315,7 +1324,7 @@ export default {
         title: "项目名称",
         dataIndex: "name",
         key: "name",
-        width: 480,
+        width: 380,
         // align: "center",
         ellipsis: true,
         // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -1582,6 +1591,7 @@ export default {
                         parentId: value.record.projectId,
                         parentName:
                           value.record.parentName + "——" + value.record.name,
+                        ptojectType: 3,
                       },
                     });
                   }}
@@ -1687,16 +1697,20 @@ export default {
           beginTime:
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
-                      ? state.searchParam.valueDate[0]
+              ? toDate(
+          new Date(state.searchParam.valueDate[0].$d).getTime() / 1000,
+          "Y-M-D")
               : "",
           endTime:
             state.searchParam.valueDate &&
             state.searchParam.valueDate.length === 2
-                      ? state.searchParam.valueDate[1]
+              ? toDate(
+          new Date(state.searchParam.valueDate[1].$d).getTime() / 1000,
+          "Y-M-D")
               : "",
         })
         .then((res) => {
-              console.log(res);
+          // console.log("搜索", res, state.searchParam);
           state.tableDataTotal = Number(res.data.data.total);
           const data = res.data.data.rows;
           initDataSublist("", data);
@@ -2064,7 +2078,6 @@ export default {
     margin: 20px 38px 30px;
 
     .ant-table-thead > tr > th {
-
       background-color: #eff4fc;
     }
   }
@@ -2092,6 +2105,9 @@ export default {
     font-weight: 400;
     color: #4ea6ff;
     margin-right: -45px;
+    display: flex;
+    justify-content: right;
+    margin-right: 18px;
 
     // line-height: 36px;
     .operation1 {

src/views/projectcenter/TaskPage.vue

@@ -707,6 +707,8 @@
                         placeholder="请输入姓名"
                       />
                     </div>
+                          <!-- 2022-11-30注释 后面放开 -->
+                    <!--
                     <div
                       style="
                         display: flex;
@@ -715,14 +717,14 @@
                         margin-bottom: 10px;
                       "
                     >
+               
                       <div class="groupname">小组名称：</div>
                       <a-input
                         v-model:value="valuestugroup"
                         placeholder="请输入小组名称"
                       />
                     </div>
-                    <!-- 2022-11-30注释 后面放开 -->
-                    <!-- <div
+                    <div
                       style="
                         display: flex;
                         align-items: center;
@@ -1144,22 +1146,6 @@
                       <span style="color: #999999">{{ sourceBelong }}</span>
                     </div>
                   </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>项目说明：</span></div>
-                    <div class="setc_main">
-                      <span style="color: #999999">{{ remark }}</span>
-                    </div>
-                  </div>
-                  <div class="set_content">
-                    <div class="setc_name"><span>同步学习记录：</span></div>
-                    <div class="setc_main">
-                      <a-radio v-model:checked="checkedSty" :disabled="true"
-                        ><span style="color: #333333"
-                          >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-                        ></a-radio
-                      >
-                    </div>
-                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>项目级别：</span></div>
                     <div class="setc_main">
@@ -1182,6 +1168,16 @@
                       ></span>
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>同步学习记录：</span></div>
+                    <div class="setc_main">
+                      <a-radio v-model:checked="checkedSty" :disabled="true"
+                      ><span style="color: #333333"
+                      >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+                      ></a-radio
+                      >
+                    </div>
+                  </div>
                   <div class="set_content">
                     <div class="setc_name"><span>是否BOEU实施：</span></div>
                     <div class="setc_main">
@@ -1190,6 +1186,12 @@
                       >
                     </div>
                   </div>
+                  <div class="set_content">
+                    <div class="setc_name"><span>项目说明：</span></div>
+                    <div class="setc_main">
+                      <span style="color: #999999">{{ remark }}</span>
+                    </div>
+                  </div>
                   <div class="set_content" v-if="isPass">
                     <div class="setc_name"><span>审核意见：</span></div>
                     <div class="setc_main">
@@ -3106,7 +3108,7 @@ export default {
           title: "姓名",
           dataIndex: "name",
           key: "name",
-          // width: 30,
+           width:"20%",
           align: "left",
           className: "h",
           // scopedSlots: { customRender: "action" }, //引入的插槽
@@ -3143,47 +3145,49 @@ export default {
           title: "部门",
           dataIndex: "bum",
           key: "bum",
-          // width: 50,
+          width:"10%",
           align: "center",
           className: "h",
+          ellipsis: true,
         },
-        {
-          title: "岗位",
-          dataIndex: "gangw",
-          key: "gangw",
+        //  {
+         //   title: "岗位",
+         //   dataIndex: "gangw",
+         //   key: "gangw",
           // width: 50,
-          align: "center",
-          className: "h",
-        },
-        {
-          title: "所属小组",
-          dataIndex: "group",
-          key: "group",
+          //  align: "center",
+           // className: "h",
+        //  },
+        //  {
+          //  title: "所属小组",
+          //  dataIndex: "group",
+         //   key: "group",
           // width: 50,
-          align: "center",
-          className: "h",
-        },
+          //  align: "center",
+          //  className: "h",
+         // },
          {
             title: "进度",
             dataIndex: "progress",
             key: "progress",
-          // width: 30,
+            width:"10%",
             align: "center",
             className: "h",
+            ellipsis: true,
           },
-        {
-          title: "证书",
-          dataIndex: "diploma",
-          key: "diploma",
+        //  {
+         //   title: "证书",
+          //  dataIndex: "diploma",
+          //  key: "diploma",
           // width: 30,
-          align: "center",
-          className: "h",
-        },
+          //  align: "center",
+           // className: "h",
+        //  },
         {
           title: "最近学习时间",
           dataIndex: "stutime",
           key: "stutime",
-          // width: 50,
+          width:"20%",
           align: "center",
           className: "h",
           // sorter: {
@@ -3195,15 +3199,16 @@ export default {
           title: "加入方式",
           dataIndex: "putin",
           key: "putin",
-          // width: 40,
+          width:"10%",
           align: "center",
           className: "h",
+          ellipsis: true,
         },
         {
           title: "操作",
           dataIndex: "operation",
           key: "operation",
-          // width: 60,
+          width:"20%",
           align: "center",
           className: "h",
           scopedSlots: { customRender: "action" }, //引入的插槽

src/views/projectcenter/TemplateLibrary.vue

@@ -11,8 +11,9 @@
                   height: 40px;
                   border-radius: 8px;
                   margin-right: 14px;
-                " placeholder="请输入项目名称" />
+                " placeholder="请输入模板名称" />
             </div>
+            <!--
             <div class="inpbox1">
               <span>创建时间：</span>
               <a-date-picker v-model:value="time" type="date" placeholder="创建时间" style="
@@ -22,6 +23,8 @@
                 margin-right: 14px;
                 " />
             </div>
+-->
+
           </div>
         </div>
         <div class="tmplh_btn">

src/views/projectcenter/templateAdd.vue

@@ -6,7 +6,7 @@
       <div
           @click="backPage"
           style="cursor: pointer"
-        to="/manage-release/libraryAdd"
+          to="/libraryAdd"
           class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
@@ -31,18 +31,6 @@
             />
           </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>
-          </div>
-        </div>
         <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
@@ -132,37 +120,6 @@
             ></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"
-            />
-          </div>
-        </div>
-        <div class="name name2">
-          <div class="namebox">
-            <div class="inname">同步学习记录</div>
-          </div>
-          <div class="in">
-            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-checkbox
-            >
-          </div>
-        </div>
         <div class="name">
           <div class="namebox">
             <img
@@ -202,6 +159,39 @@
             </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"
+            />
+          </div>
+        </div>
       </div>
     </div>
     <div class="footer">
@@ -220,7 +210,6 @@ import { ref, onMounted, watch } from "vue";
 import {message} from "ant-design-vue";
 import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/indexTemplate";
-import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
@@ -231,7 +220,7 @@ const router = useRouter();
 const store = useStore();
 const projectInfo = ref({});
 const projectPic = ref([]);
-
+const courseSyncFlag = ref(false)
 onMounted(() => {
   getDetail();
   projectPic.value = store.state.projectPic.map((e) => ({
@@ -255,6 +244,7 @@ const getDetail = () =>
         projectInfo.value.beginTime,
         projectInfo.value.endTime,
       ];
+      projectInfo.value.courseSyncFlag = !!projectInfo.value.courseSyncFlag
     });
 
 const backPage = () => {
@@ -290,6 +280,7 @@ const createProject = () => {
       return;
     }
   }
+  projectInfo.value.courseSyncFlag = courseSyncFlag.value ? 1 : 0;
   api
       .templateEdit({
         ...projectInfo.value,
@@ -311,6 +302,7 @@ function managerChange(e, l, d, t) {
 .active {
   border: 2px solid rgba(78, 166, 255, 1);
 }
+
 .projectAdd {
   width: 100%;
   // height: inherit;

src/views/research/ManagePage.vue

@@ -150,12 +150,12 @@ export default {
           dataIndex: "department",
           key: "department",
         },
-        {
-          width: 50,
-          title: "岗位",
-          dataIndex: "post",
-          key: "post",
-        },
+        //  {
+         //   width: 50,
+         //   title: "岗位",
+         //   dataIndex: "post",
+          //  key: "post",
+        //  },
         {
           title: "项目",
           width: 50,

src/views/research/ResearchManage.vue

@@ -426,6 +426,7 @@ export default {
             <div class="operation">
               {value.state === "2" ? (
                 <div class="fb">
+                 { /** 
                   <div class="jc"
                     onClick={() => {
                       handleToManagepage(value, "/managepage");
@@ -433,6 +434,7 @@ export default {
                   >
                     管理
                   </div>
+              */  }
                   <div
                     class="jc"
                     onClick={() => {

vue.config.js

@@ -11,22 +11,18 @@ const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
     publicPath: "/manage-release",
     // transpileDependencies: true,
-    // devServer: {
-    //     port: 8080,
-    //     proxy: {
-    //         "/manageApi": {
-    //             target: "http://localhost:30001/",
-    //             changeOrigin: true, //表示是否改变原域名
-    //             // secure: false,
-    //             // ws: false, //表示WebSocket协议
-    //             pathRewrite: {
-    //                 "^/manageApi": "",
-    //             },
-    //         },
-    //         "/userbasic": {
-    //             target: "https://u-pre.boe.com",
-    //             changeOrigin: true,
-    //         },
-    //     },
-    // },
+    devServer: {
+        port: 8080,
+        proxy: {
+            "/manageApi": {
+                target: process.env.VUE_APP_PROXY_URL,
+                changeOrigin: true, //表示是否改变原域名
+                // secure: false,
+                // ws: false, //表示WebSocket协议
+                pathRewrite: {
+                    "^/manageApi": "",
+                },
+            },
+        },
+    },
 });