Browse Source

feat: 修复bug

tangning 2 năm trước cách đây
mục cha
commit
05dc6ea5da

+ 4 - 4
src/views/dealer/components/financeModal.vue

@@ -53,7 +53,7 @@
         },{
           field: 'majorAddNum',
           component: 'InputNumber',
-          label: '专业会员(年)剩余可售 0  新增',
+          label: '专业会员(年)剩余可售 0  新增',
           suffix:'年',
           defaultValue: 0,
           componentProps: {
@@ -66,7 +66,7 @@
         },{
           field: 'highAddNum',
           component: 'InputNumber',
-          label: '高级会员(月)剩余可售 0  新增',
+          label: '高级会员(月)剩余可售 0  新增',
           defaultValue: 0,
           ifShow:false,
           suffix:'月',
@@ -114,10 +114,10 @@
         setTimeout(()=>{
           updateSchema([{
             field: 'majorAddNum',
-            label: `专业会员(年)剩余可售 ${data.majorSubNum || 0}  新增`,
+            label: `专业会员(年)剩余可售 ${data.majorSubNum || 0}  新增`,
           },{
             field: 'highAddNum',
-            label: `高级会员(月)剩余可售 ${data.highSubNum || 0}  新增`,
+            label: `高级会员(月)剩余可售 ${data.highSubNum || 0}  新增`,
             ifShow: isDev.value,
           },{
             field: 'downAddNum',

+ 2 - 1
src/views/statistics/components/condition.vue

@@ -42,6 +42,7 @@ const props = defineProps({
   type: String,
   timeType: String,
   name:Object,
+  selectTimeType:Number,
 });
 
 type RangeValue = [Dayjs, Dayjs];
@@ -49,7 +50,7 @@ const picker = ref('date');
 const type = ref(props.timeType ||'0');
 const value = ref(props.type ||'0');
 const selectPriceDate = ref(dayjs().subtract(6,'month').format('YYYY-MM-DD'))
-const selectTime = ref<RangeValue>([dayjs().subtract(6,'month').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]);
+const selectTime = ref<RangeValue>([dayjs().subtract(props.selectTimeType == 1 ? 1:6,'month').format('YYYY-MM-DD'), dayjs().format('YYYY-MM-DD')]);
 const options = ref<SelectProps['options']>([
   {
     value: '0',

+ 3 - 2
src/views/statistics/viewKankan/lineEcharts.vue

@@ -1,7 +1,7 @@
 <template>
   <Card :title="title" :loading="loading">
     <template #extra>
-      <condition :type="title=='管理中心用户活跃度统计'?'0':'2'"  :typeShow="title=='管理中心用户活跃度统计'" @change="Search"  @expor="handleExport" />
+      <condition :selectTimeType="1"  :type="title=='管理中心用户活跃度统计'?'0':'2'"  :typeShow="title=='管理中心用户活跃度统计'" @change="Search"  @expor="handleExport" />
     </template>
       <div ref="chartRef" :style="{ height, width }"></div>
   </Card>
@@ -24,7 +24,7 @@
   });
   const value = ref(1);
   const SearchData = reactive({
-    startTime: dayjs().subtract(6,'month').format('YYYY-MM-DD'),
+    startTime: dayjs().subtract(props.title == '云容量趋势分析'?6:1,'month').format('YYYY-MM-DD'),
     endTime: dayjs().format('YYYY-MM-DD'),
     timeType: props.title == '云容量趋势分析'?'month':'day',
     infoType: props.title == '云容量趋势分析'?'add':'all',
@@ -118,6 +118,7 @@
         data: yixStringData.value,
       },
       yAxis: {
+        name:props.title=='云容量趋势分析'?'容量/G':'',
         type: 'value',
         splitNumber: 4,
       },