ldeyun/cxc-szcx-uniapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ldeyun' into 'master'

Browse Source 
1.修改统计

See merge request cxcxt/cxc-szcx-uniapp!17
This commit is contained in:
闵 年泽 2025-03-06 14:11:09 +08:00
commit 0cf6f4345a
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,4 +1,4 @@
# 开发环境 # 开发环境
# 请求接口地址 # 请求接口地址
#VITE_REQUEST_BASE_URL = https://36.112.48.190 #VITE_REQUEST_BASE_URL = https://36.112.48.190
VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 VITE_REQUEST_BASE_URL = http://10.75.15.246:8085

16
pages/login/login.vue
View File

@ -98,17 +98,17 @@
}); });
/*生产环境 begin */ /*生产环境 begin */
loginApi({ // loginApi({
username: un, // username: un,
password: pw, // password: pw,
ip: getDeviceIp() // ip: getDeviceIp()
/*生产环境 end */ /*生产环境 end */
/*开发环境 begin */ /*开发环境 begin */
// localLoginApi({ localLoginApi({
// username: username.value, username: username.value,
// password: password.value, password: password.value,
// captcha: 'app' captcha: 'app'
/*开发环境 end */ /*开发环境 end */
}).then((loginres) => { }).then((loginres) => {
if (loginres.success) { if (loginres.success) {

17
pages/views/renliziyuan/renyuanxinxi/qttongji.vue
View File

@ -179,6 +179,8 @@
const fieldTexts = ref([]); //字段值 const fieldTexts = ref([]); //字段值
const chartOption = ref({}); const chartOption = ref({});
const orgType = ref(''); //记录单位层级 by 闵 const orgType = ref(''); //记录单位层级 by 闵
var tempOrgType = ''; //单位层级 by 闵
const chartTitle = computed(() => { const chartTitle = computed(() => {
return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计'; return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计';
@ -393,8 +395,13 @@
myChart.on('click', (params) => { myChart.on('click', (params) => {
console.log(params.name, params.seriesIndex, params.dataIndex); console.log(params.name, params.seriesIndex, params.dataIndex);
console.log(orgCodeGroupData.value); console.log(orgCodeGroupData.value);
let updateData = []
let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name); //这里需要判断是否为第三级
if(tempOrgType=='1'){
updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name);
}else{
updateData = orgCodeGroupData.value
}
console.log(updateData); console.log(updateData);
const ldhth = updateData.fieldValues[params.seriesIndex].ldhth; const ldhth = updateData.fieldValues[params.seriesIndex].ldhth;
@ -411,7 +418,7 @@
//根据一个键值查找数据 //根据一个键值查找数据
//查找人员劳动合同号 //查找人员劳动合同号
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) {
// 如果当前节点匹配，直接返回该节点及其子节点 // 如果当前节点匹配，直接返回该节点及其子节点
if (node.orgText === targetOrgCode) { if (node.orgText === targetOrgCode) {
@ -718,7 +725,7 @@
chartData.value = []; chartData.value = [];
try { try {
//这里添加一个层级字段，并避免 厂机关A01A01A01 orgType by 闵 //这里添加一个层级字段，并避免 厂机关A01A01A01 orgType by 闵
var tempOrgType = '1'; tempOrgType = '1';
if(selectedOrgCode.value.includes('A01A01A01')){ if(selectedOrgCode.value.includes('A01A01A01')){
tempOrgType = '1'; tempOrgType = '1';
}else{ }else{
@ -745,7 +752,7 @@
}); });
} }
// 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) {