From 9afd2def60737f157f00a1976a4c20c01b1fbefd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 07 十月 2023 17:57:34 +0800
Subject: [PATCH] modified: src/App.vue modified: src/page/index/index.vue modified: src/page/index/logo.vue modified: src/page/index/sidebar/index.vue modified: src/page/index/tags.vue modified: src/page/index/top/index.vue modified: src/page/wel.vue modified: vue.config.js
---
vue.config.js | 2
src/page/index/index.vue | 2
src/page/index/tags.vue | 2
src/page/index/top/index.vue | 4 +-
src/page/wel.vue | 5 ++
src/page/index/sidebar/index.vue | 22 ++--------
src/App.vue | 34 +++++++++++++----
src/page/index/logo.vue | 14 +++---
8 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index d983112..feac764 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
<template>
<div id="app">
- <router-view/>
+ <router-view />
</div>
</template>
@@ -12,15 +12,33 @@
},
computed: {},
watch: {},
- created() {
- },
+ created() {},
methods: {}
}
</script>
<style lang="scss">
- #app {
- width: 100%;
- height: 100%;
- overflow: hidden;
- }
+#app {
+ width: 100%;
+ 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: #875a7b;
+ 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..ed3f1d4 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: #875a7b;">
<!-- 椤堕儴瀵艰埅鏍� -->
<top />
</div>
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 788b4b0..6c143cb 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -2,22 +2,22 @@
<div class="avue-logo">
<transition-group name="fade">
<template v-if="!keyCollapse">
- <!--<span
- key="1"
+ <span
+ key="1" style="background-color:#875a7b;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;">
- <el-image
+ <div key="1" style="width:220px;height:60px;background-color:#875a7b;position: relative;">
+ <!-- <el-image
v-if="logSrc != null"
style="width:200px;position: absolute;"
class="left-logo-image"
:src="logSrc"
- />
+ /> -->
<!--<el-image
v-else
style="width: 220px;position: absolute;"
@@ -60,7 +60,7 @@
name: 'Logo',
data() {
return {
- sysTitle: 'ASUN-MES',
+ sysTitle: 'MES',
logSrc: '/img/logo1.png',
iconNameCn: '',
iconNameEn: ''
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index 63c1e67..fce8399 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -1,22 +1,10 @@
<template>
<div class="avue-sidebar">
- <logo/>
+ <logo />
<el-scrollbar style="height:100%">
- <div
- v-if="validatenull(menu)"
- class="avue-sidebar--tip">娌℃湁鍙戠幇鑿滃崟</div>
- <el-menu
- :default-active="nowTagValue"
- :show-timeout="200"
- :collapse="keyCollapse"
- unique-opened
- mode="vertical">
- <sidebar-item
- :menu="menu"
- :screen="screen"
- :props="website.menu.props"
- :collapse="keyCollapse"
- first/>
+ <div v-if="validatenull(menu)" class="avue-sidebar--tip">娌℃湁鍙戠幇鑿滃崟</div>
+ <el-menu :default-active="nowTagValue" :show-timeout="200" :collapse="keyCollapse" unique-opened mode="vertical">
+ <sidebar-item :menu="menu" :screen="screen" :props="website.menu.props" :collapse="keyCollapse" first />
</el-menu>
</el-scrollbar>
</div>
@@ -35,7 +23,7 @@
},
computed: {
...mapGetters(['website', 'menu', 'tag', 'keyCollapse', 'screen']),
- nowTagValue: function() {
+ nowTagValue: function () {
return this.$router.$avueRouter.getValue(this.$route)
}
}
diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue
index 8c4197a..1c971e4 100644
--- a/src/page/index/tags.vue
+++ b/src/page/index/tags.vue
@@ -1,5 +1,5 @@
<template>
- <div
+ <div style="background-color: #875a7b;"
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..81d23d2 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -15,7 +15,7 @@
</div>
<div class="top-bar__right">
- <el-tooltip
+ <!-- <el-tooltip
v-if="showLock"
effect="dark"
content="涓婚璁剧疆"
@@ -23,7 +23,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/wel.vue b/src/page/wel.vue
index ef6f539..c801334 100644
--- a/src/page/wel.vue
+++ b/src/page/wel.vue
@@ -8,7 +8,10 @@
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> -->
+ <el-row style="width: 100%; height: 100%;background-color: white;">
+ <span>鏆傛湭寮�鍙戙�傘�傘�傘�傘�傘��</span>
+ </el-row>
</div>
</template>
<style scoped="scoped" lang="scss">
diff --git a/vue.config.js b/vue.config.js
index 9a3da14..7150ce3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,7 +2,7 @@
* 閰嶇疆鍙傝��:
* https://cli.vuejs.org/zh/config/
*/
-const url = 'http://192.168.32.45:9999'
+const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3