Compare commits

..

5 Commits

Author SHA1 Message Date
8cf96126fe 统计查询修改 2025-02-13 23:03:49 +08:00
9808821b70 Merge branch 'ldeyun' of http://ngtools.cn:53000/ldeyun/cxc-szcx-uniapp into ldeyun
# Conflicts:
#	pages/views/renliziyuan/renyuanxinxi/qttongji.vue
2025-02-13 22:31:14 +08:00
d3878d3358 修改通用查询模块,增加字典API 2025-02-13 17:41:13 +08:00
2a746146f0 人员台账单位和通用字段查询初步实现,还需进一步优化,钻取列表未做。 2025-02-13 01:51:44 +08:00
闵 年泽
cedff04447 1.修改人员统计 2025-02-11 09:34:29 +08:00
6 changed files with 445 additions and 464 deletions

16
api/common.js Normal file
View File

@ -0,0 +1,16 @@
import {
https
} from '@/utils/http.js';
/*
这是后端系统通用的系统类的基础性的api路径后续的大家分类建js存放
*/
export function initDictOption(dictCode) { // 获取部门所有人员信息
return https({
url: ' /sys/dict/getDictItems',
method: 'get',
data: dictCode
})
}

4
package-lock.json generated
View File

@ -19,7 +19,7 @@
},
"node_modules/base-64": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
"integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
},
"node_modules/dayjs": {
@ -61,7 +61,7 @@
},
"base-64": {
"version": "1.0.0",
"resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
"resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
"integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
},
"dayjs": {

View File

@ -20,23 +20,23 @@
</template>
<script setup>
function toTaizhang() {
function toTaizhang() {
uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/taizhang'
});
}
}
function toTongji() {
function toTongji() {
uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/tongji'
});
}
}
function toQtTongji() {
function toQtTongji() {
uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/qttongji'
});
}
}
</script>
<style></style>

View File

@ -85,7 +85,6 @@
import { ref, reactive, onMounted, computed } from 'vue';
import * as echarts from 'echarts';
import { cxcRyDatAstatistics, cxcRyDatAstatisticsDetails } from '@/api/renyuan.js';
import { initDictOption } from '@/api/common.js';
// tableData
const bottomHeight = ref(0);
@ -757,7 +756,7 @@ const onChartClick = (e) => {
/* 图表容器 */
.chart-container {
height: 200px;
height: 250px;
margin: 20rpx 0;
border-radius: 24rpx;
overflow: hidden;
@ -850,14 +849,9 @@ scroll-view {
/* 响应式调整优化 */
@media (max-width: 768px) {
.chart-container {
height: 200px;
height: 250px;
border-radius: 20rpx;
}
.titleStyle {
font-size: 26rpx;
padding: 24rpx 0;
}
}
/* 数据行高亮效果 */

View File

@ -1,18 +1,17 @@
<template>
<view>
<view class="container" id="top1">
<uni-row style="margin-bottom: 10rpx;margin-left: 30rpx;margin-right: 30rpx;">
<uni-col :span="24"><uni-title :title="'所选单位ID:'+orgCode" align="left" type="h4"></uni-title></uni-col>
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24"><uni-title :title="'所选单位'" align="left" type="h4"></uni-title></uni-col>
</uni-row>
<uni-row style="margin-bottom: 20rpx;margin-left: 30rpx;margin-right: 30rpx;">
<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="24">
<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode"
@change="departChange"></trq-depart-select>
<trq-depart-select v-model="orgCode" returnCodeOrID="orgCode" @change="departChange"></trq-depart-select>
</uni-col>
</uni-row>
<!-- 概览统计 -->
<view class="stats-box" v-if="summary.total">
<view class=" stat-item">
<view class="stat-item">
<text class="label">总人数</text>
<text class="value">{{ summary.total }}</text>
</view>
@ -27,56 +26,47 @@
<l-echart ref="chart" @finished="initChart" />
</view>
<!-- 数据表格 -->
<uni-row style="margin-top: 10px; margin-left: 30rpx;margin-right: 30rpx;" v-if="tableData.length>0">
<uni-row style="margin-top: 10px; margin-left: 30rpx; margin-right: 30rpx" v-if="tableData.length > 0">
<uni-col :span="3">
<view class="titleStyle">
序号
</view>
<view class="titleStyle">序号</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
姓名
</view>
<view class="titleStyle">姓名</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
性别
</view>
<view class="titleStyle">性别</view>
</uni-col>
<uni-col :span="5">
<view class="titleStyle">
年龄
</view>
<view class="titleStyle">年龄</view>
</uni-col>
<uni-col :span="6">
<view class="titleStyle">
操作
</view>
<view class="titleStyle">操作</view>
</uni-col>
</uni-row>
<scroll-view scroll-y :style="{height: bottomHeight + 'px' }">
<uni-row style="margin-bottom: 10rpx;margin-left: 30rpx;margin-right: 30rpx;">
<view v-for="(item,index) in tableData">
<scroll-view scroll-y :style="{ height: bottomHeight + 'px' }">
<uni-row style="margin-bottom: 10rpx; margin-left: 30rpx; margin-right: 30rpx">
<view v-for="(item, index) in tableData">
<uni-col :span="3">
<view class="dataStyle">
{{index+1}}
{{ index + 1 }}
</view>
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{item.xm}}
{{ item.xm }}
</view>
</uni-col><uni-col :span="5">
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{item.xb_dictText}}
{{ item.xb_dictText }}
</view>
</uni-col><uni-col :span="5">
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{item.nl}}
{{ item.nl }}
</view>
</uni-col>
<uni-col :span="6">
@ -84,52 +74,43 @@
<button size="mini" type="primary" @click="detail(item)">详情</button>
</view>
</uni-col>
</view>
</uni-row>
</scroll-view>
</view>
</template>
<script setup>
import {
ref,
reactive,
onMounted
} from 'vue';
import * as echarts from 'echarts'
import { ref, reactive, onMounted } from 'vue';
import * as echarts from 'echarts';
import {
queryRenyuanByDepartID
} from '@/api/renyuan.js'
import { queryRenyuanByDepartID } from '@/api/renyuan.js';
//
const bottomHeight = ref(0);
//
const isLoading = ref(false);
const orgCode = ref('');
const rawData = ref([]);
const tableData = ref([]);
const summary = reactive({
//
const bottomHeight = ref(0);
//
const isLoading = ref(false);
const orgCode = ref('');
const rawData = ref([]);
const tableData = ref([]);
const summary = reactive({
total: 0,
avgAge: 0
});
const chart = ref(null);
const chartOption = ref({});
const drillPopup = ref(null);
const drillList = ref([]);
const drillTitle = ref('');
});
const chart = ref(null);
const chartOption = ref({});
const drillPopup = ref(null);
const drillList = ref([]);
const drillTitle = ref('');
function detail(record) {
function detail(record) {
// console.log(record)
uni.navigateTo({
url: "/pages/views/renliziyuan/renyuanxinxi/detail?data=" + encodeURIComponent(JSON.stringify(record))
})
}
// initChart
const calculateAge = (birthDate) => {
url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
});
}
// initChart
const calculateAge = (birthDate) => {
const today = new Date();
const birth = new Date(birthDate);
let age = today.getFullYear() - birth.getFullYear();
@ -138,24 +119,25 @@
age--;
}
return age;
};
//
const departChange = async (e, data) => {
tableData.value = []
console.log(e)
};
//
const departChange = async (e, data) => {
tableData.value = [];
console.log(e);
orgCode.value = e;
try {
//
isLoading.value = true;
if (orgCode.value.length <= 6) {
console.log(123242353)
uni.showLoading({
title: '全厂数据较多,耐心等待数据加载中...',
mask: true
console.log(123242353);
uni.showToast({
title: '全厂数据较多,请选 下一层级...',
icon: 'none',
duration: 1000
});
isLoading.value = false;
return;
} else {
uni.showLoading({
title: '数据加载中...',
@ -168,51 +150,51 @@
fields: ['xm', 'nl', 'xb', 'xb_dictText', 'orgCode', 'jcdw', 'jcxd', 'jcxdCode']
};
if (orgCode.value.length <= 9) {
params.orgCode = orgCode.value
params.orgCode = orgCode.value;
} else {
params.jcxd_code = orgCode.value
params.jcxd_code = orgCode.value;
}
queryRenyuanByDepartID(params).then((res) => {
queryRenyuanByDepartID(params)
.then((res) => {
if (res.success) {
processData(res.result.records);
//
isLoading.value = false;
uni.hideLoading();
}
}).catch((err) => {
console.log(err)
uni.showToast({
title: '数据加载失败',
icon: 'none'
});
})
} catch (error) {
console.log(error)
.catch((err) => {
console.log(err);
uni.showToast({
title: '数据加载失败',
icon: 'none'
icon: 'none',
duration: 1000
});
});
} catch (error) {
console.log(error);
uni.showToast({
title: '数据加载失败',
icon: 'none',
duration: 1000
});
} finally {
//
isLoading.value = false;
uni.hideLoading();
}
};
//
const processData = (data) => {
};
//
const processData = (data) => {
//
const validData = data.map(item => ({
const validData = data
.map((item) => ({
...item,
nl: calculateAge(item.cssj)
})).filter(item => item.nl >= 21 && item.nl <= 64);
}))
.filter((item) => item.nl >= 21 && item.nl <= 64);
//
summary.total = validData.length;
summary.avgAge = validData.reduce((sum, cur) => sum + cur.nl, 0) / summary.total || 0;
@ -222,27 +204,25 @@
groupsData(validData);
//
generateChartData(validData);
};
};
// ...
const subOrgStaffs = ref({}); //
const ageGroupStaffs = ref({}); //
// ...
const subOrgStaffs = ref({}); //
const ageGroupStaffs = ref({}); //
const groupsData = (data) => {
const groupsData = (data) => {
//
subOrgStaffs.value = {};
ageGroupStaffs.value = {};
data.reduce((acc, cur) => {
// console.log(cur)
let subOrg = "";
let subOrg = '';
let ageRange = getAgeRange(cur.nl);
// console.log(cur.orgCode, cur.jcxdCode)
if (cur.orgCode <= 6) {
subOrg = cur.orgCode
subOrg = cur.orgCode;
} else {
subOrg = cur.jcxdCode
subOrg = cur.jcxdCode;
}
// subOrgStaffs
@ -256,41 +236,38 @@
ageGroupStaffs.value[ageRange] = [];
}
ageGroupStaffs.value[ageRange].push(cur);
})
}
});
};
//
const getAgeRange = (age) => {
//
const getAgeRange = (age) => {
const ranges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
const index = Math.floor((age - 21) / 10);
return ranges[index] || '其他';
};
};
//
const showStaffList = (subOrg, ageRange) => {
//
const showStaffList = (subOrg, ageRange) => {
//
const targetStaffs = subOrgStaffs.value[subOrg].filter(staff =>
getAgeRange(staff.nl) === ageRange
);
const targetStaffs = subOrgStaffs.value[subOrg].filter((staff) => getAgeRange(staff.nl) === ageRange);
staffList.value = targetStaffs;
popupTitle.value = `${subOrg} ${ageRange}人员列表(共${targetStaffs.length}人)`;
popup.value.open();
};
};
//
const getSubOrgStaffs = (subOrgCode) => {
//
const getSubOrgStaffs = (subOrgCode) => {
return subOrgStaffs.value[subOrgCode] || [];
};
};
//
const getAgeGroupStaffs = (ageRange) => {
//
const getAgeGroupStaffs = (ageRange) => {
return ageGroupStaffs.value[ageRange] || [];
};
};
//
const generateChartData = (data) => {
//
const generateChartData = (data) => {
//
const ageRanges = ['21-30岁', '31-40岁', '41-50岁', '51-60岁', '61-64岁'];
const jcdwGroups = data.reduce((acc, cur) => {
@ -307,14 +284,13 @@
return acc;
}, {});
//
const xData = Object.keys(jcdwGroups);
const seriesData = ageRanges.map((range, index) => ({
name: range,
type: 'bar',
data: xData.map(jcdw => jcdwGroups[jcdw].ageGroups[index] || 0),
data: xData.map((jcdw) => jcdwGroups[jcdw].ageGroups[index] || 0),
itemStyle: {
color: ['#5470C6', '#91CC75', '#FAC858', '#EE6666', '#73C0DE'][index]
},
@ -322,14 +298,14 @@
label: {
show: true,
position: 'top'
},
}
// 20
// barWidth: 20
}))
}));
chartOption.value = {
title: {
text: '人员年龄分组统计',
padding: [0, 0, 0, 30],
padding: [0, 0, 0, 30]
},
toolbox: {
padding: [0, 30, 0, 0],
@ -377,7 +353,7 @@
color: '#7F84B5',
fontWeight: 300,
interval: 0,
rotate: 0,
rotate: 0
},
padding: [0, 10, 0, 10],
axisTick: {
@ -387,7 +363,8 @@
show: false //线
}
},
yAxis: [{
yAxis: [
{
show: true,
boundaryGap: false, //线
type: 'value',
@ -411,40 +388,36 @@
axisLine: {
show: false //线
}
}],
series: seriesData,
}
],
series: seriesData
};
//
setTimeout(async () => {
if (!chart.value) return
const myChart = await chart.value.init(echarts)
myChart.setOption(chartOption.value)
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value);
myChart.on('click', (params) => {
console.log(params.seriesName)
tableData.value = getAgeGroupStaffs(params.seriesName)
})
}, 300)
console.log(params.seriesName);
tableData.value = getAgeGroupStaffs(params.seriesName);
});
}, 300);
// #ifdef APP
getHeight();
// #endif
};
};
onMounted(() => {
onMounted(() => {
// #ifdef APP
getHeight();
// #endif
})
// #ifdef APP
});
// #ifdef APP
const getHeight = () => {
const getHeight = () => {
//
const systemInfo = uni.getSystemInfoSync();
const screenHeight = systemInfo.screenHeight;
@ -455,95 +428,94 @@
.select('#top1')
.boundingClientRect((rect1) => {
//
const topComponentsHeight = rect1.height
const topComponentsHeight = rect1.height;
//
bottomHeight.value = screenHeight - topComponentsHeight - 415;
})
.exec();
};
};
// #endif
//
const initChart = () => {
// #endif
//
const initChart = () => {
setTimeout(async () => {
if (!chart.value) return
const myChart = await chart.value.init(echarts)
myChart.setOption(chartOption.value)
}, 300)
};
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value);
}, 300);
};
</script>
<style scoped>
.container {
.container {
margin: 20, 20, 20, 20rpx;
}
}
.input-group {
.input-group {
display: flex;
gap: 20rpx;
margin-bottom: 30rpx;
}
}
.input {
.input {
flex: 1;
border: 1rpx solid #ddd;
padding: 15rpx;
border-radius: 8rpx;
}
}
.query-btn {
background: #007AFF;
.query-btn {
background: #007aff;
color: white;
padding: 0 40rpx;
border-radius: 8rpx;
}
}
.stats-box {
.stats-box {
display: flex;
justify-content: space-around;
margin: 30rpx 0;
padding: 20rpx;
background: #f8f8f8;
border-radius: 12rpx;
}
}
.stat-item {
.stat-item {
display: flex;
flex-direction: column;
align-items: center;
}
}
.label {
.label {
font-size: 24rpx;
color: #666;
}
}
.value {
.value {
font-size: 36rpx;
font-weight: bold;
color: #0000ff;
}
}
.chart-container {
.chart-container {
height: 400rpx;
margin-top: 20rpx;
}
}
.titleStyle {
.titleStyle {
font-size: 12px;
color: #747474;
line-height: 30px;
height: 30px;
background: #F2F9FC;
background: #f2f9fc;
text-align: center;
vertical-align: middle;
border-left: 1px solid #919191;
border-bottom: 1px solid #919191;
;
}
}
/* 内容样式 */
.dataStyle {
/* 内容样式 */
.dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
@ -558,6 +530,5 @@
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-overflow: ellipsis;
}
}
</style>