2
0

6 Commity d3c56f912c ... 3033257c2f

Autor SHA1 Správa Dátum
  hizhangling 3033257c2f [feat][个人中心][目录整合] 1 mesiac pred
  hizhangling 3238b43553 Merge remote-tracking branch 'origin/master' 1 mesiac pred
  hizhangling d5c9c6fd69 Merge remote-tracking branch 'origin/master' 1 mesiac pred
  hizhangling 9df0dc8b8f [feat][生涯决策][学科与未来专业] 1 mesiac pred
  hizhangling b8ac72fc04 [feat][生涯决策][决策平衡单] 1 mesiac pred
  hizhangling 31ecafe711 [feat][生涯决策][决策平衡单] 1 mesiac pred
25 zmenil súbory, kde vykonal 401 pridanie a 35 odobranie
  1. BIN
      src/assets/images/decision/common/background.png
  2. 0 0
      src/assets/images/decision/common/background_no_white.png
  3. 2 1
      src/router/index.js
  4. 27 0
      src/router/router_personcenter.js
  5. 9 1
      src/views/xjc-integratedmachine/components/head_component.vue
  6. 61 2
      src/views/xjc-integratedmachine/decision/balance_sheet/decision_balance_sheet.vue
  7. 219 19
      src/views/xjc-integratedmachine/decision/major_and_future/major_and_future_index.vue
  8. 1 1
      src/views/xjc-integratedmachine/decision/process_diagram/process_diagram_selecting_subjects.vue
  9. 0 0
      src/views/xjc-integratedmachine/personcenter/career_decision.vue
  10. 0 0
      src/views/xjc-integratedmachine/personcenter/career_passport.vue
  11. 0 0
      src/views/xjc-integratedmachine/personcenter/career_planning_report.vue
  12. 0 0
      src/views/xjc-integratedmachine/personcenter/career_planningreport_evaluationlist.vue
  13. 0 0
      src/views/xjc-integratedmachine/personcenter/career_planningreportlist.vue
  14. 0 0
      src/views/xjc-integratedmachine/personcenter/environment/environment_exploration.vue
  15. 18 0
      src/views/xjc-integratedmachine/personcenter/environment/environment_index.vue
  16. 0 0
      src/views/xjc-integratedmachine/personcenter/environment/environmental_collection_university.vue
  17. 28 0
      src/views/xjc-integratedmachine/personcenter/index.vue
  18. 0 0
      src/views/xjc-integratedmachine/personcenter/maturity_report_list.vue
  19. 0 0
      src/views/xjc-integratedmachine/personcenter/person_info.vue
  20. 0 0
      src/views/xjc-integratedmachine/personcenter/planning_management.vue
  21. 19 0
      src/views/xjc-integratedmachine/personcenter/recognize/recognize_index.vue
  22. 0 0
      src/views/xjc-integratedmachine/personcenter/self_awareness.vue
  23. 0 0
      src/views/xjc-integratedmachine/personcenter/wakeup/rainbow_chartlist.vue
  24. 17 0
      src/views/xjc-integratedmachine/personcenter/wakeup/wakeup_index.vue
  25. 0 11
      src/views/xjc-platform/personcenter/career_awakening.vue

BIN
src/assets/images/decision/common/background.png


src/assets/images/decision/background.png → src/assets/images/decision/common/background_no_white.png


+ 2 - 1
src/router/index.js

@@ -7,6 +7,7 @@ import router_decision from '@/router/router_decision.js'
 import router_environment from '@/router/router_environment.js'
 import router_plan from '@/router/router_plan.js'
 import router_common from '@/router/router_common.js'
+import router_personcenter from '@/router/router_personcenter.js'
 
 // 公共路由
 export const constantRoutes = [
@@ -196,7 +197,7 @@ export const dynamicRoutes = [
     }
 ]
 const routerArrs = [...router_wakeup.router, ...router_cognize.router, ...router_decision.router,
-    ...router_environment.router, ...router_plan.router, ...router_common.router, ...constantRoutes]
+    ...router_environment.router, ...router_plan.router, ...router_common.router, ...router_personcenter.router, ...constantRoutes]
 
 /**
  * Note: 路由配置项

+ 27 - 0
src/router/router_personcenter.js

@@ -0,0 +1,27 @@
+const router = [
+    //个人中心首页
+    {
+        path: '/xjc-integratedmachine/personcenter/index',
+        component: () => import('@/views/xjc-integratedmachine/personcenter/index.vue'),
+    },
+    //生涯唤醒
+    {
+        path: '/xjc-integratedmachine/personcenter/wakeup/wakeup_index',
+        component: () => import('@/views/xjc-integratedmachine/personcenter/wakeup/wakeup_index.vue'),
+    },
+    //自我认知
+    {
+        path: '/xjc-integratedmachine/personcenter/recognize/recognize_index',
+        component: () => import('@/views/xjc-integratedmachine/personcenter/recognize/recognize_index.vue'),
+    },
+    //环境探索
+    {
+        path: '/xjc-integratedmachine/personcenter/environment/environment_index',
+        component: () => import('@/views/xjc-integratedmachine/personcenter/environment/environment_index.vue'),
+    },
+
+]
+
+export default {
+    router
+}

+ 9 - 1
src/views/xjc-integratedmachine/components/head_component.vue

@@ -23,7 +23,7 @@
     </div>
     <div class="head-right" v-if="!headinfo.isLogin">
       <div class="right-user">
-        <img src="@/assets/images/wakeup/user.png" @click="backTo" alt="404" />
+        <img src="@/assets/images/wakeup/user.png" @click="gotoPersonCenter" alt="404" />
       </div>
       <el-button class="head-right-btn1" v-if="headinfo.isHome"
         >使用说明</el-button
@@ -144,6 +144,14 @@ function getCompareSizeData(num) {
     });
   }, 500);
 }
+
+// 前往个人中心
+function gotoPersonCenter(){
+  router.push({
+    path: "/xjc-integratedmachine/personcenter/index",
+  });
+}
+
 onMounted(() => {
   // getCompareSizeData()
 });

+ 61 - 2
src/views/xjc-integratedmachine/decision/balance_sheet/decision_balance_sheet.vue

@@ -1,11 +1,70 @@
 <template>
-    选科决策平衡单
+    <div class="decision_balance_sheet">
+        <head-component :headinfo=headinfo></head-component>
+        <div class="page-content">
+            <div class="page-box">
+                <div>
+
+                </div>
+            </div>
+            <drag_component></drag_component>
+        </div>
+    </div>
+
 </template>
 
 <script setup>
+    import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
+    import {onMounted, reactive} from "vue";
+    import drag_component from "@/views/xjc-integratedmachine/components/drag_component.vue";
+    const headinfo = ref({})
+
+    function setHeadinfo(){
+        headinfo.value = {
+            title: '决策平衡单',
+            user: {
+                avatar: '头像路径',
+                nickName: '张三'
+            },
+            backUrl : '/xjc-integratedmachine/wakeup/career_recognize/index'
+        }
+    }
+
+    onMounted(() => {
+        setHeadinfo()
+    })
 
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+    p{
+        margin: 0;
+        padding: 0;
+    }
+    .decision_balance_sheet{
+        background: url('@/assets/images/decision/common/background.png') no-repeat;
+        background-size: 1920px 1080px;
+        z-index:10;
+        width: 100%;
+        height: 1080px;
+        .page-content {
+            width: 100%;
+            height: 980px;
+            position: absolute;
+            top: 100px;
+            bottom: 0;
+        }
+        .page-box{
+            width: 1832px;
+            height: 910px;
+            overflow: auto;
+            margin: 13px auto 0;
+            padding-top: 25px;
+            position: relative;
+            overflow: auto;
+
+        }
+
+    }
 
 </style>

+ 219 - 19
src/views/xjc-integratedmachine/decision/major_and_future/major_and_future_index.vue

@@ -1,30 +1,230 @@
 <template>
-    学科与未来专业
+    <div class="major_and_future">
+        <head-component :headinfo=headinfo></head-component>
+        <div class="page-content">
+            <div class="content-box">
+                <div class="box-main">
+                    <div class="box-item" v-for="(item,index) in cinemaData">
+                        <div class="video-left" @click="playVideo(item.filmPath,item.name)">
+                            <img :src= "`${baseUrl}`+ item.picPath" />
+                            <img class="pause" src="@/assets/images/wakeup/pause.png" />
+                        </div>
+                        <div class="video-right">
+                            <p class="title">{{item.name}}</p>
+                            <div class="text-box">
+                                <p class="text" v-html="item.introduce">
+                                </p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <!--      <div class="content-bottom">-->
+            <!--        <div class="draw draggable-ball" @mousedown="startDrag" :style="{ left: position.x + 'px', top: position.y + 'px' }">-->
+            <!--          <img src="@/assets/images/wakeup/float-box.png" />-->
+            <!--        </div>-->
+            <!--        <div class="ai-rabit">-->
+            <!--          <div class="ai-rabit-text">-->
+            <!--            你好,同学欢迎进入生涯学习系统-->
+            <!--          </div>-->
+            <!--          <img  src="@/assets/images/wakeup/ai-rabit.png" />-->
+            <!--        </div>-->
+            <!--      </div>-->
+        </div>
 
-    <div>
-        英语
-    </div>
-    <div>
-        语文
-    </div>
-    <div>
-        物理
-    </div>
-    <div>
-        生物
-    </div>
-    <div>
-        化学
-    </div>
-    <div>
-        政治
+        <el-dialog
+                v-model="centerDialogVisible"
+                destroy-on-close
+                :title="videoName"
+                width="1832px"
+                height="915px"
+                center
+                @before-close="dialogBeforeClose"
+                align-center
+        >
+            <div class="video-content">
+                <video ref="videoPlayer" video preload="auto" autoplay muted controls width="1798" height="900" >
+                    <source :src="`${videoPath}`" type="video/ogg">
+                </video>
+            </div>
+        </el-dialog>
     </div>
+
 </template>
 
 <script setup>
+    import { reactive, onMounted } from 'vue';
+    import {cinemaList} from "@/api/xjc-integratedmachine/wakeup/index.js";
+    import headComponent from '@/views/xjc-integratedmachine/components/head_component.vue'
+
+
+    const router = useRouter()
+
+    const headinfo = ref({})
+    const cinemaData = ref([
+        {
+            name: '英语',
+            filePath: 'http://unimajorvedio.shengyazhidao.com/course/英语学科与未来专业职业.mp4'
+        },
+        {
+            name: '历史',
+            filePath: 'http://unimajorvedio.shengyazhidao.com/course/历史学科与未来专业职业.mp4'
+        },
+    ])
+    const baseUrl = ref('https://www.shengyazhidao.com')
+    const centerDialogVisible = ref(false)
+    const videoPlayer = ref(null);
+    const videoPath = ref(null);
+    const videoName = ref(null);
+    // const isDragging = ref(false)
+    const offset = ref({ x: 0, y: 0 })
+    const startX = ref(0)
+    const startY = ref(0)
+
+    function setHeadinfo(){
+        headinfo.value = {
+            title: '生涯影院',
+            user: {
+                avatar: '头像路径',
+                nickName: '张三'
+            },
+            backUrl : '/xjc-integratedmachine/wakeup/index'
+        }
+    }
+
+    function jumpTo(path) {
+        router.push({
+            path: path,
+            query: {name: 123}
+        })
+    }
+
+    function playVideo(filmPath,name) {
+        console.log("filmPath",filmPath)
+
+        centerDialogVisible.value = true;
+        console.log("filmPath",filmPath)
+        videoPath.value = filmPath
+        videoName.value = name
+    }
+    function dialogBeforeClose(){
+        videoPath.value = null;
+    }
+
+    onMounted(() => {
+        setHeadinfo();
+    })
+
 
 </script>
 
-<style scoped>
+
+<style scoped lang="scss">
+    p{
+        margin: 0;
+        padding: 0;
+    }
+    .major_and_future{
+        background: url('@/assets/images/decision/common/background.png') no-repeat;
+        background-size: 1920px 1080px;
+        z-index:10;
+        width: 100%;
+        height: 1080px;
+        .page-content{
+            width: 100%;
+            position: absolute;
+            top: 123px;
+            bottom: 0;
+            .content-box{
+                width: 1832px;
+                height:910px;
+                background: #FFFFFF;
+                background: rgba(255,255,255,0.2);
+                border-radius: 35px 35px 35px 35px;
+                margin: 0 auto;
+                .box-main{
+                    width: 1810px;
+                    height:850px;
+                    overflow:auto;
+                    margin-left: 26px;
+                    scrollbar-color: #D9D9D9 #9feafa0f;
+                    scrollbar-width: thin;
+                    .box-item{
+                        margin-top: 29px;
+                        width: 1786px;
+                        height: 487px;
+                        background: white;
+                        border-radius: 35px 35px 35px 35px;
+                        display: flex;
+                        justify-content: space-around;
+                        margin-bottom: 20px;
+                        .video-left{
+                            width: 300px;
+                            height: 418px;
+                            //border: 1px solid;
+                            margin-top: 25px;
+                            position: relative;
+                            img{
+                                width: 300px;
+                                height: 418px;
+                            }
+                            .pause{
+                                width:146px;
+                                height:146px;
+                                position: absolute;
+                                top: 131px;
+                                left: 72px;
+                            }
+                        }
+                        .video-right{
+                            width: 1395px;
+                            height: 314px;
+                            .text-box{
+                                overflow:auto;
+                                scrollbar-color: #D9D9D9 #9feafa0f;
+                                scrollbar-width: thin;
+                                height: 314px;
+                                //border: 1px solid;
+                                .text{
+                                    text-indent: 2em;
+                                    font-weight: 400;
+                                    font-size: 30px;
+                                    color: #333333;
+                                    line-height: 42px;
+                                }
+                            }
+                            .title{
+                                font-weight: bold;
+                                font-size: 32px;
+                                color: #333333;
+                                line-height: 52px;
+                                margin-top: 38px;
+                            }
+                        }
+                    }
+                    .box-item{
+                        scrollbar-color: #9be9fa #ffffff;
+                    }
+                }
+            }
+        }
+        .video-content{
+            width: 1798px;
+            height: 915px;
+            //border: 1px solid;
+            //background: pink;
+            z-index:10;
+        }
+        ::v-deep .el-dialog__header{
+            height: 60px;
+        }
+        ::v-deep .el-dialog__title{
+            font-size: 30px;
+            font-weight: bold;
+            line-height: 50px;
+        }
+    }
+
 
 </style>
+

+ 1 - 1
src/views/xjc-integratedmachine/decision/process_diagram/process_diagram_selecting_subjects.vue

@@ -42,7 +42,7 @@
         padding: 0;
     }
     .process_diagram_selecting_subject{
-        background: url('@/assets/images/decision/background.png') no-repeat;
+        background: url('@/assets/images/decision/common/background.png') no-repeat;
         background-size: 1920px 1080px;
         z-index:10;
         width: 100%;

src/views/xjc-platform/personcenter/career_decision.vue → src/views/xjc-integratedmachine/personcenter/career_decision.vue


src/views/xjc-platform/personcenter/career_passport.vue → src/views/xjc-integratedmachine/personcenter/career_passport.vue


src/views/xjc-platform/personcenter/career_planning_report.vue → src/views/xjc-integratedmachine/personcenter/career_planning_report.vue


src/views/xjc-platform/personcenter/career_planningreport_evaluationlist.vue → src/views/xjc-integratedmachine/personcenter/career_planningreport_evaluationlist.vue


src/views/xjc-platform/personcenter/career_planningreportlist.vue → src/views/xjc-integratedmachine/personcenter/career_planningreportlist.vue


src/views/xjc-platform/personcenter/environment_exploration.vue → src/views/xjc-integratedmachine/personcenter/environment/environment_exploration.vue


+ 18 - 0
src/views/xjc-integratedmachine/personcenter/environment/environment_index.vue

@@ -0,0 +1,18 @@
+<template>
+    <div>
+        <div>环境探索</div>
+        <ul>
+           <li>收藏的高校</li>
+           <li>收藏的专业</li>
+           <li>收藏的职业</li>
+        </ul>
+    </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/xjc-platform/personcenter/environmental_collection_university.vue → src/views/xjc-integratedmachine/personcenter/environment/environmental_collection_university.vue


+ 28 - 0
src/views/xjc-integratedmachine/personcenter/index.vue

@@ -0,0 +1,28 @@
+<template>
+    <div>
+        个人中心
+        <el-button @click="jumpTo('/xjc-integratedmachine/personcenter/wakeup/wakeup_index')">生涯唤醒</el-button>
+        <el-button @click="jumpTo('/xjc-integratedmachine/personcenter/recognize/recognize_index')">自我认知</el-button>
+        <el-button @click="jumpTo('/xjc-integratedmachine/personcenter/environment/environment_index')">环境探索</el-button>
+        <el-button @click="jumpTo('')">生涯决策</el-button>
+        <el-button @click="jumpTo('')">规划管理</el-button>
+        <el-button @click="jumpTo('')">生涯护照</el-button>
+        <el-button @click="jumpTo('')">账号信息</el-button>
+    </div>
+</template>
+
+<script setup>
+
+    const router = useRouter();
+
+    function jumpTo(path) {
+        router.push({
+            path: path
+        })
+    }
+
+</script>
+
+<style scoped>
+
+</style>

src/views/xjc-platform/personcenter/maturity_report_list.vue → src/views/xjc-integratedmachine/personcenter/maturity_report_list.vue


src/views/xjc-platform/personcenter/person_info.vue → src/views/xjc-integratedmachine/personcenter/person_info.vue


src/views/xjc-platform/personcenter/planning_management.vue → src/views/xjc-integratedmachine/personcenter/planning_management.vue


+ 19 - 0
src/views/xjc-integratedmachine/personcenter/recognize/recognize_index.vue

@@ -0,0 +1,19 @@
+<template>
+    <div>
+        <div>自我认知</div>
+        <ul>
+           <li>查看兴趣探索报告</li>
+           <li>查看性格探索报告</li>
+           <li>查看能力探索探索报告</li>
+           <li>查看价值观报告</li>
+        </ul>
+    </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

src/views/xjc-platform/personcenter/self_awareness.vue → src/views/xjc-integratedmachine/personcenter/self_awareness.vue


src/views/xjc-platform/personcenter/rainbow_chartlist.vue → src/views/xjc-integratedmachine/personcenter/wakeup/rainbow_chartlist.vue


+ 17 - 0
src/views/xjc-integratedmachine/personcenter/wakeup/wakeup_index.vue

@@ -0,0 +1,17 @@
+<template>
+    <div>
+        <div>生涯唤醒</div>
+        <ul>
+           <li>查看生涯彩虹图</li>
+           <li>查看生涯成熟度报告</li>
+        </ul>
+    </div>
+</template>
+
+<script setup>
+
+</script>
+
+<style scoped>
+
+</style>

+ 0 - 11
src/views/xjc-platform/personcenter/career_awakening.vue

@@ -1,11 +0,0 @@
-<template>
-    个人中心生涯唤醒
-</template>
-
-<script setup>
-
-</script>
-
-<style scoped>
-
-</style>