Compare commits

..

No commits in common. "9808821b70818faed387bb7416affbc80278163c" and "d3878d33583dfd4ec82ec21a1b4fdb8bd916ddbe" have entirely different histories.

2 changed files with 642 additions and 674 deletions

6
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "cxc-szcx-uniapp-master",
"name": "cxc-szcx-uniapp",
"lockfileVersion": 2,
"requires": true,
"packages": {
@ -19,7 +19,7 @@
},
"node_modules/base-64": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/base-64/-/base-64-1.0.0.tgz",
"resolved": "https://registry.npmmirror.com/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.npmjs.org/base-64/-/base-64-1.0.0.tgz",
"resolved": "https://registry.npmmirror.com/base-64/-/base-64-1.0.0.tgz",
"integrity": "sha512-kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg=="
},
"dayjs": {

View File

@ -5,14 +5,16 @@
<uni-col :span="5"><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col>
<uni-col :span="19">
<trq-depart-select v-model="selectedOrgCode" returnCodeOrID="orgCode" @change="onOrgCodeChange"></trq-depart-select>
<trq-depart-select v-model="selectedOrgCode" returnCodeOrID="orgCode"
@change="onOrgCodeChange"></trq-depart-select>
</uni-col>
</uni-row>
<uni-row style="margin-bottom: 20rpx; margin-left: 30rpx; margin-right: 30rpx">
<uni-col :span="5"><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col>
<uni-col :span="19">
<uni-data-select v-model="selectedField" :localdata="fieldList" @change="onFieldChange"></uni-data-select>
<uni-data-select v-model="selectedField" :localdata="fieldList"
@change="onFieldChange"></uni-data-select>
</uni-col>
</uni-row>
</view>
@ -22,9 +24,9 @@
</view>
<!-- 翻页按钮 -->
<view style="display: flex; justify-content: center; margin-top: 10px">
<button @click="prevPage" :disabled="currentPage === 1" size="mini">上一页</button>
<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value" size="mini">下一页</button>
<view style="display: flex; justify-content: center; margin-top: 20px">
<button @click="prevPage" :disabled="currentPage === 1">上一页</button>
<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value">下一页</button>
</view>
<!-- 数据表格 -->
@ -37,7 +39,7 @@
<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>
@ -62,7 +64,7 @@
</uni-col>
<uni-col :span="5">
<view class="dataStyle">
{{ item.jcxd }}
{{ item.xb_dictText }}
</view>
</uni-col>
<uni-col :span="5">
@ -82,18 +84,27 @@
</template>
<script setup>
import { ref, reactive, onMounted, computed } from 'vue';
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';
import {
cxcRyDatAstatistics,
cxcRyDatAstatisticsDetails
} from '@/api/renyuan.js';
import {
initDictOption
} from '@/api/common.js';
// tableData
const bottomHeight = ref(0);
//
const chart = ref(null);
const chartDataCount = ref(0);
const fieldList = ref([
{
const fieldList = ref([{
text: '性别',
value: 'xb',
isDict: true,
@ -102,8 +113,8 @@ const fieldList = ref([
{
text: '政治面貌',
value: 'zzmm',
isDict: true,
dictCode: 'zzmm'
isDict: false,
dictCode: ''
},
{
text: '民族',
@ -113,9 +124,10 @@ const fieldList = ref([
}
]); //
const dictCode = ref('');
const dictCode = ref("")
const fieldisDict = ref(true);
const selectedOrgCode = ref(''); // orgCode
const selectedOrgCodeLabel = ref('请选择单位'); //
const selectedField = ref(''); //
@ -123,8 +135,7 @@ const selectedFieldLabel = ref('请选择字段'); // 当前选择的字段名
const orgCodeGroupData = ref([]); //orgcode
const chartData = ref({}); //
const personnelList = ref([]); // initChart
const fieldValues = ref([]); //
const fieldTexts = ref([]); //
const fieldValues = ref([]);
const chartOption = ref({});
const chartTitle = computed(() => {
@ -146,6 +157,8 @@ onMounted(() => {
// #ifdef APP
getHeight();
// #endif
});
// #ifdef APP
@ -181,9 +194,9 @@ const initChart = () => {
const prevPage = () => {
if (currentPage.value > 1) {
currentPage.value--;
}
}
updateChart(chartData.value);
};
const nextPage = () => {
if (currentPage.value * pageSize.value < chartDataCount.value) {
@ -191,30 +204,25 @@ const nextPage = () => {
//
const startIndex = (currentPage.value - 1) * pageSize.value;
const endIndex = startIndex + pageSize.value;
updateChart(chartData.value);
// const tempChartData = temp.slice(startIndex, endIndex);
}
}
};
// option
const getChartOption = (ChartData) => {
const getChartOption = (tempChartData) => {
// let temp = JSON.parse(JSON.stringify(tempchartData[0].children));
// chartDataCount.value = temp.length;
//
const startIndex = (currentPage.value - 1) * pageSize.value;
const endIndex = startIndex + pageSize.value;
//
const tempChartData = ChartData.slice(startIndex, endIndex);
try {
// //
// const startIndex = (currentPage.value - 1) * pageSize.value;
// const endIndex = startIndex + pageSize.value;
// //
// const tempChartData = temp.slice(startIndex, endIndex);
let xData = [];
let seriesData = [];
console.log(1, tempChartData);
// console.log(1, temp);
// transformDataForEcharts
let legendData = [];
for (let i = 0; i < fieldValues.value.length; i++) {
legendData.push(fieldValues.value[i].filedText);
}
tempChartData.forEach((item) => {
xData.push(item.name);
});
@ -222,7 +230,6 @@ const getChartOption = (ChartData) => {
for (let i = 0; i < fieldValues.value.length; i++) {
let tempData = [];
tempChartData.forEach((item) => {
console.log(item);
if (item.data[i]) {
tempData.push(item.data[i]);
} else {
@ -230,16 +237,11 @@ const getChartOption = (ChartData) => {
}
});
seriesData.push({
name: fieldValues.value[i].filedText,
name: fieldValues.value[i],
type: 'bar',
label: {
show: true, //
position: 'top' //
},
data: tempData
});
}
console.log(2, legendData, xData, seriesData);
let tempOption = {
title: {
text: chartTitle.value,
@ -276,8 +278,7 @@ const getChartOption = (ChartData) => {
show: false //线
}
},
yAxis: [
{
yAxis: [{
show: true,
boundaryGap: false, //线
type: 'value',
@ -301,12 +302,11 @@ const getChartOption = (ChartData) => {
axisLine: {
show: false //线
}
}
],
}],
series: seriesData,
legend: {
data: legendData,
data: fieldValues.value,
itemGap: 5,
padding: [0, 15, 0, 15],
y: 'bottom',
@ -315,11 +315,8 @@ const getChartOption = (ChartData) => {
type: 'scroll'
}
};
return tempOption;
} catch (error) {
console.log(error);
return tempOption
}
};
//
const updateChart = (tempchartData) => {
@ -328,18 +325,17 @@ const updateChart = (tempchartData) => {
if (!chart.value) return;
const myChart = await chart.value.init(echarts);
console.log(tempchartData);
let tempOption = getChartOption(tempchartData);
myChart.setOption(tempOption);
myChart.setOption(getChartOption(tempchartData));
//
myChart.on('click', (params) => {
console.log(params.name, params.seriesIndex, params.dataIndex);
console.log(orgCodeGroupData.value);
let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
console.log(updateData);
// console.log(updateData);
const ldhth = updateData.fieldValues[params.seriesIndex].ldhth;
const ldhth = updateData.fieldValues[params.dataIndex].ldhth;
console.log(ldhth);
@ -356,7 +352,7 @@ function findRyByOrgCode(treeData, targetOrgCode) {
// console.log(treeData, targetOrgCode);
for (const node of treeData) {
//
if (node.orgText === targetOrgCode) {
if (node.orgCode === targetOrgCode) {
return node;
}
//
@ -391,41 +387,21 @@ function findNodeByOrgCode(treeData, targetOrgCode) {
}
//fieldValue
function collectUniqueKeyFieldValues(tree) {
const uniqueMap = new Map();
tree.forEach((item) => {
const { fieldValue, filedText } = item;
const key = `${fieldValue}-${filedText}`;
function collectUniqueKeyValues(tree, key) {
const uniqueValues = new Set(); // 使Set
if (!uniqueMap.has(key)) {
uniqueMap.set(key, {
fieldValue,
filedText
});
function traverse(node) {
if (node[key] !== undefined) {
uniqueValues.add(node[key]);
}
});
const result = Array.from(uniqueMap.values());
return result;
}
//
class OrgCodeMapper {
constructor(data) {
//
this.orgCodeToOrgTextMap = {};
//
for (let i = 0; i < data.length; i++) {
const item = data[i];
// orgCode orgText
this.orgCodeToOrgTextMap[item.orgCode] = item.orgText;
if (node.children && Array.isArray(node.children)) {
node.children.forEach((child) => traverse(child));
}
}
// orgCode orgText
findOrgText(orgCode) {
return this.orgCodeToOrgTextMap[orgCode];
}
tree.forEach((node) => traverse(node)); // tree
return Array.from(uniqueValues); // Set
}
//
@ -442,10 +418,7 @@ class OrgCodeMapper {
function transformData(selectOrgCode, data) {
const nodes = new Map();
//fieldValue data[] fieldValue
fieldValues.value = collectUniqueKeyFieldValues(data);
// console.log(fieldValues.value);
const orgMapper = new OrgCodeMapper(data); //orgtext
// console.log(orgMapper.findOrgText('A01A01A01A01'));
fieldValues.value = collectUniqueKeyValues(data, 'fieldValue');
// orgCode
function getHierarchy(orgCode) {
const hierarchy = [];
@ -465,30 +438,25 @@ function transformData(selectOrgCode, data) {
//
data.forEach((entry) => {
const hierarchy = getHierarchy(entry.orgCode);
// console.log(entry);
hierarchy.forEach((code) => {
// console.log(code);
let tempOrgText = orgMapper.findOrgText(code) === undefined ? '' : orgMapper.findOrgText(code);
// console.log(tempOrgText);
if (!nodes.has(code)) {
nodes.set(code, {
orgCode: code,
name: tempOrgText,
type: 'bar',
data: JSON.parse(JSON.stringify(tempArrayValue)), // data[0, 0]
children: []
});
}
});
// console.log(nodes);
// console.log('fieldValues', fieldValues.value, fieldValues.value.length, hierarchy);
// data
const node = nodes.get(entry.orgCode);
const fieldValue = entry.fieldValue;
const fieldValue = parseInt(entry.fieldValue, 10);
for (let i = 0; i < fieldValues.value.length; i++) {
if (fieldValue === fieldValues.value[i].fieldValue) {
if (fieldValue === parseInt(fieldValues.value[i], 10)) {
// console.log(555, i, fieldValue, fieldValues.value[i], entry.number);
node.data[i] += entry.number;
}
@ -533,24 +501,18 @@ function transformData(selectOrgCode, data) {
// data
rootNodes.forEach((root) => computeData(root));
return rootNodes;
// console.log('rootNodes', rootNodes);
// //
// function formatTree(node) {
// // console.log(node);
// return {
// orgCode: node.orgCode,
// name: node.name,
// type: 'bar',
// data: node.data,
// children: node.children.map((child) => formatTree(child))
// };
// }
//
function formatTree(node) {
return {
name: node.orgCode,
type: 'bar',
data: node.data,
children: node.children.map((child) => formatTree(child))
};
}
// return rootNodes.map((root) => {
// console.log(root);
// formatTree(root);
// });
return rootNodes.map((root) => formatTree(root));
}
//-----------------------------------------------------------------------------------------
@ -559,28 +521,25 @@ function transformData(selectOrgCode, data) {
const groupByOrgCode = (orgCode, data) => {
//
console.log(1, data)
const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode));
const orgMapper = new OrgCodeMapper(data);
console.log(2, filteredData)
// null
if (filteredData.length === 0) {
uni.showToast({
title: '过滤后数据为空',
title: "过滤后数据为空",
duration: 1000
});
})
return null;
}
// console.log(0, filteredData);
// fieldValue
const groupedByFieldValue = {};
try {
filteredData.forEach((item) => {
// console.log(item);
// console.log(item.orgCode, 11, groupedByFieldValue[item.fieldValue]);
if (!groupedByFieldValue[item.fieldValue]) {
groupedByFieldValue[item.fieldValue] = {
orgCode: item.orgCode,
orgText: item.orgText,
filedText: item.filedText,
number: 0,
ldhth: []
};
@ -590,25 +549,18 @@ const groupByOrgCode = (orgCode, data) => {
groupedByFieldValue[item.fieldValue].ldhth.push(...item.ldhth.split(','));
});
} catch (error) {
console.log(error);
console.log(error)
}
console.log(1, orgMapper.findOrgText(orgCode));
//
//
const result = {
orgCode: orgCode,
orgText: orgMapper.findOrgText(orgCode),
fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => {
const { filedText, orgCode, orgText } = groupedByFieldValue[fieldValue] || {};
return {
fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => ({
fieldValue: fieldValue,
filedText: filedText,
orgCode: orgCode,
orgText: orgText,
number: groupedByFieldValue[fieldValue].number,
ldhth: [...new Set(groupedByFieldValue[fieldValue].ldhth)] //
};
}),
})),
children: []
};
@ -624,18 +576,20 @@ const groupByOrgCode = (orgCode, data) => {
}
});
} catch (error) {
console.log(error);
console.log(error)
}
//
try {
nextLevelOrgCodes.forEach((nextLevelOrgCode) => {
const child = groupByOrgCode(nextLevelOrgCode, data);
if (child) {
result.children.push(child);
}
});
} catch (error) {
console.log(error);
console.log(error)
}
// console.log('', result);
@ -645,8 +599,7 @@ const groupByOrgCode = (orgCode, data) => {
// then filter
const fetchStatisticsData = async () => {
if (!selectedOrgCode.value || !selectedField.value) return;
let res = [];
chartData.value = [];
let res = []
try {
res = await cxcRyDatAstatistics({
orgCode: selectedOrgCode.value,
@ -654,29 +607,28 @@ const fetchStatisticsData = async () => {
dictCode: dictCode.value,
fieldisDict: fieldisDict.value
});
// console.log(res); //deepseek
if (res.success) {
// console.log(selectedOrgCode.value, res);
if (res.result.length < 1) {
console.log(res); //deepseek
if (res.length === 0) {
uni.showToast({
title: '查询数据为空'
});
return;
}
//
orgCodeGroupData.value = groupByOrgCode(selectedOrgCode.value, res.result);
// console.log(orgCodeGroupData.value);
//echart
const temp = transformData(selectedOrgCode.value, res.result);
if (temp[0].children.length > 0) {
chartData.value = JSON.parse(JSON.stringify(temp[0].children));
title: "查询数据为空"
})
return
} else {
chartData.value = temp[0];
console.log(selectedOrgCode.value, res);
orgCodeGroupData.value = groupByOrgCode(selectedOrgCode.value, res);
console.log(orgCodeGroupData.value);
chartData.value = transformData(selectedOrgCode.value, res);
let temp = []
if (chartData.value[0].children.length > 0) {
temp = JSON.parse(JSON.stringify(chartData.value[0].children));
} else {
temp = chartData.value[0]
}
chartDataCount.value = chartData.value.length;
console.log(temp)
chartDataCount.value = temp.length;
// console.log(chartData.value);
updateChart(chartData.value);
updateChart(temp);
}
} catch (error) {
console.error('获取统计数据失败:', error);
@ -685,15 +637,12 @@ const fetchStatisticsData = async () => {
// delimiter
const fetchPersonnelList = async (ldhthList) => {
personnelList.value = [];
try {
const res = await cxcRyDatAstatisticsDetails({
ldhth: ldhthList
});
console.log(res);
if (res.success) {
personnelList.value = res.result;
}
personnelList.value = res.data;
} catch (error) {
console.error('获取人员列表失败:', error);
}
@ -702,22 +651,22 @@ const fetchPersonnelList = async (ldhthList) => {
//
const onOrgCodeChange = (e, data) => {
selectedOrgCode.value = e;
// console.log(data.value.title);
console.log(data.value.title);
selectedOrgCodeLabel.value = data.value.title;
fetchStatisticsData();
};
const onFieldChange = (e) => {
// console.log(e);
console.log(e);
try {
selectedField.value = e;
for (var index = 0; index < fieldList.value.length; index++) {
var element = fieldList.value[index];
// console.log(element);
console.log(element);
if (element.value === e) {
selectedFieldLabel.value = element.text;
dictCode.value = element.dictCode;
fieldisDict.value = element.isDict;
dictCode.value = element.dictCode
fieldisDict.value = element.isDict
}
}
fetchStatisticsData();
@ -728,7 +677,9 @@ const onFieldChange = (e) => {
};
const onChartClick = (e) => {
const { ldhth } = chartData.value;
const {
ldhth
} = chartData.value;
if (ldhth && ldhth.length > 0) {
fetchPersonnelList(ldhth);
}
@ -757,7 +708,7 @@ const onChartClick = (e) => {
/* 图表容器 */
.chart-container {
height: 200px;
height: 50vh;
margin: 20rpx 0;
border-radius: 24rpx;
overflow: hidden;
@ -767,35 +718,47 @@ const onChartClick = (e) => {
}
/* 表格标题行 */
.titleStyle {
font-size: 12px;
color: #747474;
line-height: 30px;
height: 30px;
background: #f2f9fc;
text-align: center;
vertical-align: middle;
border-left: 1px solid #919191;
border-bottom: 1px solid #919191;
font-size: 28rpx;
font-weight: 600;
color: #ffffff;
background: linear-gradient(135deg, var(--gradient-start), var(--gradient-end));
padding: 28rpx 0;
border-radius: 16rpx 16rpx 0 0;
box-shadow: 0 4rpx 12rpx rgba(67, 100, 247, 0.2);
letter-spacing: 1rpx;
}
/* 内容样式 */
/* 数据行 */
.dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 12px;
color: #00007f;
line-height: 30px;
height: 30px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-overflow: ellipsis;
font-size: 28rpx;
color: #3a466b;
padding: 32rpx 0;
background: #ffffff;
border-bottom: 2rpx solid #f0f6ff;
transition: all 0.25s cubic-bezier(0.4, 0, 0.2, 1);
}
.dataStyle:hover {
background: #f8fbff;
transform: translateY(-2rpx);
}
/* 操作按钮 */
button[type='primary'] {
background: linear-gradient(135deg, var(--primary-blue), var(--deep-blue));
border: none;
border-radius: 12rpx;
padding: 12rpx 32rpx;
font-size: 26rpx;
box-shadow: 0 6rpx 16rpx rgba(64, 158, 255, 0.3);
transition: all 0.25s ease;
}
button[type='primary']:active {
transform: scale(0.96);
box-shadow: 0 4rpx 8rpx rgba(64, 158, 255, 0.3);
background: linear-gradient(135deg, var(--deep-blue), var(--primary-blue));
}
/* 滚动区域 */
@ -850,7 +813,7 @@ scroll-view {
/* 响应式调整优化 */
@media (max-width: 768px) {
.chart-container {
height: 200px;
height: 55vh;
border-radius: 20rpx;
}
@ -858,6 +821,11 @@ scroll-view {
font-size: 26rpx;
padding: 24rpx 0;
}
button[type='primary'] {
padding: 10rpx 24rpx;
font-size: 24rpx;
}
}
/* 数据行高亮效果 */