From bc1417d555b6e78627e04b3b854ccacca87eed17 Mon Sep 17 00:00:00 2001
From: 付延余 <f-yanyu@outlook.com>
Date: 星期三, 27 四月 2022 11:19:39 +0800
Subject: [PATCH] 首页数据
---
src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue | 438 ++++++++++++++++++++++++++++--------------------------
src/api/personnelTalents.js | 6
config/index.js | 2
src/main.js | 1
src/pages/show/index/index.vue | 4
5 files changed, 235 insertions(+), 216 deletions(-)
diff --git a/config/index.js b/config/index.js
index fd946f5..cb7612d 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,7 +3,7 @@
// see http://vuejs-templates.github.io/webpack for documentation.
const path = require("path");
-let url = 'http://192.168.0.132:8081'
+let url = 'http://192.168.0.130:8081'
module.exports = {
dev: {
diff --git a/src/api/personnelTalents.js b/src/api/personnelTalents.js
new file mode 100644
index 0000000..491f0f6
--- /dev/null
+++ b/src/api/personnelTalents.js
@@ -0,0 +1,6 @@
+import { getRequest, postRequest} from "../libs/axios";
+
+// 29. 鏌ヨ浜嬩笟鍗曚綅浜哄憳鎯呭喌琛ㄦ牸鏁版嵁鎺ュ彛
+export const getPersonTable = (params) => {
+ return postRequest('/ybg/webservice/app/personnel/getPersonTable.do',params)
+}
diff --git a/src/main.js b/src/main.js
index 095dcc6..fd65e3d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,6 @@
Vue.config.productionTip = false
-
import vcolorpicker from 'vcolorpicker'
Vue.use(vcolorpicker)
diff --git a/src/pages/show/index/index.vue b/src/pages/show/index/index.vue
index 5a89103..7282399 100644
--- a/src/pages/show/index/index.vue
+++ b/src/pages/show/index/index.vue
@@ -486,7 +486,7 @@
getLabourTable,
getLabourChart,
getInsuranceChart,
- getTownTable,
+ getTownTable
} from "@/api/index";
export default {
@@ -1066,7 +1066,7 @@
this.TownTable = res.list
}
})
- },
+ }
}
};
</script>
diff --git a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
index 092eacb..2609e6a 100644
--- a/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
+++ b/src/pages/show/personnelTalents/personnelTalentsChild/PersonnelTalents_UnitPersonnel.vue
@@ -8,40 +8,41 @@
border
style="width: 100%" :span-method="mergeColumnTableCell">
<el-table-column
- prop="nianfen"
+ prop="jyear"
label="骞翠唤"
fixed="left">
</el-table-column>
<el-table-column
- prop="fanwei"
+ prop="scope"
label="鑼冨洿">
</el-table-column>
<el-table-column
label="鎬讳綋鎯呭喌">
- <el-table-column label="浜嬩笟鍗曚綅(瀹�)" prop="shiyedanwei">
+ <el-table-column label="浜嬩笟鍗曚綅(瀹�)" prop="publicInstitutions">
</el-table-column>
- <el-table-column label="鍦ㄨ亴浜哄憳(涓囦汉)" prop="zaizhirenyuan">
+ <el-table-column label="鍦ㄨ亴浜哄憳(涓囦汉)" prop="inJobs">
</el-table-column>
- <el-table-column label="骞翠汉鍧囨敹鍏�(涓囧厓)" prop="nianrenjunshouru">
+ <el-table-column label="骞翠汉鍧囨敹鍏�(涓囧厓)" prop="perIncome">
</el-table-column>
- <el-table-column label="鍏ㄧ渷鎺掑悕" prop="quanshengpaiming">
+ <el-table-column label="鍏ㄧ渷鎺掑悕" prop="incomeRank">
</el-table-column>
- <el-table-column label="骞翠汉鍧囨敹鍏ュ閫�" prop="nianrenjunshouruzengsu">
+ <el-table-column label="骞翠汉鍧囨敹鍏ュ閫�" prop="incomeSpeed">
</el-table-column>
</el-table-column>
<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 label="宸ヨ祫鎬� 骞翠汉鍧囨敹鍏� 锛堜竾鍏冿級" prop="wagesIncome"></el-table-column>
+ <el-table-column label="鍏ㄧ渷鎺掍綅" prop="wagesRank"></el-table-column>
+ <el-table-column label="鍚勯」濂栧姳鎬у拰 鏀归潻鎬цˉ璐村勾 浜哄潎鏀跺叆 锛堜竾鍏冿級" prop="subsidyIncome"></el-table-column>
+ <el-table-column label="鍏ㄧ渷鎺掍綅" prop="subsidyRank"></el-table-column>
</el-table-column>
</el-table>
</div>
- <!-- 鍗曢�夋 -->
+ <!-- 鍗曢�夋 -->
<div class="PT_unitPersonnel--echart-box">
<div class="PT_navEchart--title">
- <el-radio-group v-model="checkedCategory" >
- <el-radio v-for="(categoryItem,index) in CARE_GORY" :label="categoryItem" :key="index" @change="selectEcharts(index)">{{ categoryItem }}
+ <el-radio-group v-model="checkedCategory">
+ <el-radio v-for="(categoryItem,index) in CARE_GORY" :label="categoryItem" :key="index"
+ @change="selectEcharts(index)">{{ categoryItem }}
</el-radio>
</el-radio-group>
</div>
@@ -54,97 +55,100 @@
<script>
import nowSize from "../../../../libs/nowSize";
+import {getPersonTable} from '@/api/personnelTalents'
+
export default {
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'
- },
+ // {
+ // 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'
+ // },
],
checkedCategory: '浜嬩笟鍗曚綅',
- CARE_GORY:['浜嬩笟鍗曚綅', '鍦ㄨ亴浜哄憳', '骞翠汉鍧囨敹鍏�'],
+ CARE_GORY: ['浜嬩笟鍗曚綅', '鍦ㄨ亴浜哄憳', '骞翠汉鍧囨敹鍏�'],
tableHeight: window.innerHeight - nowSize(1000)
}
},
mounted() {
this.Init_echarts()
+ this.getPersonTable()
},
methods: {
mergeColumnTableCell({rowIndex, columnIndex}) {
@@ -170,133 +174,141 @@
Init_echarts() {
const myChart = this.$echarts.init(document.querySelector('.PT_unitPersonnel--Echarts'));
const option = {
- color: ['#FF5151', '#51FF5D', '#FFD151'],
- title: {
- text: '鍘嗗勾鍏ㄥ競灞呮皯浜哄潎鍙敮閰嶆敹鍏ュ垎鏋愬浘',
- left: 'center',
- top: '5%',
- textStyle: {
- color: '#FFFFFF',
- fontSize: nowSize(30)
- }
+ color: ['#FF5151', '#51FF5D', '#FFD151'],
+ title: {
+ text: '鍘嗗勾鍏ㄥ競灞呮皯浜哄潎鍙敮閰嶆敹鍏ュ垎鏋愬浘',
+ left: 'center',
+ top: '5%',
+ textStyle: {
+ color: '#FFFFFF',
+ fontSize: nowSize(30)
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ width: 3, //鎶樼嚎瀹藉害
+ }
+ }
+ },
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ right: '2%',
+ top: 'center',
+ orient: 'vertical',
+ itemWidth: nowSize(30),
+ itemHeight: nowSize(4),
+ itemGap: nowSize(80),
+ textStyle: {
+ color: '#FFFFFF',
+ fontSize: nowSize(24),
+ }
+ },
+ grid: {
+ left: '2%',
+ top: '25%',
+ right: '18%',
+ 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)
},
- itemStyle: {
- normal: {
- lineStyle: {
- width: 3, //鎶樼嚎瀹藉害
- }
- }
+ },
+ 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)
},
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- right: '2%',
- top: 'center',
- orient: 'vertical',
- itemWidth: nowSize(30),
- itemHeight: nowSize(4),
- itemGap: nowSize(80),
- textStyle: {
- color: '#FFFFFF',
- fontSize: nowSize(24),
- }
- },
- grid: {
- left: '2%',
- top: '25%',
- right: '18%',
- 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',
- data: [120, 132, 101, 134, 90, 230]
- },
- {
- name: '鍩庨晣灞呮皯',
- type: 'line',
- data: [220, 182, 191, 234, 290, 330]
- },
- {
- name: '鍐滄潙灞呮皯',
- type: 'line',
- data: [150, 232, 201, 154, 190, 330]
- }
- ]
- };
+ },
+ axisLine: {
+ lineStyle: {
+ color: '#999999',
+ width: 1, //杩欓噷鏄潗鏍囪酱鐨勫搴�,鍙互鍘绘帀
+ type: "solid"
+ }
+ },
+ splitLine: {
+ show: false
+ },
+ },
+ series: [
+ {
+ name: '灞呮皯浜哄潎鍙敮閰嶆敹鍏�',
+ type: 'line',
+ data: [120, 132, 101, 134, 90, 230]
+ },
+ {
+ name: '鍩庨晣灞呮皯',
+ type: 'line',
+ data: [220, 182, 191, 234, 290, 330]
+ },
+ {
+ name: '鍐滄潙灞呮皯',
+ type: 'line',
+ data: [150, 232, 201, 154, 190, 330]
+ }
+ ]
+ };
option && myChart.setOption(option)
},
getHeight() {
- this.tableHeight = window.innerHeight - nowSize(900)
+ this.tableHeight = window.innerHeight - nowSize(900)
},
// 閫氳繃鐐瑰嚮鏇存崲echarts鍥捐〃淇℃伅
- selectEcharts(index){
+ selectEcharts(index) {
console.log(index);
+ },
+ // 29. 鏌ヨ浜嬩笟鍗曚綅浜哄憳鎯呭喌琛ㄦ牸鏁版嵁鎺ュ彛
+ getPersonTable() {
+ getPersonTable().then(res => {
+ if (res.code === 1000) {
+ this.tableData = res.list
+ }
+ })
}
},
- created() {
- window.addEventListener('resize',this.getHeight)
- },
- destroy() {
- window.addEventListener('resize',this.getHeight)
- }
+ created() {
+ window.addEventListener('resize', this.getHeight)
+ },
+ destroy() {
+ window.addEventListener('resize', this.getHeight)
+ }
}
</script>
@@ -395,7 +407,9 @@
background: transparent;
border-radius: 1%;
box-sizing: content-box;
- border: 0.0078125rem /* 2/256 */ solid #DCDFE6;
+ border: 0.0078125rem /* 2/256 */
+ solid #DCDFE6;
+
&::after {
content: '';
width: 0;
@@ -422,7 +436,7 @@
width: 100%;
margin-top: 0.234375rem /* 60/256 */
;
- height: calc(100% - 2.5rem /* 640/256 */ - 0.254375rem /* 60/256 */
+ height: calc(100% - 2.5rem/* 640/256 */ - 0.254375rem /* 60/256 */
);
position: relative;
--
Gitblit v1.9.1