From be59c27d2a611c2268c90c3f5b09dccaa755e535 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期五, 15 四月 2022 16:48:04 +0800
Subject: [PATCH] 人事人才

---
 src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue               |   32 +
 src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue |  482 +++++++++++++++++++++++++------
 src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue     |  326 ++++++++++++++++-----
 src/pages/show/laborRelations/LaborRelations.vue                                         |    1 
 4 files changed, 641 insertions(+), 200 deletions(-)

diff --git a/src/pages/show/laborRelations/LaborRelations.vue b/src/pages/show/laborRelations/LaborRelations.vue
index 43bb0f8..8b800fe 100644
--- a/src/pages/show/laborRelations/LaborRelations.vue
+++ b/src/pages/show/laborRelations/LaborRelations.vue
@@ -232,6 +232,7 @@
     }
   },
   methods: {
+    //鍚堝苟琛屽拰鍒�
     mergeColumnTableCell({rowIndex, columnIndex}) {
       // 鍚堝苟鍒�
       if (columnIndex === 0) {
diff --git a/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue b/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue
index 40a2c41..29af982 100644
--- a/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue
+++ b/src/pages/show/otherBusiness/otherBusinessChild/OtherB_PeopleJunShouRu.vue
@@ -4,10 +4,12 @@
       <h1>鍏ㄥ競灞呮皯浜哄潎鍙敮閰嶆敹鍏ユ儏鍐�</h1>
       <el-table
         :data="tableData"
-        style="width: 100%">
+        style="width: 100%" :cell-style="updataCellStyle">
         <el-table-column
           prop="year"
-          label="骞翠唤" min-width="80">
+          label="骞翠唤" min-width="80"
+          fied="left"
+        >
         </el-table-column>
         <el-table-column
           label="鍥芥皯浜哄潎鍙敮閰嶆敹鍏�">
@@ -230,7 +232,7 @@
         },
         series: [
           {
-            name:'灞呮皯浜哄潎鍙敮閰嶆敹鍏�',
+            name: '灞呮皯浜哄潎鍙敮閰嶆敹鍏�',
             type: 'line',
             smooth: false,  //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
             // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
@@ -249,7 +251,7 @@
             data: [120, 132, 101, 134, 90, 230]
           },
           {
-            name:'鍩庨晣灞呮皯',
+            name: '鍩庨晣灞呮皯',
             type: 'line',
             smooth: false,  //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
             // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
@@ -268,7 +270,7 @@
             data: [220, 182, 191, 234, 290, 330]
           },
           {
-            name:'鍐滄潙灞呮皯',
+            name: '鍐滄潙灞呮皯',
             type: 'line',
             smooth: false,  //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
             // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
@@ -298,6 +300,14 @@
       const option = this.option
       const myChart = this.$echarts.init(document.querySelector('.OtherB-PeopleJunShouRu__echart'));
       option && myChart.setOption(this.option)
+    },
+    // 缁欏崟鐙崟鍏冩牸娣诲姞鏍峰紡
+    updataCellStyle({rowIndex, columnIndex}) {
+      if (rowIndex ===0 && columnIndex === 0) {
+        return {background:'#51D2FF'}
+      }else if(rowIndex===1 && columnIndex ===0){
+        return {background:'#51D2FF'}
+      }
     }
   }
 }
@@ -307,20 +317,14 @@
 @import "../../../../assets/css/base";
 
 .OtherB-PeopleJunShouRu__table {
-  .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-    background:transparent;
+  .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell {
+    background: transparent;
   }
-  width: 100%;
-  height: calc(100% - 0.078125rem /* 20/256 */
-  );
-  margin-top: 0.078125rem /* 20/256 */
-;
 
   .el-table th.el-table__cell {
     background-color: $color-blue;
     height: 0.3125rem /* 80/256 */
   ;
-
   }
 
   .el-table tr {
@@ -387,7 +391,7 @@
   //);
 
   .OtherB-PeopleJunShouRu__table {
-    width:100%;
+    width: 100%;
     margin-top: 0.078125rem /* 20/256 */
   ;
 
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
index 0de6929..cea72e5 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
@@ -1,96 +1,80 @@
 <template>
-  <div class="PersonnelTalents_greenCard">
+  <div class="PersonnelTalents_greenCard--warp">
+    <h1 class="title">浜烘墠缁垮崱璐埧銆佺鎴胯ˉ璐存儏鍐电粺璁¤〃</h1>
     <div class="PT_greenCard--table">
       <el-table
-        max-height="640"
         :data="tableData"
-        :header-cell-style="handleheader"
-        stripe
         border
-        style="width: 100%">
+        style="width: 100%" :cell-style="updataCellStyle" :span-method="mergeColumnTableCell">
         <el-table-column
-          align="center"
-          prop="date"
-          label="鎸囨爣鍚嶇О"
-          fixed="left"
-          width="220">
+          prop="nianfen"
+          label="骞翠唤">
         </el-table-column>
         <el-table-column
-          prop="name"
-          align="center"
-          label="鍘诲勾瀹屾垚"
-          width="180">
+          label="A鍗�">
+          <el-table-column
+            prop="chikazongrenshu"
+            label="鎸佸崱鎬讳汉鏁� 锛堜汉锛�">
+          </el-table-column>
+          <el-table-column
+            prop="butiezongfafang"
+            label="琛ヨ创鎬诲彂鏀� 锛堜竾鍏冿級">
+          </el-table-column>
+          <el-table-column
+            label="璐埧">
+            <el-table-column
+              prop="chikarenshu"
+              label="鎸佸崱浜烘暟 锛堜汉锛�">
+            </el-table-column>
+            <el-table-column
+              prop="gourfangbutie"
+              label="璐埧琛ヨ创 锛堜竾鍏冿級">
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            label="绉熸埧">
+            <el-table-column
+              prop="chikfarenshu"
+              label="鎸佸崱浜烘暟 锛堜汉锛�">
+            </el-table-column>
+            <el-table-column
+              prop="zufangbutie"
+              label="绉熸埧琛ヨ创 锛堜竾鍏冿級">
+            </el-table-column>
+          </el-table-column>
         </el-table-column>
         <el-table-column
-          prop="address"
-          align="center"
-          label="1鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="2鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="3鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="4鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="5鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="6鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="7鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="8鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="9鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="10鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="11鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="12鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="鐪佸巺璁″垝">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="褰撳墠瀹屾垚鐜�"
-          width="160">
+          label="B鍗�">
+          <el-table-column
+            prop="chikazongrenshu1"
+            label="鎸佸崱鎬讳汉鏁� 锛堜汉锛�">
+          </el-table-column>
+          <el-table-column
+            prop="butiezongfafang1"
+            label="琛ヨ创鎬诲彂鏀� 锛堜竾鍏冿級">
+          </el-table-column>
+          <el-table-column
+            label="璐埧">
+            <el-table-column
+              prop="chikarenshu1"
+              label="鎸佸崱浜烘暟 锛堜汉锛�">
+            </el-table-column>
+            <el-table-column
+              prop="gourfangbutie1"
+              label="璐埧琛ヨ创 锛堜竾鍏冿級">
+            </el-table-column>
+          </el-table-column>
+          <el-table-column
+            label="绉熸埧">
+            <el-table-column
+              prop="chikfarenshu1"
+              label="鎸佸崱浜烘暟 锛堜汉锛�">
+            </el-table-column>
+            <el-table-column
+              prop="zufangbutie1"
+              label="绉熸埧琛ヨ创 锛堜竾鍏冿級">
+            </el-table-column>
+          </el-table-column>
         </el-table-column>
       </el-table>
       <div class="PT--Echarts"></div>
@@ -100,10 +84,182 @@
 
 <script>
 export default {
-  name: "PersonnelTalents_GreenCard"
+  name: "PersonnelTalents_GreenCard",
+  data() {
+    return {
+      tableData: [
+        {
+          nianfen:'2021骞� 1鈥斺��3鏈�',
+          chikazongrenshu:'鈥斺��',
+          butiezongfafang:'鈥斺��',
+          chikarenshu:'鈥斺��',
+          gourfangbutie:'鈥斺��',
+          chikfarenshu:'鈥斺��',
+          zufangbutie:'鈥斺��',
+          chikazongrenshu1:'9938',
+          butiezongfafang1:'2914.8',
+          chikarenshu1:'鈥斺��',
+          gourfangbutie1:'鈥斺��',
+          chikfarenshu1:'6321',
+          zufangbutie1:'2914.8'
+        },
+        {
+          nianfen:'2021骞� 4鈥斺��6鏈�',
+          chikazongrenshu:'鈥斺��',
+          butiezongfafang:'鈥斺��',
+          chikarenshu:'鈥斺��',
+          gourfangbutie:'鈥斺��',
+          chikfarenshu:'鈥斺��',
+          zufangbutie:'鈥斺��',
+          chikazongrenshu1:'9938',
+          butiezongfafang1:'9456.7',
+          chikarenshu1:'754',
+          gourfangbutie1:'6654.5',
+          chikfarenshu1:'6072',
+          zufangbutie1:'2802.2'
+        },
+        {
+          nianfen:'2021骞� 7鈥斺��9鏈�',
+          chikazongrenshu:'鈥斺��',
+          butiezongfafang:'鈥斺��',
+          chikarenshu:'鈥斺��',
+          gourfangbutie:'鈥斺��',
+          chikfarenshu:'鈥斺��',
+          zufangbutie:'鈥斺��',
+          chikazongrenshu1:'9938',
+          butiezongfafang1:'9456.7',
+          chikarenshu1:'754',
+          gourfangbutie1:'6654.5',
+          chikfarenshu1:'6072',
+          zufangbutie1:'2802.2'
+        },
+        {
+          nianfen:'2021骞� 10鈥斺��12鏈�',
+          chikazongrenshu:'915',
+          butiezongfafang:'72.56',
+          chikarenshu:'5',
+          gourfangbutie:'68',
+          chikfarenshu:'3',
+          zufangbutie:'4.56',
+          chikazongrenshu1:'10600',
+          butiezongfafang1:'9456.7',
+          chikarenshu1:'754',
+          gourfangbutie1:'6654.5',
+          chikfarenshu1:'6072',
+          zufangbutie1:'2802.2'
+        }
+      ]
+    }
+  },
+  methods:{
+    // 淇敼鍗曚釜琛ㄦ牸鏍峰紡
+    updataCellStyle({ rowIndex, columnIndex}){
+      if(rowIndex===0&&columnIndex===0){
+        return {background:'#51D2FF'}
+      }else if(rowIndex===1&&columnIndex===0){
+        return{background:'#51D2FF'}
+      }else if(rowIndex===2&&columnIndex===0){
+        return{background:'#51D2FF'}
+      }else if(rowIndex===3&&columnIndex===0){
+        return{background:'#51D2FF'}
+      }
+    },
+    // 鍚堝苟鍗曞厓鏍�
+    mergeColumnTableCell({rowIndex,columnIndex}){
+      if(columnIndex === 7){
+        if(rowIndex === 0){
+          return {
+            rowspan:3,
+            colspan:1
+          }
+        }
+      }
+    }
+  }
+
 }
 </script>
 
-<style scoped>
+<style lang="scss">
+@import "../../../../assets/css/base";
 
+.PT_greenCard--table {
+  .el-table tr {
+    background-color: #CEF2FF;
+  }
+
+  .el-table th.el-table__cell {
+    background-color: #51D2FF;
+  }
+
+  .el-table__fixed, .el-table__fixed-right, .el-table__fixed-right::before, .el-table__fixed::before {
+    background-color: #51D2FF;
+  }
+
+  .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
+    background-color: #A8E9FF;
+  }
+
+  .el-table thead {
+    color: #111111;
+  }
+
+  .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1Px solid #8E8E8E;
+  }
+
+  .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
+    border-right: 1Px solid #8E8E8E;
+  }
+
+  .el-table .el-table__cell {
+    padding:0.127rem 0;
+    //padding:0;
+  }
+
+  .el-table__body tr.hover-row.current-row > td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row > td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped > td.el-table__cell, .el-table__body tr.hover-row > td.el-table__cell {
+    background: transparent;
+    height:0.390625rem;
+  }
+
+  .el-table .cell {
+    font-size: $fontSize-28;
+    color: $color-darkGrey;
+    font-weight: 300;
+    //height:0.625rem;
+    line-height: 0.125rem;
+    text-align: center;
+  }
+  // 澶撮儴鍥綋鑳屾櫙棰滆壊
+  .el-table thead.is-group th.el-table__cell {
+    background-color: #51D2FF;
+  }
+
+  // 澶撮儴鍥綋鍗曞厓鏍间笅杈规棰滆壊
+  .el-table--border th.el-table__cell, .el-table__fixed-right-patch {
+    border-bottom: 1px solid #8E8E8E;
+  }
+
+}
+</style>
+<style lang="scss" scoped>
+@import "../../../../assets/css/base";
+
+.PersonnelTalents_greenCard--warp {
+  width: 100%;
+  height: 100%;
+  h1 {
+    font-size: $fontSize-30;
+    font-weight: 400;
+    color: #ffffff;
+    //margin-top: 0.23828125rem;
+    text-align: center;
+  }
+  .PT_greenCard--table {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    top:0.125rem;
+  }
+}
 </style>
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
index 7c55137..287730f 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
@@ -2,157 +2,437 @@
   <div class="PersonnelTalents_unitPersonnel--warp">
     <div class="PT_unitPersonnel--table">
       <el-table
-        max-height="640"
         :data="tableData"
-        :header-cell-style="handleheader"
         stripe
         border
-        style="width: 100%">
+        style="width: 100%" :span-method="mergeColumnTableCell">
         <el-table-column
-          align="center"
-          prop="date"
-          label="鎸囨爣鍚嶇О"
-          fixed="left"
-          width="220">
+          prop="nianfen"
+          label="骞翠唤"
+          fixed="left">
         </el-table-column>
         <el-table-column
-          prop="name"
-          align="center"
-          label="鍘诲勾瀹屾垚"
-          width="180">
+          prop="fanwei"
+          label="鑼冨洿">
         </el-table-column>
         <el-table-column
-          prop="address"
-          align="center"
-          label="1鏈�">
+          label="鎬讳綋鎯呭喌">
+          <el-table-column label="浜嬩笟鍗曚綅(瀹�)" prop="shiyedanwei">
+          </el-table-column>
+          <el-table-column label="鍦ㄨ亴浜哄憳(涓囦汉)" prop="zaizhirenyuan">
+          </el-table-column>
+          <el-table-column label="骞翠汉鍧囨敹鍏�(涓囧厓)" prop="nianrenjunshouru">
+          </el-table-column>
+          <el-table-column label="鍏ㄧ渷鎺掑悕" prop="quanshengpaiming">
+          </el-table-column>
+          <el-table-column label="骞翠汉鍧囨敹鍏ュ閫�" prop="nianrenjunshouruzengsu">
+          </el-table-column>
         </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="2鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="3鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="4鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="5鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="6鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="7鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="8鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="9鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="10鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="11鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="12鏈�">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="鐪佸巺璁″垝">
-        </el-table-column>
-        <el-table-column
-          prop="address"
-          align="center"
-          label="褰撳墠瀹屾垚鐜�"
-          width="160">
+        <el-table-column label="鍏朵腑">
+          <el-table-column label="宸ヨ祫鎬� 骞翠汉鍧囨敹鍏� 锛堜竾鍏冿級" prop="gongzixingnianjunshouru"></el-table-column>
+          <el-table-column label="鍏ㄧ渷鎺掍綅" prop="quanshengpaiming1"></el-table-column>
+          <el-table-column label="鍚勯」濂栧姳鎬у拰 鏀归潻鎬цˉ璐村勾 浜哄潎鏀跺叆 锛堜竾鍏冿級" prop="gexiangjianglixing"></el-table-column>
+          <el-table-column label="鍏ㄧ渷鎺掍綅" prop="quanshengpaiming2"></el-table-column>
         </el-table-column>
       </el-table>
-      <div class="PT--Echarts"></div>
+      <div class="PT_navEchart--title">
+        <el-checkbox v-model="checked">澶囬�夐」</el-checkbox>
+        <el-checkbox v-model="checked">澶囬�夐」</el-checkbox>
+        <el-checkbox v-model="checked">澶囬�夐」</el-checkbox>
+      </div>
+      <div class="PT_unitPersonnel--Echarts"></div>
     </div>
   </div>
 </template>
 
 <script>
+import nowSize from "../../../../libs/nowSize";
+
 export default {
-  name: "PersonnelTalents_UnitPersonnel"
+  name: "PersonnelTalents_UnitPersonnel",
+  data() {
+    return {
+      tableData: [
+        {
+          nianfen: '2022骞�',
+          fanwei: '鍏ㄥ競',
+          shiyedanwei: '5363',
+          zaizhirenyuan: '16.4',
+          nianrenjunshouru: '10.54',
+          quanshengpaiming: '3',
+          nianrenjunshouruzengsu: '3.02%',
+          gongzixingnianjunshouru: '6.81',
+          quanshengpaiming1: '8',
+          gexiangjianglixing: 3.73,
+          quanshengpaiming2: '1'
+        },
+        {
+          nianfen: '2022骞�',
+          fanwei: '鍏ㄥ競',
+          shiyedanwei: '5363',
+          zaizhirenyuan: '16.4',
+          nianrenjunshouru: '10.54',
+          quanshengpaiming: '3',
+          nianrenjunshouruzengsu: '3.02%',
+          gongzixingnianjunshouru: '6.81',
+          quanshengpaiming1: '8',
+          gexiangjianglixing: 3.73,
+          quanshengpaiming2: '1'
+        },
+        {
+          nianfen: '2022骞�',
+          fanwei: '鍏ㄥ競',
+          shiyedanwei: '5363',
+          zaizhirenyuan: '16.4',
+          nianrenjunshouru: '10.54',
+          quanshengpaiming: '3',
+          nianrenjunshouruzengsu: '3.02%',
+          gongzixingnianjunshouru: '6.81',
+          quanshengpaiming1: '8',
+          gexiangjianglixing: 3.73,
+          quanshengpaiming2: '1'
+        },
+        {
+          nianfen: '2021骞�',
+          fanwei: '鍏ㄥ競',
+          shiyedanwei: '5363',
+          zaizhirenyuan: '16.4',
+          nianrenjunshouru: '10.54',
+          quanshengpaiming: '3',
+          nianrenjunshouruzengsu: '3.02%',
+          gongzixingnianjunshouru: '6.81',
+          quanshengpaiming1: '8',
+          gexiangjianglixing: 3.73,
+          quanshengpaiming2: '1'
+        },
+        {
+          nianfen: '2021骞�',
+          fanwei: '鍏ㄥ競',
+          shiyedanwei: '5363',
+          zaizhirenyuan: '16.4',
+          nianrenjunshouru: '10.54',
+          quanshengpaiming: '3',
+          nianrenjunshouruzengsu: '3.02%',
+          gongzixingnianjunshouru: '6.81',
+          quanshengpaiming1: '8',
+          gexiangjianglixing: 3.73,
+          quanshengpaiming2: '1'
+        },
+        {
+          nianfen: '2021骞�',
+          fanwei: '鍏ㄥ競',
+          shiyedanwei: '5363',
+          zaizhirenyuan: '16.4',
+          nianrenjunshouru: '10.54',
+          quanshengpaiming: '3',
+          nianrenjunshouruzengsu: '3.02%',
+          gongzixingnianjunshouru: '6.81',
+          quanshengpaiming1: '8',
+          gexiangjianglixing: 3.73,
+          quanshengpaiming2: '1'
+        },
+      ],
+      option: {
+        color: ['#FF5151', '#51FF5D', '#FFD151'],
+        title: {
+          text: '鍘嗗勾鍏ㄥ競灞呮皯浜哄潎鍙敮閰嶆敹鍏ュ垎鏋愬浘',
+          left: 'center',
+          top: '5%',
+          textStyle: {
+            color: '#FFFFFF',
+            fontSize: nowSize(30)
+          }
+        },
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          right: '5%',
+          top: 'center',
+          orient: 'vertical',
+          itemWidth: nowSize(30),
+          itemHeight: nowSize(4),
+          itemGap: nowSize(80),
+          textStyle: {
+            color: '#FFFFFF',
+            fontSize: nowSize(24),
+          }
+        },
+        grid: {
+          left: '5%',
+          right: '20%',
+          bottom: '0%',
+          containLabel: true
+        },
+        xAxis: {
+          name: '鍗曚綅锛氬勾',
+          nameTextStyle: {
+            color: '#FFFFFF',
+            fontSize: nowSize(24)
+          },
+          nameGap: nowSize(92),// 鍧愭爣杞村悕绉颁笌杞寸嚎涔嬮棿鐨勮窛绂汇��
+          type: 'category',
+          boundaryGap: false,// 鍧愭爣杞翠袱绔暀鐧�
+          data: ['2017骞�', '2018骞�', '2019骞�', '2020骞�', '2021骞�'],
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#fff',
+              fontSize: nowSize(24)
+            },
+          },
+          axisLine: {
+            lineStyle: {
+              color: '#999999',
+              width: 1,   //杩欓噷鏄潗鏍囪酱鐨勫搴�,鍙互鍘绘帀
+              type: 'solid'
+            }
+          },
+          splitLine: {
+            show: false
+          }
+        },
+        yAxis: {
+          name: '鍗曚綅锛氬勾',
+          nameTextStyle: {
+            color: '#FFFFFF',
+            fontSize: nowSize(24)
+          },
+          nameGap: nowSize(30),// 鍧愭爣杞村悕绉颁笌杞寸嚎涔嬮棿鐨勮窛绂汇��
+          type: 'value',
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#fff',
+              fontSize: nowSize(24)
+            },
+          },
+          axisLine: {
+            lineStyle: {
+              color: '#999999',
+              width: 1,   //杩欓噷鏄潗鏍囪酱鐨勫搴�,鍙互鍘绘帀
+              type: "solid"
+            }
+          },
+          splitLine: {
+            show: false
+          }
+        },
+        series: [
+          {
+            name: '灞呮皯浜哄潎鍙敮閰嶆敹鍏�',
+            type: 'line',
+            smooth: false,  //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
+            // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
+            itemStyle: {
+              normal: {
+                lineStyle: {
+                  width: 3, //鎶樼嚎瀹藉害
+                }
+              }
+            },
+            emphasis: {   //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
+              borderColor: 'rgba(0,196,132,0.2)',
+              borderWidth: 100
+            },
+            stack: 'Total',
+            data: [120, 132, 101, 134, 90, 230]
+          },
+          {
+            name: '鍩庨晣灞呮皯',
+            type: 'line',
+            smooth: false,  //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
+            // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
+            itemStyle: {
+              normal: {
+                lineStyle: {
+                  width: 3, //鎶樼嚎瀹藉害
+                }
+              }
+            },
+            emphasis: {   //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
+              borderColor: 'rgba(0,196,132,0.2)',
+              borderWidth: 100
+            },
+            stack: 'Total',
+            data: [220, 182, 191, 234, 290, 330]
+          },
+          {
+            name: '鍐滄潙灞呮皯',
+            type: 'line',
+            smooth: false,  //璁剧疆鎶樼嚎涓哄渾婊戞洸绾�,false鍒欐湁杞姌鐐�
+            // symbol:'none', //榛樿鏄剧ず鎶樼偣锛屼负none鏃朵笉鏄剧ず
+            itemStyle: {
+              normal: {
+                lineStyle: {
+                  width: 3, //鎶樼嚎瀹藉害
+                }
+              }
+            },
+            emphasis: {   //榧犳爣缁忚繃鏃舵姌鐐瑰皬鍦嗗湀鏍峰紡
+              borderColor: 'rgba(0,196,132,0.2)',
+              borderWidth: 100
+            },
+            stack: 'Total',
+            data: [150, 232, 201, 154, 190, 330]
+          }
+        ]
+      }
+    }
+  },
+  mounted(){
+    this.Init_echarts()
+  },
+  methods: {
+    mergeColumnTableCell({rowIndex, columnIndex}) {
+      if (columnIndex === 0) {
+        if (rowIndex === 0) {
+          return {
+            rowspan: 3,
+            colspan: 1
+          };
+        } else if (rowIndex === 3) {
+          return {
+            rowspan: 6,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    Init_echarts() {
+      const option = this.option
+      const myChart = this.$echarts.init(document.querySelector('.PT_unitPersonnel--Echarts'));
+      option && myChart.setOption(this.option)
+    }
+  }
 }
 </script>
 <style lang="scss">
 @import "../../../../assets/css/base";
-.PT_unitPersonnel--table{
-  .el-table tr{
+
+.PT_unitPersonnel--table {
+  .el-table tr {
     background-color: #CEF2FF;
   }
-  .el-table th.el-table__cell{
+
+  .el-table th.el-table__cell {
     background-color: #51D2FF;
   }
-  .el-table__fixed, .el-table__fixed-right,.el-table__fixed-right::before, .el-table__fixed::before{
+
+  .el-table__fixed, .el-table__fixed-right, .el-table__fixed-right::before, .el-table__fixed::before {
     background-color: #51D2FF;
   }
-  .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell{
+
+  .el-table--striped .el-table__body tr.el-table__row--striped td.el-table__cell {
     background-color: #A8E9FF;
   }
-  .el-table thead{
+
+  .el-table thead {
     color: #111111;
   }
-  .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-    border-bottom: 1Px solid #8E8E8E;
+
+  .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf {
+    border-bottom: 1px solid #8E8E8E;
   }
-  .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
-    border-right: 1Px solid #8E8E8E;
+
+  .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left ~ .el-table__fixed {
+    border-right: 1px solid #8E8E8E;
   }
-  .el-table .el-table__cell{
-    padding: 0.0859375rem  /* 22/256 */ 0;
+
+  .el-table .el-table__cell {
+    //padding: 0.0850375rem /* 22/256 */
+    //0;
+    padding:0.0546875rem 0;
   }
-  .el-table__body tr.hover-row.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row>td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped>td.el-table__cell, .el-table__body tr.hover-row>td.el-table__cell{
+
+  .el-table__body tr.hover-row.current-row > td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped.current-row > td.el-table__cell, .el-table__body tr.hover-row.el-table__row--striped > td.el-table__cell, .el-table__body tr.hover-row > td.el-table__cell {
     background: transparent;
   }
-  .el-table .cell{
+
+  .el-table .cell {
+    line-height:0.125rem;
     font-size: $fontSize-28;
     color: $color-darkGrey;
     font-weight: 300;
-    line-height: 1;
+    text-align: center;
   }
+
+  // 澶撮儴鍥綋鑳屾櫙棰滆壊
+  .el-table thead.is-group th.el-table__cell {
+    background-color: #51D2FF;
+  }
+
+  // 澶撮儴鍥綋鍗曞厓鏍间笅杈规棰滆壊
+  .el-table--border th.el-table__cell, .el-table__fixed-right-patch {
+    border-bottom: 1px solid #8E8E8E;
+  }
+}
+.PT_navEchart--title{
+  .el-checkbox{
+    width:1.171875rem;
+    line-height:0.375rem;
+  }
+  .el-checkbox__label{
+    font-size:0.09375rem;
+    color:#FFFFFF;
+  }
+  .el-checkbox__inner{
+    width:40px;
+    height:40px;
+    margin-right:17px;
+    background: #51D2FF;
+    //&:after{
+    //  background: url("../../../../assets/images/personnelTalents/Yes@2x.png") no-repeat;
+    //  background:100% 100%;
+    //  content:''
+    //}
+  }
+  .el-checkbox__input.is-checked .el-checkbox__inner::after{
+    width:20px;
+    height:20px;
+    background:url('../../../../assets/images/personnelTalents/Yes@2x.png')no-repeat center;
+
+  }
+  .el-checkbox__input.is-checked .el-checkbox__inner::after{
+    -webkit-transform: rotate(45deg) scaleY(1);
+    transform: rotate(45deg) scaleY(1);
+  }
+
 }
 </style>
 <style lang="scss" scoped>
 @import "../../../../assets/css/base";
-.PersonnelTalents_unitPersonnel--warp{
+
+.PersonnelTalents_unitPersonnel--warp {
   width: 100%;
   height: 100%;
-  .PT_unitPersonnel--table{
+  .PT_unitPersonnel--table {
     width: 100%;
     height: 100%;
     position: relative;
   }
-  .PT--Echarts{
-    height: calc(100% - 640px - 0.33203125rem  /* 85/256 */);
+
+  .PT_unitPersonnel--Echarts {
+    width: 1920px;
+    margin-top: 120px;
+    height:600px;
+    //height: calc(100% - 640px - 0.33203125rem /* 85/256 */
+    //);
+    display:inline-block;
+    //height: 2.75rem;
+  }
+
+  .PT_navEchart--title{
+    width:1.171875rem;
+    display:inline-block;
+    position:relative;
+    left:100px;
+    top:-250px;
   }
 }
 </style>

--
Gitblit v1.9.1