From b70db122cd86c379aa7cf5d924dc742c5d4dd2d4 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 7 Dec 2023 20:21:09 +0800
Subject: [PATCH] 2023-12-7

---
 src/components/XyTable/index.vue              |  8 +++++++-
 src/views/dashboard/index.vue                 | 16 ++++++++--------
 src/views/finance/paymentRegistrationList.vue |  3 ++-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index 01aadf1..9a391d3 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -1,6 +1,10 @@
 <script>
 export default {
   props:{
+    highlightCurrentRow: {
+      type: Boolean,
+      default: false
+    },
     height:{
       type:Number
     },
@@ -146,7 +150,7 @@ export default {
   mounted() {
   },
   render(h) {
-    let {rowKey,expandRowKeys,selectChange,selectAllClick,summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick,rowClick,objectSpanMethod} = this
+    let {highlightCurrentRow,rowKey,expandRowKeys,selectChange,selectAllClick,summaryMethod,cellClick,btnWidth,selectClick,height,createIndexRow,tableStyle,treeProps,showSummary,showHeader,$scopedSlots,showIndex,defaultExpandAll,headerCellStyle,headerRowStyle,rowStyle,cellStyle,indent,tableHeight,tableItem,list,deleteClick,editorClick,rowClick,objectSpanMethod} = this
     return (
       <div className="table-tree" style={{ 'position': 'relative' }}>
         {tableItem && tableItem.length > 0 ?
@@ -163,6 +167,7 @@ export default {
             cell-style={cellStyle}
             indent={indent}
             data={list}
+            highlight-current-row={highlightCurrentRow}
             expand-row-keys={expandRowKeys}
             height={height ?? tableHeight}
             className="v-table"
@@ -173,6 +178,7 @@ export default {
             tree-props={treeProps}
             fit={true}
             on={{
+              ['row-click']: rowClick,
               ['select']: selectClick,
               ['cell-click']: cellClick,
               ['select-all']: selectAllClick,
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index db7c6df..b1e0080 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -607,7 +607,7 @@ export default {
             type: 'bar',
             barWidth: barWidth,
             name: `${this.carrySelect.month}计划`,
-            barGap: "96%", //相邻柱子间距
+            barGap: "90%", //相邻柱子间距
             itemStyle: {
               borderRadius: [0, 0, 0, 0],//柱子四周圆角
               color: color1//柱子左右颜色（深，浅）
@@ -617,7 +617,7 @@ export default {
               show: true,
               position: 'top',
               textStyle: {//数值样式
-                fontSize: '5px',
+                fontSize: 12,
                 color: '#4d8bdc',
               },
               formatter: params => `${params.value}%`
@@ -629,7 +629,7 @@ export default {
             type: "pictorialBar",
             data: constData1,//此数据对应底部组件
             symbol: "diamond",//底部组件形状，不写默认为椭圆
-            symbolOffset: ["-196%", "50%"],//与柱子的偏移角度
+            symbolOffset: ["-190%", "50%"],//与柱子的偏移角度
             symbolSize: [barWidth, 10],//底面[宽，高]
             itemStyle: {
               normal: {
@@ -647,7 +647,7 @@ export default {
             symbolPosition: "end",
             data: showData1,//此数据对应顶部组件
             symbol: "diamond",
-            symbolOffset: ["-234%", "-50%"],
+            symbolOffset: ["-230%", "-50%"],
             symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
             itemStyle: {
               normal: {
@@ -674,7 +674,7 @@ export default {
               show: true,
               position: 'top',
               textStyle: {//数值样式
-                fontSize: '5px',
+                fontSize: 12,
                 color: '#4d8bdc',
               },
               formatter: params => `${params.value}%`
@@ -731,7 +731,7 @@ export default {
               show: true,
               position: 'top',
               textStyle: {//数值样式
-                fontSize: '5px',
+                fontSize: 12,
                 color: '#4d8bdc',
               },
               formatter: params => `${params.value}%`
@@ -743,7 +743,7 @@ export default {
             type: "pictorialBar",
             data: constData3,
             symbol: "diamond",
-            symbolOffset: ["196%", "50%"],
+            symbolOffset: ["192%", "50%"],
             symbolSize: [barWidth, 10],
             itemStyle: {
               normal: {
@@ -761,7 +761,7 @@ export default {
             symbolPosition: "end",
             data: showData3,
             symbol: "diamond",
-            symbolOffset: ["237%", "-50%"],
+            symbolOffset: ["233%", "-50%"],
             symbolSize: [barWidth - 4, (10 * (barWidth - 4)) / barWidth],
             itemStyle: {
               normal: {
diff --git a/src/views/finance/paymentRegistrationList.vue b/src/views/finance/paymentRegistrationList.vue
index 20e4f2a..1c58d9c 100644
--- a/src/views/finance/paymentRegistrationList.vue
+++ b/src/views/finance/paymentRegistrationList.vue
@@ -75,7 +75,7 @@
       :width="720"
       @on-ok="planSelectForSearch"
     >
-      <template v-slot:normalContent>
+      <template>
         <Input
           v-model="planSearch.name"
           search
@@ -101,6 +101,7 @@
           >
         </div>
         <xy-table
+          highlight-current-row
           :list="plans"
           @rowClick="selectPlanForSearch"
           :show-index="false"