From 78242d39851256ca0172fd8a0442e96a35462e20 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 1 Aug 2024 19:46:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E6=97=A5=E5=8E=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BDbug=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                        |  2 +-
 src/views/invest/accountCalendar/index.vue | 54 +++++++++++-----------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 8a64db4..ba77e17 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -65,7 +65,7 @@ export const constantRoutes = [
   {
     path: '',
     component: Layout,
-    redirect: '/newindex'
+    redirect: '/accountCalendar'
     // children: [
     //   {
     //     path: '/index',
diff --git a/src/views/invest/accountCalendar/index.vue b/src/views/invest/accountCalendar/index.vue
index fc8e17c..3fe0af4 100644
--- a/src/views/invest/accountCalendar/index.vue
+++ b/src/views/invest/accountCalendar/index.vue
@@ -1,35 +1,37 @@
 <template>
-  <!-- 这里是自定义头部，切换视图类型和切换日期 -->
-  <div class="calendarHeader">
-    <div class="header_left">
-      <h1>{{ type === '3' ? '列表' : calendarTitle }}</h1>
-    </div>
-    <div class="header_right">
-      <!-- <span v-if="type!=='3'&&isShowBack" class="blue-color backToday" @click="getToday()">{{ type==='1'?'返回本月':'返回本周' }}</span>
+  <div class="app-container">
+    <!-- 这里是自定义头部，切换视图类型和切换日期 -->
+    <div class="calendarHeader">
+      <div class="header_left">
+        <h1>{{ type === '3' ? '列表' : calendarTitle }}</h1>
+      </div>
+      <div class="header_right">
+        <!-- <span v-if="type!=='3'&&isShowBack" class="blue-color backToday" @click="getToday()">{{ type==='1'?'返回本月':'返回本周' }}</span>
         <el-select v-model="type" placeholder="视图类型" style="width: 80px" size="small" class="header_select" @change="handleChangeType">
           <el-option label="月" value="1" />
           <el-option label="周" value="2" />
           <el-option label="列" value="3" />
         </el-select> -->
-      <!-- 选择月份的日期框 -->
-      <el-date-picker
-        v-if="type === '1'"
-        v-model="showMonth"
-        type="month"
-        size="small"
-        :clearable="false"
-        placeholder="请选择日期"
-        style="margin-left: 10px; vertical-align: middle"
-        @change="changeDate"
-      />
-      <el-button-group v-if="type === '2'" style="margin-left: 10px">
-        <el-button size="small" class="el-icon-arrow-left" @click="getPrev()">上一周</el-button>
-        <el-button size="small" @click="getNext()">下一周<i class="el-icon-arrow-right" /></el-button>
-      </el-button-group>
+        <!-- 选择月份的日期框 -->
+        <el-date-picker
+          v-if="type === '1'"
+          v-model="showMonth"
+          type="month"
+          size="small"
+          :clearable="false"
+          placeholder="请选择日期"
+          style="margin-left: 10px; vertical-align: middle"
+          @change="changeDate"
+        />
+        <el-button-group v-if="type === '2'" style="margin-left: 10px">
+          <el-button size="small" class="el-icon-arrow-left" @click="getPrev()">上一周</el-button>
+          <el-button size="small" @click="getNext()">下一周<i class="el-icon-arrow-right" /></el-button>
+        </el-button-group>
+      </div>
     </div>
+    <!-- 月视图和周视图显示，列视图显示表格形式 -->
+    <div v-show="type !== '3'" ref="fullcalendar" class="card" />
   </div>
-  <!-- 月视图和周视图显示，列视图显示表格形式 -->
-  <div v-show="type !== '3'" ref="fullcalendar" class="card" />
 </template>
 
 <script>
@@ -71,10 +73,6 @@ export default {
         magenta: { title: '#EB2F96', class: 'magenta' }
       },
       fullcalendar: ref(),
-      queryParams: {
-        type: null,
-        time: ''
-      },
       nowDate: new Date(),
       infoList: [], // 日历显示的列信息
       categoryJSON: {} // 计划分类json