diff --git a/pages/realName/index/components/bar-charts-model.vue b/pages/realName/index/components/bar-charts-model.vue index db0e866..520c338 100644 --- a/pages/realName/index/components/bar-charts-model.vue +++ b/pages/realName/index/components/bar-charts-model.vue @@ -147,7 +147,7 @@ export default { res.data.proMsgBean setTimeout(() => { let data = { - categories: ['基建线路', '基建变电', '生产线路', '生成变电', '配网', '其他'], + categories: ['基建线路', '基建变电', '生产线路', '生产变电', '配网', '其他'], series: [ { name: '', @@ -164,7 +164,11 @@ export default { const currentIndex = index.currentIndex.index // 获取当前点击的图表索引 const currenName = this.chartData.categories[currentIndex] console.log('currenName选中的工程类型', currenName) - uni.navigateTo({ url: `/pages/realName/index/pages/project?xxx=${currenName}` }) + const proType = { + currentIndex, + name: currenName + } + uni.navigateTo({ url: `/pages/realName/index/pages/project?proType=${JSON.stringify(proType)}` }) } } } diff --git a/pages/realName/index/components/pie-charts-model.vue b/pages/realName/index/components/pie-charts-model.vue index bf8f631..c8c7018 100644 --- a/pages/realName/index/components/pie-charts-model.vue +++ b/pages/realName/index/components/pie-charts-model.vue @@ -139,7 +139,13 @@ export default { const chartsData = this.chartData.series[0].data const currenRows = chartsData[currentIndex] console.log('currenRows选中的工程类型', currenRows.name) - uni.navigateTo({ url: `/pages/realName/index/pages/project?xxx=${currenRows.name}` }) + + // 电压等级信息 + const voltageLevel = { + currentIndex, + name: currenRows.name + } + uni.navigateTo({ url: `/pages/realName/index/pages/project?voltageLevel=${JSON.stringify(voltageLevel)}` }) } } } diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue index 347f60b..191b1f4 100644 --- a/pages/realName/index/index.vue +++ b/pages/realName/index/index.vue @@ -672,30 +672,29 @@ export default { onJumpWorkPlan() { uni.navigateTo({ url: '/pages/realName/workPlan/index' }) }, - + //数据概览跳转 godataView(item) { console.log(item) - if(item.data_title=='在建工程'){ + if (item.data_title == '在建工程') { uni.navigateTo({ url: '/pages/realName/index/pages/project' }) } - if(item.data_title=='在用分包单位'){ + if (item.data_title == '在用分包单位') { uni.navigateTo({ url: '/pages/realName/index/pages/subList' }) } - if(item.data_title=='在用班组'){ + if (item.data_title == '在用班组') { uni.navigateTo({ url: '/pages/realName/index/pages/teamList' }) } - if(item.data_title=='在场人数'){ + if (item.data_title == '在场人数') { uni.navigateTo({ url: '/pages/realName/index/pages/personList' }) } - if(item.data_title=='日计划打卡数'){ + if (item.data_title == '日计划打卡数') { uni.navigateTo({ url: '/pages/realName/index/pages/personList?isAtt=0&isPlanWorker=1' }) } - if(item.data_title=='今日打卡'){ + if (item.data_title == '今日打卡') { uni.navigateTo({ url: '/pages/realName/index/pages/personList?isAtt=0' }) } - - }, + }, /* 人员考勤等跳转 */ onJumpPersonList(title) { let params = '' @@ -726,25 +725,34 @@ export default { }, /* 工程概况跳转 */ onJumpProjectList(title) { - let params = '' + let name = '' + let currentIndex = 0 // 跳转人员列表 switch (title) { case '在建': - params = '在建' - break - case '筹建': - params = '筹建' - break - case '停工': - params = '停工' + name = '在建' + currentIndex = 1 break case '完工': - params = '完工' + name = '完工' + currentIndex = 2 + break + case '筹建': + name = '筹建' + currentIndex = 3 + break + case '停工': + name = '停工' + currentIndex = 4 break } - console.log('params路由参数工程概况', params) - uni.navigateTo({ url: `/pages/realName/index/pages/project?xxx=${params}` }) + // 概况 + const survey = { + name, + currentIndex + } + uni.navigateTo({ url: `/pages/realName/index/pages/project?survey=${JSON.stringify(survey)}` }) }, /* 在场人员概况跳转人员信息 */ onJumpColorLight(type) { diff --git a/pages/realName/index/pages/project.vue b/pages/realName/index/pages/project.vue index ffa762a..ab84143 100644 --- a/pages/realName/index/pages/project.vue +++ b/pages/realName/index/pages/project.vue @@ -1,11 +1,18 @@