Merge remote-tracking branch 'origin/manage-release' into manage-release

2025-12-07 01:46:43 +08:00 · 2022-12-14 19:26:38 +08:00
parent f34add84f0 4b4c146ca8
commit 613a1f285d
7 changed files with 110 additions and 101 deletions
--- 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);
    });
--- 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-14 17:40:35
 * @FilePath: /fe-manage/src/api/config.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
--- a/src/api/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);
@@ -276,7 +276,7 @@ const commonData = {
 const organizationalTree = []

 //嵌套页面
-const iframeUrl = "https://u-pre.boe.com/pc/iframe"
+const iframeUrl = "https://u-pre.boe.com/pc-release/iframe"
 //二维码
 const codeUrl = "https://u-pre.boe.com"
 export {
--- a/src/components/NavTop.vue
+++ b/src/components/NavTop.vue
@@ -76,12 +76,12 @@ export default {
        {
          id: 1,
          name: "管理员",
-          go: "/manage/learningpath",
+          go: "/manage-release/learningpath",
        },
        {
          id: 2,
          name: "学员",
-          go: "https://u.boe.com/pc/uc/study/courses",
+          go: "https://u.boe.com/pc-release/uc/study/courses",
        },
      ],

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

 })
--- 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="/manage-release/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,18 +43,18 @@
            <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="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;
@@ -62,19 +62,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>
@@ -82,53 +82,53 @@
        <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 +138,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 +151,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 +178,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 +190,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 +207,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,23 +229,33 @@ 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();
@@ -285,18 +290,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">
 .active {
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,14 +2,14 @@
 * @Author: lixg lixg@dongwu-inc.com
 * @Date: 2022-11-21 14:32:52
 * @LastEditors: lixg lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 15:15:30
+ * @LastEditTime: 2022-12-14 17:38:38
 * @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",
+    publicPath: "/manage-release",
    // transpileDependencies: true,
    // devServer: {
    //     port: 8080,