From cf0eb9a57cfc625e707899f7268b5778fa11f572 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= <chen.yuda@ebiz-digits.com>
Date: Tue, 27 May 2025 10:55:13 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(components):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20YlTable=20=E7=BB=84=E4=BB=B6=E7=9A=84=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了原有的 docWidth 判断逻辑
- 当表格列数小于等于 3 时，改为直接使用屏幕宽度减去60 作为表格宽度
- 简化了代码结构，提高了可读性和维护性
---
 src/components/YlTable/yl-table-h.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/YlTable/yl-table-h.vue b/src/components/YlTable/yl-table-h.vue
index 47d03f4..1375571 100644
--- a/src/components/YlTable/yl-table-h.vue
+++ b/src/components/YlTable/yl-table-h.vue
@@ -35,10 +35,9 @@ watch(
   () => data.value,
   (newVal) => {
     tableWidth.value = prop.value.length * 100;
-    //   tableWidth.value 判断是否铺满横屏 没有就铺满
-    let docWidth = document.documentElement.clientWidth;
-    if (docWidth - tableWidth.value > 100) {
-      tableWidth.value = docWidth;
+    if (prop.value.length <= 3) {
+      //   tableWidth.value 判断是否铺满横屏 没有就铺满
+      tableWidth.value = document.documentElement.clientWidth - 60;
     }
   },
   {

From 91d1cbc21b550a4c348c3988c9089f2c7e2eae9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= <chen.yuda@ebiz-digits.com>
Date: Tue, 27 May 2025 14:12:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(components):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=92=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-调整 tooltip 内容显示逻辑，优化样式
- 修复饼图数据为空时的显示问题- 优化表格宽度计算逻辑- 修复饼图初始化问题- 优化问卷分析页面样式
---
 src/components/Analysis/Index.vue                    | 11 +++++------
 src/components/YlTable/components/Tootips/Index.vue  |  4 ++--
 src/components/YlTable/yl-table-h.vue                | 11 +++++++++++
 src/hooks/chart/usePieChart.ts                       |  8 +++++++-
 .../components/MineTask/components/QuestionList.vue  |  6 +-----
 src/views/Survey/views/Analysis/Index.vue            |  6 +++---
 .../views/Analysis/components/LogicInfo/Index.vue    | 12 ++++++++++++
 7 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/src/components/Analysis/Index.vue b/src/components/Analysis/Index.vue
index eb21420..9ee725f 100644
--- a/src/components/Analysis/Index.vue
+++ b/src/components/Analysis/Index.vue
@@ -12,6 +12,7 @@ const tableData = ref([]);
 const analysis = defineModel<any>('analysis');
 
 // console.log('analysis', analysis.value);
+const pieChart = useTemplateRef<HTMLSpanElement>('pieChart');
 
 const series = ref([]);
 const dimension = defineModel('dimension');
@@ -47,10 +48,10 @@ watch(
     // console.log(`图标的高度是`, chartHeight.value);
 
     series.value = formatData(dimension.value ? tableData.value : analysis.value, index.value);
-    const pieChart = useTemplateRef<HTMLSpanElement>('pieChart');
     // console.log(`series value `, series.value);
-
-    if (!series.value?.data?.length) return;
+    if (series.value.data.length <= 0) {
+      series.value.data = [{ value: -1, name: '' }];
+    }
     useSetPieChart(pieChart, series, { title: false, legend: false });
   },
   { immediate: true }
@@ -61,9 +62,8 @@ const changeChart = (i: number) => {
 
   series.value = formatData(tableData.value, index.value);
   if (series.value.data.length <= 0) {
-    series.value.data = [{ value: 0, name: 0 }];
+    series.value.data = [{ value: -1, name: '' }];
   }
-  // const pieChart = useTemplateRef<HTMLSpanElement>('pieChart');
   // useSetPieChart(pieChart, series, { title: false, legend: false });
 };
 </script>
@@ -85,7 +85,6 @@ const changeChart = (i: number) => {
 
     <!-- 图表部分 -->
     <div
-      v-if="series?.data?.length"
       class="charts"
       :style="{
         display: 'flex',
diff --git a/src/components/YlTable/components/Tootips/Index.vue b/src/components/YlTable/components/Tootips/Index.vue
index 1e46a20..d0112cb 100644
--- a/src/components/YlTable/components/Tootips/Index.vue
+++ b/src/components/YlTable/components/Tootips/Index.vue
@@ -4,13 +4,13 @@ const content = defineModel<{ row: any; column: any; cellValue: any }>('content'
 
 <template>
   <div class="tooltip-content">
-    <span v-html="content?.row?.text"></span>
+    <span v-html="content?.cellValue"></span>
   </div>
 </template>
 
 <style lang="scss" scoped>
 .tooltip-content {
-  width: 90vw;
+  max-width: 80vw;
   max-height: 45vh;
   overflow: scroll;
 }
diff --git a/src/components/YlTable/yl-table-h.vue b/src/components/YlTable/yl-table-h.vue
index 1375571..585b1d1 100644
--- a/src/components/YlTable/yl-table-h.vue
+++ b/src/components/YlTable/yl-table-h.vue
@@ -38,6 +38,11 @@ watch(
     if (prop.value.length <= 3) {
       //   tableWidth.value 判断是否铺满横屏 没有就铺满
       tableWidth.value = document.documentElement.clientWidth - 60;
+    } else {
+      tableWidth.value =
+        document.documentElement.clientWidth - 60 - prop.value.length * 100 > 0
+          ? document.documentElement.clientWidth
+          : prop.value.length * 100;
     }
   },
   {
@@ -92,6 +97,12 @@ watch(
     margin-right: 10px;
   }
 }
+.el-table--fit .el-table__inner-wrapper:before {
+  width: 0;
+}
+.el-table__empty-text {
+  font-size: 13px;
+}
 </style>
 <style scoped lang="scss">
 .tableThead {
diff --git a/src/hooks/chart/usePieChart.ts b/src/hooks/chart/usePieChart.ts
index b238cca..9155687 100644
--- a/src/hooks/chart/usePieChart.ts
+++ b/src/hooks/chart/usePieChart.ts
@@ -21,7 +21,11 @@ function useSetPieChart(
     if (!dom.value && !series) return;
 
     // 在 dom 挂载之后，显示饼图
-    chartInstance = chart.init(dom.value);
+    // 在 dom 挂载之后，显示饼图
+    if (!chartInstance) {
+      chartInstance = chart.init(dom.value);
+    }
+    // chartInstance = chartInstance ? chartInstance : chart.init(dom.value);
     pieOption.series = JSON.parse(JSON.stringify(series.value));
     // 设置图表选项
     chartInstance.setOption(pieOption, opts);
@@ -29,6 +33,8 @@ function useSetPieChart(
 
   // 如果 data 变动，重新生成图表w
   watch(series, (value) => {
+    console.log(chartInstance);
+
     const currentOptions = chartInstance.getOption();
 
     // 合并新的 series 数据到现有配置中
diff --git a/src/views/Home/components/MineTask/components/QuestionList.vue b/src/views/Home/components/MineTask/components/QuestionList.vue
index febc595..897808b 100644
--- a/src/views/Home/components/MineTask/components/QuestionList.vue
+++ b/src/views/Home/components/MineTask/components/QuestionList.vue
@@ -53,11 +53,7 @@ const slideChange = function (swiper: any) {
         :allow-touch-move="false"
       >
         <swiper-slide v-for="(analysis, index) in questionAnalysis" :key="analysis.stem">
-          <analysis-info
-            :sn="survey?.sn"
-            :questionAnalysis="[analysis]"
-            :parentIndex="[index + 1]"
-          />
+          <analysis-info :sn="survey?.sn" :questionAnalysis="[analysis]" :parentIndex="index + 1" />
         </swiper-slide>
         <div class="empty-container" v-if="questionAnalysis?.length === 0">
           <empty-container :error-msg="'本问卷暂无有效答题数据'" :img-src="emptyImg" />
diff --git a/src/views/Survey/views/Analysis/Index.vue b/src/views/Survey/views/Analysis/Index.vue
index 020bcbf..3f3c7cb 100644
--- a/src/views/Survey/views/Analysis/Index.vue
+++ b/src/views/Survey/views/Analysis/Index.vue
@@ -37,9 +37,9 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div class="search">
-    <search-bar placeholder="请输入关键词" v-if="!disableSearch" :value="''" />
-  </div>
+  <!--  <div class="search">-->
+  <!--    <search-bar placeholder="请输入关键词" v-if="!disableSearch" :value="''" />-->
+  <!--  </div>-->
   <section v-if="currentSurvey" class="survey-container">
     <!--  问卷详情部分  -->
     <van-cell class="survey-item">
diff --git a/src/views/Survey/views/Analysis/components/LogicInfo/Index.vue b/src/views/Survey/views/Analysis/components/LogicInfo/Index.vue
index 8e75a9d..578c2b5 100644
--- a/src/views/Survey/views/Analysis/components/LogicInfo/Index.vue
+++ b/src/views/Survey/views/Analysis/components/LogicInfo/Index.vue
@@ -74,8 +74,20 @@ const debug = ref(false);
         <yl-table
           :data="currentTabs.find((tab) => tab.title === activeTab)?.data"
           :props="currentTabs.find((tab) => tab.title === activeTab)?.props"
+          :emptyText="`此问卷未设置${activeTab}`"
         ></yl-table>
       </section>
     </template>
   </van-cell>
 </template>
+
+<style scoped lang="scss">
+.logic-info {
+  &::after {
+    content: '';
+    border: none;
+    left: 0;
+    width: 0;
+  }
+}
+</style>