|
@@ -5,8 +5,8 @@
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
<div class="logo-title">
|
|
|
- <img src="../assets/images/mecos-logo1.jpg" alt="" class="imgg"/>
|
|
|
- <!-- <img :src="logo" alt="" class="imgg"/> -->
|
|
|
+ <!-- <img src="../assets/images/mes412.png" alt="" class="imgg" /> -->
|
|
|
+ <img :src="logo" alt="" class="imgg" />
|
|
|
<span class="title">{{ title }}</span>
|
|
|
<!-- <img src="../assets/images/comlo.png" alt="" class="imgg" /> -->
|
|
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
<span style="">
|
|
|
<span class="jianbiase">{{ username || "默认用户" }}</span>
|
|
|
</span>
|
|
|
- <img :src="avatar" class="user-avatar"/>
|
|
|
+ <img :src="avatar" class="user-avatar" />
|
|
|
<!-- <i class="el-icon-caret-bottom" /> -->
|
|
|
</div>
|
|
|
<el-dropdown-menu slot="dropdown" style="margin-top: -20px">
|
|
@@ -61,11 +61,11 @@
|
|
|
>
|
|
|
<div :class="{ 'fixed-header': fixedHeader }">
|
|
|
<!-- <navbar /> -->
|
|
|
- <tags-view v-if="needTagsView"/>
|
|
|
+ <tags-view v-if="needTagsView" />
|
|
|
</div>
|
|
|
- <app-main/>
|
|
|
+ <app-main />
|
|
|
<right-panel>
|
|
|
- <settings/>
|
|
|
+ <settings />
|
|
|
</right-panel>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -73,13 +73,14 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import {mapGetters} from "vuex";
|
|
|
+import { mapGetters } from "vuex";
|
|
|
import RightPanel from "@/components/RightPanel";
|
|
|
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from "./components";
|
|
|
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from "./components";
|
|
|
import ResizeMixin from "./mixin/ResizeHandler";
|
|
|
-import {mapState} from "vuex";
|
|
|
+import { mapState } from "vuex";
|
|
|
import variables from "@/assets/styles/variables.scss";
|
|
|
import mecLogoLogin from "@/assets/images/mec-logo-login.svg";
|
|
|
+import mes412 from "@/assets/images/mes412.svg";
|
|
|
|
|
|
export default {
|
|
|
name: "Layout",
|
|
@@ -144,24 +145,25 @@ export default {
|
|
|
})
|
|
|
.then(() => {
|
|
|
// let tenantCode = this.tenantInfo.tenantCode;
|
|
|
- this.$store.dispatch("LogOut")
|
|
|
+ this.$store.dispatch("LogOut");
|
|
|
// .then(() => {
|
|
|
// this.$router.push({path: "/login", query: {tenantCode: tenantCode}});
|
|
|
// });
|
|
|
})
|
|
|
- .catch(() => {
|
|
|
- });
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
handleClickOutside() {
|
|
|
- this.$store.dispatch("app/closeSideBar", {withoutAnimation: false});
|
|
|
+ this.$store.dispatch("app/closeSideBar", { withoutAnimation: false });
|
|
|
},
|
|
|
getlogo() {
|
|
|
let logo = sessionStorage.getItem("logo");
|
|
|
- this.title = sessionStorage.getItem("title") || "工业应用操作系统";
|
|
|
+ // this.title = sessionStorage.getItem("title") || "工业应用操作系统";
|
|
|
+ this.title = sessionStorage.getItem("title") || "生产协同管理系统";
|
|
|
if (logo) {
|
|
|
this.logo = process.env.VUE_APP_BASE_API + logo;
|
|
|
} else {
|
|
|
- this.logo = mecLogoLogin;
|
|
|
+ this.logo = mes412;
|
|
|
+ // this.logo = mecLogoLogin;
|
|
|
// this.logo = comp;
|
|
|
}
|
|
|
},
|
|
@@ -271,6 +273,7 @@ export default {
|
|
|
float: left;
|
|
|
margin-top: 7px;
|
|
|
margin-bottom: 8px;
|
|
|
+
|
|
|
/* margin-left: 50px; */
|
|
|
}
|
|
|
|