Merge branch 'dev_g' of United_Software/k_online_ui into dev

src/views/Dashboard/src/DashboardView.vue

@@ -803,7 +803,7 @@ const ClickParams = (val: any) => {
                 <div><el-switch v-model="item.switchValue" :disabled="item.isRevenueDisplay != undefined && item.isRevenueDisplay == false" /></div>
               </div>
               <div class="content_text">{{ item.text }}</div>
-              <div class="content_text_warining" v-if="item.title == 'Revenue Spent'">*To ensure the accuracy of the data display, this report needs to be configured and displayed after communicating clearly with Sales.</div>
+              <div class="content_text_warining" v-if="item.isRevenueDisplay != undefined && item.isRevenueDisplay == false">*To ensure the accuracy of the data display, this report needs to be configured and displayed after communicating clearly with Sales.</div>
             </div>
             <el-divider />
             <div class="tips">