浏览代码

Merge branch 'master_g' of United_Software/k_online_ui into master

Jack Zhou 5 月之前
父节点
当前提交
f5786b144e
共有 2 个文件被更改,包括 9 次插入3 次删除
  1. 1 2
      src/auto-imports.d.ts
  2. 8 1
      src/views/Dashboard/src/DashboardView.vue

+ 1 - 2
src/auto-imports.d.ts

@@ -3,7 +3,6 @@
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
 // Generated by unplugin-auto-import
-// biome-ignore lint: disable
 export {}
 declare global {
   const $api: typeof import('@/api/index')['default']
@@ -69,6 +68,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }

+ 8 - 1
src/views/Dashboard/src/DashboardView.vue

@@ -20,6 +20,7 @@ const SaveVisible = ref(false)
 interface ManagementItem {
   title: string
   switchValue: boolean
+  isRevenueDisplay: boolean
   text: string
   id: number
   title1: string
@@ -798,9 +799,10 @@ const ClickParams = (val: any) => {
             <div class="management_content" v-for="(item, index) in Management" :key="index">
               <div class="management_flex">
                 <div class="content_title">{{ item.title }}</div>
-                <div><el-switch v-model="item.switchValue" /></div>
+                <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.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">
@@ -1264,6 +1266,11 @@ const ClickParams = (val: any) => {
   font-size: var(--font-size-2);
   line-height: 16px;
 }
+.content_text_warining {
+  color: var(--color-warning);
+  font-size: var(--font-size-2);
+  line-height: 16px;
+}
 .tips {
   display: flex;
   justify-content: center;