界面调整

src/components/HKVideo/video-container2.vue

@@ -12,7 +12,7 @@
       <div class="tag" :title="item.name">
         <div class="name">{{ item.name }}</div>
       </div>
-      <HKVideo :dot_data="item" :height="8" />
+      <HKVideo :dot_data="item" :height="558" />
     </div>
   </div>
   <div v-else-if="videoData.length >= 5 && videoData.length <= 6" class="video-container3">

src/components/TimeAxis/index.vue

@@ -268,8 +268,9 @@ onMounted(() => {
   &::after {
     content: '';
     position: absolute;
-    top: 0;
+    top: 50%;
     right: -15px;
+    transform: translateY(-50%);
     width: 9px;
     height: 142px;
     background: url('@/assets/images/timeAxis/timeRight.png') no-repeat;

src/layout/components/Navbar.vue

@@ -155,7 +155,7 @@ const logout = async () => {
     type: 'warning'
   });
   await userStore.logout();
-  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+  location.href = import.meta.env.VITE_APP_CONTEXT_PATH + '#' + 'index';
 };
 
 const emits = defineEmits(['setLayout']);

src/layout/components/SocialCallback/index.vue

@@ -30,14 +30,14 @@ const processResponse = async (res: any) => {
   }
   ElMessage.success(res.msg);
   setTimeout(() => {
-    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + '#' + 'index';
   }, 2000);
 };
 
 const handleError = (error: any) => {
   ElMessage.error(error.message);
   setTimeout(() => {
-    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+    location.href = import.meta.env.VITE_APP_CONTEXT_PATH + '#' + 'index';
   }, 2000);
 };
 

src/types/components.d.ts

@@ -20,6 +20,7 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -41,17 +42,28 @@ declare module 'vue' {
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopover: typeof import('element-plus/es')['ElPopover']
+    ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTabPane: typeof import('element-plus/es')['ElTabPane']
+    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
+    ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
@@ -62,6 +74,7 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
@@ -97,4 +110,7 @@ declare module 'vue' {
     YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
+  export interface ComponentCustomProperties {
+    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
+  }
 }

src/utils/request.ts

@@ -134,7 +134,7 @@ service.interceptors.response.use(
         }).then(() => {
           isRelogin.show = false;
           useUserStore().logout().then(() => {
-              location.href = import.meta.env.VITE_APP_CONTEXT_PATH + 'index';
+              location.href = import.meta.env.VITE_APP_CONTEXT_PATH + '#' + 'index';
             });
         }).catch(() => {
           isRelogin.show = false;

src/views/globalMap/LeftMenu.vue

@@ -205,9 +205,9 @@ defineExpose({ setMenuChange });
     top: 100px;
     left: 0;
     background-color: #0d1d4e;
-    border: 1px solid #2C81FF;
+    border: 1px solid #2c81ff;
     width: 815px;
-    color: #000;
+    color: #00e8ff;
     font-size: 46px;
     z-index: 9;
 
@@ -260,7 +260,7 @@ defineExpose({ setMenuChange });
   .menu-header {
     display: flex;
     margin-top: 65px;
-    height: 78px;
+    height: 88px;
 
     .menu-item {
       width: 339px;
@@ -297,7 +297,6 @@ defineExpose({ setMenuChange });
     overflow-x: hidden;
     .content-box {
       padding: 0 10px;
-      margin-top: 10px;
       width: 779px;
       background: url('@/assets/images/menu/menuContent.png') no-repeat;
       background-size: 100% 100%;

src/views/routineCommandMap/RightSection/index.vue

@@ -339,4 +339,8 @@ onMounted(() => {
     }
   }
 }
+.table-content {
+  height: 240px;
+  overflow-y: auto;
+}
 </style>