完善通用查询和详情界面

This commit is contained in:
ldeyun 2025-02-14 14:12:21 +08:00
parent 8cf96126fe
commit cc6681cfb5
4 changed files with 894 additions and 770 deletions

View File

@ -90,6 +90,14 @@ export function cxcRyDatAstatistics(parm) { // 员工分组统计
}) })
} }
export function cxcRyDatAstatisticsCertificate(parm) { // 员工按证件分组统计
return https({
url: '/cxc_rlzy.zb/cxcRlzyZb/getStatisticsCertificate',
method: 'get',
data: parm
})
}
export function cxcRyDatAstatisticsDetails(parm) { // 员工信息统计 export function cxcRyDatAstatisticsDetails(parm) { // 员工信息统计
return https({ return https({
url: '/cxc_rlzy.zb/cxcRlzyZb/details', url: '/cxc_rlzy.zb/cxcRlzyZb/details',

View File

@ -28,16 +28,16 @@
<uni-row> <uni-row>
<view v-for="(item,index) in jxkhxxList"> <view v-for="(item,index) in jxkhxxList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{index+1}} {{index+1}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="10"> <uni-col :span="10">
<view class="dataStyle"> <view class="dataStyle1">
{{item.nf}} {{item.nf}}
</view> </view>
</uni-col><uni-col :span="10"> </uni-col><uni-col :span="10">
<view class="dataStyle"> <view class="dataStyle1">
{{item.khcj+"---"+item.khcj_dictText}} {{item.khcj+"---"+item.khcj_dictText}}
</view> </view>
</uni-col> </uni-col>
@ -69,20 +69,20 @@
<uni-row> <uni-row>
<view v-for="(item,index) in gzjlList"> <view v-for="(item,index) in gzjlList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.kssj}} {{item.kssj}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.jssj}} {{item.jssj}}
</view> </view>
</uni-col><uni-col :span="11"> </uni-col><uni-col :span="11">
<view class="dataStyle"> <view class="dataStyle2" ref="dataView">
{{item.jlms}} {{item.jlms}}
</view> </view>
</uni-col><uni-col :span="5"> </uni-col><uni-col :span="5">
<view class="dataStyle"> <view class="dataStyle1">
{{item.jlms2}} {{item.jlms2}}
</view> </view>
</uni-col> </uni-col>
@ -125,30 +125,30 @@
<uni-row> <uni-row>
<view v-for="(item,index) in xlxxList"> <view v-for="(item,index) in xlxxList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.xllb}} {{item.xllb}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.byyx}} {{item.byyx}}
</view> </view>
</uni-col><uni-col :span="4"> </uni-col><uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle2" ref="dataView">
{{item.sxzy}} {{item.sxzy}}
</view> </view>
</uni-col><uni-col :span="4"> </uni-col><uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.qdxl}} {{item.qdxl}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.qdxw}} {{item.qdxw}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.bytime}} {{item.bytime}}
</view> </view>
</uni-col> </uni-col>
@ -185,25 +185,25 @@
<uni-row> <uni-row>
<view v-for="(item,index) in zjtzList"> <view v-for="(item,index) in zjtzList">
<uni-col :span="6"> <uni-col :span="6">
<view class="dataStyle"> <view class="dataStyle2" ref="dataView">
{{item.zjmc}} {{item.zjmc}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="5"> <uni-col :span="5">
<view class="dataStyle"> <view class="dataStyle1">
{{item.zsdj}} {{item.zsdj}}
</view> </view>
</uni-col><uni-col :span="5"> </uni-col><uni-col :span="5">
<view class="dataStyle"> <view class="dataStyle1">
{{item.fzrq}} {{item.fzrq}}
</view> </view>
</uni-col><uni-col :span="5"> </uni-col><uni-col :span="5">
<view class="dataStyle"> <view class="dataStyle1">
{{item.fssj}} {{item.fssj}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="3"> <uni-col :span="3">
<view class="dataStyle"> <view class="dataStyle1">
{{item.bz}} {{item.bz}}
</view> </view>
</uni-col> </uni-col>
@ -241,25 +241,25 @@
<uni-row> <uni-row>
<view v-for="(item,index) in zyjtcyList"> <view v-for="(item,index) in zyjtcyList">
<uni-col :span="4"> <uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.ybrgx}} {{item.ybrgx}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="3"> <uni-col :span="3">
<view class="dataStyle"> <view class="dataStyle1">
{{item.gxname}} {{item.gxname}}
</view> </view>
</uni-col><uni-col :span="6"> </uni-col><uni-col :span="6">
<view class="dataStyle"> <view class="dataStyle1">
{{item.cstime}} {{item.cstime}}
</view> </view>
</uni-col><uni-col :span="4"> </uni-col><uni-col :span="4">
<view class="dataStyle"> <view class="dataStyle1">
{{item.cyzzmm}} {{item.cyzzmm}}
</view> </view>
</uni-col> </uni-col>
<uni-col :span="7"> <uni-col :span="7">
<view class="dataStyle"> <view class="dataStyle2" ref="dataView">
{{item.cygzdw}} {{item.cygzdw}}
</view> </view>
</uni-col> </uni-col>
@ -403,123 +403,146 @@
} }
} }
// adjustFontSize()
}).catch((err) => { }).catch((err) => {
console.log(err); console.log(err);
}) })
} }
function getJbxx() { function getJbxx() {
cellData.value.push({ cellData.value.push({
"title": "姓名", "title": "姓名",
"value": renyuanData.value.xm, "value": renyuanData.value.xm,
"titleSpan": 3, "titleSpan": 3,
"valueSpan": 3 "valueSpan": 3,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "性别", "title": "性别",
"value": renyuanData.value.xb_dictText, "value": renyuanData.value.xb_dictText,
"titleSpan": 3, "titleSpan": 3,
"valueSpan": 4 "valueSpan": 4,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "出生年月", "title": "出生年月",
"value": renyuanData.value.cssj, "value": renyuanData.value.cssj,
"titleSpan": 4, "titleSpan": 4,
"valueSpan": 4 "valueSpan": 4,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "民族", "title": "民族",
"value": renyuanData.value.mz, "value": renyuanData.value.mz,
"titleSpan": 3, "titleSpan": 3,
"valueSpan": 3 "valueSpan": 3,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "籍贯", "title": "籍贯",
"value": renyuanData.value.jg, "value": renyuanData.value.jg,
"titleSpan": 3, "titleSpan": 3,
"valueSpan": 5 "valueSpan": 5,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "出生地", "title": "出生地",
"value": renyuanData.value.csd, "value": renyuanData.value.csd,
"titleSpan": 3, "titleSpan": 3,
"valueSpan": 4 "valueSpan": 4,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "工作时间", "title": "工作时间",
"value": renyuanData.value.cjgzsj, "value": renyuanData.value.cjgzsj,
"titleSpan": 4, "titleSpan": 4,
"valueSpan": 5 "valueSpan": 5,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "政治面貌", "title": "政治面貌",
"value": renyuanData.value.zzmm + renyuanData.value.jrsj, "value": renyuanData.value.zzmm === "群众" ? renyuanData.value.zzmm : renyuanData.value.zzmm +
renyuanData.value.jrsj,
"titleSpan": 4, "titleSpan": 4,
"valueSpan": 4 "valueSpan": 4,
"class": "dataStyle1"
}) })
cellData.value.push({ cellData.value.push({
"title": "现专业", "title": "现专业",
"value": "", "value": "",
"titleSpan": 3, "titleSpan": 3,
"valueSpan": 8 "valueSpan": 8,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "用工形式", "title": "用工形式",
"value": renyuanData.value.rylb1_dictText, "value": renyuanData.value.rylb1_dictText,
"titleSpan": 4, "titleSpan": 4,
"valueSpan": 5 "valueSpan": 5,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "健康状况", "title": "健康状况",
"value": "", "value": "",
"titleSpan": 4, "titleSpan": 4,
"valueSpan": 4 "valueSpan": 4,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "所在单位", "title": "所在单位",
"value": renyuanData.value.orgCode_dictText, "value": renyuanData.value.orgCode_dictText,
"titleSpan": 4, "titleSpan": 4,
"valueSpan": 6 "valueSpan": 6,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "专业技术资格", "title": "专业技术资格",
"value": gbxxList.value.zc + gbxxList.value.zcsj, "value": gbxxList.value.zc === 0 ? "/" : gbxxList.value.zc + gbxxList.value.zcsj,
"titleSpan": 5, "titleSpan": 5,
"valueSpan": 7 "valueSpan": 7,
"class": "dataStyle1"
}) })
cellData.value.push({ cellData.value.push({
"title": "职业资格等级", "title": "职业资格等级",
"value": zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj, "value": zyzgdjList.value.ztgz === "0" ? "/" : zyzgdjList.value.ztgz + zyzgdjList.value.ztgzdj,
"titleSpan": 5, "titleSpan": 5,
"valueSpan": 7 "valueSpan": 7,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "", "title": "",
"value": "", "value": "",
"titleSpan": 0, "titleSpan": 0,
"valueSpan": 0 "valueSpan": 0,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "职务(岗位)", "title": "职务(岗位)",
"value": gbxxList.value.zw, "value": gbxxList.value.zw,
"titleSpan": 5, "titleSpan": 5,
"valueSpan": 7 "valueSpan": 7,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "职位级别", "title": "职位级别",
"value": gbxxList.value.zwcj, "value": gbxxList.value.zwcj,
"titleSpan": 5, "titleSpan": 5,
"valueSpan": 7 "valueSpan": 7,
"class": "dataStyle"
}) })
cellData.value.push({ cellData.value.push({
"title": "", "title": "",
"value": "", "value": "",
"titleSpan": 0, "titleSpan": 0,
"valueSpan": 0 "valueSpan": 0,
"class": "dataStyle"
}) })
} }
@ -553,22 +576,20 @@
.titleStyle { .titleStyle {
font-size: 12px; font-size: 12px;
color: #747474; color: #747474;
line-height: 50px; line-height: 35px;
height: 50px; height: 35px;
background: #F2F9FC; background: #F2F9FC;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
border-left: 1px solid #919191; border-left: 1px solid #919191;
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
; ;
;
} }
/* 内容样式 */ /* 内容样式 */
.dataStyle { .dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 14px; font-size: 14px;
color: #00007f; color: #00007f;
line-height: 25px; line-height: 25px;
@ -583,4 +604,42 @@
overflow-wrap: break-word; overflow-wrap: break-word;
} }
/* 内容样式 */
.dataStyle1 {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 14px;
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-align: center;
word-wrap: break-word;
overflow-wrap: break-word;
}
/* 内容样式 */
.dataStyle2 {
font-size: 12px;
color: #00007f;
line-height: 15px;
height: 30px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
border-left: 1px solid #919191;
text-align: center;
word-wrap: break-word;
overflow-wrap: break-word;
}
</style> </style>

View File

@ -5,14 +5,16 @@
<uni-col :span="5"><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col> <uni-col :span="5"><uni-title :title="'选择单位'" align="left" type="h4"></uni-title></uni-col>
<uni-col :span="19"> <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-col>
</uni-row> </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="5"><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col> <uni-col :span="5"><uni-title :title="'选择字段'" align="left" type="h4"></uni-title></uni-col>
<uni-col :span="19"> <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-col>
</uni-row> </uni-row>
</view> </view>
@ -24,7 +26,8 @@
<!-- 翻页按钮 --> <!-- 翻页按钮 -->
<view style="display: flex; justify-content: center; margin-top: 10px"> <view style="display: flex; justify-content: center; margin-top: 10px">
<button @click="prevPage" :disabled="currentPage === 1" size="mini">上一页</button> <button @click="prevPage" :disabled="currentPage === 1" size="mini">上一页</button>
<button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value" size="mini">下一页</button> <button @click="nextPage" :disabled="currentPage * pageSize >= chartDataCount.value"
size="mini">下一页</button>
</view> </view>
<!-- 数据表格 --> <!-- 数据表格 -->
@ -82,17 +85,36 @@
</template> </template>
<script setup> <script setup>
import { ref, reactive, onMounted, computed } from 'vue'; import {
import * as echarts from 'echarts'; ref,
import { cxcRyDatAstatistics, cxcRyDatAstatisticsDetails } from '@/api/renyuan.js'; reactive,
onMounted,
computed
} from 'vue';
import * as echarts from 'echarts';
import {
cxcRyDatAstatistics,
cxcRyDatAstatisticsCertificate,
cxcRyDatAstatisticsDetails
} from '@/api/renyuan.js';
// tableData // tableData
const bottomHeight = ref(0); const bottomHeight = ref(0);
// //
const chart = ref(null); const chart = ref(null);
const chartDataCount = ref(0); const chartDataCount = ref(0);
const fieldList = ref([ const fieldList = ref([{
text: '取证情况',
value: 'zjmc',
isDict: false,
dictCode: 'gzrlzy'
},
{ {
text: '岗位类别',
value: 'gwlb',
isDict: false,
dictCode: ''
}, {
text: '性别', text: '性别',
value: 'xb', value: 'xb',
isDict: true, isDict: true,
@ -110,45 +132,45 @@ const fieldList = ref([
isDict: true, isDict: true,
dictCode: 'mz' dictCode: 'mz'
} }
]); // ]); //
const dictCode = ref(''); const dictCode = ref('');
const fieldisDict = ref(true); const fieldisDict = ref(true);
const selectedOrgCode = ref(''); // orgCode const selectedOrgCode = ref(''); // orgCode
const selectedOrgCodeLabel = ref('请选择单位'); // const selectedOrgCodeLabel = ref('请选择单位'); //
const selectedField = ref(''); // const selectedField = ref(''); //
const selectedFieldLabel = ref('请选择字段'); // const selectedFieldLabel = ref('请选择字段'); //
const orgCodeGroupData = ref([]); //orgcode const orgCodeGroupData = ref([]); //orgcode
const chartData = ref({}); // const chartData = ref({}); //
const personnelList = ref([]); // initChart const personnelList = ref([]); // initChart
const fieldValues = ref([]); // const fieldValues = ref([]); //
const fieldTexts = ref([]); // const fieldTexts = ref([]); //
const chartOption = ref({}); const chartOption = ref({});
const chartTitle = computed(() => { const chartTitle = computed(() => {
return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计'; return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计';
}); });
// //
const pageSize = ref(3); // const pageSize = ref(3); //
const currentPage = ref(1); // const currentPage = ref(1); //
function detail(record) { function detail(record) {
// console.log(record) // console.log(record)
uni.navigateTo({ uni.navigateTo({
url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record)) url: '/pages/views/renliziyuan/renyuanxinxi/detail?data=' + encodeURIComponent(JSON.stringify(record))
}); });
} }
onMounted(() => { onMounted(() => {
// #ifdef APP // #ifdef APP
getHeight(); getHeight();
// #endif // #endif
}); });
// #ifdef APP // #ifdef APP
const getHeight = () => { const getHeight = () => {
// //
const systemInfo = uni.getSystemInfoSync(); const systemInfo = uni.getSystemInfoSync();
const screenHeight = systemInfo.screenHeight; const screenHeight = systemInfo.screenHeight;
@ -164,27 +186,27 @@ const getHeight = () => {
bottomHeight.value = screenHeight - topComponentsHeight - 415; bottomHeight.value = screenHeight - topComponentsHeight - 415;
}) })
.exec(); .exec();
}; };
// #endif // #endif
// ECharts length departChange // ECharts length departChange
// //
const initChart = () => { const initChart = () => {
setTimeout(async () => { setTimeout(async () => {
if (!chart.value) return; if (!chart.value) return;
const myChart = await chart.value.init(echarts); const myChart = await chart.value.init(echarts);
myChart.setOption(chartOption.value); myChart.setOption(chartOption.value);
}, 300); }, 300);
}; };
const prevPage = () => { const prevPage = () => {
if (currentPage.value > 1) { if (currentPage.value > 1) {
currentPage.value--; currentPage.value--;
} }
updateChart(chartData.value); updateChart(chartData.value);
}; };
const nextPage = () => { const nextPage = () => {
if (currentPage.value * pageSize.value < chartDataCount.value) { if (currentPage.value * pageSize.value < chartDataCount.value) {
currentPage.value++; currentPage.value++;
// //
@ -193,9 +215,9 @@ const nextPage = () => {
updateChart(chartData.value); updateChart(chartData.value);
// const tempChartData = temp.slice(startIndex, endIndex); // const tempChartData = temp.slice(startIndex, endIndex);
} }
}; };
// option // option
const getChartOption = (ChartData) => { const getChartOption = (ChartData) => {
// let temp = JSON.parse(JSON.stringify(tempchartData[0].children)); // let temp = JSON.parse(JSON.stringify(tempchartData[0].children));
// chartDataCount.value = temp.length; // chartDataCount.value = temp.length;
// //
@ -211,7 +233,7 @@ const getChartOption = (ChartData) => {
let legendData = []; let legendData = [];
for (let i = 0; i < fieldValues.value.length; i++) { for (let i = 0; i < fieldValues.value.length; i++) {
legendData.push(fieldValues.value[i].filedText); legendData.push(fieldValues.value[i].fieldText);
} }
tempChartData.forEach((item) => { tempChartData.forEach((item) => {
@ -221,7 +243,7 @@ const getChartOption = (ChartData) => {
for (let i = 0; i < fieldValues.value.length; i++) { for (let i = 0; i < fieldValues.value.length; i++) {
let tempData = []; let tempData = [];
tempChartData.forEach((item) => { tempChartData.forEach((item) => {
console.log(item); // console.log(item);
if (item.data[i]) { if (item.data[i]) {
tempData.push(item.data[i]); tempData.push(item.data[i]);
} else { } else {
@ -229,7 +251,7 @@ const getChartOption = (ChartData) => {
} }
}); });
seriesData.push({ seriesData.push({
name: fieldValues.value[i].filedText, name: fieldValues.value[i].fieldText,
type: 'bar', type: 'bar',
label: { label: {
show: true, // show: true, //
@ -275,8 +297,7 @@ const getChartOption = (ChartData) => {
show: false //线 show: false //线
} }
}, },
yAxis: [ yAxis: [{
{
show: true, show: true,
boundaryGap: false, //线 boundaryGap: false, //线
type: 'value', type: 'value',
@ -300,8 +321,7 @@ const getChartOption = (ChartData) => {
axisLine: { axisLine: {
show: false //线 show: false //线
} }
} }],
],
series: seriesData, series: seriesData,
legend: { legend: {
@ -318,10 +338,10 @@ const getChartOption = (ChartData) => {
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
}; };
// //
const updateChart = (tempchartData) => { const updateChart = (tempchartData) => {
// //
setTimeout(async () => { setTimeout(async () => {
if (!chart.value) return; if (!chart.value) return;
@ -348,10 +368,10 @@ const updateChart = (tempchartData) => {
// updateChart(updateData); // updateChart(updateData);
}); });
}, 300); }, 300);
}; };
// //
// //
function findRyByOrgCode(treeData, targetOrgCode) { function findRyByOrgCode(treeData, targetOrgCode) {
// console.log(treeData, targetOrgCode); // console.log(treeData, targetOrgCode);
for (const node of treeData) { for (const node of treeData) {
// //
@ -365,15 +385,15 @@ function findRyByOrgCode(treeData, targetOrgCode) {
} }
} }
return null; return null;
} }
/** /**
* 从echart图标的树状数据中根据 orgCode 获取节点及其子节点数据 * 从echart图标的树状数据中根据 orgCode 获取节点及其子节点数据
* @param {Array} treeData 树状数据 * @param {Array} treeData 树状数据
* @param {string} targetOrgCode 目标 orgCode * @param {string} targetOrgCode 目标 orgCode
* @returns {Object|null} 匹配的节点及其子节点数据未找到返回 null * @returns {Object|null} 匹配的节点及其子节点数据未找到返回 null
*/ */
function findNodeByOrgCode(treeData, targetOrgCode) { function findNodeByOrgCode(treeData, targetOrgCode) {
// console.log(treeData, targetOrgCode); // console.log(treeData, targetOrgCode);
for (const node of treeData) { for (const node of treeData) {
// //
@ -387,29 +407,32 @@ function findNodeByOrgCode(treeData, targetOrgCode) {
} }
} }
return null; return null;
} }
//fieldValue //fieldValue
function collectUniqueKeyFieldValues(tree) { function collectUniqueKeyFieldValues(tree) {
const uniqueMap = new Map(); const uniqueMap = new Map();
tree.forEach((item) => { tree.forEach((item) => {
const { fieldValue, filedText } = item; const {
const key = `${fieldValue}-${filedText}`; fieldValue,
fieldText
} = item;
const key = `${fieldValue}-${fieldText}`;
if (!uniqueMap.has(key)) { if (!uniqueMap.has(key)) {
uniqueMap.set(key, { uniqueMap.set(key, {
fieldValue, fieldValue,
filedText fieldText
}); });
} }
}); });
const result = Array.from(uniqueMap.values()); const result = Array.from(uniqueMap.values());
return result; return result;
} }
// //
class OrgCodeMapper { class OrgCodeMapper {
constructor(data) { constructor(data) {
// //
this.orgCodeToOrgTextMap = {}; this.orgCodeToOrgTextMap = {};
@ -425,20 +448,20 @@ class OrgCodeMapper {
findOrgText(orgCode) { findOrgText(orgCode) {
return this.orgCodeToOrgTextMap[orgCode]; return this.orgCodeToOrgTextMap[orgCode];
} }
} }
// //
// const result = findNodeByOrgCode(echartData, "A01A01A01A01"); // const result = findNodeByOrgCode(echartData, "A01A01A01A01");
// console.log(result); // console.log(result);
/** /**
* 转换数据为支持钻取的ECharts格式 * 转换数据为支持钻取的ECharts格式
* @param {Array} data 原始数据 * @param {Array} data 原始数据
* @param {string} selectOrgCode 当前选择的组织编码 * @param {string} selectOrgCode 当前选择的组织编码
* @returns {Object} 包含当前层级数据和子节点信息的对象 符合echart的格式 * @returns {Object} 包含当前层级数据和子节点信息的对象 符合echart的格式
*/ */
//----------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------
function transformData(selectOrgCode, data) { function transformData(selectOrgCode, data) {
const nodes = new Map(); const nodes = new Map();
//fieldValue data[] fieldValue //fieldValue data[] fieldValue
fieldValues.value = collectUniqueKeyFieldValues(data); fieldValues.value = collectUniqueKeyFieldValues(data);
@ -467,7 +490,8 @@ function transformData(selectOrgCode, data) {
// console.log(entry); // console.log(entry);
hierarchy.forEach((code) => { hierarchy.forEach((code) => {
// console.log(code); // console.log(code);
let tempOrgText = orgMapper.findOrgText(code) === undefined ? '' : orgMapper.findOrgText(code); let tempOrgText = orgMapper.findOrgText(code) === undefined ? '' : orgMapper.findOrgText(
code);
// console.log(tempOrgText); // console.log(tempOrgText);
if (!nodes.has(code)) { if (!nodes.has(code)) {
nodes.set(code, { nodes.set(code, {
@ -550,13 +574,13 @@ function transformData(selectOrgCode, data) {
// console.log(root); // console.log(root);
// formatTree(root); // formatTree(root);
// }); // });
} }
//----------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------
// orgCode children deepseek // orgCode children deepseek
const groupByOrgCode = (orgCode, data) => { const groupByOrgCode = (orgCode, data) => {
// //
const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode)); const filteredData = data.filter((item) => item.orgCode.startsWith(orgCode));
@ -579,7 +603,7 @@ const groupByOrgCode = (orgCode, data) => {
groupedByFieldValue[item.fieldValue] = { groupedByFieldValue[item.fieldValue] = {
orgCode: item.orgCode, orgCode: item.orgCode,
orgText: item.orgText, orgText: item.orgText,
filedText: item.filedText, fieldText: item.fieldText,
number: 0, number: 0,
ldhth: [] ldhth: []
}; };
@ -591,17 +615,21 @@ const groupByOrgCode = (orgCode, data) => {
} catch (error) { } catch (error) {
console.log(error); console.log(error);
} }
console.log(1, orgMapper.findOrgText(orgCode)); // console.log(1, orgMapper.findOrgText(orgCode));
// //
const result = { const result = {
orgCode: orgCode, orgCode: orgCode,
orgText: orgMapper.findOrgText(orgCode), orgText: orgMapper.findOrgText(orgCode),
fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => { fieldValues: Object.keys(groupedByFieldValue).map((fieldValue) => {
const { filedText, orgCode, orgText } = groupedByFieldValue[fieldValue] || {}; const {
fieldText,
orgCode,
orgText
} = groupedByFieldValue[fieldValue] || {};
return { return {
fieldValue: fieldValue, fieldValue: fieldValue,
filedText: filedText, fieldText: fieldText,
orgCode: orgCode, orgCode: orgCode,
orgText: orgText, orgText: orgText,
number: groupedByFieldValue[fieldValue].number, number: groupedByFieldValue[fieldValue].number,
@ -640,22 +668,34 @@ const groupByOrgCode = (orgCode, data) => {
// console.log('', result); // console.log('', result);
return result; return result;
}; };
// then filter // then filter
const fetchStatisticsData = async () => { const fetchStatisticsData = async () => {
if (!selectedOrgCode.value || !selectedField.value) return; if (!selectedOrgCode.value || !selectedField.value) return;
let res = []; let res = [];
chartData.value = []; chartData.value = [];
try { try {
if (selectedField.value === "zjmc") {
console.log(dictCode.value)
res = await cxcRyDatAstatisticsCertificate({
orgCode: selectedOrgCode.value,
field: selectedField.value,
dictCode: dictCode.value,
fieldisDict: fieldisDict.value
});
} else {
res = await cxcRyDatAstatistics({ res = await cxcRyDatAstatistics({
orgCode: selectedOrgCode.value, orgCode: selectedOrgCode.value,
field: selectedField.value, field: selectedField.value,
dictCode: dictCode.value, dictCode: dictCode.value,
fieldisDict: fieldisDict.value fieldisDict: fieldisDict.value
}); });
}
// console.log(res); //deepseek // console.log(res); //deepseek
if (res.success) { if (res.success) {
// console.log(selectedOrgCode.value, res); console.log(selectedOrgCode.value, res);
if (res.result.length < 1) { if (res.result.length < 1) {
uni.showToast({ uni.showToast({
title: '查询数据为空' title: '查询数据为空'
@ -680,10 +720,10 @@ const fetchStatisticsData = async () => {
} catch (error) { } catch (error) {
console.error('获取统计数据失败:', error); console.error('获取统计数据失败:', error);
} }
}; };
// delimiter // delimiter
const fetchPersonnelList = async (ldhthList) => { const fetchPersonnelList = async (ldhthList) => {
personnelList.value = []; personnelList.value = [];
try { try {
const res = await cxcRyDatAstatisticsDetails({ const res = await cxcRyDatAstatisticsDetails({
@ -696,17 +736,19 @@ const fetchPersonnelList = async (ldhthList) => {
} catch (error) { } catch (error) {
console.error('获取人员列表失败:', error); console.error('获取人员列表失败:', error);
} }
}; };
// //
const onOrgCodeChange = (e, data) => { const onOrgCodeChange = (e, data) => {
personnelList.value = []
selectedOrgCode.value = e; selectedOrgCode.value = e;
// console.log(data.value.title); // console.log(data.value.title);
selectedOrgCodeLabel.value = data.value.title; selectedOrgCodeLabel.value = data.value.title;
fetchStatisticsData(); fetchStatisticsData();
}; };
const onFieldChange = (e) => { const onFieldChange = (e) => {
personnelList.value = []
// console.log(e); // console.log(e);
try { try {
selectedField.value = e; selectedField.value = e;
@ -724,38 +766,41 @@ const onFieldChange = (e) => {
//TODO handle the exception //TODO handle the exception
console.log(error); console.log(error);
} }
}; };
const onChartClick = (e) => { const onChartClick = (e) => {
const { ldhth } = chartData.value; personnelList.value = []
const {
ldhth
} = chartData.value;
if (ldhth && ldhth.length > 0) { if (ldhth && ldhth.length > 0) {
fetchPersonnelList(ldhth); fetchPersonnelList(ldhth);
} }
}; };
</script> </script>
<style scoped> <style scoped>
/* 颜色变量 */ /* 颜色变量 */
:root { :root {
--primary-blue: #409eff; --primary-blue: #409eff;
--deep-blue: #2c7be5; --deep-blue: #2c7be5;
--light-blue: #ecf5ff; --light-blue: #ecf5ff;
--gradient-start: #6b8cff; --gradient-start: #6b8cff;
--gradient-end: #4364f7; --gradient-end: #4364f7;
--hover-blue: #66b1ff; --hover-blue: #66b1ff;
} }
/* 全局容器 */ /* 全局容器 */
.container { .container {
margin: 10rpx 10rpx; margin: 10rpx 10rpx;
padding: 10rpx; padding: 10rpx;
background: linear-gradient(145deg, #f5f9ff, var(--light-blue)); background: linear-gradient(145deg, #f5f9ff, var(--light-blue));
border-radius: 24rpx; border-radius: 24rpx;
box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15); box-shadow: 0 8rpx 24rpx rgba(64, 158, 255, 0.15);
border: 2rpx solid rgba(64, 158, 255, 0.1); border: 2rpx solid rgba(64, 158, 255, 0.1);
} }
/* 图表容器 */ /* 图表容器 */
.chart-container { .chart-container {
height: 250px; height: 250px;
margin: 20rpx 0; margin: 20rpx 0;
border-radius: 24rpx; border-radius: 24rpx;
@ -763,11 +808,11 @@ const onChartClick = (e) => {
background: #ffffff; background: #ffffff;
box-shadow: 0 8rpx 32rpx rgba(64, 158, 255, 0.12); box-shadow: 0 8rpx 32rpx rgba(64, 158, 255, 0.12);
border: 2rpx solid rgba(64, 158, 255, 0.08); border: 2rpx solid rgba(64, 158, 255, 0.08);
} }
/* 表格标题行 */ /* 表格标题行 */
.titleStyle { .titleStyle {
font-size: 12px; font-size: 12px;
color: #747474; color: #747474;
line-height: 30px; line-height: 30px;
@ -777,10 +822,10 @@ const onChartClick = (e) => {
vertical-align: middle; vertical-align: middle;
border-left: 1px solid #919191; border-left: 1px solid #919191;
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
} }
/* 内容样式 */ /* 内容样式 */
.dataStyle { .dataStyle {
max-font-size: 14px; max-font-size: 14px;
/* 最大字体限制 */ /* 最大字体限制 */
min-font-size: 10px; min-font-size: 10px;
@ -795,23 +840,23 @@ const onChartClick = (e) => {
border-bottom: 1px solid #919191; border-bottom: 1px solid #919191;
border-left: 1px solid #919191; border-left: 1px solid #919191;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
/* 滚动区域 */ /* 滚动区域 */
scroll-view { scroll-view {
background: #ffffff; background: #ffffff;
border-radius: 0 0 16rpx 16rpx; border-radius: 0 0 16rpx 16rpx;
box-shadow: 0 8rpx 24rpx rgba(0, 35, 111, 0.08); box-shadow: 0 8rpx 24rpx rgba(0, 35, 111, 0.08);
} }
/* 输入框聚焦效果 */ /* 输入框聚焦效果 */
.trq-depart-select:focus-within { .trq-depart-select:focus-within {
box-shadow: 0 0 0 4rpx rgba(64, 158, 255, 0.2); box-shadow: 0 0 0 4rpx rgba(64, 158, 255, 0.2);
border-color: var(--primary-blue); border-color: var(--primary-blue);
} }
/* 加载动画优化 */ /* 加载动画优化 */
@keyframes fadeIn { @keyframes fadeIn {
from { from {
opacity: 0; opacity: 0;
transform: translateY(20rpx); transform: translateY(20rpx);
@ -821,45 +866,45 @@ scroll-view {
opacity: 1; opacity: 1;
transform: translateY(0); transform: translateY(0);
} }
} }
.container > * { .container>* {
animation: fadeIn 0.6s cubic-bezier(0.23, 1, 0.32, 1); animation: fadeIn 0.6s cubic-bezier(0.23, 1, 0.32, 1);
} }
/* 自定义滚动条美化 */ /* 自定义滚动条美化 */
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 8rpx; width: 8rpx;
background: rgba(64, 158, 255, 0.05); background: rgba(64, 158, 255, 0.05);
} }
::-webkit-scrollbar-thumb { ::-webkit-scrollbar-thumb {
background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue)); background: linear-gradient(45deg, var(--primary-blue), var(--deep-blue));
border-radius: 12rpx; border-radius: 12rpx;
border: 2rpx solid white; border: 2rpx solid white;
} }
/* 筛选行间距优化 */ /* 筛选行间距优化 */
.filter-row { .filter-row {
margin: 30rpx 0; margin: 30rpx 0;
padding: 20rpx 0; padding: 20rpx 0;
border-radius: 16rpx; border-radius: 16rpx;
} }
/* 响应式调整优化 */ /* 响应式调整优化 */
@media (max-width: 768px) { @media (max-width: 768px) {
.chart-container { .chart-container {
height: 250px; height: 250px;
border-radius: 20rpx; border-radius: 20rpx;
} }
} }
/* 数据行高亮效果 */ /* 数据行高亮效果 */
.data-row:nth-child(even) { .data-row:nth-child(even) {
background: rgba(236, 245, 255, 0.3); background: rgba(236, 245, 255, 0.3);
} }
.data-row:hover { .data-row:hover {
box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1); box-shadow: 0 4rpx 12rpx rgba(64, 158, 255, 0.1);
} }
</style> </style>

View File

@ -7,7 +7,7 @@
</view> </view>
</uni-col> </uni-col>
<uni-col :span="item.valueSpan"> <uni-col :span="item.valueSpan">
<view class="dataStyle"> <view :class="item.class">
{{ doEmptyString(item.value) }} {{ doEmptyString(item.value) }}
</view> </view>
</uni-col> </uni-col>
@ -77,8 +77,8 @@
.titleStyle { .titleStyle {
font-size: 12px; font-size: 12px;
color: #747474; color: #747474;
line-height: 50px; line-height: 30px;
height: 50px; height: 30px;
background: #F2F9FC; background: #F2F9FC;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
@ -90,14 +90,26 @@
/* 内容样式 */ /* 内容样式 */
.dataStyle { .dataStyle {
max-font-size: 14px;
/* 最大字体限制 */
min-font-size: 10px;
/* 最小字体限制 */
font-size: 14px; font-size: 14px;
color: #00007f; color: #00007f;
line-height: 25px; line-height: 35px;
height: 50px; height: 30px;
font-weight: 500;
text-align: center;
vertical-align: middle;
border-bottom: 1px solid #919191;
text-overflow: ellipsis;
overflow: hidden;
}
/* 内容样式 */
.dataStyle1 {
font-size: 12px;
color: #00007f;
line-height: 15px;
height: 30px;
font-weight: 500; font-weight: 500;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;