From e0b0d19b4b95abed5cdb2e5e8933e07c369add62 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 10:04:50 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
screen_standard/src/components/AppLayout.vue | 50 ++++++++++++
screen_standard/src/App.vue | 67 +---------------
screen_standard/src/router/index.js | 6 +
screen_standard/src/assets/main.css | 28 ------
screen_standard/src/views/index.vue | 36 +++++++++
5 files changed, 97 insertions(+), 90 deletions(-)
diff --git a/screen_standard/src/App.vue b/screen_standard/src/App.vue
index 2f80735..9799296 100644
--- a/screen_standard/src/App.vue
+++ b/screen_standard/src/App.vue
@@ -1,73 +1,16 @@
<script setup>
-import { RouterLink, RouterView } from 'vue-router'
+
import AppLayout from './components/AppLayout.vue'
</script>
<template>
<AppLayout />
-
+<<<<<<< HEAD
+
+=======
+>>>>>>> 5103535bcd7b012c0eda4cbb26968066b35704d1
</template>
<style scoped>
-header {
- line-height: 1.5;
- max-height: 100vh;
-}
-.logo {
- display: block;
- margin: 0 auto 2rem;
-}
-
-nav {
- width: 100%;
- font-size: 12px;
- text-align: center;
- margin-top: 2rem;
-}
-
-nav a.router-link-exact-active {
- color: var(--color-text);
-}
-
-nav a.router-link-exact-active:hover {
- background-color: transparent;
-}
-
-nav a {
- display: inline-block;
- padding: 0 1rem;
- border-left: 1px solid var(--color-border);
-}
-
-nav a:first-of-type {
- border: 0;
-}
-
-@media (min-width: 1024px) {
- header {
- display: flex;
- place-items: center;
- padding-right: calc(var(--section-gap) / 2);
- }
-
- .logo {
- margin: 0 2rem 0 0;
- }
-
- header .wrapper {
- display: flex;
- place-items: flex-start;
- flex-wrap: wrap;
- }
-
- nav {
- text-align: left;
- margin-left: -1rem;
- font-size: 1rem;
-
- padding: 1rem 0;
- margin-top: 1rem;
- }
-}
</style>
diff --git a/screen_standard/src/assets/main.css b/screen_standard/src/assets/main.css
index e8667cd..4dc5a1d 100644
--- a/screen_standard/src/assets/main.css
+++ b/screen_standard/src/assets/main.css
@@ -1,35 +1,9 @@
@import './base.css';
#app {
- max-width: 1280px;
margin: 0 auto;
- padding: 2rem;
-
+ height: 100vh;
font-weight: normal;
}
-a,
-.green {
- text-decoration: none;
- color: hsla(160, 100%, 37%, 1);
- transition: 0.4s;
-}
-@media (hover: hover) {
- a:hover {
- background-color: hsla(160, 100%, 37%, 0.2);
- }
-}
-
-@media (min-width: 1024px) {
- body {
- display: flex;
- place-items: center;
- }
-
- #app {
- display: grid;
- grid-template-columns: 1fr 1fr;
- padding: 0 2rem;
- }
-}
diff --git a/screen_standard/src/components/AppLayout.vue b/screen_standard/src/components/AppLayout.vue
index 0197674..f54d402 100644
--- a/screen_standard/src/components/AppLayout.vue
+++ b/screen_standard/src/components/AppLayout.vue
@@ -1,16 +1,64 @@
<template>
<div class="content">
-
+ <div class="header">
+ <div class="header-item" style="font-size: 20px;">璞嗙背绉戞妧</div>
+ <div class="title">DM浜戝伐鍘傝溅闂村ぇ灞�</div>
+ <div class="header-item">澶╂皵</div>
+ </div>
+
+ <div class="num-list">
+
+ </div>
+ <RouterView />
</div>
</template>
<script setup>
+import { reactive } from 'vue';
+import { RouterView } from 'vue-router'
+
+const layoutList = [
+ { bgImg: requir('@/assets/img/bg_zhixingzhong@2x.png'), name: '鎵ц涓鍒掓暟(涓�)', logo: requir('@/assets/img') }
+]
+
</script>
<style lang="scss" scoped>
.content {
background-image: url('@/assets/img/bg@2x.png');
+ background-position: center;
+ background-size: 100% 100%;
+ background-repeat: no-repeat;
+ width: 100%;
+ height: 100%;
+ padding: 30px;
+ box-sizing: border-box;
+ .header {
+ background-image: url('@/assets/img/bg_maintitle@2x.png');
+ background-size: 100% 74px;
+ width: 100%;
+ height: 74px;
+ display: flex;
+ padding-top: 1px;
+ justify-content: space-between;
+ color: #fff;
+ .header-item {
+ width: 200px;
+ }
+ .title {
+ margin-top: 15px;
+ font-size: 25px;
+ font-weight: 500;
+ text-shadow: 0px 2px 17px rgba(0,0,0,0.32);
+ line-height: 25px;
+ text-align: center;
+ }
+ }
+ .num-list {
+ display: flex;
+ justify-content: space-between;
+ }
}
</style>
diff --git a/screen_standard/src/router/index.js b/screen_standard/src/router/index.js
index e58491f..6b2d945 100644
--- a/screen_standard/src/router/index.js
+++ b/screen_standard/src/router/index.js
@@ -1,5 +1,6 @@
import { createRouter, createWebHistory } from 'vue-router'
import HomeView from '../views/HomeView.vue'
+import indexView from '../views/index.vue'
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
@@ -8,6 +9,11 @@
path: '/',
name: 'home',
component: HomeView
+ },
+ {
+ path: '/index',
+ name: 'index',
+ component: indexView
}
]
})
diff --git a/screen_standard/src/views/index.vue b/screen_standard/src/views/index.vue
new file mode 100644
index 0000000..e660a85
--- /dev/null
+++ b/screen_standard/src/views/index.vue
@@ -0,0 +1,36 @@
+<template>
+ <div class="content">
+ <div class="content_left">1</div>
+ <div class="content_center">2</div>
+ <div class="content_right">3</div>
+ </div>
+</template>
+
+
+<script setup>
+
+</script>
+
+<style lang="scss" scoped>
+ .content {
+ width: 100%;
+ height: auto;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .content_left {
+ width: 920px;
+ background-color: aquamarine;
+ }
+ .content_center {
+ flex: 1;
+ margin: 0 40px;
+ background-color: aquamarine;
+ }
+ .content_right {
+ width: 920px;
+ background-color: aquamarine;
+ }
+ }
+</style>
+
\ No newline at end of file
--
Gitblit v1.9.3