kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/build' into build

Browse Source
This commit is contained in:
wanglei
2024-06-27 16:34:33 +08:00
parent 205f17b706 2164d0f348
commit 7aa17bd31c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue
View File

@@ -46,7 +46,7 @@
@getList="getTableData" :col-configs="colConfigs" :dict="dict" height="calc(100% - 64px)"> @getList="getTableData" :col-configs="colConfigs" :dict="dict" height="calc(100% - 64px)">
<el-table-column label="操作" slot="options" align="center" width="100"> <el-table-column label="操作" slot="options" align="center" width="100">
<template v-slot="{row}"> <template v-slot="{row}">
<el-button v-if="row.aiEnable==1" type="text" @click="$router.push({hash:'#add',query:{id:row.id}})">详情</el-button> <el-button v-if="row.aiEnable==1" type="text" @click="$router.push({hash:'#add',query:{id:row.id},params:globalParams})">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</ai-table> </ai-table>
@@ -122,7 +122,7 @@ export default {
methods: { methods: {
loadNode(node, resolve) { loadNode(node, resolve) {
if (node.level == 0) { if (node.level == 0) {
this.instance.post(`/api/appcorp2/getCorpStatTotal`, null, {...this.globalParams}).then((res) => { this.instance.post(`/api/appcorp2/getCorpStatTotal`, null, {params: this.globalParams}).then((res) => {
if (res.data) { if (res.data) {
return resolve([{name: `全国 (${res.data})`}]); return resolve([{name: `全国 (${res.data})`}]);
} }
@@ -134,7 +134,9 @@ export default {
if (node.level == 1) { //全国 if (node.level == 1) { //全国
areaId = '' areaId = ''
} }
this.instance.post(`/api/appcorp2/getCorpStatByArea`, null, {areaId, ...this.globalParams}).then((res) => { this.instance.post(`/api/appcorp2/getCorpStatByArea`, null, {
params: {areaId, ...this.globalParams}
}).then((res) => {
if (res.data) { if (res.data) {
res.data.map((item) => { res.data.map((item) => {
item.name = item.name + `(${item.total})` item.name = item.name + `(${item.total})`
@@ -161,7 +163,7 @@ export default {
this.getTableData() this.getTableData()
}, },
getInfo() { getInfo() {
this.instance.post(`/api/appcorp2/getLatestInfo?areaId=${this.areaId}`, null, {...this.globalParams}).then(res => { this.instance.post(`/api/appcorp2/getLatestInfo?areaId=${this.areaId}`, null, {params: this.globalParams}).then(res => {
if (res?.data) { if (res?.data) {
this.info = res.data || {} this.info = res.data || {}
} }
@@ -169,8 +171,7 @@ export default {
}, },
getTableData() { getTableData() {
this.instance.post(`/api/appcorp2/list?areaId=${this.areaId}&name=${this.name}`, null, { this.instance.post(`/api/appcorp2/list?areaId=${this.areaId}&name=${this.name}`, null, {
...this.page, params: {...this.page, ...this.globalParams}
...this.globalParams
}).then(res => { }).then(res => {
if (res?.data) { if (res?.data) {
this.gropList = res.data.records this.gropList = res.data.records

2
project/oms/apps/statistics/AppCorpStatistics/coDetail.vue
View File

@@ -53,7 +53,7 @@ export default {
<template> <template>
<ai-detail class="coDetail"> <ai-detail class="coDetail">
<ai-title slot="title" :title="$options.label" isShowBottomBorder isShowBack @back="$router.push({})"/> <ai-title slot="title" :title="$options.label" isShowBottomBorder isShowBack @back="$router.push({query:{aiEnable:detail.aiEnable||undefined}})"/>
<template #content> <template #content>
<div class="grid col-2 gap-20"> <div class="grid col-2 gap-20">
<div> <div>