From 3c34800c7a653974e6fa4d77a68edf3fb1a99bfd Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 30 Jan 2024 15:50:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=B2=92=E5=BA=A6=E4=B8=BA=E5=B9=B4=E6=9C=88?=
 =?UTF-8?q?=EF=BC=8C=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=9C=88=E4=B8=BA=E5=8D=95=E4=BD=8D=E6=97=A0=E6=B3=95=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8A=A8=E6=80=81=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/pom.xml                        |  4 ++--
 .../custom-component/v-query/DynamicTimeRange.vue | 15 ++-------------
 .../src/custom-component/v-query/time-format.ts   |  2 +-
 core/core-frontend/src/router/index.ts            |  7 -------
 4 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/core/core-frontend/pom.xml b/core/core-frontend/pom.xml
index 302a387805..4bb88670f4 100644
--- a/core/core-frontend/pom.xml
+++ b/core/core-frontend/pom.xml
@@ -49,7 +49,7 @@
             </configuration>
           </execution>-->
           <!--前端组件有更新需要放开-->
-          <execution>
+          <!--<execution>
             <id>npm install</id>
             <goals>
               <goal>npm</goal>
@@ -57,7 +57,7 @@
             <configuration>
               <arguments>install</arguments>
             </configuration>
-          </execution>
+          </execution>-->
 
           <execution>
             <id>npm run build</id>
diff --git a/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue b/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
index e41738bc83..1c30ea34a3 100644
--- a/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
+++ b/core/core-frontend/src/custom-component/v-query/DynamicTimeRange.vue
@@ -45,8 +45,6 @@ const props = defineProps({
   }
 })
 const selectValue = ref<[Date, Date]>([new Date(), new Date()])
-const rendering = ref(true)
-
 const { config } = toRefs(props)
 
 const timeConfig = computed(() => {
@@ -81,11 +79,7 @@ const timeConfig = computed(() => {
 watch(
   () => timeConfig.value,
   () => {
-    rendering.value = false
-    nextTick(() => {
-      init()
-      rendering.value = true
-    })
+    init()
   },
   {
     deep: true
@@ -103,11 +97,7 @@ watch(
 watch(
   () => config.value.id,
   () => {
-    rendering.value = false
-    nextTick(() => {
-      init()
-      rendering.value = true
-    })
+    init()
   }
 )
 
@@ -164,7 +154,6 @@ const formatDate = computed(() => {
 <template>
   <el-date-picker
     disabled
-    v-if="rendering"
     v-model="selectValue"
     :type="config.timeGranularityMultiple"
     :prefix-icon="Calendar"
diff --git a/core/core-frontend/src/custom-component/v-query/time-format.ts b/core/core-frontend/src/custom-component/v-query/time-format.ts
index 8f663383df..1705023e75 100644
--- a/core/core-frontend/src/custom-component/v-query/time-format.ts
+++ b/core/core-frontend/src/custom-component/v-query/time-format.ts
@@ -85,7 +85,7 @@ function getCustomTime(
     resultMonth = resultMonth % 12
   } else if (resultMonth < 0) {
     resultYear += parseInt(`${resultMonth / 12}`) - 1
-    resultMonth = month + (resultMonth % 12)
+    resultMonth = (resultMonth % 12) + 12
   } else if (resultMonth === 0) {
     resultYear += parseInt(`${resultMonth / 12}`) - 1
     resultMonth = 12
diff --git a/core/core-frontend/src/router/index.ts b/core/core-frontend/src/router/index.ts
index 1ebe8639d5..a6d785a921 100644
--- a/core/core-frontend/src/router/index.ts
+++ b/core/core-frontend/src/router/index.ts
@@ -27,13 +27,6 @@ export const routes: AppRouteRecordRaw[] = [
     meta: {},
     component: () => import('@/views/login/index.vue')
   },
-  {
-    path: '/home',
-    name: 'home',
-    hidden: true,
-    meta: {},
-    component: () => import('@/views/home/index.vue')
-  },
   {
     path: '/dvCanvas',
     name: 'dvCanvas',