소스 검색

三库layout

shilipojs 3 년 전
부모
커밋
32f9885e85

+ 16 - 16
src/router/index.js

@@ -634,14 +634,14 @@ export const constantRoutes = [{
           title: '职业性格测评-评测列表'
         }
       },
-      {
-        path: '/career/plan/MajorLib',
-        component: (resolve) => require(['@/views/career/plan/new-major-lib'], resolve),
-        name: 'ProfessLib',
-        meta: {
-          title: '专业库'
-        }
-      },
+      // {
+      //   path: '/career/plan/MajorLib',
+      //   component: (resolve) => require(['@/views/career/plan/new-major-lib'], resolve),
+      //   name: 'ProfessLib',
+      //   meta: {
+      //     title: '专业库'
+      //   }
+      // },
       {
         path: '/career/plan/MajorDetail',
         component: (resolve) => require(['@/views/career/plan/new-major-detail'], resolve),
@@ -723,14 +723,14 @@ export const constantRoutes = [{
           title: '选科报名'
         }
       },
-      {
-        path: '/career/vocation/index',
-        component: (resolve) => require(['@/views/career/vocation/new-index'], resolve),
-        name: 'Vocation',
-        meta: {
-          title: '职业库'
-        }
-      },
+      // {
+      //   path: '/career/vocation/index',
+      //   component: (resolve) => require(['@/views/career/vocation/new-index'], resolve),
+      //   name: 'Vocation',
+      //   meta: {
+      //     title: '职业库'
+      //   }
+      // },
       {
         path: '/career/vocation/Detail',
         component: (resolve) => require(['@/views/career/vocation/new-detail'], resolve),

+ 4 - 4
src/views/career/plan/new-major-detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="professDetail" style="padding:24px 5%">
+  <div  class="app-container professDetail">
     <el-row :gutter="20">
       <el-col :span="6" >
         <el-tabs type="border-card" @tab-click="tabClick" :value="type"  stretch >
@@ -28,7 +28,7 @@
           <el-card style="color: #5E5E5E;" ref="navBar">
             <el-breadcrumb separator-class="el-icon-arrow-right">
               <el-breadcrumb-item :to="{ path: '/index' }">首页</el-breadcrumb-item>
-              <el-breadcrumb-item :to="{ path: '/career/plan/ProfessLib'}">专业库</el-breadcrumb-item>
+              <el-breadcrumb-item :to="{ path: '/new-gaokao/three/ProfessLib'}">专业库</el-breadcrumb-item>
               <el-breadcrumb-item>专业详情</el-breadcrumb-item>
             </el-breadcrumb>
           </el-card>
@@ -227,7 +227,7 @@ export default {
     },
     // 平均薪资趋势
     reverseSalary() {
-      if (!this.prospects.averageSalary) return null
+      if (!this.prospects.averageSalary.length) return []
       const averageSalary = this.deepClone(this.prospects.averageSalary)
       return averageSalary.reverse().splice(0 ,10)
     },
@@ -437,7 +437,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-#professDetail {
+.professDetail {
 
   .header-content {
     top: 0;

+ 3 - 3
src/views/career/plan/new-major-lib.vue

@@ -1,8 +1,8 @@
 <template>
-  <div id="vocation" ref="vocation">
+  <div class="app-container majorlib" ref="vocation">
     <el-card style="height:158px;margin: 10px auto;">
       <div :style="{'background-image':backimg}" class="back">
-        <p style="color:#A6A6A6;font-size:24px;font-weight:bold;">Professional library</p>
+        <p style="color:#A6A6A6;font-size:24px;font-weight:bold;">MAJOR LIBRARY</p>
         <p style="color:#414141;font-size:24px;font-weight:bold;">专业库</p>
         <hr class="layui-bg-orange" style="width:40px;height:4px;margin-top:10px;" />
       </div>
@@ -84,7 +84,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-#vocation{
+.majorlib{
   .levelOne{
     padding-top:100px;
     margin-top:-100px;

+ 3 - 3
src/views/career/vocation/new-detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="jobDetail" style="padding:24px 5%" >
+  <div  class="app-container jobDetail" >
     <el-row :gutter="20">
       <el-col :span="6">
        <div class="bd-f2">
@@ -29,7 +29,7 @@
         <el-card style="color: #5E5E5E;" ref="navBar">
           <el-breadcrumb separator-class="el-icon-arrow-right">
             <el-breadcrumb-item :to="{ path: '/index' }">首页</el-breadcrumb-item>
-            <el-breadcrumb-item :to="{ path: '/career/vocation/index'}">职业库</el-breadcrumb-item>
+            <el-breadcrumb-item :to="{ path: '/new-gaokao/three/Vocation'}">职业库</el-breadcrumb-item>
             <el-breadcrumb-item>职业详情</el-breadcrumb-item>
           </el-breadcrumb>
         </el-card>
@@ -407,7 +407,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-#jobDetail {
+.jobDetail {
   .header-content{
     top: 0;
     left: 0;

+ 2 - 2
src/views/career/vocation/new-index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div id="vocation" ref="vocation">
+  <div  class="app-container vocation" ref="vocation">
     <el-card style="height:158px;margin: 10px auto;">
       <div :style="{'background-image':backimg}" class="back">
         <p style="color:#A6A6A6;font-size:24px;font-weight:bold;">CAREER POOL</p>
@@ -80,7 +80,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-#vocation{
+.vocation{
   .levelOne{
     padding-top:100px;
     margin-top:-100px;

+ 5 - 4
src/views/permission/teacher-manage.vue

@@ -77,9 +77,10 @@ export default {
   },
   watch: {
     selectedCode: {
+      immediate: true,    // 这句重要
       handler(val) {
-        console.log(val,111111111)
-      }
+        console.log(val,222222222)
+      },
     }
   },
   data() {
@@ -98,7 +99,8 @@ export default {
       return this.dataList.find(item => item['localSelected'])
     },
     dataListWithSelected() {
-      if (this.selectMode && this.dataList.length) {
+      if (this.selectMode && this.dataList.length && this.selectedCode) {
+        console.log(1111111111111111111)
         this.dataList.forEach(user => {
           // 本地字段,强制进入双向绑定
           this.$set(user, 'selecedClassName', this.isSelecedClassName(user))
@@ -110,7 +112,6 @@ export default {
   },
   methods: {
     isSelecedClassName(row) {
-      const settingsValue = Object.values(this.headTeacherSettings)
       const headTeacherSettings = this.headTeacherSettings
       for (const key in headTeacherSettings) {
         if(headTeacherSettings[key].customerCode ==  row.customerCode) {