From c5f8bee8d8dfb18d7257a2c9f36a4d095a970ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E5=86=A0=E5=AD=A6?= <1109935898@qq.com>
Date: Thu, 26 Oct 2023 11:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=9E=90=EF=BC=8C=E5=9F=BA=E7=A1=80?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=EF=BC=8C=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataAnalyse/diagram/components/DiagramTableFile.vue  | 2 +-
 .../DataAnalyse/diagram/components/DiagramTables.vue     | 2 +-
 src/views/DataAnalyse/diagram/components/MultiChart.vue  | 9 ++++++---
 src/views/DataAnalyse/diagram/components/SingleChart.vue | 2 +-
 .../DataAnalyse/diagram/components/diagram-item-new.vue  | 2 +-
 .../components/questionTypes/basic/ConstantAggregate.vue | 2 +-
 .../components/questionTypes/quick/CascaderType.vue      | 2 +-
 .../components/questionTypes/quick/Institution.vue       | 2 +-
 .../diagram/components/questionTypes/quick/Major.vue     | 2 +-
 .../components/questionTypes/quick/ProvinceCityType.vue  | 2 +-
 .../questionTypes/quick/ProvinceDistrictType.vue         | 2 +-
 11 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue b/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue
index 073a2dae..ee16c39f 100644
--- a/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue
+++ b/src/views/DataAnalyse/diagram/components/DiagramTableFile.vue
@@ -4,7 +4,7 @@
       :align="'center'"
       :columns="columns"
       :dataSource="tableSource"
-      :scroll="{ x: 300, y: 400 }"
+      :scroll="{ x: 300, y: 455 }"
       rowKey="title"
       :pagination="finalPagination"
       class="ant-table-striped"
diff --git a/src/views/DataAnalyse/diagram/components/DiagramTables.vue b/src/views/DataAnalyse/diagram/components/DiagramTables.vue
index 06595c2a..604bee74 100644
--- a/src/views/DataAnalyse/diagram/components/DiagramTables.vue
+++ b/src/views/DataAnalyse/diagram/components/DiagramTables.vue
@@ -67,7 +67,7 @@ const finalPagination = computed(() => {
 })
 
 const scroll = computed(() =>
-  tableSource.value.length >= perPage.value ? { x: '100%', y:420 } : {  x: '100%', y: 420}
+  tableSource.value.length >= perPage.value ? { x: '100%', y:475 } : {  x: '100%', y: 475}
 );
 
 function renderTitle(title) {
diff --git a/src/views/DataAnalyse/diagram/components/MultiChart.vue b/src/views/DataAnalyse/diagram/components/MultiChart.vue
index 5c16601b..b2f75403 100644
--- a/src/views/DataAnalyse/diagram/components/MultiChart.vue
+++ b/src/views/DataAnalyse/diagram/components/MultiChart.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script>
-import { defineComponent, ref, watch , inject} from "vue";
+import { computed, defineComponent, ref, watch , inject} from "vue";
 import { cloneDeep } from "lodash";
 import pieChart from "@/components/chart/PieChart";
 import ChartAction from "@/views/DataAnalyse/diagram/components/ChartAction";
@@ -83,7 +83,9 @@ export default defineComponent({
     const columns = ref([]);
     const head = ref([]);
     const tableSource = ref([]);
-    const scroll = ref({ y: 110, x: 400 });
+    const scroll = computed(() => {
+      return { y: props.data.group_head.length > 0 ? 110 : 165, x: 400 };
+    });
     const source = ref(props.data.option);
     const option = ref({});
 
@@ -187,7 +189,7 @@ export default defineComponent({
         if(data.group_head.length > 0){
           const hasRowGroup = data.head[0]?.key === "rowGroupTitle";
           let keys = [];
-          columns.value = data.group_head.map((groupItem) => {
+          columns.value = data.group_head.map((groupItem, groupIndex) => {
             let children = [];
             children = groupItem.children.map((item) => {
               keys.push(item.key);
@@ -218,6 +220,7 @@ export default defineComponent({
             });
             return {
               ...groupItem,
+              title: () => <RenderTableTitle title={groupItem.title}/>,
               children: children,
             }
           });
diff --git a/src/views/DataAnalyse/diagram/components/SingleChart.vue b/src/views/DataAnalyse/diagram/components/SingleChart.vue
index 19b95edd..efa6cf64 100644
--- a/src/views/DataAnalyse/diagram/components/SingleChart.vue
+++ b/src/views/DataAnalyse/diagram/components/SingleChart.vue
@@ -84,7 +84,7 @@ export default defineComponent({
     const chart = ref(null);
     const columns = ref([]);
     const tableSource = ref([]);
-    const scroll = ref({ y: 135, x: 400 });
+    const scroll = ref({ y: 230, x: 400 });
     const source = ref([]);
     const option = ref({});
     const other =
diff --git a/src/views/DataAnalyse/diagram/components/diagram-item-new.vue b/src/views/DataAnalyse/diagram/components/diagram-item-new.vue
index 2dc15360..c73d6e7d 100644
--- a/src/views/DataAnalyse/diagram/components/diagram-item-new.vue
+++ b/src/views/DataAnalyse/diagram/components/diagram-item-new.vue
@@ -193,7 +193,7 @@ function fullScreen() {
 .diagram-item {
   box-sizing: border-box;
   position: relative;
-  height: 640px;
+  height: 695px;
   padding: 24px 32px 24px 32px;
   background: #fff;
   border-radius: 6px;
diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue b/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue
index 6a59de23..a71a7ab9 100644
--- a/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue
+++ b/src/views/DataAnalyse/diagram/components/questionTypes/basic/ConstantAggregate.vue
@@ -66,7 +66,7 @@ export default defineComponent({
     const tableInstance = inject('tableInstance')
 
     const chart = ref(null);
-    const scroll = ref({ y: 140, x: 400 });
+    const scroll = ref({ y: 195, x: 400 });
     const option = ref({})
     const options = ref({
       legendData: [],
diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue
index 19ce3598..70f45832 100644
--- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue
+++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/CascaderType.vue
@@ -69,7 +69,7 @@ const chart = ref(null);
 
 const columns = ref([]);
 const tableSource = ref([]);
-const scroll = ref({ y: 140, x: 400 });
+const scroll = ref({ y: 195, x: 400 });
 const source = ref(props.data.option);
 const option = ref({});
 const chart_params = ref({});
diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue
index d0af3f89..ba70ae5c 100644
--- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue
+++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Institution.vue
@@ -71,7 +71,7 @@ const chart = ref(null);
 
 const columns = ref([]);
 const tableSource = ref([]);
-const scroll = ref({ y: 135, x: 400 });
+const scroll = ref({ y: 230, x: 400 });
 const source = ref(props.data.option);
 const option = ref({});
 const chart_params = ref({});
diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue
index 3ee11008..3a6212ad 100644
--- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue
+++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/Major.vue
@@ -71,7 +71,7 @@ const chart = ref(null);
 
 const columns = ref([]);
 const tableSource = ref([]);
-const scroll = ref({ y: 135, x: 400 });
+const scroll = ref({ y: 230, x: 400 });
 const source = ref(props.data.option);
 const option = ref({});
 const chart_params = ref({});
diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue
index d20d6dbd..64b7e703 100644
--- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue
+++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceCityType.vue
@@ -70,7 +70,7 @@ const chart = ref(null);
 
 const columns = ref([]);
 const tableSource = ref([]);
-const scroll = ref({ y: 135, x: 400 });
+const scroll = ref({ y: 230, x: 400 });
 const source = ref(props.data.option);
 const option = ref({});
 const chart_params = ref({});
diff --git a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue
index ff08ccc2..1d75d193 100644
--- a/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue
+++ b/src/views/DataAnalyse/diagram/components/questionTypes/quick/ProvinceDistrictType.vue
@@ -70,7 +70,7 @@ const chart = ref(null);
 
 const columns = ref([]);
 const tableSource = ref([]);
-const scroll = ref({ y: 135, x: 400 });
+const scroll = ref({ y: 230, x: 400 });
 const source = ref(props.data.option);
 const option = ref({});
 const chart_params = ref({});