From 6909dedb987f65ebd30084947bd32c5d59da6f0d Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 17:03:28 +0800
Subject: [PATCH 01/12] -- bug

---
 src/components/project/ProjectLevel.vue |    2 +-
 src/views/projectcenter/SonProject.vue  | 1119 +++++------------------
 src/views/projectcenter/templateAdd.vue |    1 -
 3 files changed, 234 insertions(+), 888 deletions(-)

diff --git a/src/components/project/ProjectLevel.vue b/src/components/project/ProjectLevel.vue
index ad6d4b9c..975c58f0 100644
--- a/src/components/project/ProjectLevel.vue
+++ b/src/components/project/ProjectLevel.vue
@@ -19,7 +19,7 @@
   </template>
 </template>
 <script setup>
-import {computed, defineEmits, defineProps, onMounted, ref} from "vue";
+import {computed, defineEmits, defineProps} from "vue";
 import {useStore} from "vuex";
 
 
diff --git a/src/views/projectcenter/SonProject.vue b/src/views/projectcenter/SonProject.vue
index 35bf8f3e..80691e3b 100644
--- a/src/views/projectcenter/SonProject.vue
+++ b/src/views/projectcenter/SonProject.vue
@@ -4,210 +4,194 @@
     <div class="header">
       <span class="title">创建/编辑单层子项目</span>
       <div
-        @click="backPage"
-        style="cursor: pointer"
-        to="/projectmanage"
-        class="goback"
+          @click="backPage"
+          style="cursor: pointer"
+          to="/projectmanage"
+          class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
     </div>
     <div class="content">
       <div class="main">
-        <div class="name">
+        <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
           <div class="in">
             <div style="color: #c7cbd2; font-size: 14px; margin-left: 15px">
-              {{ projectAscription }}
+              {{ projectInfo.parentName }}
             </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 class="inname">项目名称</div>
           </div>
           <div class="in">
-            <a-input
-              v-model:value="projectName"
-              placeholder="请输入项目名称"
-              show-count
-              :maxlength="30"
-              :disabled="viewDetail ? true : false"
-            />
+            <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">
-          <div class="namebox">
+        <div class="name flex-top">
+          <div class="namebox" style="margin-top: 10px">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">分类</div>
-          </div>
-          <div class="in select">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect"
-              placeholder="请选择分类"
-              style="width: 100%"
-              :options="classifyList"
-              @change="classificationChange"
-              allowClear
-              showSearch
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            >
-            </a-select>
-          </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="box"
-            style="
-              width: 100px;
-              height: 100px;
-              border: 1px solid rgba(78, 166, 255, 1);
-              border-radius: 5px;
-              cursor: pointer;
-              position: relative;
-              overflow: hidden;
-            "
-          >
-            <a-upload
-              v-model:file-list="fileList"
-              name="file"
-              list-type="picture-card"
-              class="avatar-uploader"
-              :show-upload-list="false"
-              action="/api/file/upload"
-              :before-upload="beforeUpload"
-              @change="handleChange"
-              :disabled="viewDetail ? true : false"
+          <div class="in select" style="flex: 1; display: flex">
+            <div
+                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+                style="
+                width: 100px;
+                height: 100px;
+                border-radius: 5px;
+                cursor: pointer;
+                position: relative;
+                overflow: hidden;
+              "
+                v-for="(src, index) in projectPic"
+                :key="index"
+                @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                style="
+                  style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                v-if="imageUrl"
-                :src="imageUrl"
-                alt="avatar"
+                  :src="src.value"
+                  alt="avatar"
               />
-              <div v-else>
-                <!-- <loading-outlined v-if="loading"></loading-outlined> -->
-                <!-- <plus-outlined v-else></plus-outlined> -->
-                <div class="box1"></div>
-                <div class="box2"></div>
-                <!-- <div class="ant-upload-text"></div> -->
-              </div>
-            </a-upload>
+            </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 class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-              separator="至"
-              :placeholder="['      开始时间', '        结束时间']"
-              v-model:value="rangevalue"
-              style="width: 100%; height: 40px; border-radius: 5px"
-              @change="onRangeChange"
-              :disabled="viewDetail ? true : false"
+                show-time
+                separator="至"
+                :placeholder="['      开始时间', '        结束时间']"
+                v-model:value="projectInfo.rangeTime"
+                style="width: 100%; height: 40px; border-radius: 5px"
+                valueFormat="YYYY-MM-DD HH:mm:ss"
+                @change="timeChange"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
+                class="nameimg"
+                src="../../assets/images/basicinfo/asterisk.png"
             />
-            <div class="inname">子项目经理</div>
+            <div class="inname">项目经理</div>
           </div>
           <div class="in">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              :value="classifySelect1"
-              mode="multiple"
-              placeholder="请选择项目经理"
-              style="width: 100%"
-              :options="classifyList1"
-              @change="classificationChange1"
-              allowClear
-              showSearch
-              :disabled="viewDetail ? true : false"
-              @popupScroll="memberScroll"
-            >
-            </a-select>
+            <ProjectManager
+                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">
-            <a-tree-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect2"
-              style="width: 100%"
-              :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-              placeholder="自动带出 可修改"
-              :options="classifyList2"
-              @change="classificationChange2"
-              :disabled="viewDetail ? true : false"
-              :tree-data="classifyList2"
-              :fieldNames="{
-                children: 'treeChildList',
-                label: 'name',
-                value: 'id',
-              }"
-            ></a-tree-select>
+            <OrgClass
+                v-model:value="projectInfo.sourceBelongId"
+                v-model:name="projectInfo.sourceBelongName"
+            ></OrgClass>
+          </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">
+            <ProjectLevel v-model:value="projectInfo.level"></ProjectLevel>
+          </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">
+            <TrainClass v-model:value="projectInfo.systemId"></TrainClass>
+          </div>
+        </div>
+        <div class="name">
+          <div class="namebox">
+            <img
+                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"
+                :disabled="viewDetail ? true : false"
+            >
+              <a-radio :style="radioStyle" :value="1">是</a-radio>
+              <a-radio :style="radioStyle" :value="0">否</a-radio>
+            </a-radio-group>
+          </div>
+        </div>
+        <div class="name name2">
+          <div class="namebox">
+            <div class="inname">同步学习记录</div>
+          </div>
+          <div class="in">
+            <a-checkbox
+                v-model:checked="courseSyncFlag"
+                :disabled="viewDetail ? true : false"
+            ><span
+                style="
+                  width: 100%;
+                  color: rgba(109, 117, 132, 1);
+                  font-size: 14px;
+                "
+            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+            ></a-checkbox
+            >
           </div>
         </div>
         <div class="name name2">
@@ -216,178 +200,31 @@
           </div>
           <div class="in">
             <a-textarea
-              v-model:value="remark"
-              style="height: 80px"
-              placeholder="请输入说明"
-              show-count
-              :maxlength="200"
-              :disabled="viewDetail ? true : false"
+                v-model:value="projectInfo.remark"
+                style="height: 80px"
+                placeholder="请输入说明"
+                show-count
+                :maxlength="200"
+                :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
-        <div class="name name2">
+
+        <div v-if="projectInfo.status == -5" class="name name2">
           <div class="namebox">
-            <div class="inname">同步学习记录</div>
+            <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>
-          <div class="in">
-            <a-radio
-              @click="changeChecked"
-              v-model:checked="checked"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-              ></a-radio
-            >
+          <div class="description">
+            {{ auditDescription }}
           </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">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect3"
-              :options="classifyList3"
-              @change="classificationChange3"
-              placeholder="集团级/组织级/现地级/部门级"
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            />
-          </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">
-            <a-select
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect4"
-              :options="classifyList4"
-              @change="classificationChange4"
-              placeholder="集团级/组织级/现地级/部门级"
-              :disabled="viewDetail ? true : false"
-              :fieldNames="{
-                label: 'dictName',
-                value: 'dictCode',
-              }"
-            />
-          </div>
-        </div>
-        <div class="name">
-          <div class="namebox">
-            <img
-              class="nameimg"
-              src="../../assets/images/basicinfo/asterisk.png"
-            />
-            <div class="inname">是否BOEU实施</div>
-          </div>
-          <div class="in">
-            <a-radio
-              @click="changeChecked1"
-              v-model:checked="checked1"
-              :disabled="viewDetail ? true : false"
-              ><span
-                style="
-                  width: 100%;
-                  color: rgba(109, 117, 132, 1);
-                  font-size: 14px;
-                "
-                >BOEU实施</span
-              ></a-radio
-            >
-          </div>
-        </div>
-        <!-- <div class="name name2">
-					<div class="namebox" style="margin-top: 8px">
-						<img class="nameimg" src="../../assets/images/basicinfo/asterisk.png" />
-						<div class="inname">附件</div>
-					</div>
-					<div class="filebox">
-						<div>
-							<img v-if="fileList1.length < 6" class="fileimg" src="../../assets/images/projectadd/enclosure.png" />
-							<a-upload :disabled="fileList1.length > 5" :before-upload="beforeUpload1" v-model:file-list="fileList1"
-								@remove="removeFile" name="file" action="/api/file/upload" :headers="headers" @change="handleChange1">
-								<span v-if="fileList1.length > 5" class="filetext">上传数量已经达到最大值</span>
-								<span v-else class="filetext">上传附件</span>
-							</a-upload>
-						</div>
-						<div class="support">
-							支持.pdf,.ppt,.pptx,.doc,.docx,.xls,.xlsx,.jpg,.jpeg,.png,.gif,.zip
-						</div>
-					</div>
-				</div> -->
       </div>
-      <!-- 2022-11-30注释 后面放开 -->
-      <!-- <div class="template">
-        <div class="name">
-          <div class="inname" style="width: 50px">模版</div>
-          <div class="in select" style="margin-left: 2px">
-            <a-select
-              v-if="isEdit"
-              disabled="true"
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-            >
-            </a-select>
-            <a-select
-              v-else
-              :getPopupContainer="
-                (triggerNode) => {
-                  return triggerNode.parentNode || document.body;
-                }
-              "
-              v-model:value="classifySelect5"
-              placeholder="请选择模版"
-              :size="size"
-              style="width: 100%"
-              :options="classifyList5"
-              @change="classificationChange5"
-              @popupScroll="templateScroll"
-            >
-            </a-select>
-          </div>
-        </div>
-      </div> -->
     </div>
     <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>
@@ -395,24 +232,33 @@
   </div>
 </template>
 <script>
-import { reactive, toRefs, ref, computed } from "vue";
-import { message } from "ant-design-vue";
-import { useRouter, useRoute } from "vue-router";
-import dayjs from "dayjs";
+import {reactive, toRefs, ref, computed, onMounted} from "vue";
+import {message} from "ant-design-vue";
+import {useRouter, useRoute} from "vue-router";
 import * as api from "../../api/index";
-import * as api1 from "../../api/index1";
-import { toDate, scrollLoad } from "../../api/method";
-import { useStore } from "vuex";
+import {useStore} from "vuex";
+import ProjectManager from "@/components/project/ProjectManagerNew";
+import ProjectLevel from "@/components/project/ProjectLevel";
+import TrainClass from "@/components/project/TrainClass";
+import NameInput from "@/components/project/NameInput";
+import OrgClass from "@/components/project/OrgClass";
+import {validateName} from "../../api/index1";
+
 export default {
   name: "projectAdd",
+  components: {
+    ProjectManager,
+    ProjectLevel,
+    TrainClass,
+    NameInput,
+    OrgClass,
+  },
   setup() {
     const store = useStore();
     // 编辑页面跳转过来时候，自动填充表格
     const routers = useRoute();
     const router = useRouter();
     const isEdit = ref(false);
-    let peojectID = "";
-    let paraentID = "";
 
     const state = reactive({
       classifySelect: null,
@@ -437,78 +283,37 @@ export default {
 
       currentPage1: 1, //项目经理
       pageSize1: 10, //项目经理
+      projectInfo: {},
+      courseSyncFlag:false
     });
 
-    if (routers.query.name == undefined) {
-      router.push({
-        path: "/projectmanage",
-      });
-    }
+    const projectPic = computed(() => store.state.projectPic.map((e) => ({
+      value: e.dictValue,
+      label: e.dictName,
+    })));
 
-    peojectID = routers.query.projectId;
-    state.projectAscription = routers.query.name;
 
-    if (routers.query.edit !== undefined) {
-      isEdit.value = true;
-      // 需要编辑
-      api
-        .getProjectDetail({ projectId: routers.query.projectId })
-        .then((res) => {
-          if (res.status == 200 && res.data.code == 200) {
-            let info = res.data.data.projectInfo;
-            console.log(info);
-            // projectName classifySelect imageUrl * classifySelect1 * remark checked classifySelect3 classifySelect4 changeChecked1 *
-            projectName.value = info.name;
-            state.classifySelect = classifyList.value[1]; // info.category
-            imageUrl.value = info.picUrl;
+    onMounted(() => {
+      state.viewDetail = routers.query.viewDetail;
+      getProjectInfo();
+    });
 
-            let start = toDate(info.beginTime / 1000, "YYYY/MM/DD");
-            let end = toDate(info.endTime / 1000, "YYYY/MM/DD");
-            state.rangevalue = [
-              dayjs(start, "YYYY/MM/DD"),
-              dayjs(end, "YYYY/MM/DD"),
+    function getProjectInfo() {
+      state.projectInfo.parentName = routers.query.parentName;
+      state.projectInfo.parentId = routers.query.parentId;
+      state.projectInfo.projectId = routers.query.projectId;
+      (state.projectInfo.projectId || state.projectInfo.parentId) &&
+      api.getProjectDetail({
+            projectId: state.projectInfo.projectId,
+          })
+          .then((res) => {
+            state.projectInfo = res.data.data.projectInfo;
+            state.projectInfo.rangeTime = [
+              state.projectInfo.beginTime,
+              state.projectInfo.endTime,
             ];
-
-            let manageName = info.manager.split(",");
-            let manageValue = info.managerId.split(",");
-            let optionsManage = [];
-            for (let i = 0; i < manageName.length; i++) {
-              let obj = {
-                label: manageName[i],
-                value: manageValue[i],
-              };
-              optionsManage.push(obj);
-            }
-            console.log(optionsManage);
-            state.classifySelect1 = optionsManage;
-            state.classifySelect2 =
-              classifyList2.value[info.sourceBelongId - 1];
-            remark.value = info.remark;
-            state.checked = info.boeFlag ? info.boeFlag : false;
-            state.classifySelect3 = classifyList3.value[info.level];
-            state.classifySelect4 = classifyList4.value[info.systemId - 1];
-            state.checked1 = info.boeFlag ? info.boeFlag : false;
-            // fileList1.value = info.attach.split(",");
-
-            projectType = 1;
-            picUrl = info.picUrl;
-            beginTime = Number(info.beginTime / 1000);
-            endTime = Number(info.endTime / 1000);
-            manager = info.manager;
-            managerId = info.managerId;
-            sourceBelongIdC = Number(info.sourceBelongId);
-            courseSyncFlag = info.courseSyncFlag;
-            levels = info.level;
-            systemid = info.systemId;
-            boeFlag = info.boeFlag;
-            paraentID = Number(info.parentId);
-          }
-        })
-        .catch((err) => {
-          console.log(err);
-        });
-    } else {
-      paraentID = Number(routers.query.projectId);
+            state.courseSyncFlag = !!state.projectInfo.courseSyncFlag;
+          });
     }
 
     const backPage = () => {
@@ -519,542 +324,84 @@ export default {
       }, 400);
     };
 
-    const projectName = ref("");
-
-    const classifyList = ref([
-      // { value: 1, label: "管理者" },
-    ]);
-
-    let projectType = "";
-
-    const classificationChange = (value) => {
-      console.log(`selected ${value}`);
-      projectType = value;
-    };
-
-    function getBase64(img, callback) {
-      const reader = new FileReader();
-      reader.addEventListener("load", () => callback(reader.result));
-      reader.readAsDataURL(img);
-    }
-
-    const fileList = ref([]);
-    const fileList1 = ref([]);
-    const loading = ref(false);
-    const imageUrl = ref("");
-    let picUrl = "";
-
-    const handleChange = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log("上传图片返回的信息 %o", info);
-        picUrl = info.file.response.data;
-        // Get this url from response in real world.
-        getBase64(info.file.originFileObj, (base64Url) => {
-          imageUrl.value = base64Url;
-          loading.value = false;
-        });
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
-
-    let uplodaFileCount = false;
-
-    let attach = "";
-    let attachData = "";
-    const handleChange1 = (info) => {
-      if (info.file.status === "uploading") {
-        loading.value = true;
-        return;
-      }
-      if (info.file.status === "done") {
-        console.log(
-          "上传附件返回的信息 %o",
-          info,
-          info.fileList.length,
-          uplodaFileCount
-        );
-
-        let attachStr = "";
-        attachData = info.fileList;
-        for (let i = 0; i < attachData.length; i++) {
-          if (attachData.length - 1 == i) {
-            attachStr += attachData[i].response.data;
-          } else {
-            attachStr += attachData[i].response.data + ",";
-          }
-        }
-        console.log(attachStr);
-        attach = attachStr;
-
-        if (info.fileList.length > 5) {
-          uplodaFileCount = true;
-        } else {
-          uplodaFileCount = false;
-        }
-      }
-      if (info.file.status === "error") {
-        loading.value = false;
-        message.error("upload error");
-      }
-    };
-
-    const beforeUpload = (file) => {
-      const isJpgOrPng =
-        file.type === "image/jpeg" || file.type === "image/png";
-      if (!isJpgOrPng) {
-        message.error("You can only upload JPG file!");
-      }
-      const isLt2M = file.size / 1024 / 1024 < 1;
-      if (!isLt2M) {
-        message.error("Image must smaller than 1MB!");
-      }
-      return isJpgOrPng && isLt2M;
-    };
-
-    const beforeUpload1 = () => {
-      return new Promise((resovle, reject) => {
-        if (uplodaFileCount) {
-          message.warning("上传文件数量已达最大数量");
-          return reject(false);
-        }
-        return resovle(true);
-      });
-    };
-
-    let beginTime = "";
-    let endTime = "";
-    const dateFormatList = ["YYYY/MM/DD"];
-
-    const onRangeChange = (value, dateString) => {
-      console.log("Selected Time: ", value);
-      // 项目时间选择函数
-      console.log("Formatted Selected Time: ", dateString);
-      console.log(
-        "Formatted Selected TimeStamp",
-        new Date(dateString[0]).getTime()
-      );
-      beginTime = new Date(dateString[0]).getTime() / 1000;
-      endTime = new Date(dateString[1]).getTime() / 1000;
-    };
-
-    // 项目经理 后续接口调用
-    const classifyList1 = ref([
-      // { value: 1, label: "李俊国" },
-    ]);
-    //获取学员
-    const getMember = () => {
-      api1
-        .getMemberInfo({
-          pageNo: state.currentPage1,
-          pageSize: state.pageSize1,
-          keyWord: "",
-        })
-        .then((res) => {
-          if (res.data.code === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList1.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.realName,
-              };
-              array.push(obj);
-            });
-            classifyList1.value = array;
-            console.log("获取学员", res.data);
-            // classifyList1.value = res.data.data.rows;
-            // state.tableDataTotal = res.data.data.total;
-            // return res.data.data.rows;
-          }
-        })
-        .catch((err) => {
-          console.log("获取学员失败", err);
-        });
-    };
-    getMember();
-    //学员滚动加载信息
-    const memberScroll = (e) => {
-      // console.log("滚动", e, b);
-      let num = scrollLoad(e);
-      if (num === 1) {
-        state.currentPage1 = 1;
-      } else if (num === 2) {
-        // 如果滑到底部，则加载下一页
-        state.currentPage1++;
-        getMember();
-      }
-    };
-    //选择处理项目经理
-    let manager = "";
-    let managerId = "";
-    const classificationChange1 = (key, options) => {
-      console.log(`selected ${key}`, options);
-      let mstr = "";
-      let midstr = "";
-      for (let i = 0; i < key.length; i++) {
-        if (key.length - 1 !== i) {
-          midstr += key[i] + ",";
-          mstr += classifyList1.value[i].label + ",";
-        } else {
-          midstr += key[i];
-          mstr += classifyList1.value[i].label;
-        }
-      }
-      console.log(mstr, midstr);
-      state.classifySelect1 = options;
-      let newoptions = [];
-      for (let i = 0; i < state.classifySelect1.length; i++) {
-        if (state.classifySelect1[i].value) {
-          newoptions.push(state.classifySelect1[i]);
-        }
-      }
-      state.classifySelect1 = newoptions;
-      manager = mstr;
-      managerId = midstr;
-    };
-
-    // 资源归属 sourceBelongId 后续给接口
-    const classifyList2 = computed(() => {
-      return store.state.orgtreeList ? store.state.orgtreeList : ref([]);
-    });
-
-    let sourceBelongIdC = "";
-    const classificationChange2 = (key) => {
-      console.log(`selected ${key}`, classifyList2);
-      sourceBelongIdC = key;
-    };
-
-    // 项目级别
-    const classifyList3 = ref([
-      // { value: 1, label: "集团级" },
-    ]);
-
-    let levels = "";
-    const classificationChange3 = (key) => {
-      console.log(`selected ${key}`, classifyList3);
-      levels = key;
-    };
-
-    // 培训分类
-    const classifyList4 = ref([
-      // { value: 1, label: "集团级" },
-    ]);
-
-    let systemid = "";
-    const classificationChange4 = (key) => {
-      console.log(`selected ${key}`, classifyList4);
-      systemid = key;
-    };
-    //获取分类、封面图、项目级别、培训分类-----------字典配置-------------------------------
-    const getDictList = (param) => {
-      let obj = {
-        pageNo: 1,
-        pageSize: 20,
-        setCode: param,
-      };
-      api1
-        .getDict(obj)
-        .then((res) => {
-          console.log("获取字典成功", res);
-          if (res.status === 200) {
-            if (param === "projectClass") {
-              classifyList.value = res.data.data.rows;
-            }
-            if (param === "projectPic") {
-              if (res.data.data.rows.length > 0) {
-                imageUrl.value = res.data.data.rows[0].dictValue;
-                picUrl = res.data.data.rows[0].dictValue;
-              }
-            }
-            if (param === "projectLevel") {
-              classifyList3.value = res.data.data.rows;
-            }
-            if (param === "projectSys") {
-              classifyList4.value = res.data.data.rows;
-            }
-          }
-        })
-        .catch((err) => {
-          console.log("获取字典失败", err);
-        });
-    };
-    getDictList("projectClass");
-    getDictList("projectPic");
-    getDictList("projectLevel");
-    getDictList("projectSys");
-    //获取分类、封面图、项目级别、培训分类---------------字典配置---------------------------
-
-    // 模版
-    const classifyList5 = ref([
-      // { value: 1, label: "模版一" },
-    ]);
-    const classificationChange5 = (key) => {
-      console.log(`selected ${key}`, classifyList5);
-    };
-    //获取模版列表
-    const getTemplate = () => {
-      let obj = {
-        pageNo: state.currentPage,
-        pageSize: state.pageSize,
-        // projectId:id?id:''
-      };
-      api
-        .getTemplate(obj)
-        .then((res) => {
-          console.log("获取模版列表", res);
-          state.totalPages = Number(res.data.data.pages);
-          if (res.status === 200) {
-            let arr = res.data.data.rows;
-            let array = classifyList5.value;
-            arr.map((value) => {
-              let obj = {
-                value: value.projectTemplateId,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            classifyList5.value = array;
-          }
-        })
-        .catch((err) => {
-          console.log("获取模版列表失败", err);
-        });
-    };
-    getTemplate();
-    //模版滚动加载模板信息
-    const templateScroll = (e) => {
-      // console.log("滚动", e, b);
-      let num = scrollLoad(e);
-      if (num === 1) {
-        state.currentPage = 1;
-      } else if (num === 2) {
-        // 如果滑到底部，则加载下一页
-        state.currentPage++;
-        getTemplate();
-      }
-    };
-
-    // 项目说明
-    const remark = ref("");
-
-    let courseSyncFlag = 0;
-    const changeChecked = () => {
-      console.log(state.checked);
-      state.checked ? (state.checked = false) : (state.checked = true);
-      courseSyncFlag = state.checked ? 1 : 0;
-    };
-
-    let boeFlag = 0;
-    const changeChecked1 = () => {
-      console.log(state.checked1);
-      state.checked1 ? (state.checked1 = false) : (state.checked1 = true);
-      boeFlag = state.checked1 ? 1 : 0;
-    };
-
-    const removeFile = (file) => {
-      const index = fileList1.value.indexOf(file);
-      const newFileList = fileList1.value.slice();
-      newFileList.splice(index, 1);
-      fileList1.value = newFileList;
-
-      let attachStr = "";
-      if (newFileList.length == 0) {
-        attachStr = "";
-      }
-      for (let i = 0; i < fileList1["value"].length; i++) {
-        console.log(fileList1["value"][i].response.data);
-        if (fileList1["value"].length - 1 == i) {
-          attachStr += fileList1["value"][i].response.data;
-        } else {
-          attachStr += fileList1["value"][i].response.data + ",";
-        }
-      }
-      attach = attachStr;
-    };
 
     const errorMsgs = {
       name: "请输入项目名称",
-      category: "请选择项目分类",
-      picUrl: "请上传项目封面图",
+      picUrl: "请选择项目封面图",
       beginTime: "请选择项目开始时间",
       endTime: "请选择项目结束时间",
       manager: "请选择项目经理",
       managerId: "请选择项目经理",
       sourceBelongId: "请选择资源归属",
       level: "请填写项目级别",
-      systemId: "请填写项目培训分类",
-      boeFlag: "请选择是否BOE实施",
+      systemId: "请填写项目培训体系",
+      boeFlag: "请选择是否BOEU实施",
     };
 
-    const createProject = () => {
-      console.log("我是否要编辑项目", isEdit.value);
-      if (isEdit.value) {
-        console.log("我要编辑项目", peojectID);
-        let obj = {
-          projectId: Number(peojectID),
-          name: projectName["value"],
-          category: projectType,
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 0,
-          parentId: paraentID,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
-        };
-
-        console.log(obj);
-
-        for (let i in errorMsgs) {
-          console.log(obj[i]);
-          if (obj[i] === "" || obj[i] === undefined) {
-            message.destroy();
-            message.warning(errorMsgs[i]);
-            return;
-          }
-        }
-
-        api
-          .createProject(obj)
-          .then((res) => {
-            console.log(res);
-            if (res.status == 200 && res.data.code == 200) {
-              message.destroy();
-              message.success("编辑成功");
-              setTimeout(() => {
-                router.push({
-                  path: "/projectmanage",
-                });
-              }, 1000);
-            } else {
-              message.destroy();
-              message.error("编辑失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("编辑失败，请检查当前网络状态。");
-          });
-      } else {
-        let obj = {
-          name: projectName["value"],
-          category: projectType,
-          picUrl: picUrl,
-          beginTime: beginTime,
-          endTime: endTime,
-          manager: manager,
-          managerId: managerId,
-          sourceBelongId: sourceBelongIdC,
-          remark: remark["value"],
-          courseSyncFlag: courseSyncFlag,
-          level: levels,
-          systemId: systemid,
-          boeFlag: boeFlag,
-          attach: attach,
-          type: 3,
-          templateId: 10,
-          parentId: paraentID,
-          notice: "",
-          noticeFlag: 0,
-          status: 0,
-        };
-        console.log("提交的数据格式 %o", obj);
-        for (let i in errorMsgs) {
-          console.log(obj[i]);
-          if (obj[i] === "" || obj[i] === undefined) {
-            message.destroy();
-            message.warning(errorMsgs[i]);
-            return;
-          }
-        }
-
-        api
-          .createProject(obj)
-          .then((res) => {
-            console.log(res);
-            if (res.status == 200 && res.data.code == 200) {
-              message.destroy();
-              message.success("创建成功");
-              setTimeout(() => {
-                router.push({
-                  path: "/taskpage",
-                  query: { id: res.data.data.projectId },
-                });
-              }, 1000);
-            } else {
-              message.destroy();
-              message.error("创建失败，请检查当前网络状态。");
-            }
-          })
-          .catch((err) => {
-            console.log(err);
-            message.destroy();
-            message.error("创建失败，请检查当前网络状态。");
-          });
+    function timeChange(e) {
+      if (e && e.length === 2) {
+        state.projectInfo.beginTime = e[0];
+        state.projectInfo.endTime = e[1];
       }
+    }
+
+    function validate(obj, errorMsgs) {
+      for (let i in errorMsgs) {
+        if (!obj[i] && obj[i] !== 0) {
+          message.destroy();
+          message.warning(errorMsgs[i]);
+          return false;
+        }
+      }
+      return true;
+    }
+
+    const createProject = async () => {
+      console.log("我是否要编辑项目", isEdit.value);
+      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.courseSyncFlag = state.courseSyncFlag ? 1 : 0;
+      api.createProject(state.projectInfo).then(() => {
+        message.destroy();
+        message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
+        router.back()
+      });
     };
 
     return {
       ...toRefs(state),
-      projectName,
-      classifyList,
-      classificationChange,
-      classificationChange1,
-      classificationChange2,
-      classificationChange3,
-      classificationChange4,
-      classificationChange5,
-      fileList,
-      fileList1,
-      loading,
-      imageUrl,
-      handleChange,
-      handleChange1,
-      beforeUpload,
-      beforeUpload1,
-      onRangeChange,
-      classifyList1,
-      classifyList2,
-      classifyList3,
-      classifyList4,
-      classifyList5,
-      remark,
-      changeChecked,
-      changeChecked1,
-      uplodaFileCount,
+      timeChange,
+      projectPic,
       createProject,
-      removeFile,
-
       isEdit,
       backPage,
-      dateFormatList,
-
-      templateScroll,
-      memberScroll,
     };
   },
 };
 </script>
 <style lang="scss">
+.active {
+  border: 2px solid rgba(78, 166, 255, 1);
+}
+
 .sonproject {
   width: 100%;
   // height: inherit;
diff --git a/src/views/projectcenter/templateAdd.vue b/src/views/projectcenter/templateAdd.vue
index 7cd08f12..526840ef 100644
--- a/src/views/projectcenter/templateAdd.vue
+++ b/src/views/projectcenter/templateAdd.vue
@@ -210,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";

From 37cb81763a3aa1257c8c05881e114021899060f1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:24:00 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix:=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/api/config.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2354d8c4..b85229f3 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.13------------");
+    console.log("版本0.9.14------------");
     const routes = computed(() => {
       return router.getRoutes().filter((e) => e.meta?.isLink);
     });
diff --git a/src/api/config.js b/src/api/config.js
index ec213068..705f7897 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-14 09:04:31
+ * @LastEditTime: 2022-12-14 17:22:48
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        // window.open("https://u-pre.boe.com/web/", '_self');
+        window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);

From 6dda7355a6f75c1cb3b8cf63973eb7f412c7c506 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:37:25 +0800
Subject: [PATCH 03/12] =?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/api/method.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 705f7897..80cc989e 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-14 17:22:48
+ * @LastEditTime: 2022-12-14 17:35:43
  * @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/api/method.js b/src/api/method.js
index a10dafa0..771df5d4 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -193,7 +193,7 @@ const setCookie = (name, value, perpetual) => {
 
 //先写一个方法
 function getCookie(name) {
-    return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`,'') || ''
+    return document.cookie?.split(";").find(e => e.includes(name)).replace(`${name}=`, '') || ''
     //1.获取cookie字符串
     // const cookies = document.cookie;
     // console.log('cookies',cookies)
@@ -219,7 +219,7 @@ function getCookie(name) {
 //滚动加载信息
 const scrollLoad = (e) => {
     // console.log("滚动", e, b);
-    const {target} = e;
+    const { target } = e;
     const scrllHeight = target.scrollHeight - target.scrollTop;
     const clientHeight = target.clientHeight;
     // console.log("scrllHeight", scrllHeight, clientHeight);

From 652282773f5f73392f7a3dd197e0f9825f92b2da Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 17:52:13 +0800
Subject: [PATCH 04/12] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js         | 2 +-
 src/api/method.js         | 4 ++++
 src/components/NavTop.vue | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index 80cc989e..df04b6ff 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-14 17:35:43
+ * @LastEditTime: 2022-12-14 17:51:50
  * @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/api/method.js b/src/api/method.js
index 771df5d4..c3ed4f2a 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -277,6 +277,9 @@ const organizationalTree = []
 
 //嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+//学员端路由
+const studentUrl = 'https://u.boe.com/pc/uc/study/courses'
+
 //二维码
 const codeUrl = "https://u-pre.boe.com"
 export {
@@ -292,5 +295,6 @@ export {
     commonData,
     organizationalTree,
     iframeUrl,
+    studentUrl,
     codeUrl,
 }
\ No newline at end of file
diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue
index 797a6847..b69ba583 100644
--- a/src/components/NavTop.vue
+++ b/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: {
@@ -81,7 +81,7 @@ export default {
         {
           id: 2,
           name: "学员",
-          go: "https://u.boe.com/pc/uc/study/courses",
+          go: studentUrl,
         },
       ],
 

From 42340e38d0463b376cdf5ad2a5084a5d160577ba Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:36:37 +0800
Subject: [PATCH 05/12] -- bug

---
 .env                                | 10 ++++++++++
 .env.boe                            |  8 ++++++++
 .env.prod                           |  8 ++++++++
 .env.release                        |  8 ++++++++
 .env.test                           |  9 +++++++++
 src/api/config.js                   |  2 +-
 src/components/project/OrgClass.vue |  8 ++------
 src/router/index.js                 |  2 +-
 vue.config.js                       | 31 +++++++++++++++--------------
 9 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 .env
 create mode 100644 .env.boe
 create mode 100644 .env.prod
 create mode 100644 .env.release
 create mode 100644 .env.test

diff --git a/.env b/.env
new file mode 100644
index 00000000..78d58245
--- /dev/null
+++ b/.env
@@ -0,0 +1,10 @@
+VITE_BASE=/manage
+VITE_BASE_API=/
+VITE_PROXY_URL=http://111.231.196.214:30001/
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.boe b/.env.boe
new file mode 100644
index 00000000..20656803
--- /dev/null
+++ b/.env.boe
@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=/manageApi
+
+VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/.env.prod b/.env.prod
new file mode 100644
index 00000000..6671831e
--- /dev/null
+++ b/.env.prod
@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/.env.release b/.env.release
new file mode 100644
index 00000000..6671831e
--- /dev/null
+++ b/.env.release
@@ -0,0 +1,8 @@
+VITE_BASE=/fe-student-release
+VITE_BASE_API=/manageApi-release
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u.boe.com
\ No newline at end of file
diff --git a/.env.test b/.env.test
new file mode 100644
index 00000000..6f9f2122
--- /dev/null
+++ b/.env.test
@@ -0,0 +1,9 @@
+VITE_BASE=/fe-student
+VITE_BASE_API=/manageApi
+
+
+VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
+VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
+VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
+
+VITE_BOE_API_URL=https://u-pre.boe.com
\ No newline at end of file
diff --git a/src/api/config.js b/src/api/config.js
index ec213068..a8df7617 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -16,7 +16,7 @@ import axios from "axios";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: "/manageApi",
+  baseURL: process.env.VITE_BASE_API,
   timeout: 1000 * 15,
   // headers: { "Content-Type": "multipart/form-data" },
   headers: { "Content-Type": "application/json" },
diff --git a/src/components/project/OrgClass.vue b/src/components/project/OrgClass.vue
index 72c82170..916f7cc2 100644
--- a/src/components/project/OrgClass.vue
+++ b/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();
@@ -33,16 +33,12 @@ const props = defineProps({
 })
 const emit = defineEmits({})
 
-const options = ref([])
+const options = computed(() => store.state.orgtreeList)
 
 const id = computed(() => {
   return props.value
 })
 
-onMounted(() => {
-  options.value = [...store.state.orgtreeList]
-})
-
 function change(key, obj) {
   emit('update:name', obj[0])
   emit('update:value', key)
diff --git a/src/router/index.js b/src/router/index.js
index 75da5b5a..18acace6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -17,7 +17,7 @@ const routes = [
 	...routesConfig
 ]
 const router = createRouter({
-	history: createWebHistory("/manage/"),
+	history: createWebHistory(process.env.VITE_BASE),
 	routes,
 
 })
diff --git a/vue.config.js b/vue.config.js
index 341e4b39..f030ea5f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,22 +6,23 @@
  * @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://111.231.196.214:30001/",
-          changeOrigin: true, //表示是否改变原域名
-        // secure: false,
-        // ws: false, //表示WebSocket协议
-        pathRewrite: {
-          "^/manageApi": "",
+    publicPath: process.env.VITE_BASE,
+    // transpileDependencies: true,
+    devServer: {
+        port: 8080,
+        proxy: {
+            "/manageApi": {
+                target: process.env.VITE_PROXY_URL,
+                changeOrigin: true, //表示是否改变原域名
+                // secure: false,
+                // ws: false, //表示WebSocket协议
+                pathRewrite: {
+                    "^/manageApi": "",
+                },
+            },
         },
-      },
     },
-  },
 });

From fffc5c66b29cf4fce18041a26c4c0df03500a90b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:50:46 +0800
Subject: [PATCH 06/12] -- bug

---
 .env              |  1 +
 .env.boe          |  1 +
 .env.release      |  2 +
 src/api/config.js | 96 +++++++++++++++++++++++------------------------
 vue.config.js     |  2 +-
 5 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/.env b/.env
index 78d58245..06a891d8 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,7 @@
 VITE_BASE=/manage
 VITE_BASE_API=/
 VITE_PROXY_URL=http://111.231.196.214:30001/
+VITE_LOGIN_URL=https://u-pre.boe.com/web
 
 
 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
diff --git a/.env.boe b/.env.boe
index 20656803..407c5463 100644
--- a/.env.boe
+++ b/.env.boe
@@ -1,6 +1,7 @@
 VITE_BASE=/fe-student
 VITE_BASE_API=/manageApi
 
+
 VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u-pre.boe.com/pc/case/detail?id=
 VITE_BOE_TEST_DETAIL_URL=https://u-pre.boe.com/web/quizsummary?detailId=
diff --git a/.env.release b/.env.release
index 6671831e..05c6e5c4 100644
--- a/.env.release
+++ b/.env.release
@@ -1,5 +1,7 @@
 VITE_BASE=/fe-student-release
 VITE_BASE_API=/manageApi-release
+VITE_LOGIN_URL=https://u.boe.com/web
+
 
 VITE_BOE_ONLINE_CLASS_URL=https://u.boe.com/pc-release/course/studyindex?id=
 VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc-release/case/detail?id=
diff --git a/src/api/config.js b/src/api/config.js
index ec1bb837..e40b19da 100644
--- a/src/api/config.js
+++ b/src/api/config.js
@@ -6,8 +6,9 @@
  * @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 {message} from "ant-design-vue";
 import axios from "axios";
+import router from "@/router";
 // import { getCookie } from '../api/method'
 // const Qs = require("qs");
 
@@ -16,61 +17,60 @@ import axios from "axios";
 
 axios.defaults.withCredentials = true;
 const http = axios.create({
-  baseURL: process.env.VITE_BASE_API,
-  timeout: 1000 * 15,
-  // headers: { "Content-Type": "multipart/form-data" },
-  headers: { "Content-Type": "application/json" },
+    baseURL: process.env.VITE_BASE_API,
+    timeout: 1000 * 15,
+    // headers: { "Content-Type": "multipart/form-data" },
+    headers: {"Content-Type": "application/json"},
 });
 
 http.interceptors.request.use(
-  (config) => {
-    // console.log("config", config);
-    // const token = localStorage.getItem("token");
-    // // const token = getCookie('token')
-    // // console.log('token', token)
-    // if (token) {
-    //   config.headers.token = token; //测试1111
-    // } else {
-    // console.log("当前请求页面无token,请执行操作！！！");
+    (config) => {
+        // console.log("config", config);
+        // const token = localStorage.getItem("token");
+        // // const token = getCookie('token')
+        // // console.log('token', token)
+        // if (token) {
+        //   config.headers.token = token; //测试1111
+        // } else {
+        // console.log("当前请求页面无token,请执行操作！！！");
 
-    // // 此处测试默认配置token
-    // config.headers.token =
-    //   "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
-    // // }
-    return config;
-  },
-  (err) => {
-    console.log("登陆前拦截", err);
-    return Promise.reject(err);
-  }
+        // // 此处测试默认配置token
+        // config.headers.token =
+        //   "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7";
+        // // }
+        return config;
+    },
+    (err) => {
+        console.log("登陆前拦截", err);
+        return Promise.reject(err);
+    }
 );
 
 http.interceptors.response.use(
-  (response) => {
-    // console.log('response', response)
-    const {
-      data: { code, msg },
-    } = response;
-    // console.log('code', code)
-    if (code === 0 || code === 200) {
-      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');
-      }
-      console.log("api %o", msg);
+    (response) => {
+        // console.log('response', response)
+        const {
+            data: {code, msg},
+        } = response;
+        // console.log('code', code)
+        if (code === 0 || code === 200) {
+            return response;
+        } else {
+            if (code === 1000) {
+                process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VITE_LOGIN_URL)
+            }
+            console.log("api %o", msg);
+        }
+        return response;
+    },
+    function (error) {
+        if (error.message == "timeout of 1ms exceeded") {
+            message.destroy();
+            message.error("请求超时");
+        }
+        console.log("api error %o", error);
+        return Promise.reject(error);
     }
-    return response;
-  },
-  function (error) {
-    if (error.message == "timeout of 1ms exceeded") {
-      message.destroy();
-      message.error("请求超时");
-    }
-    console.log("api error %o", error);
-    return Promise.reject(error);
-  }
 );
 
 export default http;
diff --git a/vue.config.js b/vue.config.js
index f030ea5f..55ec18eb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -9,7 +9,7 @@
 const {defineConfig} = require("@vue/cli-service");
 
 module.exports = defineConfig({
-    publicPath: process.env.VITE_BASE,
+    publicPath: "/manage",
     // transpileDependencies: true,
     devServer: {
         port: 8080,

From 29461f594eaa6d753b24bc4bf44ed74e11e8f17a Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:53:07 +0800
Subject: [PATCH 07/12] -- bug

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 935c5f5b..026679be 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
 	"version": "0.1.0",
 	"private": true,
 	"scripts": {
-		"serve": "vue-cli-service serve",
+		"serve": "vue-cli-service serve --mode boe",
 		"build": "vue-cli-service build",
 		"lint": "vue-cli-service lint"
 	},

From f484534754979d5baf16af820ec5a7b4ba91d6ff Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:54:00 +0800
Subject: [PATCH 08/12] -- bug

---
 .env.boe | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.boe b/.env.boe
index 407c5463..ef2ad7d6 100644
--- a/.env.boe
+++ b/.env.boe
@@ -1,4 +1,4 @@
-VITE_BASE=/fe-student
+VITE_BASE=/manage
 VITE_BASE_API=/manageApi
 
 

From eece67eb229e53b2a57e0e94e27e830a9ceb71b1 Mon Sep 17 00:00:00 2001
From: lixg <lixg@dongwu-inc.com>
Date: Wed, 14 Dec 2022 20:55:34 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/config.js                         |   4 +-
 src/api/method.js                         |   2 +-
 src/components/drawers/AddProject.vue     |  90 ++++----
 src/views/projectcenter/ProjectAdd.vue    | 251 ++++++++++++----------
 src/views/projectcenter/ProjectManage.vue |   1 +
 5 files changed, 181 insertions(+), 167 deletions(-)

diff --git a/src/api/config.js b/src/api/config.js
index df04b6ff..3353037a 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-14 17:51:50
+ * @LastEditTime: 2022-12-14 18:56:46
  * @FilePath: /fe-manage/src/api/config.js
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -56,7 +56,7 @@ http.interceptors.response.use(
       return response;
     } else {
       if (code === 1000) {
-        window.open("https://u-pre.boe.com/web/", '_self');
+        // window.open("https://u-pre.boe.com/web/", '_self');
         // window.open("http://111.231.196.214:12013/manage/login", '_self');
       }
       console.log("api %o", msg);
diff --git a/src/api/method.js b/src/api/method.js
index c3ed4f2a..401b7d1d 100644
--- a/src/api/method.js
+++ b/src/api/method.js
@@ -278,7 +278,7 @@ const organizationalTree = []
 //嵌套页面
 const iframeUrl = "https://u-pre.boe.com/pc/iframe"
 //学员端路由
-const studentUrl = 'https://u.boe.com/pc/uc/study/courses'
+const studentUrl = 'https://u-pre.boe.com/pc/loading'
 
 //二维码
 const codeUrl = "https://u-pre.boe.com"
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index 04f75503..98d6dbe1 100644
--- a/src/components/drawers/AddProject.vue
+++ b/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>
@@ -141,11 +141,11 @@
             </div>
           </div>
         </div>
-     
+
         <div class="main_table">
           <div class="drawerbox">
             <!-- 添加的时候显示多选的表 -->
-          
+
             <!-- 编辑的时候显示单选的表 -->
             <a-table
               :columns="tableDataFunc()"
@@ -166,7 +166,7 @@
           <div class="pa">
             <a-pagination
               v-if="tableDataTotal > 10"
-             :showSizeChanger="false"
+              :showSizeChanger="false"
               showQuickJumper="true"
               hideOnSinglePage="true"
               :pageSize="pageSize"
@@ -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",
@@ -309,28 +310,28 @@ export default {
           title: "项目名称",
           dataIndex: "name",
           key: "projectName",
-          width:"40%",
+          width: "40%",
           ellipsis: true,
         },
         {
           title: "项目经理",
           dataIndex: "manager",
           key: "manager",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
         {
           title: "创建人",
           dataIndex: "creater",
           key: "creater",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
         {
           title: "创建时间",
           dataIndex: "time",
           key: "time",
-          width:"20%",
+          width: "20%",
           align: "center",
         },
       ];
@@ -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,
@@ -551,7 +552,7 @@ export default {
 
     const updateTask = async (res) => {
       if (props.isLevel == 1) {
-        if(!props.isactive){
+        if (!props.isactive) {
           message.destroy();
           return message.warning("请先选中关卡");
         }
@@ -849,7 +850,7 @@ export default {
             }
           }
         }
-      
+
         .main_item2 {
           display: flex;
           align-items: flex-start;
@@ -930,36 +931,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%;
@@ -991,7 +992,6 @@ export default {
         color: #fff;
       }
     }
-    
   }
 }
 </style>
diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index d34bef73..a27b84b0 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -3,13 +3,13 @@
   <div class="projectAdd">
     <div class="header">
       <span class="title"
-      >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
+        >{{ projectInfo.parentId ? "编辑" : "创建" }}项目</span
       >
       <div
-          @click="backPage"
-          style="cursor: pointer"
-          to="/projectmanage"
-          class="goback"
+        @click="backPage"
+        style="cursor: pointer"
+        to="/projectmanage"
+        class="goback"
       >
         <span class="return"></span><span class="returntext">返回</span>
       </div>
@@ -19,8 +19,8 @@
         <div class="name" v-if="projectInfo.parentName">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目归属</div>
           </div>
@@ -33,29 +33,36 @@
         <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 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">
           <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; display: flex">
             <div
-                :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
-                style="
+              :class="`box ${projectInfo.picUrl === src.value ? 'active' : ''}`"
+              style="
                 width: 100px;
                 height: 100px;
                 border-radius: 5px;
@@ -63,19 +70,19 @@
                 position: relative;
                 overflow: hidden;
               "
-                v-for="(src, index) in projectPic"
-                :key="index"
-                @click="() => (projectInfo.picUrl = src.value)"
+              v-for="(src, index) in projectPic"
+              :key="index"
+              @click="() => (projectInfo.picUrl = src.value)"
             >
               <img
-                  style="
+                style="
                   width: 100px;
                   height: 100px;
                   margin-bottom: 4px;
                   margin-right: 4px;
                 "
-                  :src="src.value"
-                  alt="avatar"
+                :src="src.value"
+                alt="avatar"
               />
             </div>
           </div>
@@ -83,63 +90,63 @@
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目时间</div>
           </div>
 
           <div class="in">
             <a-range-picker
-                show-time
-                separator="至"
-                :placeholder="['      开始时间', '        结束时间']"
-                v-model:value="projectInfo.rangeTime"
-                style="width: 100%; height: 40px; border-radius: 5px"
-                valueFormat="YYYY-MM-DD HH:mm:ss"
-                @change="timeChange"
-                :disabled="viewDetail ? true : false"
+              show-time
+              separator="至"
+              :placeholder="['      开始时间', '        结束时间']"
+              v-model:value="projectInfo.rangeTime"
+              style="width: 100%; height: 40px; border-radius: 5px"
+              valueFormat="YYYY-MM-DD HH:mm:ss"
+              @change="timeChange"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">项目经理</div>
           </div>
           <div class="in">
             <ProjectManager
-                v-model:value="projectInfo.managerId"
-                v-model:name="projectInfo.manager"
-                @onChange="managerChange"
-                mode="multiple"
+              v-model:value="projectInfo.managerId"
+              v-model:name="projectInfo.manager"
+              @onChange="managerChange"
+              mode="multiple"
             ></ProjectManager>
           </div>
         </div>
         <div class="name">
           <div class="namebox">
             <img
-                class="nameimg"
-                src="../../assets/images/basicinfo/asterisk.png"
+              class="nameimg"
+              src="../../assets/images/basicinfo/asterisk.png"
             />
             <div class="inname">资源归属</div>
           </div>
 
           <div class="in select">
             <OrgClass
-                v-model:value="projectInfo.sourceBelongId"
-                v-model:name="projectInfo.sourceBelongName"
+              v-model:value="projectInfo.sourceBelongId"
+              v-model:name="projectInfo.sourceBelongName"
             ></OrgClass>
           </div>
         </div>
         <div class="name">
           <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>
@@ -150,8 +157,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>
@@ -162,15 +169,15 @@
         <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"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.boeFlag"
+              :disabled="viewDetail ? true : false"
             >
               <a-radio :style="radioStyle" :value="1">是</a-radio>
               <a-radio :style="radioStyle" :value="0">否</a-radio>
@@ -183,16 +190,16 @@
           </div>
           <div class="in">
             <a-checkbox
-                v-model:checked="courseSyncFlag"
-                :disabled="viewDetail ? true : false"
-            ><span
+              v-model:checked="courseSyncFlag"
+              :disabled="viewDetail ? true : false"
+              ><span
                 style="
                   width: 100%;
                   color: rgba(109, 117, 132, 1);
                   font-size: 14px;
                 "
-            >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
-            ></a-checkbox
+                >同步课程学习记录（如学员在课程库中拥有课程的学习记录，自动免修该课程）</span
+              ></a-checkbox
             >
           </div>
         </div>
@@ -202,12 +209,12 @@
           </div>
           <div class="in">
             <a-textarea
-                v-model:value="projectInfo.remark"
-                style="height: 80px"
-                placeholder="请输入说明"
-                show-count
-                :maxlength="200"
-                :disabled="viewDetail ? true : false"
+              v-model:value="projectInfo.remark"
+              style="height: 80px"
+              placeholder="请输入说明"
+              show-count
+              :maxlength="200"
+              :disabled="viewDetail ? true : false"
             />
           </div>
         </div>
@@ -217,7 +224,7 @@
             <div class="inname" style="margin-top: 13px">审核意见</div>
           </div>
           <div class="description">
-           {{auditDescription}}
+            {{ auditDescription }}
           </div>
         </div>
       </div>
@@ -226,18 +233,18 @@
           <div class="inname" style="width: 50px">模版</div>
           <div class="in select" style="margin-left: 2px">
             <a-select
-                :getPopupContainer="
+              :getPopupContainer="
                 (triggerNode) => {
                   return triggerNode.parentNode || document.body;
                 }
               "
-                placeholder="请选择模版"
-                :size="size"
-                style="width: 100%"
-                :options="classifyList5"
-                @change="classificationChange5"
-                @popupScroll="templateScroll"
-                :fieldNames="{
+              placeholder="请选择模版"
+              :size="size"
+              style="width: 100%"
+              :options="classifyList5"
+              @change="classificationChange5"
+              @popupScroll="templateScroll"
+              :fieldNames="{
                 label: 'name',
                 value: 'projectTemplateId',
               }"
@@ -251,33 +258,32 @@
       <div class="btn">
         <a-button @click="backPage" class="btn2">取消</a-button>
         <a-button
-            v-on:click="createProject"
-            type="primary"
-            class="btn1"
-            style="margin-left: 20px"
-        >确定
-        </a-button
-        >
+          v-on:click="createProject"
+          type="primary"
+          class="btn1"
+          style="margin-left: 20px"
+          >确定
+        </a-button>
       </div>
     </div>
   </div>
 </template>
 <script>
-import {onMounted, reactive, toRefs, watch} from "vue";
-import {message} from "ant-design-vue";
-import {useRoute, useRouter} from "vue-router";
+import { onMounted, reactive, toRefs, watch } from "vue";
+import { message } from "ant-design-vue";
+import { useRoute, useRouter } from "vue-router";
 import * as api from "../../api/index";
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 // import ProjectClass from "@/components/project/ProjectClass";
 import TrainClass from "@/components/project/TrainClass";
 import OrgClass from "@/components/project/OrgClass";
 import ProjectManager from "@/components/project/ProjectManagerNew";
 import NameInput from "@/components/project/NameInput";
 import ProjectLevel from "@/components/project/ProjectLevel";
-import {changeOwnership, scrollLoad} from "@/api/method";
-import {storage} from "../../api/storage";
+import { changeOwnership, scrollLoad } from "@/api/method";
+import { storage } from "../../api/storage";
 import * as api2 from "../../api/indexAudit";
-import {validateName} from "@/api/index1";
+import { validateName } from "@/api/index1";
 
 export default {
   name: "projectAdd",
@@ -308,7 +314,7 @@ export default {
       },
       classifyList5: [],
       courseSyncFlag: false,
-      auditDescription:"",
+      auditDescription: "",
     });
 
     // 封面图选择
@@ -324,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, () => {
@@ -337,10 +345,10 @@ export default {
       state.projectInfo.parentId = routers.query.parentId;
       state.projectInfo.projectId = routers.query.projectId;
       (state.projectInfo.projectId || state.projectInfo.parentId) &&
-      api
+        api
           .getProjectDetail({
             projectId:
-                state.projectInfo.projectId || state.projectInfo.parentId,
+              state.projectInfo.projectId || state.projectInfo.parentId,
           })
           .then((res) => {
             state.projectInfo = {
@@ -353,23 +361,24 @@ export default {
             ];
             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 : "-";
+              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
+                      : "-";
+                  }
                 }
-              }
-            });
-        
-             }
+              });
+            }
           });
     }
 
@@ -446,7 +455,7 @@ export default {
       return true;
     }
 
-    const createProject = async() => {
+    const createProject = async () => {
       console.log("保存", state.projectInfo);
       if (!validate(state.projectInfo, errorMsgs)) {
         return;
@@ -457,26 +466,30 @@ export default {
         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("项目名称重复，请重新填写");
-         }
+      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) => {
         state.projectInfo.projectId ||
-        changeOwnership("project", res.data.data.projectId, [
-          {id: res.data.data.createId, name: res.data.data.createName},
-        ]);
+          changeOwnership("project", res.data.data.projectId, [
+            { id: res.data.data.createId, name: res.data.data.createName },
+          ]);
         message.destroy();
         message.success(state.projectInfo.projectId ? "编辑成功" : "创建成功");
         // router.back();
         router.push({
           path: "/taskpage",
-          query: {projectId: res.data.data.projectId},
+          query: { projectId: res.data.data.projectId },
         });
         storage.set("projectId", res.data.data.projectId);
       });
@@ -484,9 +497,9 @@ export default {
 
     function managerChange(e, l, d, t) {
       !state.projectInfo.sourceBelongId &&
-      (state.projectInfo.sourceBelongId = d);
+        (state.projectInfo.sourceBelongId = d);
       !state.projectInfo.sourceBelongName &&
-      (state.projectInfo.sourceBelongName = t);
+        (state.projectInfo.sourceBelongName = t);
     }
 
     return {
@@ -701,7 +714,7 @@ export default {
       .name2 {
         display: flex;
         align-items: flex-start;
-        .description{
+        .description {
           margin-top: 14px;
           margin-left: 11px;
         }
diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue
index 1a45eade..0a549a0a 100644
--- a/src/views/projectcenter/ProjectManage.vue
+++ b/src/views/projectcenter/ProjectManage.vue
@@ -1595,6 +1595,7 @@ export default {
                         parentId: value.record.projectId,
                         parentName:
                           value.record.parentName + "——" + value.record.name,
+                        ptojectType: 3,
                       },
                     });
                   }}

From 5c6abd7b8b593ffb64cc1446bb62fd39e451468b Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:56:48 +0800
Subject: [PATCH 10/12] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 135 ++++++++++++++++++++++++++-------------------------
 1 file changed, 69 insertions(+), 66 deletions(-)

diff --git a/package.json b/package.json
index 026679be..85cb3cf5 100644
--- a/package.json
+++ b/package.json
@@ -1,68 +1,71 @@
 {
-	"name": "fe_manage",
-	"version": "0.1.0",
-	"private": true,
-	"scripts": {
-		"serve": "vue-cli-service serve --mode boe",
-		"build": "vue-cli-service build",
-		"lint": "vue-cli-service lint"
-	},
-	"dependencies": {
-		"@wangeditor/editor": "^5.1.23",
-		"@wangeditor/editor-for-vue": "^5.1.12",
-		"ant-design-vue": "^3.2.12",
-		"axios": "^1.1.3",
-		"core-js": "^3.8.3",
-		"dayjs": "^1.11.6",
-		"element-plus": "^2.2.17",
-		"element-resize-detector": "^1.2.4",
-		"html2canvas": "^1.4.1",
-		"jquery": "^3.6.1",
-		"mitt": "^3.0.0",
-		"moment": "^2.29.4",
-		"qrcode.vue": "^3.3.3",
-		"qs": "^6.11.0",
-		"sortablejs": "^1.15.0",
-		"vue": "^3.2.13",
-		"vue-router": "^4.0.3",
-		"vuedraggable": "^4.1.0",
-		"vuex": "^4.0.0"
-	},
-	"devDependencies": {
-		"@babel/core": "^7.12.16",
-		"@babel/eslint-parser": "^7.12.16",
-		"@vue/cli-plugin-babel": "~5.0.0",
-		"@vue/cli-plugin-eslint": "~5.0.0",
-		"@vue/cli-plugin-router": "~5.0.0",
-		"@vue/cli-plugin-vuex": "~5.0.0",
-		"@vue/cli-service": "~5.0.0",
-		"eslint": "^7.32.0",
-		"eslint-plugin-vue": "^8.0.3",
-		"sass": "^1.32.7",
-		"sass-loader": "^12.0.0"
-	},
-	"eslintConfig": {
-		"root": true,
-		"env": {
-			"node": true
-		},
-		"extends": [
-			"plugin:vue/vue3-essential",
-			"eslint:recommended"
-		],
-		"parserOptions": {
-			"parser": "@babel/eslint-parser"
-		},
-		"rules": {
-			"no-console": "off",
-			"no-debugger": "off",
-			"no-mixed-spaces-and-tabs": "off"
-		}
-	},
-	"browserslist": [
-		"> 1%",
-		"last 2 versions",
-		"not dead",
-		"not ie 11"
-	]
+  "name": "fe_manage",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build --mode boe",
+    "boe": "vue-cli-service build --mode boe",
+    "release": "vue-cli-service build --mode release",
+    "prod": "vue-cli-service build --mode prod",
+    "test": "vue-cli-service build --mode test"
+  },
+  "dependencies": {
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-vue": "^5.1.12",
+    "ant-design-vue": "^3.2.12",
+    "axios": "^1.1.3",
+    "core-js": "^3.8.3",
+    "dayjs": "^1.11.6",
+    "element-plus": "^2.2.17",
+    "element-resize-detector": "^1.2.4",
+    "html2canvas": "^1.4.1",
+    "jquery": "^3.6.1",
+    "mitt": "^3.0.0",
+    "moment": "^2.29.4",
+    "qrcode.vue": "^3.3.3",
+    "qs": "^6.11.0",
+    "sortablejs": "^1.15.0",
+    "vue": "^3.2.13",
+    "vue-router": "^4.0.3",
+    "vuedraggable": "^4.1.0",
+    "vuex": "^4.0.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-eslint": "~5.0.0",
+    "@vue/cli-plugin-router": "~5.0.0",
+    "@vue/cli-plugin-vuex": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-vue": "^8.0.3",
+    "sass": "^1.32.7",
+    "sass-loader": "^12.0.0"
+  },
+  "eslintConfig": {
+    "root": true,
+    "env": {
+      "node": true
+    },
+    "extends": [
+      "plugin:vue/vue3-essential",
+      "eslint:recommended"
+    ],
+    "parserOptions": {
+      "parser": "@babel/eslint-parser"
+    },
+    "rules": {
+      "no-console": "off",
+      "no-debugger": "off",
+      "no-mixed-spaces-and-tabs": "off"
+    }
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
 }

From d8c63030f8db90bc57e39b6803f5cef734df7433 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:57:25 +0800
Subject: [PATCH 11/12] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 85cb3cf5..be5848db 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,10 @@
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build --mode boe",
-    "boe": "vue-cli-service build --mode boe",
-    "release": "vue-cli-service build --mode release",
-    "prod": "vue-cli-service build --mode prod",
-    "test": "vue-cli-service build --mode test"
+    "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",

From 635cf2040ff6f6d7bb157054254d407bc7947a24 Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Wed, 14 Dec 2022 20:57:40 +0800
Subject: [PATCH 12/12] =?UTF-8?q?--=20=E7=8E=AF=E5=A2=83=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be5848db..f694a453 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build --mode boe",
+    "build": "vue-cli-service build",
     "build:boe": "vue-cli-service build --mode boe",
     "build:release": "vue-cli-service build --mode release",
     "build:prod": "vue-cli-service build --mode prod",