From 921b268d9fe58ba299604b8d6c8ca21e3ff37fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 24 Oct 2021 10:42:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=A6=96=E9=A1=B5=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=B1=95=E7=A4=BA=E6=96=B0=E6=89=8B=E5=BC=95=E5=AF=BC?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/utils/util.js                  |  6 +++++-
 jshERP-web/src/views/dashboard/IndexChart.vue | 17 ++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/utils/util.js b/jshERP-web/src/utils/util.js
index 26b3405d..d1c7d753 100644
--- a/jshERP-web/src/utils/util.js
+++ b/jshERP-web/src/utils/util.js
@@ -665,10 +665,14 @@ export function sheet2blob (aoa, sheetName) {
 export function handleIntroJs(module, cur_version) {
   //每个页面设置不同的缓存变量名称，不可以重复，有新版本时，更新cur_version
   //有新版本更新时才出现一次引导页， 第二次进入进不再出现， 这里有缓存来判断
+  let introJsObj = introJs()
+  if(module !== 'indexChart') {
+    introJsObj = introJs('.ant-modal-cust-warp')
+  }
   if (Vue.ls.get('intro_cache_' + module) === cur_version) {
     return;
   }
-  introJs(".ant-modal-cust-warp").setOptions({
+  introJsObj.setOptions({
     prevLabel: '&larr; 上一步',
     nextLabel: '下一步 &rarr;',
     doneLabel: '知道了',
diff --git a/jshERP-web/src/views/dashboard/IndexChart.vue b/jshERP-web/src/views/dashboard/IndexChart.vue
index 225177b8..7a89db15 100644
--- a/jshERP-web/src/views/dashboard/IndexChart.vue
+++ b/jshERP-web/src/views/dashboard/IndexChart.vue
@@ -2,7 +2,7 @@
   <div class="page-header-index-wide">
     <a-row :gutter="24">
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="今日累计销售" data-step="1" data-intro="统计今日零售和销售单据的总金额">
+        <chart-card :loading="loading" title="今日累计销售" data-step="1" data-title="今日累计销售" data-intro="统计今日零售和销售单据的总金额">
           <a-tooltip title="统计今日零售和销售单据的总金额" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
@@ -10,7 +10,7 @@
         </chart-card>
       </a-col>
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="本月累计销售" data-step="2" data-intro="统计本月零售和销售单据的总金额">
+        <chart-card :loading="loading" title="本月累计销售" data-step="2" data-title="本月累计销售" data-intro="统计本月零售和销售单据的总金额">
           <a-tooltip title="统计本月零售和销售单据的总金额" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
@@ -18,7 +18,7 @@
         </chart-card>
       </a-col>
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="今日累计采购" data-step="3" data-intro="统计今日采购单据的总金额">
+        <chart-card :loading="loading" title="今日累计采购" data-step="3" data-title="今日累计采购" data-intro="统计今日采购单据的总金额">
           <a-tooltip title="统计今日采购单据的总金额" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
@@ -26,7 +26,7 @@
         </chart-card>
       </a-col>
       <a-col :sm="24" :md="12" :xl="6" :style="{ marginBottom: '24px' }">
-        <chart-card :loading="loading" title="本月累计采购" data-step="4" data-intro="统计本月采购单据的总金额">
+        <chart-card :loading="loading" title="本月累计采购" data-step="4" data-title="本月累计采购" data-intro="统计本月采购单据的总金额">
           <a-tooltip placement="left" title="统计本月采购单据的总金额" slot="action">
             <a-icon type="info-circle-o" />
           </a-tooltip>
@@ -36,19 +36,22 @@
     </a-row>
     <a-row :gutter="24">
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
-        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="5" data-intro="统计往前6个月每月销售的总金额">
+        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="5" data-title="销售统计"
+                data-intro="统计往前6个月每月销售的总金额">
           <bar title="销售统计" :height="410" :yaxisText="yaxisText" :dataSource="salePriceData"/>
         </a-card>
       </a-col>
       <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
-        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="6" data-intro="统计往前6个月每月采购的总金额">
+        <a-card :loading="loading" :bordered="false" :body-style="{paddingRight: '5'}" data-step="6" data-title="采购统计"
+                data-intro="统计往前6个月每月采购的总金额">
           <bar title="采购统计" :height="410" :yaxisText="yaxisText" :dataSource="buyPriceData"/>
         </a-card>
       </a-col>
     </a-row>
     <a-row :gutter="24">
       <a-col :sm="24" :md="24" :xl="24" :style="{ marginBottom: '5px' }">
-        <a-card :bordered="false" :body-style="{padding: '5'}" data-step="7" data-intro="展示服务到期时间（快到期时会出现续费链接，请注意及时续费）、
+        <a-card :bordered="false" :body-style="{padding: '5'}" data-step="7" data-title="服务和版权"
+                data-intro="展示服务到期时间（快到期时会出现续费链接，请注意及时续费）、
           用户数量（是指最多可以录入的用户数量）、版权信息">
           <div class="hidden-xs" style="float:right;">&copy; 2015-2030 {{systemTitle}} V3.0</div>
           <a-tag v-if="tenant.type==0" color="blue">试用到期：{{tenant.expireTime}}</a-tag>