diff --git a/.env.development b/.env.development index e96d5b3..23a4ddb 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # 开发环境 # 请求接口地址 - #VITE_REQUEST_BASE_URL = https://36.112.48.190 -VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 +#VITE_REQUEST_BASE_URL = https://36.112.48.190 +VITE_REQUEST_BASE_URL = http://10.75.15.246:8085 diff --git a/pages/login/login.vue b/pages/login/login.vue index fd2b532..976a718 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -98,17 +98,17 @@ }); /*生产环境 begin */ - loginApi({ - username: un, - password: pw, - ip: getDeviceIp() + // loginApi({ + // username: un, + // password: pw, + // ip: getDeviceIp() /*生产环境 end */ /*开发环境 begin */ - // localLoginApi({ - // username: username.value, - // password: password.value, - // captcha: 'app' + localLoginApi({ + username: username.value, + password: password.value, + captcha: 'app' /*开发环境 end */ }).then((loginres) => { if (loginres.success) { diff --git a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue index 339a860..0f31a08 100644 --- a/pages/views/renliziyuan/renyuanxinxi/qttongji.vue +++ b/pages/views/renliziyuan/renyuanxinxi/qttongji.vue @@ -179,6 +179,8 @@ const fieldTexts = ref([]); //字段值 const chartOption = ref({}); const orgType = ref(''); //记录单位层级 by 闵 + var tempOrgType = ''; //单位层级 by 闵 + const chartTitle = computed(() => { return selectedOrgCodeLabel.value + '人员(' + selectedFieldLabel.value + ')分组统计'; @@ -393,8 +395,13 @@ myChart.on('click', (params) => { console.log(params.name, params.seriesIndex, params.dataIndex); console.log(orgCodeGroupData.value); - - let updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name); + let updateData = [] + //这里需要判断是否为第三级 + if(tempOrgType=='1'){ + updateData = findRyByOrgCode(orgCodeGroupData.value.children, params.name); + }else{ + updateData = orgCodeGroupData.value + } console.log(updateData); const ldhth = updateData.fieldValues[params.seriesIndex].ldhth; @@ -411,7 +418,7 @@ //根据一个键值查找数据 //查找人员劳动合同号 function findRyByOrgCode(treeData, targetOrgCode) { - // console.log(treeData, targetOrgCode); + console.log(treeData, targetOrgCode); for (const node of treeData) { // 如果当前节点匹配,直接返回该节点及其子节点 if (node.orgText === targetOrgCode) { @@ -718,7 +725,7 @@ chartData.value = []; try { //这里添加一个层级字段,并避免 厂机关A01A01A01 orgType by 闵 - var tempOrgType = '1'; + tempOrgType = '1'; if(selectedOrgCode.value.includes('A01A01A01')){ tempOrgType = '1'; }else{ @@ -745,7 +752,7 @@ }); } - // console.log(res); //deepseek + console.log(res); //deepseek if (res.success) { console.log(selectedOrgCode.value, res); if (res.result.length < 1) {