From 421ee711aa469f00eaff610cfa85ad1d4b755688 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 19 十月 2023 08:49:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/wel/Statistic.vue |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/wel/Statistic.vue b/Source/UBCS-WEB/src/views/wel/Statistic.vue
index 9f9d094..e94e248 100644
--- a/Source/UBCS-WEB/src/views/wel/Statistic.vue
+++ b/Source/UBCS-WEB/src/views/wel/Statistic.vue
@@ -4,7 +4,6 @@
       <el-button icon="el-icon-more" plain size="small" type="primary" @click="MoreHandler">鏇村</el-button>
     </div>
     <avue-data-box ref="dataBox" :animation="true" :option="option"  ></avue-data-box>
-<!--      <avue-data-panel :animation="true":option="option"></avue-data-panel>-->
     <el-dialog :visible.sync="dialogTableVisible" append-to-body class="avue-dialog avue-dialog--top" title="涓绘暟鎹厤缃�"
                top="0">
       <avue-crud ref="crud"
@@ -106,7 +105,7 @@
               info.style.fontSize = '16px';
             });
             items.forEach((item) => {
-              item.style.border = '1px solid  rgb(200, 200, 200, 1)'; // 娣诲姞杈规鏍峰紡
+              item.style.border = '1px solid  rgb(200, 200, 200, 1)';
             });
             this.loading=false;
           }, 1000); // 寤惰繜1绉掓煡鎵緄nfo鍏冪礌
@@ -137,7 +136,7 @@
 
           this.MasterGetList()
           this.dialogTableVisible = false;
-          //瀛椾綋閲嶆柊鍔犺浇鍙樺ぇ
+          //瀛椾綋鍜岃竟妗嗛噸鏂板姞杞�
           this.loading=true;
           this.FontInfo()
         }

--
Gitblit v1.9.3