From f7e1471fb9766573d4e2d80a3bf2725b9128fab8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 17 十月 2023 10:45:22 +0800
Subject: [PATCH] modified: src/App.vue modified: src/page/index/index.vue modified: src/page/index/logo.vue modified: src/page/index/tags.vue modified: src/page/index/top/index.vue modified: src/page/login/index.vue modified: src/page/wel.vue
---
src/page/login/index.vue | 4 ++--
src/page/index/index.vue | 2 +-
src/page/index/tags.vue | 2 +-
src/page/index/top/index.vue | 5 ++---
src/page/wel.vue | 3 ++-
src/App.vue | 19 +++++++++++++++++++
src/page/index/logo.vue | 15 ++++++++-------
7 files changed, 35 insertions(+), 15 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d983112..6830291 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -23,4 +23,23 @@
height: 100%;
overflow: hidden;
}
+ /* 鍏ㄥ眬妯℃�佹鏍峰紡 */
+.el-dialog__header,.el-message-box__header {
+ box-sizing: border-box;
+ height: 56px;
+ border-bottom: 1px solid rgb(238, 238, 238);
+ padding: 0px;
+ display: flex;
+ align-items: center;
+}
+.el-dialog__header::before {
+ content: "";
+ display: inline-block;
+ width: 4px;
+ height: 30.24px;
+ background: rgb(0, 95, 201);
+ border-radius: 10px;
+ margin-left: 32px;
+ margin-right: 8.5px;
+}
</style>
diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index efc230f..3b195d5 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -1,6 +1,6 @@
<template>
<div :class="{ 'avue--collapse': isCollapse }" class="avue-contail">
- <div class="avue-header">
+ <div class="avue-header" style="background-color: rgb(160, 46, 109);">
<!-- 椤堕儴瀵艰埅鏍� -->
<top />
</div>
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 788b4b0..a83c1bf 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -1,17 +1,18 @@
<template>
- <div class="avue-logo">
+ <div class="avue-logo" style="background-color:rgb(160, 46, 109);">
<transition-group name="fade">
<template v-if="!keyCollapse">
- <!--<span
- key="1"
+ <span
+ key="1" style="background-color:rgb(160, 46, 109);font-weight: bold; "
class="avue-logo_title" @click="goIndex"><span
- class="logo-lg">{{sysTitle&&sysTitle!='null'?sysTitle:'ASUN-MES'}}</span></span>-->
+ class="logo-lg">{{sysTitle&&sysTitle!='null'?sysTitle:'MES'}}</span>
+ </span>
<!--<span key="1" class="avue-logo_title" @click="goIndex">
<el-image
style="width: 220px;"
src="/images/Sun-Mes-Logo-Normal.png"
/></span>-->
- <div key="1" style="width:220px;height:60px;background-color:white;position: relative;">
+ <div key="1" style="width:220px;height:60px;background-color:rgb(160, 46, 109);position: relative;">
<el-image
v-if="logSrc != null"
style="width:200px;position: absolute;"
@@ -60,8 +61,8 @@
name: 'Logo',
data() {
return {
- sysTitle: 'ASUN-MES',
- logSrc: '/img/logo1.png',
+ sysTitle: 'MES',
+ logSrc: '',
iconNameCn: '',
iconNameEn: ''
}
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index 8c4197a..c71492d 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -1,5 +1,5 @@
<template>
- <div
+ <div style="background-color:rgb(160, 46, 109)"
v-if="showTag"
@click="contextmenuFlag=false"
class="avue-tags">
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 6262812..352d0e3 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -14,8 +14,7 @@
<tags/>
</div>
<div class="top-bar__right">
-
- <el-tooltip
+ <!-- <el-tooltip
v-if="showLock"
effect="dark"
content="涓婚璁剧疆"
@@ -23,7 +22,7 @@
<div class="top-bar__item">
<top-theme></top-theme>
</div>
- </el-tooltip>
+ </el-tooltip> -->
<el-tooltip
v-if="showLock"
effect="dark"
diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 5ba369d..6521cd1 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -3,7 +3,7 @@
<div class="login-new-left"></div>
<div class="login-new-right">
<div class="login-new-weaper">
- <h1>{{ sysTitle && sysTitle != 'null' ? sysTitle : 'ASUN-MES' }}</h1>
+ <h1>{{ sysTitle && sysTitle != 'null' ? sysTitle : 'MES' }}</h1>
<div class="login-new-border"></div>
<div class="login-new-main">
<userLogin v-if="activeName === 'user'" />
@@ -36,7 +36,7 @@
},
data() {
return {
- sysTitle: 'ASUN-MES',
+ sysTitle: 'MES',
tenantList: [],
active: '',
activeName: 'user',
diff --git a/src/page/wel.vue b/src/page/wel.vue
index ef6f539..ac769b3 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -8,7 +8,8 @@
id="myiframe"
>浣犵殑娴忚鍣ㄤ笉鏀寔璇frame鏍囩</iframe
>-->
- <el-image :src="url" style="width:100%;height:100%;"></el-image>
+ <!-- <el-image :src="url" style="width:100%;height:100%;"></el-image> -->
+ 姝ｅ湪寮�鍙�......
</div>
</template>
<style scoped="scoped" lang="scss">
--
Gitblit v1.9.3