From cef6591ddd244d41696504a53a0aebe7a5980f6a Mon Sep 17 00:00:00 2001
From: zmc <zmc_li@foxmail.com>
Date: 星期三, 22 十一月 2023 14:36:58 +0800
Subject: [PATCH] 1.用import异常图标 2.修改飞行巡检的时间格式 3.修改了部分网络请求为api函数形式
---
src/components/layout/AppLayout.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/components/layout/AppLayout.vue b/src/components/layout/AppLayout.vue
index 4c2e72a..f4c7603 100644
--- a/src/components/layout/AppLayout.vue
+++ b/src/components/layout/AppLayout.vue
@@ -2,7 +2,13 @@
<script >
import AppAside from "./AppAside.vue";
import AppHeader from "./AppHeader.vue"
+import Content from '@/components/core/Content.vue';
export default{
+ components:[
+ AppAside,
+ AppHeader,
+ Content
+ ],
data(){
return{
@@ -16,13 +22,14 @@
</script>
<template>
- <div class="common-layout">
+ <div class="page-container">
<el-container>
<AppAside/>
<el-container class="header-and-main">
<AppHeader/>
- <el-main class="main-content">
- <RouterView/>
+ <el-main >
+ <Content></Content>
+ <!-- <RouterView/> -->
</el-main>
</el-container>
</el-container>
@@ -34,12 +41,16 @@
.header-and-main {
flex-direction: column;
height: 100vh;
+ // min-width: 1445px;
+ min-width: 1475px;
}
-// 鍨傜洿鏂瑰悜婧㈠嚭鍖哄煙绂佹婊氬姩
+/* // 鍨傜洿鏂瑰悜婧㈠嚭鍖哄煙绂佹婊氬姩 */
.el-main {
background-color: #f4f4f5;
padding: 0;
- // overflow-y: hidden;
+}
+* {
+ font-family: 'KaiGenGothicSC-Light';
}
</style>
--
Gitblit v1.9.3