shilipojs пре 3 година
родитељ
комит
04d41132d4

+ 38 - 33
src/views/career/plan/new-profess-detail.vue

@@ -3,29 +3,24 @@
     <el-row :gutter="20">
       <el-col :span="6" >
         <el-tabs type="border-card" @tab-click="tabClick" :value="type"  stretch >
-          <el-tab-pane label="本科" name="本科" class="tree">
-            <el-tree
-
-              :data="majorList"
-              node-key="code"
-              :default-checked-keys="[code]"
-              :default-expanded-keys="[code]"
-              :props="defaultProps"
-              @node-click="handleNodeClick"
-              :isLeaf="isLeaf"
-            >
-              <p  class="custom-tree-node" slot-scope="{node, data}">
-                <span>{{node.label }}</span>
-                <span>{{data.children ? data.children.length : ''}}</span>
-              </p>
-            </el-tree>
-          </el-tab-pane>
-          <el-tab-pane label="专科"  name="专科" class="tree">
-            <el-tree
-              :data="majorList"
-              :props="defaultProps"
-            ></el-tree>
-          </el-tab-pane>
+          <el-tab-pane label="本科" name="本科" class="tree"></el-tab-pane>
+          <el-tab-pane label="专科"  name="专科" class="tree"></el-tab-pane>
+          <el-tree
+            ref="tree"
+            :data="majorList"
+            node-key="code"
+            :default-checked-keys="[code]"
+            :default-expanded-keys="[code]"
+            :props="defaultProps"
+            :current-node-key="code"
+            @node-click="handleNodeClick"
+            :isLeaf="isLeaf"
+          >
+            <p  class="custom-tree-node" slot-scope="{node, data}">
+              <span>{{node.label }}</span>
+              <span>{{data.children ? data.children.length : ''}}</span>
+            </p>
+          </el-tree>
         </el-tabs>
       </el-col>
       <el-col :span="18">
@@ -122,7 +117,7 @@
                         <el-col :span="24" class="f16" v-for="(item,index) in  prospects.industryDistribution">
                           <el-row class="format-job-wrap">
                             <el-col :span="3" class="f18 text-center f-666">{{index + 1}}</el-col>
-                            <el-col :span="18" class="f-333">{{item.name}}</el-col>
+                            <el-col :title="item.name" :span="18" class="f-333  text-ellipsis">{{item.name}}</el-col>
                             <el-col  :span="3" class="f-red  text-right f14">{{item.value}}%</el-col>
                           </el-row>
                         </el-col>
@@ -139,7 +134,7 @@
                         <el-col :span="24" class="f16" v-for="(item,index) in  prospects.jobRegionDistribution">
                           <el-row class="format-job-wrap">
                             <el-col :span="3" class="f18 text-center f-666">{{index + 1}}</el-col>
-                            <el-col :span="18" class="f-333">{{item.name}}</el-col>
+                            <el-col :span="18" class="f-333 text-ellipsis">{{item.name}}</el-col>
                             <el-col  :span="3" class="f-red  text-right f14">{{item.value}}%</el-col>
                           </el-row>
                         </el-col>
@@ -354,6 +349,7 @@ export default {
         if (val.query.code) {
           this.getOverView()
         }
+        this.$refs.tree.setCurrentKey(this.code)
       }
     }
   },
@@ -361,7 +357,9 @@ export default {
     handleNodeClick(data,node) {
       if(!node.isLeaf) return
       console.log('跳转')
-        // 跳转
+      console.log(node.data.code)
+      // 跳转
+      this.$router.replace({path:'/career/plan/ProfessLibDetail',query:{code:node.data.code}})
     },
     isLeaf(data,node) {
       return node.childCount == 0
@@ -409,6 +407,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 #professDetail {
+
   .header-content {
     top: 0;
     left: 0;
@@ -467,13 +466,19 @@ export default {
     height: 1px;
   }
 
+  .el-tabs--border-card ::v-deep .el-tabs__content{
+    height: calc(100vh - 176px) ;
+    overflow: hidden;
+    overflow-y: auto;
+  }
+  ::v-deep .el-tree-node.is-current > .el-tree-node__content {
+    background: rgba(22, 119, 255, 0.1);
+    color: #47C6A2;
+    ::v-deep .is-leaf {
+      color: rgba(0, 0, 0, 0);
+    }
+  }
 }
-</style>
-<style>
-.el-tabs--border-card > .el-tabs__content{
-  height: calc(100vh - 176px) ;
-  overflow: hidden;
-  overflow-y: auto;
 
-}
 </style>
+

+ 0 - 1
src/views/system/user/profile/components/report-table.vue

@@ -121,7 +121,6 @@ export default {
         rows.forEach((row) => {
           const descriptors = column.groupDescriptors.find(desc => desc.groupId == row.groupId) ?
             column.groupDescriptors.find(desc => desc.groupId == row.groupId).descriptors : []
-            console.log(descriptors)
            row[prop] = descriptors.length > 0 ?  descriptors.length > 1 ? `${descriptors[0].value}/${descriptors[1].value}` : `${descriptors[0].value}`  : ''
         })
       })