From 3a4f3fc29d4379a632279cba802e4b6722941c49 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期一, 18 四月 2022 13:42:01 +0800
Subject: [PATCH] 人事人才
---
/dev/null | 31 ------
src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue | 215 ++++++++++++++++++++-----------------------
src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue | 2
src/pages/components/showIndexTitle.vue | 2
4 files changed, 102 insertions(+), 148 deletions(-)
diff --git a/src/pages/components/showIndexTitle.vue b/src/pages/components/showIndexTitle.vue
index da86543..1eeac87 100644
--- a/src/pages/components/showIndexTitle.vue
+++ b/src/pages/components/showIndexTitle.vue
@@ -2,7 +2,7 @@
<div class="showIndexTitle-wrap">
<h1 class="title">鐭冲搴勪汉绀惧眬涓氬姟杩愯鏁版嵁鍒嗘瀽骞冲彴</h1>
<el-menu
- :default-active="$route.path"
+ default-active="/index"
:class="activeStyle"
router
mode="horizontal"
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
index cea72e5..fee2fb3 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_GreenCard.vue
@@ -247,7 +247,7 @@
.PersonnelTalents_greenCard--warp {
width: 100%;
- height: 100%;
+ height: 90%;
h1 {
font-size: $fontSize-30;
font-weight: 400;
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
index 55b3d2a..e083bdb 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
@@ -35,10 +35,12 @@
<el-table-column label="鍏ㄧ渷鎺掍綅" prop="quanshengpaiming2"></el-table-column>
</el-table-column>
</el-table>
+ <!-- 鍗曢�夋 -->
<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>
+ <el-radio-group v-model="checkedCategory">
+ <el-radio v-for="categoryItem in careGory" :label="categoryItem" :key="categoryItem">{{ categoryItem }}
+ </el-radio>
+ </el-radio-group>
</div>
<div class="PT_unitPersonnel--Echarts"></div>
</div>
@@ -48,6 +50,7 @@
<script>
import nowSize from "../../../../libs/nowSize";
+const CARE_GORY = ['浜嬩笟鍗曚綅', '鍦ㄨ亴浜哄憳', '骞翠汉鍧囨敹鍏�']
export default {
name: "PersonnelTalents_UnitPersonnel",
data() {
@@ -132,7 +135,36 @@
quanshengpaiming2: '1'
},
],
- option: {
+ checkedCategory: '浜嬩笟鍗曚綅',
+ careGory: CARE_GORY
+ }
+ },
+ 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 = {
color: ['#FF5151', '#51FF5D', '#FFD151'],
title: {
text: '鍘嗗勾鍏ㄥ競灞呮皯浜哄潎鍙敮閰嶆敹鍏ュ垎鏋愬浘',
@@ -141,6 +173,13 @@
textStyle: {
color: '#FFFFFF',
fontSize: nowSize(30)
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ width: 3, //鎶樼嚎瀹藉害
+ }
}
},
tooltip: {
@@ -216,98 +255,28 @@
},
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)
+ option && myChart.setOption(option)
}
}
}
@@ -347,7 +316,7 @@
.el-table .el-table__cell {
//padding: 0.0850375rem /* 22/256 */
//0;
- padding:0.0546875rem 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 {
@@ -355,7 +324,7 @@
}
.el-table .cell {
- line-height:0.125rem;
+ line-height: 0.125rem;
font-size: $fontSize-28;
color: $color-darkGrey;
font-weight: 300;
@@ -372,32 +341,49 @@
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__inner::after{
- border: 0.01953125rem /* 5/256 */ solid #FFF;
- height: 0.08203125rem /* 21/256 */;
- width: 0.0625rem /* 16/256 */;
- border-left: 0;
- border-top: 0;
+
+.PT_navEchart--title {
+ .el-radio {
+ width: 1.171875rem;
+ line-height: 0.375rem;
+
+ .el-radio__label {
+ font-size: 0.09375rem;
+ color: #FFFFFF;
+ }
+
+ .el-radio__input {
+ margin-bottom: 5px;
+
+ &.is-checked {
+ .el-radio__inner {
+ background-color: #51D2FF;
+ border-color: #51D2FF;
+ background: url("../../../../assets/images/personnelTalents/Yes@2x.png") no-repeat;
+ background-size: 100% 100%;
+ background-color: #51D2FF;
+
+ &:hover {
+ border-color: #51D2FF;
+ }
+ }
+ }
+
+ .el-radio__inner {
+ width: 40px;
+ height: 40px;
+ margin-right: 17px;
+ background: transparent;
+ border-radius: 1%;
+ box-sizing: content-box;
+
+ &::after {
+ content: '';
+ width: 0;
+ height: 0;
+ }
+ }
+ }
}
}
</style>
@@ -410,25 +396,24 @@
.PT_unitPersonnel--table {
width: 100%;
height: 100%;
- position: relative;
}
.PT_unitPersonnel--Echarts {
width: 1920px;
+ height:550px;
margin-top: 120px;
- height:600px;
+ //height: 600px;
//height: calc(100% - 640px - 0.33203125rem /* 85/256 */
//);
- display:inline-block;
- //height: 2.75rem;
+ display: inline-block;
}
- .PT_navEchart--title{
- width:1.171875rem;
- display:inline-block;
- position:relative;
- left:100px;
- top:-250px;
+ .PT_navEchart--title {
+ width: 1.171875rem;
+ display: inline-block;
+ position: relative;
+ left: 100px;
+ top: -250px;
}
}
</style>
diff --git a/src/pages/show/renshiRencai/shiyeDanweiRenyuanQingkuang.vue b/src/pages/show/renshiRencai/shiyeDanweiRenyuanQingkuang.vue
deleted file mode 100644
index b36b375..0000000
--- a/src/pages/show/renshiRencai/shiyeDanweiRenyuanQingkuang.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
- <div class="shiyeDanweiRenyuanQingkuang-wrap">
- <el-table
- :data="tableData"
- style="width: 100%">
- <el-table-column
- prop="year"
- label="骞翠唤">
- </el-table-column>
- <el-table-column
- prop="fanwei"
- label="鑼冨洿">
- </el-table-column>
- </el-table>
- </div>
-</template>
-
-<script>
- export default {
- name: "shiyeDanweiRenyuanQingkuang",
- data() {
- return {
- tableData: []
- }
- }
- }
-</script>
-
-<style scoped>
-
-</style>
--
Gitblit v1.9.1