From d9608d69e37f32bd53d60a8176c88784f6356716 Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Tue, 13 Dec 2022 17:56:18 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                              | 1 +
 src/components/BreadCrumb.vue           | 2 +-
 src/views/courselibrary/courseModal.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e297b87..92a8e40b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ package-lock.json
 src/api/config.js
 src/api/config.js
 src/api/config.js
+src/api/config.js
diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue
index 65dbfae8..b5e57c20 100644
--- a/src/components/BreadCrumb.vue
+++ b/src/components/BreadCrumb.vue
@@ -70,7 +70,7 @@ export default {
               href: "/leveladd",
             },
             {
-              name: "管理",
+              name: "关卡",
             },
           ];
         }
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index 104673b8..adf79a38 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/src/views/courselibrary/courseModal.vue
@@ -426,7 +426,7 @@ export default defineComponent({
       hideshow: true,
       ft_eidt: false,
       attach: "",
-      validate:false,
+      validate:true,
       ft_hs: false,
       addLoading: false,
       statusJuJue: 0,

From 68f5a4957e353e87cfd733560bd00db0ce40f655 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Tue, 13 Dec 2022 21:49:54 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                       |   2 +-
 src/components/NavTop.vue               |   2 +-
 src/views/projectcenter/templateAdd.vue | 220 +++++++++++++-----------
 3 files changed, 119 insertions(+), 105 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index b726a884..8e180c47 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -2,7 +2,7 @@
  * @Author: lixg lixg@dongwu-inc.com
  * @Date: 2022-11-21 14:32:52
  * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-12-13 09:24:16
+ * @LastEditTime: 2022-12-13 15:30:27
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 306d7b78..797a6847 100644
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -76,7 +76,7 @@ export default {
         {
           id: 1,
           name: "管理员",
-          go: "/manage/learningpath",
+          go: "/learningpath",
         },
         {
           id: 2,
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 6d7ae89d..839f41b3 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -4,10 +4,10 @@
     <div class="header">
       <span class="title">创建/编辑单层模板</span>
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/manage/libraryAdd"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/libraryAdd"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -17,25 +17,25 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">模板名称</div>
           </div>
           <div class="in">
             <a-input
-                v-model:value="projectInfo.name"
-                placeholder="请输入模板名称"
-                show-count
-                :maxlength="30"
+              v-model:value="projectInfo.name"
+              placeholder="请输入模板名称"
+              show-count
+              :maxlength="30"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">分类</div>
           </div>
@@ -43,92 +43,97 @@
             <ProjectClass v-model:value="projectInfo.category"></ProjectClass>
           </div>
         </div>
-        <div class="name" style="align-items: flex-start;">
+        <div class="name" style="align-items: flex-start">
           <div class="namebox" style="margin-top: 10px">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">封面图</div>
           </div>
-          <div class="in select" style="flex:1">
+          <div class="in select" style="flex: 1">
             <a-select
-                :getPopupContainer="
-                        (triggerNode) => {
-                          return triggerNode.parentNode || document.body;
-                        }
-                      "
-                v-model:value="projectInfo.picUrl"
-                dropdownClassName="dropdown-style"
-                style="width: 440px"
-                placeholder="请选择"
-                :options="projectPic"
-                @change="handleChangeSelect"
-                allowClear
+              :getPopupContainer="
+                (triggerNode) => {
+                  return triggerNode.parentNode || document.body;
+                }
+              "
+              v-model:value="projectInfo.picUrl"
+              dropdownClassName="dropdown-style"
+              style="width: 440px"
+              placeholder="请选择"
+              :options="projectPic"
+              @change="handleChangeSelect"
+              allowClear
             ></a-select>
             <img
-                style="width:100px;height:100px;margin-top:20px;border-radius: 8px"
-                v-if="projectInfo.picUrl"
-                :src="projectInfo.picUrl"
-                alt="avatar"
+              style="
+                width: 100px;
+                height: 100px;
+                margin-top: 20px;
+                border-radius: 8px;
+              "
+              v-if="projectInfo.picUrl"
+              :src="projectInfo.picUrl"
+              alt="avatar"
             />
             <div class="i_bottom">
-                      <span style="color: #999ba3">
-                        高宽比为16:9 (如:800*450) png或jpg图片
-                      </span>
+              <span style="color: #999ba3">
+                高宽比为16:9 (如:800*450) png或jpg图片
+              </span>
             </div>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="projectInfo.rangeTime"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-                @change="timeChange"
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm:ss"
+              @change="timeChange"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
@@ -138,11 +143,11 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
             />
           </div>
         </div>
@@ -151,24 +156,23 @@
             <div class="inname">同步学习记录</div>
           </div>
           <div class="in">
-            <a-checkbox
-                v-model:checked="projectInfo.courseSyncFlag"
-            ><span
+            <a-checkbox v-model:checked="projectInfo.courseSyncFlag"
+              ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-checkbox
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
             >
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目级别</div>
           </div>
@@ -179,8 +183,8 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">培训体系</div>
           </div>
@@ -191,15 +195,13 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">是否BOEU实施</div>
           </div>
           <div class="in">
-            <a-radio-group
-                v-model:value="projectInfo.boeFlag"
-            >
+            <a-radio-group v-model:value="projectInfo.boeFlag">
               <a-radio :value="1">是</a-radio>
               <a-radio :value="0">否</a-radio>
             </a-radio-group>
@@ -210,20 +212,18 @@
     <div class="footer">
       <div class="btn">
         <a-button v-on:click="createProject" type="primary" class="btn1"
-        >确定
-        </a-button
-        >
+          >确定
+        </a-button>
         <a-button @click="backPage" class="btn2">取消</a-button>
       </div>
     </div>
   </div>
 </template>
 <script setup>
-
-import {useStore} from "vuex";
-import {ref, onMounted, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRouter, useRoute} from "vue-router";
+import { useStore } from "vuex";
+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";
@@ -234,31 +234,41 @@ import ProjectLevel from "@/components/project/ProjectLevel";
 const route = useRoute();
 const router = useRouter();
 const store = useStore();
-const projectInfo = ref({})
-const projectPic = ref([])
+const projectInfo = ref({});
+const projectPic = ref([]);
 
 onMounted(() => {
-  getDetail()
-  projectPic.value = store.state.projectPic.map((e) => ({value: e.dictValue, label: e.dictName}));
-})
+  getDetail();
+  projectPic.value = store.state.projectPic.map((e) => ({
+    value: e.dictValue,
+    label: e.dictName,
+  }));
+});
 
-watch(() => route.query.projectTemplateId, () => {
-  getDetail()
-})
+watch(
+  () => route.query.projectTemplateId,
+  () => {
+    getDetail();
+  }
+);
 
-const getDetail = () => route.query.projectTemplateId && api.templateDetail(route.query.projectTemplateId)
-    .then((res) => {
-      projectInfo.value = res.data.data.projectTemplateInfo;
-      projectInfo.value.rangeTime = [projectInfo.value.beginTime, projectInfo.value.endTime]
-    })
+const getDetail = () =>
+  route.query.projectTemplateId &&
+  api.templateDetail(route.query.projectTemplateId).then((res) => {
+    projectInfo.value = res.data.data.projectTemplateInfo;
+    projectInfo.value.rangeTime = [
+      projectInfo.value.beginTime,
+      projectInfo.value.endTime,
+    ];
+  });
 
 const backPage = () => {
   router.back();
 };
 
 const handleChangeSelect = (value) => {
-  projectInfo.value.picUrl = value
-}
+  projectInfo.value.picUrl = value;
+};
 
 function timeChange(e) {
   if (e && e.length === 2) {
@@ -289,18 +299,22 @@ const createProject = () => {
       return;
     }
   }
-  api.templateEdit({...projectInfo.value, courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0}).then(() => {
-    message.destroy();
-    message.success("编辑成功");
-    router.back()
-  })
+  api
+    .templateEdit({
+      ...projectInfo.value,
+      courseSyncFlag: projectInfo.value.courseSyncFlag ? 1 : 0,
+    })
+    .then(() => {
+      message.destroy();
+      message.success("编辑成功");
+      router.back();
+    });
 };
 
 function managerChange(e, l, d, t) {
-  projectInfo.value.valuesourceBelongId = d
-  projectInfo.value.sourceBelongName = t
+  projectInfo.value.valuesourceBelongId = d;
+  projectInfo.value.sourceBelongName = t;
 }
-
 </script>
 <style lang="scss">
 .projectAdd {

From 7c8ae62f70c7c5349c54c692b10c9dd60645f71e Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 07:27:04 +0800
Subject: [PATCH 3/6] bug

---
 src/components/drawers/AddInvist.vue      |   4 +-
 src/components/drawers/AddOnline.vue      |  38 +++--
 src/components/drawers/SelFacet.vue       | 168 +++++++++++++++++++++-
 src/components/drawers/SelectTest.vue     |  20 +--
 src/components/project/NameInput.vue      |  21 +++
 src/views/courselibrary/courseModal.vue   |   4 +-
 src/views/examine/CourseReviewed.vue      |   2 +-
 src/views/examine/CourseReviewedN.vue     |   2 +-
 src/views/learningpath/LearningPath.vue   |   4 +-
 src/views/projectcenter/ProjectAdd.vue    |  46 +++++-
 src/views/projectcenter/ProjectManage.vue |  21 ++-
 11 files changed, 287 insertions(+), 43 deletions(-)

diff --git a/src/components/drawers/AddInvist.vue b/src/components/drawers/AddInvist.vue
index 1ba2c07a..2a3ee083 100644
--- a/src/components/drawers/AddInvist.vue
+++ b/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"
@@ -192,7 +192,7 @@ export default {
             } else {
               RouterEditTask({
                 chapterId: props.isactive,
-                courseTaskId: state.assessmentId,
+                courseId: state.assessmentId,
                 name: state.assessmentName,
                 routerId: props.routerId,
                 routerTaskId: props.routerTaskId || 0,
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index d4114a0d..ced345f9 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/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(() => {
-                    message.destroy();
-                    message.success(
+                  .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 ? "编辑" : "新增"}关卡任务失败`
diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index 15dccaec..eeb7414e 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/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"
@@ -167,8 +167,8 @@ const columns1 = [
   {
     title: "内容分类",
     width: "15%",
-    dataIndex: "content",
-    key: "content",
+    dataIndex: "category",
+    key: "category",
     align: "center",
   },
   {
@@ -216,6 +216,129 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      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",
+            },
+          ],
+        },
+      ],
       classTableData: [
         // {
         //   key: "1",
@@ -310,6 +433,7 @@ export default {
 
     const getClassData = (tabledata) => {
       let data = tabledata;
+      let tData =[];
       let array = [];
       data.map((value) => {
         let obj = {
@@ -320,11 +444,44 @@ export default {
           creator: value.createName || "-",
           time: value.publishTime,
           categoryId: value.categoryId,
+          category:"",
           //需要判断content
         };
+        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(value.categoryId)
+            ) {
+              console.log();
+              value.category = options.value[i].children[j].title;
+             
+              return false;
+            }
+          }
+        }
         array.push(obj);
+     
       });
-      state.classTableData = array;
+      array.forEach((itm) => {
+        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(itm.categoryId)
+            ) {
+              console.log("找到了",i);
+              itm.category = options.value[i].children[j].title;
+              tData.push(itm);
+              return false;
+            }
+          }
+        }
+        });
+        console.log("结果：",tData);
+      state.classTableData = tData;
     };
     /**
      const options1 = ref([
@@ -369,6 +526,7 @@ export default {
       afterVisibleChange,
       closeDrawer,
 
+
       columns1,
       getClassData,
       handleChange,
diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue
index b12a379e..ca8a5db4 100644
--- a/src/components/drawers/SelectTest.vue
+++ b/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>
@@ -197,15 +197,15 @@ export default {
             className: "h",
             ellipsis: true,
           },
-          {
-            title: "最近更新时间",
-            dataIndex: "sysUpdateTime",
-            key: "sysUpdateTime",
-            ellipsis: true,
-            width: "20%",
-            align: "center",
-            className: "h",
-          },
+         //   {
+         //     title: "最近更新时间",
+         //     dataIndex: "sysUpdateTime",
+         //   //    key: "sysUpdateTime",
+          //    ellipsis: true,
+          //    width: "20%",
+          //    align: "center",
+           //   className: "h",
+         //   },
         ];
         return columns;
       }
diff --git a/src/components/project/NameInput.vue b/src/components/project/NameInput.vue
index d898b85a..ed8389e6 100644
--- a/src/components/project/NameInput.vue
+++ b/src/components/project/NameInput.vue
@@ -67,6 +67,27 @@ function validateProName() {
 
 </script>
 <style lang="scss">
+.in{
+  .pro{
+  .ant-input-affix-wrapper {
+    position: relative;
+    display: inline-block;
+    width: 99%;
+    min-width: 0;
+    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;
diff --git a/src/views/courselibrary/courseModal.vue b/src/views/courselibrary/courseModal.vue
index adf79a38..3c19074f 100644
--- a/src/views/courselibrary/courseModal.vue
+++ b/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"
diff --git a/src/views/examine/CourseReviewed.vue b/src/views/examine/CourseReviewed.vue
index 9babe163..05d0864a 100644
--- a/src/views/examine/CourseReviewed.vue
+++ b/src/views/examine/CourseReviewed.vue
@@ -505,7 +505,7 @@ export default {
       console.log(data);
     };
     const reset = () => {
-      (state.valueproj = ""),
+      (state.valueproj = null),
         (state.valuecreater = null),
         (state.valuename = null),
         getList();
diff --git a/src/views/examine/CourseReviewedN.vue b/src/views/examine/CourseReviewedN.vue
index 635e46a8..65e91f33 100644
--- a/src/views/examine/CourseReviewedN.vue
+++ b/src/views/examine/CourseReviewedN.vue
@@ -623,7 +623,7 @@ export default {
       state.tableData1 = array;
     };
     const reset = () => {
-      state.valueproj = "";
+      state.valueproj = null;
       state.valuecreater = null;
       state.valuename = null;
       getFaceList();
diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue
index 8c76fb9d..69f732e7 100644
--- a/src/views/learningpath/LearningPath.vue
+++ b/src/views/learningpath/LearningPath.vue
@@ -809,8 +809,8 @@ export default {
         },
         {
           id: 3,
-          value: "已停用",
-          label: "已停用",
+          value: "已结束",
+          label: "已结束",
           classify: -1,
         },
       ],
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index 0bfdb837..f5914863 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -211,6 +211,14 @@
             />
           </div>
         </div>
+        <div 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">
@@ -267,6 +275,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 +307,7 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
+      auditDescription:"",
     });
 
     // 封面图选择
@@ -340,6 +351,24 @@ 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,16 +445,24 @@ 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;
       api.createProject(state.projectInfo).then((res) => {
@@ -663,7 +700,10 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
-
+        .description{
+          margin-top: 14px;
+          margin-left: 11px;
+        }
         .ant-input-textarea {
           .ant-input {
             height: 88px;
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index aaab9c1e..67bf4807 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -44,7 +44,7 @@
           ></a-select>
         </div>
         <div class="select addTimeBox">
-          <div class="addTime">项目起止时间：</div>
+          <div class="addTime">创建时间：</div>
           <a-range-picker
               v-model:value="searchParam.valueDate"
               :show-time="{
@@ -179,7 +179,7 @@
               />
             </div>
             <div class="inname">项目名称:</div>
-            <div class="in">
+            <div class="in pro">
               <NameInput
                   placeholder="请输入项目名称"
                   v-model:value="projectInfo.name"
@@ -831,6 +831,7 @@ 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";
 
 export default {
   name: "projectManage",
@@ -958,7 +959,7 @@ export default {
     }
 
     // 创建多层项目
-    const createStoreyProject = () => {
+    const createStoreyProject = async() => {
       // 接口需要传递的参数信息
       const errorMsgs = {
         name: "请输入项目名称",
@@ -969,11 +970,19 @@ 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;
         message.destroy();
@@ -1355,6 +1364,7 @@ export default {
                       dayjs().isBefore(value.record.end) ? "进行中" : "已结束",
                   "-1": () => "已结束",
                   "-5": () => "草稿",
+               
                 }[value.record.status + ""]() || ""
                     : "-"}
               </div>
@@ -2092,6 +2102,9 @@ export default {
     font-weight: 400;
     color: #4ea6ff;
     margin-right: -45px;
+    display: flex;
+    justify-content: right;
+    margin-right: 18px;
 
     // line-height: 36px;
     .operation1 {

From aef73624d61bf4a92b9e459fa985d5c160bbcf2a Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 08:39:46 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=9D=A2=E6=8E=88=E8=AF=BE=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/SelFacet.vue | 104 +++++++++++++++++-----------
 1 file changed, 63 insertions(+), 41 deletions(-)

diff --git a/src/components/drawers/SelFacet.vue b/src/components/drawers/SelFacet.vue
index eeb7414e..441eb6d2 100644
--- a/src/components/drawers/SelFacet.vue
+++ b/src/components/drawers/SelFacet.vue
@@ -117,7 +117,7 @@
               :loading="tableDataTotal === -1 ? true : false"
               :pagination="false"
           />
-          <div class="tableBox" style="margin-top: 85px;">
+          <div class="tableBox" style="margin-top:85px;">
           <div class="pa" style="display:flex;justify-content:center;">
             <a-pagination
                 v-if="tableDataTotal > 10"
@@ -162,6 +162,7 @@ const columns1 = [
     width: "30%",
     dataIndex: "name",
     key: "name",
+    ellipsis: true,
     
   },
   {
@@ -170,6 +171,7 @@ const columns1 = [
     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,
   },
 ];
 
@@ -216,6 +221,17 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
+      classTableData: [
+        // {
+        //   key: "1",
+        //   num: "JDF2022071100001",
+        //   name: "时间管理课程",
+        //   content: "通用力",
+        //   teacher: "BOE教师",
+        //   creator: "管理员",
+        //   time: "2022-10-31 23:12:00",
+        // }
+      ],
       options2222: [
         {
           title: "领导力",
@@ -339,17 +355,6 @@ export default {
           ],
         },
       ],
-      classTableData: [
-        // {
-        //   key: "1",
-        //   num: "JDF2022071100001",
-        //   name: "时间管理课程",
-        //   content: "通用力",
-        //   teacher: "BOE教师",
-        //   creator: "管理员",
-        //   time: "2022-10-31 23:12:00",
-        // }
-      ],
       currentPage: 1,
       tableDataTotal: null,
       pageSize: 10,
@@ -433,8 +438,8 @@ export default {
 
     const getClassData = (tabledata) => {
       let data = tabledata;
-      let tData =[];
       let array = [];
+      let options = state.options2222;    
       data.map((value) => {
         let obj = {
           key: value.offcourseId,
@@ -447,43 +452,60 @@ export default {
           category:"",
           //需要判断content
         };
-        let options = state.options2222;      
+        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(value.categoryId)
+              String(id)
             ) {
               console.log();
-              value.category = options.value[i].children[j].title;
+              category = options.value[i].children[j].title;
              
-              return false;
+              return category;
             }
           }
         }
-        array.push(obj);
-     
-      });
-      array.forEach((itm) => {
-        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(itm.categoryId)
-            ) {
-              console.log("找到了",i);
-              itm.category = options.value[i].children[j].title;
-              tData.push(itm);
-              return false;
-            }
-          }
-        }
-        });
-        console.log("结果：",tData);
-      state.classTableData = tData;
-    };
-    /**
+      return category;
+    }
+
+ 
      const options1 = ref([
      {
         value: 0,
@@ -526,7 +548,6 @@ export default {
       afterVisibleChange,
       closeDrawer,
 
-
       columns1,
       getClassData,
       handleChange,
@@ -536,6 +557,7 @@ export default {
       rowSelection,
       search,
       submitCourse,
+     
       // change,
     };
   },

From 428a968f12a8cf7be864782dd022bb72007c727d Mon Sep 17 00:00:00 2001
From: zhangyc <zhangyc@dongwu-inc.com>
Date: Wed, 14 Dec 2022 08:47:37 +0800
Subject: [PATCH 5/6] 404

---
 vue.config.js | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/vue.config.js b/vue.config.js
index 23d6b8f8..341e4b39 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,27 +6,22 @@
  * @FilePath: /fe-manage/vue.config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
-const {defineConfig} = require("@vue/cli-service");
-
+const { defineConfig } = require("@vue/cli-service");
 module.exports = defineConfig({
-    publicPath: "/manage",
-    // 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,
-    //         },
-    //     },
-    // },
+  publicPath: "/manage",
+  // transpileDependencies: true,
+  devServer: {
+    port: 8080,
+    proxy: {
+      "/manageApi": {
+         target:"http://111.231.196.214:30001/",
+          changeOrigin: true, //表示是否改变原域名
+        // secure: false,
+        // ws: false, //表示WebSocket协议
+        pathRewrite: {
+          "^/manageApi": "",
+        },
+      },
+    },
+  },
 });

From 0382f7ae1231deb36d6740ab953b6ed2a025ad03 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 09:03:23 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                        |   2 +-
 src/components/drawers/AddTest.vue | 400 +++++++++++++----------------
 2 files changed, 181 insertions(+), 221 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 01c9c500..2354d8c4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -44,7 +44,7 @@ export default defineComponent({
     const store = useStore();
     const isLogin = ref(false);
     // console.log("router", router.getRoutes(), route);
-    console.log("版本0.9.12------------");
+    console.log("版本0.9.13------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index b02f68ea..ca1a2075 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -33,10 +33,10 @@
           外部考试
         </button> -->
       </div>
-  
-        <div class="contentMain">
-          <div class="main_left">
-            <div class="main_item">
+
+      <div class="contentMain">
+        <div class="main_left">
+          <div class="main_item">
             <div class="signbox">
               <div class="sign">
                 <img
@@ -49,13 +49,13 @@
             <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"
               />
             </div>
           </div>
-     
+
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -70,18 +70,12 @@
               <button class="xkbtn" @click="selectTest">
                 {{ chooseCourse ? "重选" : "选择" }}试卷
               </button>
-              <div   v-if="paperName != ''">
-                <a-tag
-                 
-                    closable
-                    color="processing"
-                    @close="delTag"
-                  >
-                    <span style="font-size: 14px; line-height: 33px">{{
-                      paperName
-                    }}</span>
-                  </a-tag>
-               
+              <div v-if="paperName != ''">
+                <a-tag closable color="processing" @close="delTag">
+                  <span style="font-size: 14px; line-height: 33px">{{
+                    paperName
+                  }}</span>
+                </a-tag>
               </div>
             </div>
             <!-- 选择面授侧弹窗 -->
@@ -94,7 +88,7 @@
             </div>
             <!-- 选择面授侧弹窗 -->
           </div>
-     
+
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -105,8 +99,9 @@
               </div>
               <span style="margin-right: 3px">考试时间：</span>
             </div>
-            <div class="btnbox" >
-              <a-range-picker style="width: 400px; height: 40px; border-radius: 8px;"
+            <div class="btnbox">
+              <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>
@@ -154,7 +149,7 @@
             <div class="signbox">
               <span style="margin-right: 3px">考试限制：</span>
             </div>
-            <div class="kqszbox"> 
+            <div class="kqszbox">
               <div class="setbox">
                 <div class="timerbox">
                   <span>允许重复考试：</span>
@@ -170,166 +165,138 @@
                     "
                     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">
+          <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>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio1"
-                      >不允许查看
-                    </a-radio>
-                  </a-radio-group>
-               
-              </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>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
+                  >不允许查看
+                </a-radio>
+              </a-radio-group>
             </div>
-            <div class="main_item">
-              <div class="signbox">
+          </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.showAnalysis"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio2"
-                      >允许查看
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio2"
-                      >不允许查看
-                    </a-radio>
-                  </a-radio-group>
-             
-              </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>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
+                  >不允许查看
+                </a-radio>
+              </a-radio-group>
             </div>
-            <div class="main_item">
-              <div class="signbox">
+          </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.scoringModel"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio3"
-                      >最高一次
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio3"
-                      >最后一次
-                    </a-radio>
-                  </a-radio-group>
-              
-              </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>
+                <a-radio v-model:checked="checked" :value="2" @click="cloradio3"
+                  >最后一次
+                </a-radio>
+              </a-radio-group>
             </div>
-            <div class="main_item">
-              <div class="signbox">
+          </div>
+          <div class="main_item">
+            <div class="signbox">
               <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;"
-                  />
-              
-                  <span style="color: #999999; margin-left: 8px">分</span>
-              </div>
+            <div class="btnbox">
+              <a-input
+                v-model:value="test.passLine"
+                type="number"
+                style="width: 400px; height: 40px; border-radius: 8px"
+              />
+
+              <span style="color: #999999; margin-left: 8px">分</span>
             </div>
+          </div>
+          <div class="main_item">
             <div class="main_item">
-              <div class="main_item">
               <div class="signbox">
-              <span style="margin-right: 3px">作业要求：</span>
-            </div>
+                <span style="margin-right: 3px">作业要求：</span>
+              </div>
               <div class="btnbox">
-              
-                  <a-radio-group
-                    style="margin-right: 12px"
-                    v-model:value="test.questionArrangement"
-                  >
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="1"
-                      @click="cloradio4"
-                      >试题乱序
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="2"
-                      @click="cloradio4"
-                      >选项乱序
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="3"
-                      @click="cloradio4"
-                      >全部乱序
-                    </a-radio>
-                    <a-radio
-                      v-model:checked="checked"
-                      :value="4"
-                      @click="cloradio4"
-                      >不乱序
-                    </a-radio>
-                  </a-radio-group>
-               
+                <a-radio-group
+                  style="margin-right: 12px"
+                  v-model:value="test.questionArrangement"
+                >
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="1"
+                    @click="cloradio4"
+                    >试题乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="2"
+                    @click="cloradio4"
+                    >选项乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="3"
+                    @click="cloradio4"
+                    >全部乱序
+                  </a-radio>
+                  <a-radio
+                    v-model:checked="checked"
+                    :value="4"
+                    @click="cloradio4"
+                    >不乱序
+                  </a-radio>
+                </a-radio-group>
               </div>
             </div>
           </div>
         </div>
-    
+      </div>
+      <div class="main_btns">
+        <a-button class="btn1" @click="closeDrawer2">取消</a-button>
+        <a-button class="btn2" @click="updateTest">确定</a-button>
+      </div>
+      <!--  加载动画 -->
+      <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
+        <a-spin :spinning="addLoading" tip="" />
+      </div>
 
+      <!-- 选择考试抽屉 -->
+      <s-test v-model:STvisible="STvisible" @getSTData="getData" />
     </div>
-    <div class="main_btns">
-          <a-button class="btn1" @click="closeDrawer2">取消</a-button>
-          <a-button class="btn2" @click="updateTest">确定</a-button>
-        </div>
-    <!--  加载动画 -->
-    <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
-      <a-spin :spinning="addLoading" tip="" />
-    </div>
-
-    <!-- 选择考试抽屉 -->
-    <s-test v-model:STvisible="STvisible" @getSTData="getData" />
-  </div> 
   </a-drawer>
 </template>
 <script>
-import { reactive,toRefs } from "vue";
+import { reactive, toRefs } from "vue";
 import { message } from "ant-design-vue";
 import {
   createExamination,
@@ -407,10 +374,8 @@ export default {
   },
   setup(props, ctx) {
     const state = reactive({
-      test:{
+      test: {},
 
-      },
-     
       addLoading: false,
       isOuter: 1, // 是否为外部考试
       STvisible: false, //选择试卷抽屉
@@ -433,14 +398,11 @@ export default {
       ],
     });
 
-
     const clearAll = () => {
-      state.test={};
-
+      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.scoringModel = Number(state.test.scoringModel);
+          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"),
@@ -489,16 +452,14 @@ export default {
           state.paperName = state.test.examinationTestName;
           // state.paperId=dayjs
           state.paperId = state.test.examinationTestId;
-          
-          console.log("querytest",state.test);
+
+          console.log("querytest", state.test);
         })
         .catch(() => {
           //message.error(`查询失败`);
         });
     };
     const updateTest = () => {
-      
-
       if (!state.test.examinationName) {
         message.destroy();
         return message.warning("请输入考试名称");
@@ -508,29 +469,29 @@ export default {
         return message.warning("请输入选择试卷");
       }
       if (!state.test.chooseTime) {
-       message.destroy();
-       return message.warning("请输入开始结束时间");
+        message.destroy();
+        return message.warning("请输入开始结束时间");
       }
       if (!state.test.examinationDuration) {
         message.destroy();
         return message.warning("请输入考试时长");
       }
-   
+
       state.addLoading = true;
-      console.log("test",state.test);
-     // state.test.examinationStartTime = toDate(
+      console.log("test", state.test);
+      // state.test.examinationStartTime = toDate(
       //  new Date(state.test.chooseTime[0].$d).getTime() / 1000,
-       // "Y-M-D h:m"
-     // );
-     // state.test.examinationEndTime =toDate(
-     //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
-     //   "Y-M-D h:m"
-     // );
+      // "Y-M-D h:m"
+      // );
+      // state.test.examinationEndTime =toDate(
+      //   new Date(state.test.$slotschooseTime[1].$d).getTime() / 1000,
+      //   "Y-M-D h:m"
+      // );
       state.test.examinationStartTime = toDate(
         new Date(state.test.chooseTime[0].$d).getTime() / 1000,
         "Y-M-D h:m"
       );
-      state.test.examinationEndTime =toDate(
+      state.test.examinationEndTime = toDate(
         new Date(state.test.chooseTime[1].$d).getTime() / 1000,
         "Y-M-D h:m"
       );
@@ -538,7 +499,7 @@ export default {
       //TODO缺少paperName字段
       state.test.examinationTestName = state.paperName;
 
-      if (props.EditTestId>0) {
+      if (props.EditTestId > 0) {
         // 编辑任务
         updateExamination(state.test)
           .then(async (res) => {
@@ -566,14 +527,14 @@ export default {
       state.EditTestId = res.data.data.examinationId;
       if (props.faceLevel) {
         state.EditTestId = res.data.data.examinationId;
-     
+
         closeDrawer();
       } else {
         if (props.isLevel == 1) {
-          if(!props.isactive){
-          message.destroy();
-          return message.warning("请先选中关卡");
-        }
+          if (!props.isactive) {
+            message.destroy();
+            return message.warning("请先选中关卡");
+          }
           let editObj1 = {
             chapterId: props.isactive,
             duration: res.data.data.examinationDuration,
@@ -588,7 +549,7 @@ export default {
               console.log("props.edit", props.edit);
               message.success(`${props.edit ? "编辑" : "新增"}任务成功`);
               ctx.emit("changeData", false);
-             
+
               closeDrawer();
             })
             .catch(() => {
@@ -673,7 +634,6 @@ export default {
     };
 
     return {
-     
       afterVisibleChange,
       closeDrawer,
       closeDrawer2,
@@ -682,9 +642,9 @@ export default {
       cloradio2,
       cloradio3,
       cloradio4,
-    
+
       clearAll,
-   
+
       delTag,
       // layout,
 
@@ -872,36 +832,36 @@ export default {
       }
     }
     .main_table {
-        position: relative;
-        padding-bottom: 80px;
-        .ant-checkbox-wrapper {
-          align-items: center;
-          margin-top: -2px;
-        }
-        .ant-table-selection-column {
-          padding: 0px !important;
-          padding-left: 5px !important;
-        }
-        .ant-table-thead > tr > th {
-          background-color: rgba(239, 244, 252, 1);
-        }
-        th.h {
-          background-color: #eff4fc !important;
-        }
-        .ant-table-tbody
-          > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
-          > td {
-          background: #f6f9fd;
-        }
-        .pa {
-          left: 0;
-          width: 100%;
-          display: flex;
-          justify-content: center;
-          position: absolute;
-          bottom: 20px;
-        }
+      position: relative;
+      padding-bottom: 80px;
+      .ant-checkbox-wrapper {
+        align-items: center;
+        margin-top: -2px;
       }
+      .ant-table-selection-column {
+        padding: 0px !important;
+        padding-left: 5px !important;
+      }
+      .ant-table-thead > tr > th {
+        background-color: rgba(239, 244, 252, 1);
+      }
+      th.h {
+        background-color: #eff4fc !important;
+      }
+      .ant-table-tbody
+        > tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)
+        > td {
+        background: #f6f9fd;
+      }
+      .pa {
+        left: 0;
+        width: 100%;
+        display: flex;
+        justify-content: center;
+        position: absolute;
+        bottom: 20px;
+      }
+    }
     .main_btns {
       height: 72px;
       width: 100%;