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

project/oms/apps/statistics/AppCorpStatistics/AppCorpOverview.vue

@@ -46,7 +46,7 @@
                       @getList="getTableData" :col-configs="colConfigs" :dict="dict" height="calc(100% - 64px)">
               <el-table-column label="操作" slot="options" align="center" width="100">
                 <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>
               </el-table-column>
             </ai-table>
@@ -122,7 +122,7 @@ export default {
   methods: {
     loadNode(node, resolve) {
       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) {
             return resolve([{name: `全国  (${res.data})`}]);
           }
@@ -134,7 +134,9 @@ export default {
       if (node.level == 1) {  //全国
         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) {
           res.data.map((item) => {
             item.name = item.name + `(${item.total})`
@@ -161,7 +163,7 @@ export default {
       this.getTableData()
     },
     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) {
           this.info = res.data || {}
         }
@@ -169,8 +171,7 @@ export default {
     },
     getTableData() {
       this.instance.post(`/api/appcorp2/list?areaId=${this.areaId}&name=${this.name}`, null, {
-        ...this.page,
-        ...this.globalParams
+        params: {...this.page, ...this.globalParams}
       }).then(res => {
         if (res?.data) {
           this.gropList = res.data.records

project/oms/apps/statistics/AppCorpStatistics/coDetail.vue

@@ -53,7 +53,7 @@ export default {
 
 <template>
   <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>
       <div class="grid col-2 gap-20">
         <div>