fix:校验报名审批接口调整

package-lock.json

@@ -39,7 +39,8 @@
         "vue-pdf": "^4.2.0",
         "vue-quill-editor": "^3.0.6",
         "vue-router": "^3.5.2",
-        "vuex": "^3.6.2"
+        "vuex": "^3.6.2",
+        "wangeditor": "^4.7.15"
       },
       "devDependencies": {
         "@vue/cli-plugin-babel": "~4.5.0",
@@ -1445,7 +1446,6 @@
       "version": "7.18.3",
       "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.3.tgz",
       "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
-      "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
       },
@@ -1453,6 +1453,17 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/runtime-corejs3": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.28.4.tgz",
+      "integrity": "sha512-h7iEYiW4HebClDEhtvFObtPmIvrd1SSfpI9EhOeKk4CtIK/ngBWFpuhCzhdmRKtg71ylcue+9I6dv54XYO1epQ==",
+      "dependencies": {
+        "core-js-pure": "^3.43.0"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/template": {
       "version": "7.16.7",
       "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.16.7.tgz",
@@ -4621,6 +4632,16 @@
         "semver": "bin/semver.js"
       }
     },
+    "node_modules/core-js-pure": {
+      "version": "3.46.0",
+      "resolved": "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.46.0.tgz",
+      "integrity": "sha512-NMCW30bHNofuhwLhYPt66OLOKTMbOhgTTatKVbaQC3KRHpTCiRIBYvtshr+NBYSnBxwAFhjW/RfJ0XbIjS16rw==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
     "node_modules/core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -11871,8 +11892,7 @@
     "node_modules/regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-      "dev": true
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.0",
@@ -15197,6 +15217,16 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
       "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
+    "node_modules/wangeditor": {
+      "version": "4.7.15",
+      "resolved": "https://registry.npmmirror.com/wangeditor/-/wangeditor-4.7.15.tgz",
+      "integrity": "sha512-aPTdREd8BxXVyJ5MI+LU83FQ7u1EPd341iXIorRNYSOvoimNoZ4nPg+yn3FGbB93/owEa6buLw8wdhYnMCJQLg==",
+      "dependencies": {
+        "@babel/runtime": "^7.11.2",
+        "@babel/runtime-corejs3": "^7.11.2",
+        "tslib": "^2.1.0"
+      }
+    },
     "node_modules/watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
@@ -17471,11 +17501,18 @@
       "version": "7.18.3",
       "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.3.tgz",
       "integrity": "sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==",
-      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "@babel/runtime-corejs3": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime-corejs3/-/runtime-corejs3-7.28.4.tgz",
+      "integrity": "sha512-h7iEYiW4HebClDEhtvFObtPmIvrd1SSfpI9EhOeKk4CtIK/ngBWFpuhCzhdmRKtg71ylcue+9I6dv54XYO1epQ==",
+      "requires": {
+        "core-js-pure": "^3.43.0"
+      }
+    },
     "@babel/template": {
       "version": "7.16.7",
       "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.16.7.tgz",
@@ -20272,6 +20309,11 @@
         }
       }
     },
+    "core-js-pure": {
+      "version": "3.46.0",
+      "resolved": "https://registry.npmmirror.com/core-js-pure/-/core-js-pure-3.46.0.tgz",
+      "integrity": "sha512-NMCW30bHNofuhwLhYPt66OLOKTMbOhgTTatKVbaQC3KRHpTCiRIBYvtshr+NBYSnBxwAFhjW/RfJ0XbIjS16rw=="
+    },
     "core-util-is": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
@@ -26353,8 +26395,7 @@
     "regenerator-runtime": {
       "version": "0.13.9",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+      "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
-      "dev": true
     },
     "regenerator-transform": {
       "version": "0.15.0",
@@ -29150,6 +29191,16 @@
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
       "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
+    "wangeditor": {
+      "version": "4.7.15",
+      "resolved": "https://registry.npmmirror.com/wangeditor/-/wangeditor-4.7.15.tgz",
+      "integrity": "sha512-aPTdREd8BxXVyJ5MI+LU83FQ7u1EPd341iXIorRNYSOvoimNoZ4nPg+yn3FGbB93/owEa6buLw8wdhYnMCJQLg==",
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@babel/runtime-corejs3": "^7.11.2",
+        "tslib": "^2.1.0"
+      }
+    },
     "watchpack": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",

package.json

@@ -46,7 +46,8 @@
     "vue-pdf": "^4.2.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.2",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "wangeditor": "^4.7.15"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

src/api/new-employee/newEmployee.js

@@ -0,0 +1,91 @@
+import ajax from '../ajax';
+
+/**
+ * 获取欢迎页数据
+ */
+export function getWelcomeData() {
+  return ajax.get('/manageApi/stu/project/socialRecruit/enroll/getStudentEnrollInfo')
+}
+
+/**
+ * 报名审批
+ */
+export function enrollRequest() {
+  return ajax.get('/manageApi/stu/project/socialRecruit/enroll/socialRecruitRegistrationRequest')
+}
+
+/**
+ * 获取学习列表
+ * @param {Object} params - 参数对象
+ * @param {string} params.type - 类型：''全部, 'course'在线课, 'exam'考试
+ * @param {string} params.status - 状态：''全部, 'completed'已完成, 'incomplete'未完成
+ * @param {number} params.pageIndex - 页码
+ * @param {number} params.pageSize - 每页条数
+ */
+export function getStudyList(params) {
+  return ajax.postJson('/boe/new-employee/study/list', params)
+}
+
+/**
+ * 获取学习进度
+ */
+export function getStudyProgress() {
+  return ajax.get('/boe/new-employee/study/progress')
+}
+
+/**
+ * 下载成绩单
+ */
+export function downloadScorecard() {
+  // 使用request方法支持responseType: 'blob'
+  return ajax.request({
+    url: '/boe/new-employee/study/scorecard/download',
+    method: 'get',
+    responseType: 'blob'
+  })
+}
+/**
+ * 获取社招新员工项目信息
+ * GET
+ */
+export function getSzxygProjectInfo() {
+  return ajax.get('/manageApi/admin/project/getSzxygProjectInfo')
+}
+
+/**
+ * 社招新员工培训及考试列表查询
+ * POST
+ * @param {Object} params
+ * @param {number} params.pageNo - 页码
+ * @param {number} params.pageSize - 每页条数
+ * @param {string|number} params.studentId - 学员ID
+ * @param {string|number} params.projectId - 项目ID
+ */
+export function getStuProjectTaskList(data) {
+  return ajax.postJson('', '/manageApi/stu/project/getStuProjectTaskList', data)
+}
+
+/**
+ * 学员项目进度明细查询
+ * POST
+ * @param {string|number} params.studentId - 学员ID
+ * @param {string|number} params.projectId - 项目ID
+ */
+export function getStuProjectProcess(data) {
+  return ajax.postJson('', `/manageApi/stu/project/getStuProjectTaskProgress`, data)
+}
+
+/**
+ * 社招新员工培训在线课程成绩单下载
+ * GET
+ * @param {string|number} projectId - 项目ID
+ * @param {string|number} studentId - 学员ID
+ */
+export function downloadSocialRecruitReport(projectId, studentId) {
+  return ajax.request({
+    url: `/manageApi/stu/project/socialRecruit/report/download?projectId=${projectId}&studentId=${studentId}`,
+    method: 'get',
+    responseType: 'arraybuffer',
+  })
+}
+

src/components/CustomErrorMessage.vue

@@ -0,0 +1,112 @@
+<template>
+  <transition name="fade">
+    <div v-if="visible" class="custom-info-message" @click="handleClose">
+      <div class="message-content">
+        <div class="icon-wrapper">
+          <span class="icon-text">X</span>
+        </div>
+        <div class="message-text">{{ message }}</div>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+export default {
+  name: "CustomErrorMessage",
+  data() {
+    return {
+      visible: false,
+      message: "",
+      timer: null,
+    };
+  },
+  methods: {
+    show(msg, duration = 3000) {
+      this.message = msg;
+      this.visible = true;
+
+      if (this.timer) {
+        clearTimeout(this.timer);
+      }
+
+      this.timer = setTimeout(() => {
+        this.hide();
+      }, duration);
+    },
+    hide() {
+      this.visible = false;
+      if (this.timer) {
+        clearTimeout(this.timer);
+        this.timer = null;
+      }
+    },
+    handleClose() {
+      this.hide();
+    },
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+    }
+  },
+};
+</script>
+
+<style scoped>
+.custom-info-message {
+  position: fixed;
+  top: 20%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 3000;
+  cursor: pointer;
+}
+
+.message-content {
+  display: flex;
+  align-items: center;
+  background: rgba(255, 241, 240, 1);
+  border-radius: 8px;
+  padding: 8px 16px;
+  border: 1px solid rgba(255, 204, 199, 1);
+}
+
+.icon-wrapper {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background: rgba(230, 31, 31, 1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 12px;
+  flex-shrink: 0;
+}
+
+.icon-wrapper .icon-text {
+  color: #fff;
+  font-size: 12px;
+  font-weight: 400;
+  font-style: normal;
+  line-height: 1;
+}
+
+.message-text {
+  color: rgba(0, 0, 0, 0.88);
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.5;
+  flex: 1;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.3s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+</style>

src/components/CustomInfoMessage.vue

@@ -0,0 +1,112 @@
+<template>
+  <transition name="fade">
+    <div v-if="visible" class="custom-info-message" @click="handleClose">
+      <div class="message-content">
+        <div class="icon-wrapper">
+          <span class="icon-text">i</span>
+        </div>
+        <div class="message-text">{{ message }}</div>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+export default {
+  name: "CustomInfoMessage",
+  data() {
+    return {
+      visible: false,
+      message: "",
+      timer: null,
+    };
+  },
+  methods: {
+    show(msg, duration = 3000) {
+      this.message = msg;
+      this.visible = true;
+
+      if (this.timer) {
+        clearTimeout(this.timer);
+      }
+
+      this.timer = setTimeout(() => {
+        this.hide();
+      }, duration);
+    },
+    hide() {
+      this.visible = false;
+      if (this.timer) {
+        clearTimeout(this.timer);
+        this.timer = null;
+      }
+    },
+    handleClose() {
+      this.hide();
+    },
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+    }
+  },
+};
+</script>
+
+<style scoped>
+.custom-info-message {
+  position: fixed;
+  top: 20%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 3000;
+  cursor: pointer;
+}
+
+.message-content {
+  display: flex;
+  align-items: center;
+  background: #ffffff;
+  border-radius: 8px;
+  padding: 8px 16px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+}
+
+.icon-wrapper {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background: rgba(22, 119, 255, 1);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 12px;
+  flex-shrink: 0;
+}
+
+.icon-wrapper .icon-text {
+  color: #ffffff;
+  font-size: 12px;
+  font-weight: 400;
+  font-style: normal;
+  line-height: 1;
+}
+
+.message-text {
+  color: rgba(0, 0, 0, 0.88);
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.5;
+  flex: 1;
+}
+
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.3s;
+}
+
+.fade-enter,
+.fade-leave-to {
+  opacity: 0;
+}
+</style>

src/components/NewEmployeeGuideDialog.vue

@@ -0,0 +1,185 @@
+<template>
+  <el-dialog
+    :visible.sync="innerVisible"
+    :close-on-click-modal="false"
+    class="custom-strategy-dialog"
+    width="880px"
+    @close="handleClose"
+  >
+    <div class="strategy-container">
+      <div class="strategy-content">
+        <div class="strategy-title">转正攻略</div>
+        <div class="strategy-body">
+          <RichTextEditor v-model="modalContent" />
+        </div>
+      </div>
+      <div class="strategy-footer-btns">
+        <el-button
+          class="footer-btn"
+          type="primary"
+          :loading="processing"
+          @click="handleCancelClick"
+          v-if="showBtn"
+        >
+          关闭
+        </el-button>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import RichTextEditor from "@/components/RichTextEditor.vue";
+import { getSzxygProjectInfo } from "@/api/new-employee/newEmployee";
+
+export default {
+  name: "NewEmployeeGuideDialog",
+  components: { RichTextEditor },
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    processing: {
+      type: Boolean,
+      default: false,
+    },
+    showBtn: {
+      type: Boolean,
+      default: true,
+    },
+    onConfirm: {
+      type: Function,
+      default: null,
+    },
+    onCancel: {
+      type: Function,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      modalContent: "",
+      innerVisible: this.visible,
+      hasLoadedOnce: false,
+    };
+  },
+  watch: {
+    visible(val) {
+      this.innerVisible = val;
+      if (val) {
+        this.fetchContent();
+      }
+    },
+    innerVisible(val) {
+      if (val !== this.visible) {
+        this.$emit("update:visible", val);
+      }
+    },
+  },
+  mounted() {
+    if (this.visible) {
+      this.fetchContent();
+    }
+  },
+  methods: {
+    async fetchContent() {
+      if (this.hasLoadedOnce) return;
+      try {
+        const res = await getSzxygProjectInfo();
+        this.modalContent =
+          (res && res.data && res.data.learningGuideConfig) || "";
+        this.hasLoadedOnce = true;
+      } catch (e) {
+        // 保底：避免影响弹窗展示
+        this.modalContent = "";
+      }
+    },
+    handleConfirmClick() {
+      if (typeof this.onConfirm === "function") {
+        this.onConfirm();
+      } else {
+        // 默认行为：关闭并派发事件
+        this.innerVisible = false;
+        this.$emit("confirm");
+      }
+    },
+    handleCancelClick() {
+      if (typeof this.onCancel === "function") {
+        this.onCancel();
+      } else {
+        this.innerVisible = false;
+        this.$emit("cancel");
+      }
+    },
+    handleClose() {
+      this.$emit("close");
+    },
+  },
+};
+</script>
+
+<style scoped>
+.custom-strategy-dialog >>> .el-dialog {
+  background: url("../assets/images/bg_yd.png");
+  background-size: cover;
+  border-radius: 18px;
+  overflow: hidden;
+  padding: 0;
+  box-shadow: 0 8px 32px rgba(0, 43, 121, 0.14);
+}
+.strategy-container {
+  position: relative;
+  min-height: 360px;
+  padding: 0px 40px 28px 40px;
+  border-radius: 18px;
+}
+.strategy-content {
+  position: relative;
+  z-index: 1;
+}
+.strategy-title {
+  font-size: 24px;
+  font-weight: bold;
+  color: #1e7cfa;
+  line-height: 32px;
+  margin-bottom: 18px;
+  text-align: left;
+  letter-spacing: 1px;
+}
+.strategy-body {
+  color: #444;
+  font-size: 15px;
+  min-height: 200px;
+  line-height: 2;
+  margin-bottom: 16px;
+  text-align: left;
+}
+.strategy-footer-btns {
+  display: flex;
+  margin-top: 18px;
+  z-index: 1;
+  position: relative;
+  gap: 14px;
+}
+.footer-btn {
+  min-width: 115px;
+  font-size: 16px;
+  border-radius: 6px;
+  height: 40px;
+}
+.footer-btn.el-button--primary {
+  background: linear-gradient(
+    90deg,
+    rgba(48, 116, 239, 1) 0%,
+    rgba(81, 146, 238, 1) 100%
+  );
+  border-color: #278cff;
+  color: #fff;
+  font-weight: bold;
+  width: 210px;
+  border-radius: 58px;
+}
+</style>
+
+

src/components/PortalHeader.vue

@@ -3,53 +3,108 @@
     <div class="portal-top" :style="{ color: textColor }">
       <div class="portal-top-left">
         <div class="portal-top-logo">
-            <img src="../assets/logo/logo-white.png" v-if="textColor == '#fff' || textColor == '#ffffff'" style="width:160px;height: 27px;" />
+          <img
-            <img src="../assets/logo/logo.png" v-else style="width:160px;height: 27px;" />
+            src="../assets/logo/logo-white.png"
+            v-if="textColor == '#fff' || textColor == '#ffffff'"
+            style="width: 160px; height: 27px"
+          />
+          <img
+            src="../assets/logo/logo.png"
+            v-else
+            style="width: 160px; height: 27px"
+          />
         </div>
         <div class="portal-top-nav" v-if="userInfo.role === 1">
-            <div class="top-nav" :style="{color:textColor}" :class="current == 'index' ? activeNav : ''">
+          <div
-              <router-link to="/index" >首页
+            class="top-nav"
+            :style="{ color: textColor }"
+            :class="current == 'index' ? activeNav : ''"
+          >
+            <router-link to="/index"
+              >首页
               <div :class="current == 'index' ? 'nav-bottbor' : ''"></div>
             </router-link>
           </div>
-            <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
+          <div
-              <a @click="handleChangeCourse">课程
+            class="top-nav"
+            :style="{ color: textColor }"
+            :class="current == 'course' ? activeNav : ''"
+          >
+            <a @click="handleChangeCourse"
+              >课程
               <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
             </a>
           </div>
-            <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
+          <div
-              <router-link to="/case">案例
+            class="top-nav"
+            :style="{ color: textColor }"
+            :class="current == 'case' ? activeNav : ''"
+          >
+            <router-link to="/case"
+              >案例
               <div :class="current == 'case' ? 'nav-bottbor' : ''"></div>
             </router-link>
           </div>
-            <div class="top-nav" :style="{color:textColor}" :class="current == 'article' ? activeNav : ''">
+          <div
-              <router-link to="/article">文章
+            class="top-nav"
+            :style="{ color: textColor }"
+            :class="current == 'article' ? activeNav : ''"
+          >
+            <router-link to="/article"
+              >文章
               <div :class="current == 'article' ? 'nav-bottbor' : ''"></div>
             </router-link>
           </div>
-            <div class="top-nav" :style="{color:textColor}" :class="current == 'qa' ? activeNav : ''">
+          <div
-              <router-link to="/qa" >问答
+            class="top-nav"
+            :style="{ color: textColor }"
+            :class="current == 'qa' ? activeNav : ''"
+          >
+            <router-link to="/qa"
+              >问答
               <div :class="current == 'qa' ? 'nav-bottbor' : ''"></div>
             </router-link>
           </div>
           <div class="top-nav">
             <el-dropdown placement="bottom" @command="handleCommand">
-                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">专区</span>
+              <span
+                class="el-dropdown-link"
+                style="font-size: 16px; cursor: pointer"
+                :style="{ color: textColor }"
+                >专区</span
+              >
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="zero">热点论坛</el-dropdown-item>
-                  <el-dropdown-item command="one" divided>BOE系列公开课</el-dropdown-item>
+                <el-dropdown-item command="one" divided
-                  <el-dropdown-item command="two" divided>Grow180</el-dropdown-item>
+                  >BOE系列公开课</el-dropdown-item
-                  <el-dropdown-item command="three" divided>管理者进阶</el-dropdown-item>
+                >
-                  <el-dropdown-item command="four" divided>U选小课堂</el-dropdown-item>
+                <el-dropdown-item command="two" divided
-                  <el-dropdown-item command="five" divided>社招新员工</el-dropdown-item>
+                  >Grow180</el-dropdown-item
+                >
+                <el-dropdown-item command="three" divided
+                  >管理者进阶</el-dropdown-item
+                >
+                <el-dropdown-item command="four" divided
+                  >U选小课堂</el-dropdown-item
+                >
+                <el-dropdown-item command="five" divided
+                  >社招新员工</el-dropdown-item
+                >
                 <!-- <el-dropdown-item command="six" divided>贡献者专区</el-dropdown-item> -->
-                  <el-dropdown-item command="seven" divided>教师专区</el-dropdown-item>
+                <el-dropdown-item command="seven" divided
+                  >教师专区</el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <div class="top-nav">
             <el-dropdown placement="bottom" @command="handleContributor">
-                <span class="el-dropdown-link" style="font-size:16px;cursor: pointer;" :style="{color:textColor}">贡献者大会</span>
+              <span
+                class="el-dropdown-link"
+                style="font-size: 16px; cursor: pointer"
+                :style="{ color: textColor }"
+                >贡献者大会</span
+              >
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item command="three">2024</el-dropdown-item>
                 <el-dropdown-item command="one" divided>2023</el-dropdown-item>
@@ -58,18 +113,40 @@
             </el-dropdown>
           </div>
 
-            <div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
+          <div
-              <router-link to="/follow">我的关注
+            class="top-nav"
+            :style="{ color: textColor }"
+            :class="current == 'follow' ? activeNav : ''"
+          >
+            <router-link to="/follow"
+              >我的关注
               <div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
             </router-link>
           </div>
-
         </div>
       </div>
       <div class="portal-top-right">
-          <div  v-if="goSearch !=10 && userInfo.role === 1" style="position: relative;">
+        <div
-            <el-input class="portal-input" v-show="!hideSearch" placeholder="搜索全部" style="border-radius: 20px !important; " @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword" >
+          v-if="goSearch != 10 && userInfo.role === 1"
-              <el-select v-if="current == 'index'"  v-model="findType" style="width: 75px; border-radius:20px !important;" slot="prepend" placeholder="请选择">
+          style="position: relative"
+        >
+          <el-input
+            class="portal-input"
+            v-show="!hideSearch"
+            placeholder="搜索全部"
+            style="border-radius: 20px !important"
+            @keyup.enter.native="searchJump()"
+            clearable
+            maxlength="50"
+            v-model="keyword"
+          >
+            <el-select
+              v-if="current == 'index'"
+              v-model="findType"
+              style="width: 75px; border-radius: 20px !important"
+              slot="prepend"
+              placeholder="请选择"
+            >
               <el-option label="课程" value="1"></el-option>
               <el-option label="案例" value="2"></el-option>
               <el-option label="文章" value="3"></el-option>
@@ -77,7 +154,14 @@
               <!-- <el-option label="专区" value="5"></el-option> -->
             </el-select>
           </el-input>
-             <el-button v-show="!hideSearch" class="sear-but"  @click="searchJump()" type="primary" size="mini">搜索</el-button>
+          <el-button
+            v-show="!hideSearch"
+            class="sear-but"
+            @click="searchJump()"
+            type="primary"
+            size="mini"
+            >搜索</el-button
+          >
         </div>
 
         <div class="person-action">
@@ -86,11 +170,25 @@
             <el-link v-else class="person-action-index" type="primary" style="margin-right:10px; color:#fff;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link> -->
           <!-- <el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link> -->
           <div class="person-action-item">
-              <el-badge class="person-action-index"  :value="userMsg" :hidden="userMsg == 0">
+            <el-badge
-                <el-tooltip   content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
+              class="person-action-index"
+              :value="userMsg"
+              :hidden="userMsg == 0"
+            >
+              <el-tooltip
+                content="消息"
+                placement="bottom"
+                effect="light"
+                :visible-arrow="false"
+                popper-class="text-tooltip"
+              >
                 <!-- <el-link  type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false"> -->
                 <router-link to="/message/center/index">
-                        <svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
+                  <svg-icon
+                    :style="{ color: textColor }"
+                    style="margin-right: 0; font-size: 22px"
+                    icon-class="messfff"
+                  ></svg-icon>
                 </router-link>
                 <!-- </el-link> -->
               </el-tooltip>
@@ -100,39 +198,93 @@
             <el-dropdown class="person-action-index">
               <span class="el-dropdown-link">
                 <span :style="{ color: textColor }">学员</span>
-                    <i :style="{color:textColor}" class="el-icon-arrow-down el-icon--right"></i>
+                <i
+                  :style="{ color: textColor }"
+                  class="el-icon-arrow-down el-icon--right"
+                ></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
+                <el-dropdown-item
-                    <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
+                  ><router-link to="/index">学员</router-link></el-dropdown-item
-                    <el-dropdown-item v-if="identity == 3 || identity == 5" ><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
+                >
+                <el-dropdown-item
+                  v-if="identity == 2 || identity == 5"
+                  @click.native="setCurIdentity(2)"
+                  ><router-link to="/need/waitaudit"
+                    >教师</router-link
+                  ></el-dropdown-item
+                >
+                <el-dropdown-item v-if="identity == 3 || identity == 5"
+                  ><a :href="managerPath + '/learningpath'"
+                    >管理员</a
+                  ></el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <div class="person-action-item">
             <el-dropdown>
-                  <div class="el-dropdown-link" style="display:flex" :style="{color:textColor}">
+              <div
+                class="el-dropdown-link"
+                style="display: flex"
+                :style="{ color: textColor }"
+              >
                 <div class="person-action-index">
                   <div v-if="userInfo.avatar !== ''" class="user-avatar">
-                          <img :src="userInfo.avatar"  style="width: 35px;height: 35px;"/>
+                    <img
+                      :src="userInfo.avatar"
+                      style="width: 35px; height: 35px"
+                    />
                   </div>
                   <div v-else class="uavatar">
-                          <div v-if="sex === 1 "><img src="../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;"></div>
+                    <div v-if="sex === 1">
-                          <div v-else><img src="../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;"></div>
+                      <img
+                        src="../../public/images/Avatarman.png"
+                        alt=""
+                        style="width: 30px; height: 30px"
+                      />
+                    </div>
+                    <div v-else>
+                      <img
+                        src="../../public/images/Avatarwoman.png"
+                        alt=""
+                        style="width: 30px; height: 30px"
+                      />
                     </div>
                   </div>
-                    <div style="font-weight: 400;font-size: 16px; margin-top: 8px;">{{userInfo.name}}</div>
+                </div>
+                <div style="font-weight: 400; font-size: 16px; margin-top: 8px">
+                  {{ userInfo.name }}
+                </div>
               </div>
               <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                <el-dropdown-item @click.native="setCurIdentity(1)"
-                    <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
+                  ><a
+                    :href="`${webBaseUrl}${
+                      isTiao ? '/uc/study/task' : '/uc/study/courses'
+                    }`"
+                    >个人中心</a
+                  ></el-dropdown-item
+                >
+                <el-dropdown-item
+                  ><router-link :to="'/home/' + userInfo.aid"
+                    >个人主页</router-link
+                  ></el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <div class="person-action-item">
-
+            <div
-              <div class="person-action-index pointer" :style="{color:textColor}" @click="logout()">
+              class="person-action-index pointer"
-                <svg-icon  style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出
+              :style="{ color: textColor }"
+              @click="logout()"
+            >
+              <svg-icon
+                style="margin-right: 4px; font-size: 16px"
+                icon-class="white-out"
+              ></svg-icon
+              >登出
             </div>
           </div>
         </div>
@@ -142,18 +294,19 @@
   </div>
 </template>
 <script>
-import { mapGetters, mapActions } from 'vuex';
+import { mapGetters, mapActions } from "vuex";
-import apiMessage from '@/api/system/message.js';
+import apiMessage from "@/api/system/message.js";
-import popup from '@/components/AlertPopup.vue';
+import popup from "@/components/AlertPopup.vue";
-import yearMedal from '@/components/Popup/China2023.vue';
+import yearMedal from "@/components/Popup/China2023.vue";
-import apiBoeCourse from '@/api/boe/course.js';
+import { getWelcomeData } from "@/api/new-employee/newEmployee";
+import apiBoeCourse from "@/api/boe/course.js";
 import { userAvatarText } from "@/utils/tools.js";
 import apiCase from "@/api/modules/cases.js";
 export default {
   props: {
     current: {
       type: String,
-      default: '',
+      default: "",
     },
     hideSearch: {
       type: Boolean,
@@ -161,7 +314,7 @@ export default {
     },
     textColor: {
       type: String,
-      default: '',
+      default: "",
     },
     goSearch: {
       type: Number,
@@ -169,63 +322,70 @@ export default {
     },
     keywords: {
       type: String,
-      default:''
+      default: "",
     },
   },
   components: { popup, yearMedal },
   computed: {
-    ...mapGetters(['userInfo','curIdentity', 'userMsg','identity','studyTaskCount']),
+    ...mapGetters([
+      "userInfo",
+      "curIdentity",
+      "userMsg",
+      "identity",
+      "studyTaskCount",
+    ]),
 
     avatarText() {
       return userAvatarText(this.userInfo.name);
     },
     activeNav() {
       return {
-          'top-nav-active-blue': this.textColor=='#000000',
+        "top-nav-active-blue": this.textColor == "#000000",
-          'top-nav-active-white': this.textColor=='#fff' || this.textColor=='#ffffff',
+        "top-nav-active-white":
-        }
+          this.textColor == "#fff" || this.textColor == "#ffffff",
-    }
+      };
+    },
   },
   watch: {
     keywords(newval) {
       console.log(newval, 9999);
-      if(this.findType == '1'){
+      if (this.findType == "1") {
-        this.keyword = newval
+        this.keyword = newval;
-      }
       }
     },
+  },
   data() {
     return {
       popupConfig: {},
       ctx: process.env.VUE_APP_PUBLIC_PATH,
       managerPath: process.env.VUE_APP_MANAGER_PATH,
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      findType: '1',
+      findType: "1",
-      keyword: '',
+      keyword: "",
       isTiao: false,
-      sex:'',
+      sex: "",
     };
   },
   mounted() {
     this.sex = this.userInfo.sex;
-    this.$store.dispatch('refrashMsg');
+    this.$store.dispatch("refrashMsg");
     this.loadBoeData();
     // console.log('this.userInfo::',this.userInfo)
     //this.loadPopupConfig();
   },
   methods: {
     handleChangeCourse() {
-      const paths = ["/course","/qualityCourse"]
+      const paths = ["/course", "/qualityCourse"];
       // 如果是 课程 和 精品课程， 那么就不再重定向
-      const needReload = paths.findIndex(e=> e === this.$route.path) === -1
+      const needReload = paths.findIndex((e) => e === this.$route.path) === -1;
-      if (needReload) this.$router.push({path: paths[0]})
+      if (needReload) this.$router.push({ path: paths[0] });
     },
 
     setCurIdentity(iden) {
-        this.$store.dispatch('SetCurIdentity',iden);
+      this.$store.dispatch("SetCurIdentity", iden);
     },
     tomy() {
-      console.log('lll')
+      console.log("lll");
     },
     loadBoeData() {
       if (this.studyTaskCount > 0) {
@@ -253,13 +413,23 @@ export default {
       let obj = {
         one: urlPre + "/web/contributornew/index",
         two: urlPre + "/web/contributor/index",
-          three: urlPre + "/web/contributor_2024/index"
+        three: urlPre + "/web/contributor_2024/index",
       };
       window.open(obj[val]);
     },
-    handleCommand(val) {
+    async handleCommand(val) {
+      if (val === "five") {
+        // 从后端获取用户信息和报名状态
+        const res = await getWelcomeData();
+        if (res.status === 200 && res.data) {
+          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
+            this.$router.push("/new-employee/study");
+            return;
+          }
+        }
+      }
       if (val === "four") {
-        window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
+        window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130");
         // this.$emit('showClass',true)
       } else {
         let urlPre = window.location.protocol + "//" + window.location.host;
@@ -270,66 +440,84 @@ export default {
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-          five: urlPre + "/boe/new-employee/index.html",
+          five: this.webBaseUrl + "/new-employee/welcome",
-          six: urlPre + "/web/contributor/index",
+          six: this.webBaseUrl + "/web/contributor/index",
-          seven: this.webBaseUrl + '/grateful/index'
+          seven: this.webBaseUrl + "/grateful/index",
         };
         window.open(obj[val]);
       }
     },
     handleUcCommand(val) {
-      if (val == 'uc') {
+      if (val == "uc") {
-        window.location.href = `${this.webBaseUrl}${this.isTiao ? '/uc/study/task' : '/uc/study/courses'}`;
+        window.location.href = `${this.webBaseUrl}${
-      } else if (val == 'logout') {
+          this.isTiao ? "/uc/study/task" : "/uc/study/courses"
+        }`;
+      } else if (val == "logout") {
         this.logout();
       }
     },
     searchJump() {
-      this.$emit('type1', '')
+      this.$emit("type1", "");
-  if(this.current == 'index') {
+      if (this.current == "index") {
-    if (this.findType == '1') {
+        if (this.findType == "1") {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           // 课程
           location.href = `${this.webBaseUrl}/course?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/course?keyword=${this.keyword}`);
-        } else if (this.findType == '2') {
+        } else if (this.findType == "2") {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           // 案例
           location.href = `${this.webBaseUrl}/case?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
-        } else if (this.findType == '3') {
+        } else if (this.findType == "3") {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           //文章
           location.href = `${this.webBaseUrl}/article?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/article?keyword=${this.keyword}`);
-        } else if (this.findType == '4') {
+        } else if (this.findType == "4") {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           // 问答
           location.href = `${this.webBaseUrl}/qa?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/qa?keyword=${this.keyword}`);
-        } else if (this.findType == '5') {
+        } else if (this.findType == "5") {
           // 专区,专区要单独的写，因为不是一个系统呀
           window.open(`${this.webBaseUrl}/zone?keyword=${this.keyword}`);
         }
       } else {
-  this.$emit('emitInput',this.keyword)
+        this.$emit("emitInput", this.keyword);
         if (this.goSearch == 1) {
-    if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           // 课程
           location.href = `${this.webBaseUrl}/course?keyword=${this.keyword}`;
         } else if (this.goSearch == 2) {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           // 案例
           // location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
-          this.$router.push(`/case?keyword=${this.keyword}`)
+          this.$router.push(`/case?keyword=${this.keyword}`);
           //window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
         } else if (this.goSearch == 3) {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           //文章
           location.href = `${this.webBaseUrl}/article?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/article?keyword=${this.keyword}`);
         } else if (this.goSearch == 4) {
-          if(this.keyword==''){return;}
+          if (this.keyword == "") {
+            return;
+          }
           // 问答
           location.href = `${this.webBaseUrl}/qa?keyword=${this.keyword}`;
           //window.open(`${this.webBaseUrl}/qa?keyword=${this.keyword}`);
@@ -338,17 +526,20 @@ export default {
           window.open(`${this.webBaseUrl}/zone?keyword=${this.keyword}`);
         }
       }
-
     },
     logout() {
-      this.$confirm('您确定要退出系统吗？', '提示', {
+      this.$confirm("您确定要退出系统吗？", "提示", {
-        confirmButtonText: '确定',
+        confirmButtonText: "确定",
-        cancelButtonText: '取消',
+        cancelButtonText: "取消",
-        type: 'warning'
+        type: "warning",
-      }).then(() => {
+      })
-          this.$store.dispatch('LogOut').then(() => {
+        .then(() => {
+          this.$store.dispatch("LogOut").then(() => {
             //location.href = this.webBaseUrl + '/login';
-            sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
+            sessionStorage.setItem(
+              "dialog_session_show" + this.userInfo.aid,
+              null
+            ); // 清除兴趣采集的"关闭"缓存
             location.href = process.env.VUE_APP_LOGIN_URL;
           });
         })
@@ -356,21 +547,20 @@ export default {
     },
     //获取未读消息数量
     getMsgNum() {
-      apiMessage.isRead().then(res => {
+      apiMessage.isRead().then((res) => {
         if (res.status == 200) {
           this.msgNum = res.result;
         }
       });
-    }
+    },
-  }
+  },
 };
 </script>
 
 <style scoped rel="stylesheet/scss" lang="scss">
-
 ::v-deep .el-dropdown-menu__item:not(.is-disabled):hover {
   background-color: #fff !important;
-    color: #0059FF !important;
+  color: #0059ff !important;
 }
 ::v-deep.el-dropdown-menu {
   text-align: center;
@@ -383,21 +573,25 @@ text-align: center;
   border-radius: 50%;
 }
 .top-nav-active-blue {
-    color: #387DF7;
+  color: #387df7;
-    a{color:#387DF7;}
+  a {
+    color: #387df7;
+  }
   div {
     width: 75%;
     height: 4px;
     top: 75%;
     left: 13%;
-      background: #387DF7;
+    background: #387df7;
     border-radius: 5px;
     position: absolute;
   }
 }
 .top-nav-active-white {
   color: #fff;
-    a{color:#fff;}
+  a {
+    color: #fff;
+  }
   div {
     width: 75%;
     height: 4px;
@@ -440,7 +634,6 @@ text-align: center;
     justify-content: flex-start;
     align-items: center;
     .portal-top-logo {
-
     }
     .portal-top-nav {
       display: flex;
@@ -542,7 +735,6 @@ text-align: center;
 ::v-deep .el-badge {
   .el-badge__content {
     top: 0px;
-
   }
 }
 
@@ -563,7 +755,6 @@ text-align: center;
 }
 ::v-deep .el-badge {
   margin-top: 0 !important;
-
 }
 ::v-deep .el-link.el-link--primary:hover {
   color: #588afc;

src/components/RichTextEditor.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="editor-wrap">
+    <div ref="editor" style="min-height: 200px"></div>
+  </div>
+</template>
+
+<script>
+import E from "wangeditor";
+
+export default {
+  name: "RichTextEditor",
+  props: {
+    value: { type: String, default: "" },
+  },
+  data() {
+    return {
+      editor: null,
+    };
+  },
+  mounted() {
+    const editor = new E(this.$refs.editor);
+    editor.config.zIndex = 1000;
+    editor.create();
+    editor.txt.html(this.value || "");
+    editor.disable(); // 只读
+    this.editor = editor;
+  },
+  watch: {
+    value(val) {
+      if (this.editor && val !== this.editor.txt.html()) {
+        this.editor.txt.html(val || "");
+      }
+    },
+  },
+  beforeDestroy() {
+    if (this.editor) {
+      this.editor.destroy();
+      this.editor = null;
+    }
+  },
+};
+</script>
+
+<style scoped>
+.editor-wrap {
+  width: 100%;
+}
+.editor-wrap >>> .w-e-toolbar {
+  display: none;
+}
+.editor-wrap >>> .w-e-text-container {
+  border: 0px !important;
+  background-color: rgba(0, 0, 0, 0);
+}
+</style>

src/layout/components/TopNav/Index.vue

@@ -4,28 +4,60 @@
       <div class="xtop-content">
         <div class="xtop-left">
           <div class="xtop-logo">
-          <router-link class="routerLink" to="/index"><img src="../../../assets/logo/logo-white.png" style="width:161px;height:27px;" /></router-link>
+            <router-link class="routerLink" to="/index"
+              ><img
+                src="../../../assets/logo/logo-white.png"
+                style="width: 161px; height: 27px"
+            /></router-link>
           </div>
           <div class="xtop-nav" v-if="userInfo.role === 1">
-          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/index`">首页</a></div>
+            <div class="xtop-nav-item">
-          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/course`">课程</a></div>
+              <a :href="`${webBaseUrl}/index`">首页</a>
-          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/case`">案例</a></div>
+            </div>
-          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/article`">文章</a></div>
+            <div class="xtop-nav-item">
-          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/qa`">问答</a></div>
+              <a :href="`${webBaseUrl}/course`">课程</a>
+            </div>
+            <div class="xtop-nav-item">
+              <a :href="`${webBaseUrl}/case`">案例</a>
+            </div>
+            <div class="xtop-nav-item">
+              <a :href="`${webBaseUrl}/article`">文章</a>
+            </div>
+            <div class="xtop-nav-item">
+              <a :href="`${webBaseUrl}/qa`">问答</a>
+            </div>
             <div class="xtop-nav-item">
               <el-dropdown placement="bottom" @command="handleCommand">
-              <span class="el-dropdown-link" style="color:#fff;font-size:16px;cursor: pointer;">专区</span>
+                <span
+                  class="el-dropdown-link"
+                  style="color: #fff; font-size: 16px; cursor: pointer"
+                  >专区</span
+                >
                 <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command='one'>BOE系列公开课</el-dropdown-item>
+                  <el-dropdown-item command="one"
-                <el-dropdown-item command='two' divided>Grow180</el-dropdown-item>
+                    >BOE系列公开课</el-dropdown-item
-                <el-dropdown-item command='three' divided>管理者进阶</el-dropdown-item>
+                  >
-                <el-dropdown-item command='for' divided>U选小课堂</el-dropdown-item>
+                  <el-dropdown-item command="two" divided
-                <el-dropdown-item command='five' divided>社招新员工</el-dropdown-item>
+                    >Grow180</el-dropdown-item
-                <el-dropdown-item command="seven" divided>教师专区</el-dropdown-item>
+                  >
+                  <el-dropdown-item command="three" divided
+                    >管理者进阶</el-dropdown-item
+                  >
+                  <el-dropdown-item command="for" divided
+                    >U选小课堂</el-dropdown-item
+                  >
+                  <el-dropdown-item command="five" divided
+                    >社招新员工</el-dropdown-item
+                  >
+                  <el-dropdown-item command="seven" divided
+                    >教师专区</el-dropdown-item
+                  >
                 </el-dropdown-menu>
               </el-dropdown>
             </div>
-          <div class="xtop-nav-item"><a :href="`${webBaseUrl}/follow`">我的关注</a></div>
+            <div class="xtop-nav-item">
+              <a :href="`${webBaseUrl}/follow`">我的关注</a>
+            </div>
           </div>
         </div>
         <div class="xtop-right">
@@ -41,40 +73,114 @@
             </el-input> -->
           <!-- </div> -->
           <div>
-            <el-badge :value="userMsg" :hidden="userMsg==0" class="message-count">
+            <el-badge
-              <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
+              :value="userMsg"
-                <svg-icon style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
+              :hidden="userMsg == 0"
+              class="message-count"
+            >
+              <el-link
+                type="primary"
+                :href="`${webBaseUrl}/message/center/index`"
+                :underline="false"
+              >
+                <svg-icon
+                  style="margin-right: 0; font-size: 22px"
+                  icon-class="messfff"
+                ></svg-icon>
               </el-link>
             </el-badge>
           </div>
           <div>
-            <el-dropdown class="person-action-index" style="margin-left: 44px;">
+            <el-dropdown class="person-action-index" style="margin-left: 44px">
               <span class="el-dropdown-link">
-                 <span v-if="current == 'qa'" style="color: #333;">{{curIdentity==3? '管理员':curIdentity==2? '教师':'学员'}}</span>
+                <span v-if="current == 'qa'" style="color: #333">{{
-                <span v-else style="color: #fff;">{{curIdentity==3? '管理员':curIdentity==2? '教师':'学员'}}</span><i class="el-icon-arrow-down el-icon--right"></i>
+                  curIdentity == 3
-
+                    ? "管理员"
+                    : curIdentity == 2
+                    ? "教师"
+                    : "学员"
+                }}</span>
+                <span v-else style="color: #fff">{{
+                  curIdentity == 3
+                    ? "管理员"
+                    : curIdentity == 2
+                    ? "教师"
+                    : "学员"
+                }}</span
+                ><i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
+                <el-dropdown-item
-                <el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
+                  ><router-link to="/index">学员</router-link></el-dropdown-item
-                <el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
+                >
+                <el-dropdown-item
+                  v-if="identity == 2 || identity == 5"
+                  @click.native="setCurIdentity(2)"
+                  ><router-link to="/need/waitaudit"
+                    >教师</router-link
+                  ></el-dropdown-item
+                >
+                <el-dropdown-item
+                  v-if="identity == 3 || identity == 5"
+                  @click.native="setCurIdentity(3)"
+                  ><a :href="managerPath + '/learningpath'"
+                    >管理员</a
+                  ></el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
           <div>
             <el-dropdown>
-                <div style="margin-left: 50px;color: #fff;font-size: 14px;cursor: pointer;">
+              <div
-                  <el-avatar v-if="userInfo.avatar !== ''" :src="userInfo.avatar" style="vertical-align: middle;width:40px;height:40px;margin-right:10px;"></el-avatar>
+                style="
-                  <span v-else style="display: inline-block;">
+                  margin-left: 50px;
-                    <img v-if="userInfo.sex === 1 " src="../../../../public/images/Avatarman.png" alt="" style="width: 30px;height: 30px;vertical-align: middle;">
+                  color: #fff;
-                    <img v-else src="../../../../public/images/Avatarwoman.png" alt="" style="width: 30px;height: 30px;vertical-align: middle;">
+                  font-size: 14px;
+                  cursor: pointer;
+                "
+              >
+                <el-avatar
+                  v-if="userInfo.avatar !== ''"
+                  :src="userInfo.avatar"
+                  style="
+                    vertical-align: middle;
+                    width: 40px;
+                    height: 40px;
+                    margin-right: 10px;
+                  "
+                ></el-avatar>
+                <span v-else style="display: inline-block">
+                  <img
+                    v-if="userInfo.sex === 1"
+                    src="../../../../public/images/Avatarman.png"
+                    alt=""
+                    style="width: 30px; height: 30px; vertical-align: middle"
+                  />
+                  <img
+                    v-else
+                    src="../../../../public/images/Avatarwoman.png"
+                    alt=""
+                    style="width: 30px; height: 30px; vertical-align: middle"
+                  />
                 </span>
 
                 {{ userInfo.name }}
               </div>
               <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                <el-dropdown-item @click.native="setCurIdentity(1)"
-                  <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
+                  ><a
+                    :href="`${webBaseUrl}${
+                      isTiao ? '/uc/study/task' : '/uc/study/courses'
+                    }`"
+                    >个人中心</a
+                  ></el-dropdown-item
+                >
+                <el-dropdown-item
+                  ><router-link :to="'/home/' + userInfo.aid"
+                    >个人主页</router-link
+                  ></el-dropdown-item
+                >
               </el-dropdown-menu>
             </el-dropdown>
           </div>
@@ -90,19 +196,52 @@
             </el-dropdown>
           </div> -->
           <div class="person-action">
-          <el-button @click="logout()" type="text"><svg-icon  style="margin-right: 4px;font-size:16px;" icon-class="white-out"></svg-icon>登出</el-button>
+            <el-button @click="logout()" type="text"
+              ><svg-icon
+                style="margin-right: 4px; font-size: 16px"
+                icon-class="white-out"
+              ></svg-icon
+              >登出</el-button
+            >
           </div>
         </div>
       </div>
     </div>
-    <el-dialog title="修改登录密码" :close-on-click-modal="false" :visible.sync="pwdDlg.show" width="600px" custom-class="g-dialog">
+    <el-dialog
+      title="修改登录密码"
+      :close-on-click-modal="false"
+      :visible.sync="pwdDlg.show"
+      width="600px"
+      custom-class="g-dialog"
+    >
       <el-form :model="pwdDlg" size="medium" label-width="100px">
-        <el-form-item label="当前密码"><el-input v-model="pwdDlg.nowPwd" type="password" placeholder="当前的登录密码" :style="{ width: '100%' }"></el-input></el-form-item>
+        <el-form-item label="当前密码"
+          ><el-input
+            v-model="pwdDlg.nowPwd"
+            type="password"
+            placeholder="当前的登录密码"
+            :style="{ width: '100%' }"
+          ></el-input
+        ></el-form-item>
         <el-form-item label="新密码">
-          <el-input v-model="pwdDlg.newPwd" type="password" placeholder="新的密码" :maxlength="20" clearable :style="{ width: '100%' }"></el-input>
+          <el-input
+            v-model="pwdDlg.newPwd"
+            type="password"
+            placeholder="新的密码"
+            :maxlength="20"
+            clearable
+            :style="{ width: '100%' }"
+          ></el-input>
         </el-form-item>
         <el-form-item label="密码确认">
-          <el-input v-model="pwdDlg.rePwd" type="password" placeholder="和上面新密码一致" :maxlength="20" clearable :style="{ width: '100%' }"></el-input>
+          <el-input
+            v-model="pwdDlg.rePwd"
+            type="password"
+            placeholder="和上面新密码一致"
+            :maxlength="20"
+            clearable
+            :style="{ width: '100%' }"
+          ></el-input>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -110,12 +249,35 @@
         <el-button type="primary" @click="submitPwd">提交修改</el-button>
       </span>
     </el-dialog>
-    <el-dialog custom-class="dialog-signin" :show-close="false" :visible.sync="signInShow" :close-on-click-modal="false" width="520px" top="8vh">
+    <el-dialog
+      custom-class="dialog-signin"
+      :show-close="false"
+      :visible.sync="signInShow"
+      :close-on-click-modal="false"
+      width="520px"
+      top="8vh"
+    >
       <div>
-         <img usemap="#HotMap" src="/pc/ad/dlg.png" style="width:416px;height: 576px;">
+        <img
+          usemap="#HotMap"
+          src="/pc/ad/dlg.png"
+          style="width: 416px; height: 576px"
+        />
         <map name="HotMap" id="HotMap">
-             <area shape="circle" name="link1" coords="380,40,30" @click="closeSignDlg" href="javascript:;" />
+          <area
-             <area shape="rectangle" name="link2" coords="150,400,300,500" target="_blank"  href="https://boehrsurvey.wjx.cn/vm/PmreuFN.aspx"  />
+            shape="circle"
+            name="link1"
+            coords="380,40,30"
+            @click="closeSignDlg"
+            href="javascript:;"
+          />
+          <area
+            shape="rectangle"
+            name="link2"
+            coords="150,400,300,500"
+            target="_blank"
+            href="https://boehrsurvey.wjx.cn/vm/PmreuFN.aspx"
+          />
         </map>
       </div>
     </el-dialog>
@@ -148,9 +310,7 @@
                   内容涵盖：领导力、市场营销、职场技能、财务知识、法律常识、人力资源、经典国学、人文社科
                 </div>
               </div>
-              <div class="text_msg">
+              <div class="text_msg">创新力专区课程版权已到期！</div>
-                创新力专区课程版权已到期！
-              </div>
               <!-- <div class="cyl" @click="cylClick">
                 <div class="tyl_title">
                   <img
@@ -175,12 +335,13 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters } from "vuex";
-import desk from '@/api/console.js';
+import desk from "@/api/console.js";
-import Cookies from 'vue-cookies';
+import { getWelcomeData } from "@/api/new-employee/newEmployee";
-import InterestCollection from '@/components/Portal/interestCollection.vue'
+import Cookies from "vue-cookies";
-import GuideBox from '@/components/Portal/guideBox.vue'
+import InterestCollection from "@/components/Portal/interestCollection.vue";
-import gonggao from '@/components/Gonggao.vue';
+import GuideBox from "@/components/Portal/guideBox.vue";
+import gonggao from "@/components/Gonggao.vue";
 export default {
   components: { InterestCollection, GuideBox, gonggao },
   data() {
@@ -191,28 +352,28 @@ export default {
       interestShow: false,
       checked: true,
       signInShow: false,
-      signLocalTimesKey:'xboe_sign_dlg_times',
+      signLocalTimesKey: "xboe_sign_dlg_times",
-      keyword: '',
+      keyword: "",
-      findType: '1',
+      findType: "1",
       mouseIndex: 0,
-      activeIndex: '',
+      activeIndex: "",
       msg: { num: 0 },
-      user: { name: '' },
+      user: { name: "" },
-      pwdDlg: { show: false, newPwd: '', nowPwd: '', rePwd: '' },
+      pwdDlg: { show: false, newPwd: "", nowPwd: "", rePwd: "" },
-      current:1
+      current: 1,
     };
   },
   computed: {
-    ...mapGetters(['userInfo', 'userMsg','curIdentity','identity']),
+    ...mapGetters(["userInfo", "userMsg", "curIdentity", "identity"]),
     showName: function () {
       //console.log('name='+this.name);
       //console.log('loginName='+this.loginName);
-      if (this.userInfo.name != '') {
+      if (this.userInfo.name != "") {
         return this.userInfo.name;
       } else {
         return this.userInfo.userName;
       }
-    }
+    },
   },
   mounted() {
     this.interestShow = true;
@@ -238,7 +399,7 @@ export default {
     //       localStorage.setItem(this.$xpage.constants.newLoginKey,0);
     //     }
     // }
-    this.$store.dispatch('refrashMsg');
+    this.$store.dispatch("refrashMsg");
   },
   methods: {
     tylClick() {
@@ -248,12 +409,12 @@ export default {
       window.open("https://u.boe.com/pc/course?keyword=创新力专区");
     },
     setCurIdentity(iden) {
-        this.$store.dispatch('SetCurIdentity',iden);
+      this.$store.dispatch("SetCurIdentity", iden);
     },
     closeSignDlg() {
       this.signInShow = false;
     },
-    handleCommand(val) {
+    async handleCommand(val) {
       // let obj = {
       //   one: process.env.VUE_APP_BOE_WEB_URL+'/web/teacherLesson',
       //   two: process.env.VUE_APP_BOE_WEB_URL+'/grow180/login',
@@ -261,6 +422,16 @@ export default {
       //   four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
       //   five: process.env.VUE_APP_BOE_WEB_URL+'/boe/new-employee/index.html'
       // };
+      if (val === "five") {
+        // 从后端获取用户信息和报名状态
+        const res = await getWelcomeData();
+        if (res.status === 200 && res.data) {
+          if (res.data?.approvalResults && res.data?.approvalResults != 1) {
+            this.$router.push("/new-employee/study");
+            return;
+          }
+        }
+      }
       if (val === "for") {
         this.uClassShow = true;
       } else {
@@ -271,14 +442,14 @@ export default {
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-          five: urlPre + "/boe/new-employee/index.html",
+          five: this.webBaseUrl + "/new-employee/welcome",
-          seven: this.webBaseUrl + '/grateful/index'
+          seven: this.webBaseUrl + "/grateful/index",
         };
         window.open(obj[val]);
       }
     },
     handleUcCommand(val) {
-      if(val == 'logout'){
+      if (val == "logout") {
         this.logout();
       }
     },
@@ -289,36 +460,39 @@ export default {
       this.pwdDlg.show = true;
     },
     submitPwd() {
-      if (this.pwdDlg.nowPwd == '' || (this.pwdDlg.newPwd == '') | (this.pwdDlg.rePwd == '')) {
+      if (
+        this.pwdDlg.nowPwd == "" ||
+        (this.pwdDlg.newPwd == "") | (this.pwdDlg.rePwd == "")
+      ) {
         return;
       }
       let params = {
         loginName: this.loginName,
         old: this.pwdDlg.nowPwd,
         newPassword: this.pwdDlg.newPwd,
-        rePassword: this.pwdDlg.rePwd
+        rePassword: this.pwdDlg.rePwd,
       };
-      desk.updatePassword(params).then(res => {
+      desk.updatePassword(params).then((res) => {
         if (res.status == 200) {
-          this.$message({ message: '修改成功，请重新登录', type: 'success' });
+          this.$message({ message: "修改成功，请重新登录", type: "success" });
         } else {
-          this.$message({ message: '修改失败，请检查输入', type: 'error' });
+          this.$message({ message: "修改失败，请检查输入", type: "error" });
         }
       });
     },
     logout() {
-      this.$confirm('确定退出系统吗？', '提示', {
+      this.$confirm("确定退出系统吗？", "提示", {
-        confirmButtonText: '确定',
+        confirmButtonText: "确定",
-        cancelButtonText: '取消',
+        cancelButtonText: "取消",
-        type: 'warning'
+        type: "warning",
       }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
+        this.$store.dispatch("LogOut").then(() => {
           //location.href = this.webBaseUrl + '/login';
           location.href = process.env.VUE_APP_LOGIN_URL;
         });
       });
-    }
+    },
-  }
+  },
 };
 </script>
 
@@ -499,12 +673,11 @@ export default {
 }
 ::v-deep .el-dropdown-menu__item:not(.is-disabled):hover {
   background-color: #fff !important;
-    color: #0059FF !important;
+  color: #0059ff !important;
 }
 ::v-deep.el-dropdown-menu {
   text-align: center;
   border: none !important;
-
 }
 ::v-deep .el-avatar {
   margin-right: 8px;
@@ -519,7 +692,6 @@ text-align: center;
   color: #fff;
 }
 img {
-
 }
 ::v-deep .dialog-signin {
   background: transparent;
@@ -532,7 +704,6 @@ img{
   }
   .el-dialog__footer {
     padding: 0;
-
   }
   .signin-bg {
     position: relative;
@@ -550,7 +721,7 @@ img{
     .signin-checkbox {
       display: flex;
       align-items: center;
-		color: #FFFFFF;
+      color: #ffffff;
       margin-top: 10px;
       .el-checkbox {
         margin-right: 5px;
@@ -573,9 +744,9 @@ img{
     .signin-text {
       font-size: 12px;
       font-weight: bold;
-      color: #FFFFFF;
+      color: #ffffff;
       .ti-yan {
-        border-bottom: 1px solid #FFFFFF;
+        border-bottom: 1px solid #ffffff;
         margin-left: 10px;
         cursor: pointer;
       }
@@ -591,34 +762,34 @@ img{
       font-size: 12px;
       font-family: Alibaba PuHuiTi;
       font-weight: 600;
-      color: #FFFFFF;
+      color: #ffffff;
       span {
-        border-bottom: 1px solid #FFFFFF;
+        border-bottom: 1px solid #ffffff;
       }
     }
     .signin-b {
       font-size: 12px;
-      color:#FFFFFF;
+      color: #ffffff;
       text-align: right;
       .el-checkbox__inner {
         //background-color: #588AFC;
-        border-color: #FFFFFF;
+        border-color: #ffffff;
       }
       .el-checkbox__input.is-checked .el-checkbox__inner {
-        background-color: #588AFC;
+        background-color: #588afc;
       }
     }
   }
 }
 .dialog-footer-signin {
   display: flex;
-  justify-content: space-between
+  justify-content: space-between;
 }
 .xtop {
   height: 72px;
   line-height: 72px;
   min-width: 1280px;
-  background-color: #0078FC;
+  background-color: #0078fc;
   position: fixed;
   top: 0px;
   left: 0px;
@@ -647,7 +818,6 @@ img{
   }
 }
 
-
 .xtop-nav {
   display: flex;
   // justify-content: flex-start;
@@ -685,7 +855,7 @@ img{
       margin-right: 30px;
       i {
         font-size: 26px;
-        color:#409EFF;
+        color: #409eff;
       }
     }
 
@@ -708,7 +878,7 @@ img{
 }
 
 .xtop .arrow-down {
-  content: '';
+  content: "";
   width: 0;
   height: 0;
   border-style: solid dashed dashed;
@@ -801,7 +971,7 @@ img{
   }
 }
 ::v-deep .el-link.el-link--primary:hover {
-  color:#588AFC;
+  color: #588afc;
 }
 .el-dropdown-link {
   cursor: pointer;

src/main.js

@@ -86,6 +86,7 @@ Vue.use(Element, {
   size: VueCookies.get('size') || 'medium' // set element-ui default size
 })
 
+// VueCookies.set('token', "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6IkMwMDEiLCJ1SWQiOiI5NjUzNDIwMjc0OTc2MDcxNjgiLCJjb21wYW55SWQiOiIxMDQxNjczOTc3Mzc5OTQ2NDk2IiwibG9naW5JZCI6IjE5MzgwNTQ2NDY2OTAxNzcwMjYiLCJpc3MiOiJodHRwOi8vdS5ib2UuY29tIiwiR2l2ZW5OYW1lIjoiYm9ldSIsImV4cCI6MTc1MDkxMDQwOTc0NiwidXNlck5hbWUiOiLmnY7njonlhrAiLCJ1c2VySWQiOiI2QjA0OUZBRi1DMzE0LTdDQ0YtMEQyOC0wRDIzRjRDNDI1MzEifQ==.7f03d1ce991253197f0e733ba554496e8de715595b169b505bed8831ede565a9", 1)
 // 加入百度统计
 router.beforeEach((to, from, next) => {
   if (to.path) {

src/router/index.js

@@ -368,6 +368,20 @@ export const constantRoutes = [{
   component: (resolve) => require(['@/views/portal/course/qualityCourse'], resolve),
   name: 'qualityCourse',
   meta: { title: '精品课课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false },
+},
+{
+  path: '/new-employee/welcome',
+  hidden: true,
+  component: (resolve) => require(['@/views/new-employee/WelcomePage'], resolve),
+  name: 'NewEmployeeWelcome',
+  meta: { title: '社招新员工欢迎页', icon: 'dashboard', noCache: true, affix: false },
+},
+{
+  path: '/new-employee/study',
+  hidden: true,
+  component: (resolve) => require(['@/views/new-employee/StudyPage'], resolve),
+  name: 'NewEmployeeStudy',
+  meta: { title: '社招新员工学习页面', icon: 'dashboard', noCache: true, affix: false },
 }
 
 ]

src/views/new-employee/StudyPage.vue

@@ -0,0 +1,872 @@
+<template>
+  <div class="ne-study-page">
+    <div class="banner-header">
+      <portalHeader textColor="#fff" />
+    </div>
+    <!-- 顶部横幅与标题 -->
+    <div class="banner">
+      <div class="banner-inner">
+        <div class="title">社招新员工培训及考试</div>
+        <!-- 筛选条 -->
+        <div class="filters">
+          <div class="filter-group">
+            <span class="label">类型：</span>
+            <el-radio-group
+              v-model="flag"
+              @change="onTypeChange"
+              class="pill-radios"
+            >
+              <el-radio-button label="all">全部</el-radio-button>
+              <el-radio-button label="1">必修</el-radio-button>
+              <el-radio-button label="0">选修</el-radio-button>
+            </el-radio-group>
+          </div>
+          <div class="filter-group">
+            <span class="label">状态：</span>
+            <el-radio-group
+              v-model="status"
+              @change="onStatusChange"
+              class="pill-radios"
+            >
+              <el-radio-button label="all">全部</el-radio-button>
+              <el-radio-button label="0">未开始</el-radio-button>
+              <el-radio-button label="2">进行中</el-radio-button>
+              <el-radio-button label="1">已完成</el-radio-button>
+            </el-radio-group>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="content">
+      <!-- 左侧主区域 -->
+      <div class="main">
+        <!-- 列表：课程 -->
+        <div class="list" v-loading="loading">
+          <div
+            class="list-item card"
+            v-for="it in items"
+            :key="it.id"
+            @click="toLearn(it.courseId)"
+          >
+            <div style="margin-right: 16px">
+              <img
+                width="160px"
+                src="../../assets/images/course_icon.png"
+                alt=""
+              />
+            </div>
+            <div class="item-left">
+              <div>
+                <div class="title-box">
+                  <div class="item-title">{{ it.name }}</div>
+                  <!-- 右侧动作/成绩 -->
+                  <div class="item-right">
+                    <el-button
+                      v-if="it.status == 0"
+                      type="text"
+                      style="color: #999999"
+                      >未开始</el-button
+                    >
+                    <el-button
+                      v-if="it.status == 2"
+                      type="text"
+                      style="color: #ffb01e"
+                      >进行中</el-button
+                    >
+                    <el-button
+                      v-if="it.status == 1"
+                      type="text"
+                      style="color: #27ce9a"
+                      >已完成</el-button
+                    >
+                  </div>
+                </div>
+                <div class="tags">
+                  <span class="tag" :class="'tag-blue'"> 在线课 </span>
+                  <span v-if="it.flag" class="tag tag-green">必修</span>
+                  <span v-else class="tag tag-yellow">选修</span>
+                </div>
+                <div class="progress-wrap">
+                  <div class="progress">
+                    <div
+                      class="bar"
+                      :style="{ width: (it.currentRatio || 0) + '%' }"
+                    ></div>
+                  </div>
+                  <div class="percent">{{ it.currentRatio || 0 }}%</div>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <!-- 分页 -->
+          <div class="pagination">
+            <el-pagination
+              background
+              layout="prev, pager, next"
+              :total="total"
+              :page-size="pageSize"
+              :current-page.sync="page"
+              @current-change="onPageChange"
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- 右侧侧栏 -->
+      <div class="sidebar">
+        <div class="profile card">
+          <div
+            class="avatar"
+            :style="`background: url(${userInfo.avatar}) no-repeat center/100% 100%;`"
+          ></div>
+          <div class="name">{{ userInfo.name }}</div>
+          <div class="desc">{{ userInfo.departName }}</div>
+          <div class="btns">
+            <el-button class="btn btn-outline" @click="onGuide"
+              >转正攻略</el-button
+            >
+          </div>
+          <div>
+            <div v-if="approvalResults == 2">
+              <el-alert type="warning" center show-icon :closable="false">
+                <template slot="title">
+                  <span style="color: rgba(0, 0, 0, 0.88)"
+                    >报名申请正在审核中</span
+                  >
+                </template>
+              </el-alert>
+            </div>
+            <div v-if="approvalResults == 3">
+              <el-alert type="success" center show-icon :closable="false">
+                <template slot="title">
+                  <span style="color: rgba(0, 0, 0, 0.88)"
+                    >报名申请审核已通过</span
+                  >
+                </template>
+              </el-alert>
+            </div>
+            <div
+              v-if="approvalResults == 4"
+              style="cursor: pointer"
+              @click="returnEnroll"
+            >
+              <el-alert type="error" center show-icon :closable="false">
+                <template slot="title">
+                  <span style="color: rgba(0, 0, 0, 0.88)">审核已驳回，请</span>
+                  <span style="color: #0078fc">重新报名</span>
+                </template>
+              </el-alert>
+            </div>
+          </div>
+          <div style="text-align: center">
+            <el-button type="text" @click="chartVisible = true"
+              >转正流程示意图 ></el-button
+            >
+          </div>
+          <div class="label">成绩单</div>
+          <div class="transcript">
+            <el-button
+              class="btn btn-long"
+              :class="{ 'btn-disabled': isDownloadDisabled }"
+              type="success"
+              icon="el-icon-download"
+              :disabled="isDownloadDisabled"
+              @click="onDownload"
+              >成绩下载</el-button
+            >
+          </div>
+          <div class="label">学习进度</div>
+          <div class="progress-circles">
+            <div class="circle">
+              <div
+                class="ring"
+                :style="`background: conic-gradient(#0078FC 0 ${progressRing.total}%, #eef2f6 ${progressRing.total}%);`"
+              >
+                <span>{{ progressRing.total }}</span>
+              </div>
+              <div class="text">总进度</div>
+            </div>
+            <div class="circle">
+              <div
+                class="ring"
+                :style="`background: conic-gradient(#27ce9a 0 ${progressRing.required}%, #eef2f6 ${progressRing.required}%);`"
+              >
+                <span>{{ progressRing.required }}</span>
+              </div>
+              <div class="text">必修课进度</div>
+            </div>
+            <div class="circle">
+              <div
+                class="ring"
+                :style="`background: conic-gradient(#FFB01E 0 ${progressRing.elective}%, #eef2f6 ${progressRing.elective}%);`"
+              >
+                <span>{{ progressRing.elective }}</span>
+              </div>
+              <div class="text">选修课进度</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <portalFooter />
+    <portalFloatTools />
+    <!-- 学习引导弹窗 -->
+    <NewEmployeeGuideDialog
+      :visible.sync="guideDialogVisible"
+      @close="guideDialogVisible = false"
+      :showBtn="true"
+    />
+    <!-- 转正流程图弹窗 -->
+    <el-dialog
+      :visible.sync="chartVisible"
+      title="转正流程示意图"
+      :close-on-click-modal="false"
+      @close="chartVisible = false"
+    >
+      <div>
+        <!-- <el-image src="../../assets/images/flowchart.png" fit="fill" /> -->
+        <img width="100%" src="../../assets/images/flowchart.png" alt="" />
+      </div>
+    </el-dialog>
+    <!-- 自定义信息提示 -->
+    <CustomInfoMessage ref="customMessage" />
+    <CustomErrorMessage ref="errorMessage" />
+  </div>
+</template>
+
+<script>
+import portalHeader from "@/components/PortalHeader.vue";
+import portalFooter from "@/components/PortalFooter.vue";
+import portalFloatTools from "@/components/PortalFloatTools.vue";
+import NewEmployeeGuideDialog from "@/components/NewEmployeeGuideDialog.vue";
+import CustomInfoMessage from "@/components/CustomInfoMessage.vue";
+import { mapGetters } from "vuex";
+import {
+  getWelcomeData,
+  getStuProjectTaskList,
+  getStuProjectProcess,
+  downloadSocialRecruitReport,
+  getSzxygProjectInfo,
+  enrollRequest,
+} from "@/api/new-employee/newEmployee";
+import CustomErrorMessage from "@/components/CustomErrorMessage.vue";
+import { start } from "nprogress";
+
+export default {
+  name: "StudyPage",
+  components: {
+    portalHeader,
+    portalFooter,
+    portalFloatTools,
+    NewEmployeeGuideDialog,
+    CustomInfoMessage,
+    CustomErrorMessage,
+  },
+  data() {
+    return {
+      flag: "all",
+      status: "all",
+      page: 1,
+      pageSize: 20,
+      total: 0,
+      loading: false,
+      projectId: "",
+      studentId: "",
+      // 列表数据（课程/考试混合）
+      items: [],
+      // 进度环数据
+      progressRing: {
+        total: 0,
+        required: 0,
+        elective: 0,
+      },
+      // 学习引导弹窗
+      guideDialogVisible: false,
+      // 转正流程图弹窗
+      chartVisible: false,
+      approvalList: {
+        1: "报名失败",
+        2: "审核中",
+        3: "审核通过",
+        4: "审核失败",
+      },
+      approvalResults: 1,
+    };
+  },
+  computed: {
+    ...mapGetters(["userInfo"]),
+    // 判断下载按钮是否应该禁用
+    isDownloadDisabled() {
+      // 只有在审核通过(3)且学习进度为100时才可下载
+      // 其他情况（报名失败1、审核中2、审核失败4、进度未到100）都禁用
+      return this.approvalResults != 3 || this.progressRing.total != 100;
+    },
+  },
+  methods: {
+    async initIds() {
+      // studentId 来自用户信息
+      this.studentId = this.userInfo?.aid || this.userInfo?.id || "";
+      const res = await getSzxygProjectInfo();
+      this.projectId = res.data.id || "";
+    },
+    async loadList() {
+      if (!this.studentId || !this.projectId) return;
+      this.loading = true;
+      try {
+        const res = await getStuProjectTaskList({
+          pageNo: this.page,
+          pageSize: this.pageSize,
+          studentId: this.studentId,
+          projectId: this.projectId,
+          status: this.status === "all" ? undefined : this.status,
+          flag: this.flag === "all" ? undefined : this.flag,
+        });
+        const payload = res?.data || {};
+        const records = payload.rows || [];
+        this.total = Number(payload.total || 0);
+        this.items = records;
+      } catch (e) {
+        this.$message.error("加载学习列表失败");
+      } finally {
+        this.loading = false;
+      }
+    },
+    async loadProcess() {
+      if (!this.studentId || !this.projectId) return;
+      try {
+        const res = await getStuProjectProcess({
+          studentId: this.studentId,
+          projectId: this.projectId,
+        });
+        const data = res?.data || {};
+        const total = Number(data.totalProgress ?? 0) | 0;
+        const required = Number(data.compulsoryProgress ?? 0) | 0;
+        const elective = Number(data.electiveProgress ?? 0) | 0;
+        this.progressRing = {
+          total: total,
+          required: required,
+          elective: elective,
+        };
+      } catch (_) {
+        // 默认0
+        this.progressRing = { total: 0, required: 0, elective: 0 };
+      }
+    },
+    async onTypeChange() {
+      await this.loadList();
+    },
+    async onStatusChange() {
+      await this.loadList();
+    },
+    async onPageChange(p) {
+      this.page = p;
+      await this.loadList();
+    },
+    onGuide() {
+      this.guideDialogVisible = true;
+    },
+    toLearn(courseId) {
+      this.$router.push(
+        `/course/studyindex?id=${courseId}&newEmployee=${true}`
+      );
+    },
+    async onDownload() {
+      try {
+        const res = await downloadSocialRecruitReport(
+          this.projectId,
+          this.studentId
+        );
+        const blob = new Blob([res], { type: "application/pdf" });
+        const pdfUrl = URL.createObjectURL(blob);
+        window.open(pdfUrl);
+      } catch (e) {
+        this.$message.error("下载失败");
+      }
+    },
+    async returnEnroll() {
+      this.$confirm("是否重新报名社招新员工项目?", {
+        title: "报名确认",
+        type: "warning",
+        customClass: "returnEnroll",
+      }).then(async () => {
+        const res = await enrollRequest();
+        if (res.data.sendToOaSuccess != 0) {
+          this.$refs.errorMessage.show(
+            "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
+          );
+        } else {
+          this.$refs.customMessage.show("您已重新报名成功");
+          this.approvalResults = 2;
+        }
+      });
+    },
+  },
+  async mounted() {
+    const res = await getWelcomeData();
+    // 社招新员工项目标识：0否，1是
+    if (res.data.approvalResults == 1 || !res.data.approvalResults) {
+      this.$refs.customMessage.show("未报名或报名失败，请前往报名页面进行报名");
+      this.$router.push("/new-employee/welcome");
+    }
+    this.guideDialogVisible = this.$route.query?.fromWelcome == 1;
+    // 1报名失败、2审核中、3审核通过、4审核失败
+    this.approvalResults = res.data.approvalResults;
+    await this.initIds();
+    if (!this.projectId || !this.studentId) {
+      this.$message.warning("未获得项目或学员信息，列表可能无法加载");
+    }
+    await Promise.all([this.loadList(), this.loadProcess()]);
+  },
+};
+</script>
+
+<style scoped>
+/* 颜色变量近似还原截图 */
+.ne-study-page {
+  font-family: "PingFang SC", "Helvetica Neue", Arial, "Microsoft YaHei",
+    sans-serif;
+  color: #2b2f36;
+  background: #f4f6f9;
+}
+
+.banner-header {
+  background: #0f80ff;
+}
+.banner {
+  background: #0f80ff;
+  padding-top: 36px;
+}
+.banner-inner {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 24px 16px 0px;
+}
+.title {
+  color: #ffffff;
+  font-weight: 600;
+  font-size: 20px;
+  margin-bottom: 10px;
+}
+
+.content {
+  max-width: 1200px;
+  margin: 16px auto 40px;
+  padding: 0 16px;
+  display: flex;
+  gap: 16px;
+}
+.main {
+  flex: 1;
+}
+.sidebar {
+  width: 360px;
+  margin-top: -70px;
+}
+
+.card {
+  background: #ffffff;
+  border-radius: 8px;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04);
+}
+
+/* 筛选条 */
+.filters {
+  padding: 0px 12px 8px;
+  display: flex;
+  gap: 24px;
+  align-items: center;
+  background: #ffffff;
+  border-radius: 8px 8px 0 0;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.04);
+  width: 68%;
+}
+.filter-group {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.label {
+  color: #333333;
+  font-size: 14px;
+  font-weight: bold;
+  margin: 24px 0px 12px;
+}
+.pills {
+  display: flex;
+  gap: 8px;
+}
+.pill {
+  padding: 6px 12px;
+  border-radius: 16px;
+  background: #f3f5f8;
+  color: #4b5563;
+  font-size: 12px;
+  cursor: default;
+}
+.pill.active {
+  background: #e6f1ff;
+  color: #0f80ff;
+  border: 1px solid #b3d4ff;
+}
+
+/* 列表 */
+.list {
+  margin-top: 12px;
+}
+.list-item {
+  display: flex;
+  justify-content: space-between;
+  padding: 16px;
+  margin-bottom: 12px;
+  transition: transform 0.08s ease, box-shadow 0.12s ease,
+    background-color 0.12s ease;
+  cursor: pointer;
+}
+.list-item:hover,
+.list-item:active {
+  transform: translateY(-1px);
+  box-shadow: 0 6px 18px rgba(0, 0, 0, 0.06);
+  background-color: #ffffff;
+}
+/* 触摸设备：点按反馈 */
+@media (hover: none) {
+  .list-item:active {
+    transform: scale(0.995);
+    background-color: #f8fbff;
+  }
+}
+.item-left {
+  flex: 1;
+}
+
+.title-box {
+  display: flex;
+  justify-content: space-between;
+}
+
+.item-title {
+  font-size: 15px;
+  font-weight: 600;
+  margin-bottom: 8px;
+  color: #2b2f36;
+}
+.tags {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 10px;
+}
+.tag {
+  display: inline-flex;
+  align-items: center;
+  height: 22px;
+  padding: 0 8px;
+  border-radius: 12px;
+  font-size: 12px;
+  color: #0f80ff;
+  background: #eaf3ff;
+}
+.tag-green {
+  color: #27ce9a;
+  background: #e9fbf3;
+}
+.tag-yellow {
+  color: #ffb01e;
+  background: #ffecec;
+}
+.tag-blue {
+  color: #0f80ff;
+  background: #eaf3ff;
+}
+
+.progress-wrap {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+.progress {
+  position: relative;
+  flex: 1;
+  height: 8px;
+  background: #eff2f6;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.bar {
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  background: #19c37d;
+  border-radius: 4px;
+}
+.w-8 {
+  width: 8%;
+  background: #ffb74d;
+}
+.w-40 {
+  width: 40%;
+  background: #2fa3ff;
+}
+.w-100 {
+  width: 100%;
+  background: #19c37d;
+}
+.percent {
+  font-size: 12px;
+  color: #8a8f99;
+  width: 42px;
+  text-align: right;
+}
+
+.item-right {
+  min-width: 72px;
+  text-align: right;
+  font-size: 14px;
+}
+.item-right.score {
+  font-weight: 700;
+}
+.item-right.score.good {
+  color: #19c37d;
+}
+.item-right.score.bad {
+  color: #ff5a5f;
+}
+
+/* 分页 */
+.pagination {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 8px;
+  padding: 12px 0 4px;
+}
+.pg {
+  min-width: 30px;
+  height: 30px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 6px;
+  background: #ffffff;
+  color: #4b5563;
+  font-size: 12px;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
+}
+.pg.btn {
+  padding: 0 8px;
+}
+.pg.active {
+  background: #0f80ff;
+  color: #ffffff;
+}
+
+/* 细化 text 按钮与原页面链接的一致性 */
+.item-right >>> .el-button--text {
+  padding: 0;
+  color: inherit;
+  font-weight: inherit;
+}
+.item-right.link >>> .el-button--text {
+  color: #0f80ff;
+}
+.item-right.done >>> .el-button--text {
+  color: #8a8f99;
+}
+.item-right.score.good >>> .el-button--text {
+  color: #19c37d;
+}
+.item-right.score.bad >>> .el-button--text {
+  color: #ff5a5f;
+}
+
+/* 单选按钮组胶囊皮肤（替代 Tabs），保持外观一致 */
+.pill-radios {
+  padding-top: 20px;
+}
+.pill-radios >>> .el-radio-button__inner {
+  background: #f3f5f8;
+  color: #4b5563;
+  font-size: 12px;
+  padding: 6px 12px;
+  border-radius: 16px !important;
+  border: 1px solid transparent;
+  box-shadow: none;
+  margin-right: 8px;
+}
+.pill-radios
+  >>> .el-radio-button__orig-radio:checked
+  + .el-radio-button__inner {
+  background: #e6f1ff;
+  color: #0f80ff;
+  border-color: #b3d4ff;
+  box-shadow: none;
+}
+.pill-radios >>> .el-radio-button__inner:hover {
+  filter: brightness(0.98);
+}
+.pill-radios >>> .el-radio-button__inner::before,
+.pill-radios >>> .el-radio-button__inner::after {
+  display: none;
+}
+
+/* 侧栏 */
+.profile {
+  padding: 20px 16px;
+}
+.avatar {
+  width: 80px;
+  height: 80px;
+  background: #d9e8ff;
+  border-radius: 50%;
+  margin: -48px auto 12px;
+  border: 6px solid #ffffff;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+}
+.name {
+  text-align: center;
+  font-weight: 700;
+  color: #2b2f36;
+}
+.desc {
+  text-align: center;
+  color: #8a8f99;
+  font-size: 12px;
+  margin-top: 4px;
+}
+.btns {
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+  margin-top: 14px;
+  margin-bottom: 16px;
+}
+.btn {
+  width: 100% !important;
+  height: 36px;
+  padding: 0 14px;
+  border-radius: 8px;
+  border: none;
+  font-weight: 600;
+}
+.btn-outline {
+  background: rgba(0, 120, 252, 1);
+  color: #fff;
+  border: 1px solid rgba(0, 120, 252, 1);
+  width: 120px;
+}
+.transcript {
+  text-align: center;
+}
+.transcript .label {
+  color: #8a8f99;
+  font-size: 12px;
+  margin-bottom: 8px;
+}
+.btn-long {
+  width: 100%;
+  height: 40px;
+  border-radius: 8px;
+  background: #1ac07f;
+  color: #ffffff;
+  box-shadow: 0 2px 8px rgba(26, 192, 127, 0.35);
+}
+.btn-long.btn-disabled,
+.btn-long:disabled {
+  background: #cccccc !important;
+  color: #ffffff !important;
+  cursor: not-allowed !important;
+  box-shadow: none !important;
+}
+.btn-long.btn-disabled:hover,
+.btn-long:disabled:hover {
+  background: #cccccc !important;
+  transform: none !important;
+}
+
+.progress-circles {
+  display: flex;
+  justify-content: space-between;
+  margin-top: 8px;
+}
+.circle {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 6px;
+  width: 32%;
+}
+.ring {
+  width: 84px;
+  height: 84px;
+  border-radius: 50%;
+  background: conic-gradient(#d9dfe7 0 65%, #eef2f6 65%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #4b5563;
+  font-weight: 700;
+}
+.ring span {
+  background: #ffffff;
+  width: 66px;
+  height: 66px;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: inset 0 0 0 6px #ffffff;
+}
+.circle .text {
+  font-size: 12px;
+  color: #8a8f99;
+  text-align: center;
+}
+</style>
+
+<style lang="scss">
+.returnEnroll {
+  width: 380px;
+  height: auto;
+  .el-message-box__header {
+    display: block;
+    position: relative;
+    padding: 15px 15px 10px;
+    .el-message-box__title {
+      font-size: 16px;
+    }
+  }
+  .el-message-box__content {
+    padding: 10px 15px;
+    color: #606266;
+    font-size: 14px;
+    text-align: left;
+    font-weight: 500;
+    margin-top: 0px;
+    font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
+      Microsoft YaHei, SimSun, sans-serif;
+  }
+  .el-message-box__status {
+    display: block;
+  }
+  .el-message-box__btns {
+    padding: 5px 15px 0;
+    text-align: right;
+    margin-top: 0px;
+    .el-button {
+      padding: 9px 15px;
+      font-size: 12px;
+      border-radius: 3px;
+      width: auto;
+      height: auto;
+    }
+  }
+  .el-message-box__btns button:nth-child(2) {
+    margin-left: 10px;
+  }
+}
+</style>
+
+

src/views/new-employee/WelcomePage.vue

@@ -0,0 +1,385 @@
+<template>
+  <div class="welcome" v-loading="enrollLoading">
+    <p class="top-title">欢迎来到京东方大学</p>
+    <!-- 内容卡片 -->
+    <div class="main">
+      <div class="row">
+        <div class="col-md-6">
+          <img
+            class="img-responsive wel_img"
+            src="@/assets/images/new-employee/wel.png"
+            alt=""
+          />
+        </div>
+        <div class="col-md-6">
+          <!-- 桌面端显示 -->
+          <div class="right-font visible-lg-block visible-md-block">
+            <p class="greeting">{{ userInfo.name }}，您好!</p>
+            <p>欢迎加入京东方科技集团股份有限公司</p>
+            <p>从这一刻起，你就是这个大家庭里的一份子。</p>
+            <p>在这里，我们干事业、交朋友、长本领、练胸怀!</p>
+            <p>为了帮你快速融入BOE，我们为你准备了丰富的入职培训课程!</p>
+            <p>快开始学习吧!</p>
+          </div>
+          <!-- 移动端显示 -->
+          <div class="right-font-sm visible-xs-block">
+            <p>{{ userInfo.name }}，您好！</p>
+            <p>欢迎加入京东方</p>
+            <p>为了帮你快速融入BOE</p>
+            <P>我们为你准备了丰富的入职培训课程</P>
+            <p>快开始学习吧！</p>
+          </div>
+          <div class="col-md-12 send_btn">
+            <button
+              v-if="
+                (!approvalResults ||
+                  approvalResults == '1' ||
+                  approvalResults == '4') &&
+                allowSelfRegistration
+              "
+              class="btn btn-default btn-lg send center-block start-btn"
+              :disabled="enrollLoading"
+              @click="handleEnrollClick"
+            >
+              报名社招新员工项目
+            </button>
+            <button
+              v-else
+              class="btn btn-default btn-lg send center-block start-btn"
+              :disabled="enrollLoading"
+              @click="handleEnrollClick"
+            >
+              开启学习之旅
+            </button>
+            <p
+              style="
+                color: #ffe551;
+                font-size: 14px;
+                font-family: '黑体';
+                margin-top: 20px;
+              "
+            >
+              温馨提示：仅社招新员工可以报名，校招新员工和其他员工请不要点击
+            </p>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 学习引导页面 -->
+    <!-- <NewEmployeeGuideDialog
+      :visible.sync="infoConfirmDialogVisible"
+      :processing="processing"
+      :onConfirm="handleConfirm"
+      :onCancel="() => (infoConfirmDialogVisible = false)"
+      @close="handleDialogClose"
+    /> -->
+    <!-- 自定义信息提示 -->
+    <CustomErrorMessage ref="customMessage" />
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+import {
+  getWelcomeData,
+  enrollRequest,
+  getSzxygProjectInfo,
+} from "@/api/new-employee/newEmployee";
+import NewEmployeeGuideDialog from "@/components/NewEmployeeGuideDialog.vue";
+import CustomErrorMessage from "@/components/CustomErrorMessage.vue";
+
+export default {
+  name: "WelcomePage",
+  components: { NewEmployeeGuideDialog, CustomErrorMessage },
+  data() {
+    return {
+      userName: "",
+      projectId: "",
+      approvalResults: null,
+      allowSelfRegistration: false,
+      processing: false,
+      confirmBtnText: "确认",
+      infoConfirmDialogVisible: false,
+      enrollLoading: false,
+    };
+  },
+  computed: {
+    // 如果需要使用Vuex中的用户信息
+    ...mapGetters(["userInfo"]),
+  },
+  mounted() {
+    this.initPageData();
+  },
+  methods: {
+    // 初始化页面数据
+    async initPageData() {
+      try {
+        // 从后端获取用户信息和报名状态
+        const res = await getWelcomeData();
+        const szxygProjectInfo = await getSzxygProjectInfo();
+        this.allowSelfRegistration =
+          szxygProjectInfo.data.allowSelfRegistration;
+        if (res.status === 200 && res.data) {
+          if (typeof res.data === "string") {
+            this.approvalResults = null;
+            return;
+          }
+          this.userName = res.data.studentName;
+          // 1报名失败、2审核中、3审核通过、4审核失败
+          if (res.data.approvalResults) {
+            this.approvalResults = res.data.approvalResults;
+
+            if (res.data.approvalResults != 1) {
+              this.$router.push("/new-employee/study");
+            }
+          }
+        }
+      } catch (error) {
+        console.error("初始化数据失败:", error);
+      }
+    },
+
+    // 报名按钮点击
+    async handleEnrollClick() {
+      if (
+        !this.approvalResults ||
+        this.approvalResults == "1" ||
+        this.approvalResults == "4"
+      ) {
+        this.enrollLoading = true;
+        try {
+          const res = await enrollRequest();
+          if (res.data.data.sendToOaSuccess != 0) {
+            this.$refs.customMessage.show(
+              "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
+            );
+          } else {
+            this.$router.push("/new-employee/study?fromWelcome=1");
+          }
+        } catch (error) {
+          console.error("报名请求失败:", error);
+          this.$refs.customMessage.show(
+            "报名失败请稍后重试，如果再次失败，请联系：XXXX，联系方式：XXXX。"
+          );
+        } finally {
+          this.enrollLoading = false;
+        }
+      } else {
+        this.$router.push("/new-employee/study?fromWelcome=1");
+      }
+    },
+
+    // 确认按钮
+    // async handleConfirm() {
+    //   try {
+    //     this.$router.push("/new-employee/study");
+    //   } catch (error) {
+    //     console.error("提交失败:", error);
+    //     this.processing = false;
+    //     this.confirmBtnText = "确认";
+    //     this.$message.error("提交失败，请重试");
+    //   }
+    // },
+
+    // 关闭对话框
+    handleDialogClose() {
+      this.processing = false;
+      this.confirmBtnText = "确认";
+    },
+  },
+};
+</script>
+
+<style scoped>
+/* 欢迎页面样式 */
+.welcome {
+  min-height: 100vh;
+  background: #2e5aa6;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+/* 顶部标题 */
+.top-title {
+  /* 左移整个屏幕的1/4 */
+  font-size: 48px;
+  font-weight: bold;
+  color: white;
+  text-align: center;
+  margin: 40px 20px 60px;
+  font-family: "Microsoft YaHei", sans-serif;
+  text-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  margin-left: -25%;
+}
+
+/* 主内容卡片 */
+.welcome .main {
+  background: #2e5aa6;
+  border-radius: 10px;
+  padding: 50px 40px;
+  max-width: 1200px;
+  width: 100%;
+}
+
+/* 自定义栅格系统 */
+.welcome .main .row {
+  display: flex;
+  flex-wrap: wrap;
+  margin: 0 -15px;
+}
+
+.welcome .main .col-md-6 {
+  position: relative;
+  width: 100%;
+  padding: 0 15px;
+  flex: 0 0 50%;
+  max-width: 50%;
+}
+
+.welcome .main .col-md-12 {
+  position: relative;
+  width: 100%;
+  padding: 0 15px;
+  flex: 0 0 100%;
+  max-width: 100%;
+}
+
+.wel_img {
+  max-width: 100%;
+  height: auto;
+  margin: 0 auto;
+  display: block;
+}
+
+/* 右侧文字区域 */
+.right-font {
+  padding: 20px 0;
+}
+
+.right-font .greeting {
+  font-size: 20px;
+  font-weight: bold;
+  color: white;
+  margin-bottom: 15px;
+  font-family: "Microsoft YaHei", sans-serif;
+}
+
+.right-font p {
+  font-size: 18px;
+  line-height: 2;
+  color: white;
+  margin-bottom: 10px;
+  font-family: "Microsoft YaHei", sans-serif;
+}
+
+.right-font-sm p {
+  font-size: 16px;
+  line-height: 1.8;
+  color: white;
+  margin-bottom: 8px;
+  font-family: "Microsoft YaHei", sans-serif;
+}
+
+.send_btn {
+  margin-top: 30px;
+  text-align: center;
+}
+
+.start-btn {
+  /* background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); */
+  background: #2e5aa6;
+  border: 5px solid #6e88b5;
+  color: white;
+  padding: 15px 50px;
+  font-size: 20px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: all 0.3s ease;
+  /* box-shadow: 0 4px 15px rgba(102, 126, 234, 0.4); */
+}
+
+.start-btn:hover {
+  transform: translateY(-2px);
+  /* box-shadow: 0 6px 20px rgba(102, 126, 234, 0.6);
+  background: linear-gradient(135deg, #764ba2 0%, #667eea 100%); */
+}
+
+.start-btn:active {
+  transform: translateY(0);
+}
+
+.start-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  transform: none;
+}
+
+.start-btn:disabled:hover {
+  transform: none;
+}
+
+/* 响应式样式 */
+@media (max-width: 768px) {
+  .top-title {
+    font-size: 32px;
+    margin-bottom: 30px;
+  }
+
+  .welcome {
+    padding: 40px 15px 30px;
+  }
+
+  .welcome .main {
+    padding: 30px 20px;
+  }
+
+  .welcome .main .col-md-6 {
+    flex: 0 0 100%;
+    max-width: 100%;
+    margin-bottom: 20px;
+  }
+
+  .right-font p {
+    font-size: 16px;
+  }
+
+  .start-btn {
+    padding: 12px 30px;
+    font-size: 18px;
+  }
+}
+
+/* 显示/隐藏控制 */
+.visible-lg-block,
+.visible-md-block,
+.visible-xs-block {
+  display: block;
+}
+
+@media (max-width: 767px) {
+  .visible-lg-block,
+  .visible-md-block {
+    display: none !important;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 991px) {
+  .visible-xs-block {
+    display: none !important;
+  }
+}
+
+@media (min-width: 992px) {
+  .visible-xs-block {
+    display: none !important;
+  }
+}
+
+/* Loading遮罩层透明度 */
+.welcome ::v-deep .el-loading-mask {
+  background-color: rgba(255, 255, 255, 0.5) !important;
+}
+</style>
+

src/views/study/TaskList.vue

@@ -7,24 +7,57 @@
       <div class="progress"><div class="msg">路径图完成情况</div> <el-progress :text-inside="true" :stroke-width="16" :percentage="porcessData.router" class="progressItem"> </el-progress>  </div>
      
       </div> -->
-    <div style="display: flex; justify-content: space-between; padding: 12px 32px 10px 22px;">
+    <div
+      style="
+        display: flex;
+        justify-content: space-between;
+        padding: 12px 32px 10px 22px;
+      "
+    >
       <div style="display: flex; justify-content: flex-start">
         <div>
-          <el-select class="search-input" v-model="status" clearable placeholder="学习进度">
+          <el-select
+            class="search-input"
+            v-model="status"
+            clearable
+            placeholder="学习进度"
+          >
             <el-option label="全部" value=""></el-option>
             <el-option label="未开始" value="0"></el-option>
             <el-option label="进行中" value="1"></el-option>
             <el-option label="已完成" value="2"></el-option>
           </el-select>
         </div>
-        <div style="padding-left: 10px"><el-input v-model="params.cmtask_name" clearable placeholder="搜索名称"></el-input></div>
+        <div style="padding-left: 10px">
-        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button></div>
+          <el-input
-        <div class="button-class" style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right"  @click="reset()">重置</el-button></div>
+            v-model="params.cmtask_name"
+            clearable
+            placeholder="搜索名称"
+          ></el-input>
+        </div>
+        <div class="button-class" style="padding-left: 10px">
+          <el-button type="primary" icon="el-icon-search" @click="search()"
+            >搜索</el-button
+          >
+        </div>
+        <div class="button-class" style="padding-left: 10px">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-right"
+            @click="reset()"
+            >重置</el-button
+          >
+        </div>
       </div>
     </div>
     <!--课程列表内容-->
     <div class="uc-list" v-if="couresList.length > 0">
-      <div class="uc-course" v-for="(item, idx) in couresList" @click="jumpRouter(item)" :key="idx">
+      <div
+        class="uc-course"
+        v-for="(item, idx) in couresList"
+        @click="jumpRouter(item)"
+        :key="idx"
+      >
         <div class="uc-course-img">
           <img :src="item.cmtask_imgurl" />
           <span class="spanname" v-if="item.cmtask_type == 1">学习路径图</span>
@@ -41,7 +74,8 @@
             <span v-html="item.cmtask_name"></span>
           </div>
           <!-- <div class="uc-course-source" @click="jumpRouter(item)">来源：{{ item.cmtask_name }}</div> -->
-          <div style="padding-top: 18px; " class="uc-course-text">学习进度：
+          <div style="padding-top: 18px" class="uc-course-text">
+            学习进度：
             <span v-if="item.cmtask_user_status == 0">未开始</span>
             <span v-if="item.cmtask_user_status == 1">进行中</span>
             <span v-if="item.cmtask_user_status == 2">已完成</span>
@@ -50,21 +84,24 @@
           <div class="uc-course-time">推送时间：{{ item.created_at }}</div>
         </div>
         <div class="uc-course-btns">
-          <el-button @click="jumpRouter(item)" type="primary" size="small">开始学习</el-button>
+          <el-button @click="jumpRouter(item)" type="primary" size="small"
+            >开始学习</el-button
+          >
         </div>
       </div>
-      <div style="height:150px;  text-align: center;  margin-top:57px;" >
+      <div style="height: 150px; text-align: center; margin-top: 57px">
-        <el-pagination background
+        <el-pagination
+          background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :page-sizes="[10, 20, 30, 40]"
           :current-page="page"
           :page-size="size"
           layout="total, sizes, prev, pager, next, jumper"
-            :total="total">
+          :total="total"
+        >
         </el-pagination>
       </div>
-
     </div>
     <!-- </div> -->
     <div v-else class="zan-wu">
@@ -80,21 +117,21 @@
 </template>
 
 <script>
-import studyItem from '@/components/Course/studyItem.vue';
+import studyItem from "@/components/Course/studyItem.vue";
-import apiManage from '@/api/manage/manage.js'
+import apiManage from "@/api/manage/manage.js";
-import { getToken } from '@/utils/token'
+import { getToken } from "@/utils/token";
-import {formatsec} from '@/utils/datetime.js'
+import { formatsec } from "@/utils/datetime.js";
-import axios from 'axios'
+import axios from "axios";
 export default {
-  name: 'ucStudyTask',
+  name: "ucStudyTask",
   components: { studyItem },
   data() {
     return {
-      status: '',
+      status: "",
       params: {
-         cmtask_name:'',
+        cmtask_name: "",
-         cmtask_status:'',
+        cmtask_status: "",
-         type:'',
+        type: "",
       },
       porcessData: {
         course: 0,
@@ -104,29 +141,39 @@ export default {
       loading: true,
       size: 10,
       page: 1,
-      keyword:'',
+      keyword: "",
       formatsec,
       couresList: [],
-      total: 0
+      total: 0,
     };
   },
   mounted() {
     this.loadBoeData();
-   this.getPossData()
+    this.getPossData();
   },
   methods: {
     jumpRouter(item) {
+      if (item.szxygProjectFlag == 1) {
+        this.$router.push("/new-employee/study");
+        return;
+      }
       //location.href=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}`;
 
       //let urlPre=window.location.protocol+'//'+window.location.host;
       let studentPath = process.env.VUE_APP_STUDENT_PATH;
-      if(item.cmtask_type==1){ //学习路径图
+      if (item.cmtask_type == 1) {
-         let params=encodeURIComponent('routerId='+item.cmtask_id);
+        //学习路径图
+        let params = encodeURIComponent("routerId=" + item.cmtask_id);
         //this.$router.push('/forward?to='+studentPath+'/pathdetails&params='+params);
-         this.$router.push('/forward?to='+studentPath+'/pathchapterdetails&params='+params);
+        this.$router.push(
-      }else if(item.cmtask_type==2){ //学习项目
+          "/forward?to=" + studentPath + "/pathchapterdetails&params=" + params
-         let params=encodeURIComponent('projectId='+item.cmtask_id);
+        );
-         this.$router.push('/forward?to='+studentPath+'/projectdetails&params='+params);
+      } else if (item.cmtask_type == 2) {
+        //学习项目
+        let params = encodeURIComponent("projectId=" + item.cmtask_id);
+        this.$router.push(
+          "/forward?to=" + studentPath + "/projectdetails&params=" + params
+        );
       } else if (item.cmtask_type == 3) {
         let pushUrl = `/course/boeframe?id=${item.cmtask_id}&type=3`;
         this.$router.push(pushUrl);
@@ -135,19 +182,37 @@ export default {
     getPossData() {
       axios({
         method: "POST",
-        url: '/report/boeu/studyInfo',
+        url: "/report/boeu/studyInfo",
         params: {},
-        headers:{token:getToken(),}
+        headers: { token: getToken() },
       }).then((res) => {
-        console.log('111',res.data.result)
+        console.log("111", res.data.result);
         // this.porcessData=response.data.data
-        this.porcessData.course=Math.floor(res.data.result.course.total === 0 ? 0: (res.data.result.course.completion/res.data.result.course.total)*100)
+        this.porcessData.course = Math.floor(
-        this.porcessData.project=Math.floor(res.data.result.project.total === 0 ? 0: (res.data.result.project.completion/res.data.result.project.total)*100)
+          res.data.result.course.total === 0
-        this.porcessData.router=Math.floor(res.data.result.router.total === 0 ? 0: (res.data.result.router.completion/res.data.result.router.total)*100)
+            ? 0
-      })
+            : (res.data.result.course.completion /
+                res.data.result.course.total) *
+                100
+        );
+        this.porcessData.project = Math.floor(
+          res.data.result.project.total === 0
+            ? 0
+            : (res.data.result.project.completion /
+                res.data.result.project.total) *
+                100
+        );
+        this.porcessData.router = Math.floor(
+          res.data.result.router.total === 0
+            ? 0
+            : (res.data.result.router.completion /
+                res.data.result.router.total) *
+                100
+        );
+      });
     },
     loadBoeData() {
-      if(this.status !== '5') {
+      if (this.status !== "5") {
         this.params.cmtask_status = this.status;
       }
       let params = {
@@ -155,30 +220,33 @@ export default {
         pageSize: this.size,
         cmtask_user_status: this.params.cmtask_status,
         cmtask_name: this.params.cmtask_name,
-        }
+      };
       this.loading = true;
-      apiManage.userTaskList(params).then(res=>{
+      apiManage
+        .userTaskList(params)
+        .then((res) => {
           if (res.code == 200) {
             this.total = parseInt(res.data.total);
             this.couresList = res.data.records;
           } else {
-             this.$message.error('查询数据失败：'+res.msg);
+            this.$message.error("查询数据失败：" + res.msg);
           }
           this.loading = false;
-        }).catch(()=>{
-           this.loading=false;
         })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     search() {
       this.page = 1;
-      this.loadBoeData()
+      this.loadBoeData();
     },
     reset() {
       this.loading = false;
-       this.params.cmtask_name = '',
+      (this.params.cmtask_name = ""),
-       this.params.type = '',
+        (this.params.type = ""),
-       this.params.cmtask_status = ''
+        (this.params.cmtask_status = "");
-       this.status = '';
+      this.status = "";
       this.page = 1;
       this.loadBoeData();
     },
@@ -190,8 +258,8 @@ export default {
     handleCurrentChange(value) {
       this.page = value;
       this.loadBoeData();
-    }
+    },
-  }
+  },
 };
 </script>
 
@@ -252,7 +320,7 @@ export default {
   cursor: pointer;
   display: flex;
   justify-content: space-around;
-  border-bottom: 1px solid #E8E8E8;
+  border-bottom: 1px solid #e8e8e8;
   margin-right: 32px;
   padding: 20px 0px 15px 0px;
   .uc-course-img {
@@ -263,7 +331,6 @@ export default {
       width: 100%;
       height: 100%;
     }
-
   }
   .uc-course-info {
     // width: 50%;
@@ -281,7 +348,6 @@ export default {
       margin-bottom: 3px;
       font-size: 16px;
       margin-top: 20px;
-
     }
   }
   .uc-course-btns {

vue.config.js

@@ -131,13 +131,15 @@ module.exports = {
       //   changeOrigin: true,
       // },
       "/growth": {
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         // target: 'http://192.168.86.195:32002',
         changeOrigin: true,
       },
       '/manageApi': {
         // 目标代理服务器地址
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -147,7 +149,8 @@ module.exports = {
       '/systemapi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9090',
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -157,7 +160,8 @@ module.exports = {
       },
       '/uboeApi': {
         // 目标代理服务器地址
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -166,7 +170,8 @@ module.exports = {
       },
       '/userbasic': {
         // 目标代理服务器地址
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -176,7 +181,8 @@ module.exports = {
       '/statApi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9080',
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -187,7 +193,8 @@ module.exports = {
       '/socialApi': {
         // 目标代理服务器地址
         // target: 'http://127.0.0.1:9081',
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         logLevel: 'debug',
         secure: false,
@@ -197,7 +204,8 @@ module.exports = {
       },
       '/report': {
         // 目标代理服务器地址
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
         pathRewrite: {
@@ -206,13 +214,15 @@ module.exports = {
       },
       '/infrasApi': {
         // 目标代理服务器地址
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
       },
       '/activityApi': {
         // 目标代理服务器地址
-        target: 'https://u-pre.boe.com',
+        // target: 'https://u-pre.boe.com',
+        target: 'http://10.10.176.17:81',
         changeOrigin: true,
         secure: false,
       },