Browse Source

工联院打包配置保存

lph 1 year ago
parent
commit
5dfb80a675

BIN
zkqy-ui/public/favicon.ico


BIN
zkqy-ui/public/favicon1.ico


+ 18 - 15
zkqy-ui/src/layout/index.vue

@@ -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; */
 }
 

+ 9 - 5
zkqy-ui/src/views/login.vue

@@ -14,8 +14,8 @@
         <el-col :span="12" class="comlogo"></el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple-dark title">
-            · 生产协同管理系统
-            <!-- 智能制造平台 -->
+            <!-- · 生产协同管理系统 -->
+            · 智能制造平台
           </div>
         </el-col>
       </el-row>
@@ -430,11 +430,15 @@ export default {
   margin-top: 49px;
   width: 200px;
   height: 70px;
-  background: url(../assets/images/mecos-logo1.jpg);
+  // background: url(../assets/images/mecos-logo1.jpg);
+  background: url(../assets/images/mes412.png);
   /* background: url(../assets/images/comp.png); */
   /* box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25); */
   opacity: 1;
-  background-size: cover;
+  // background-size: cover;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
 }
 
 .login {
@@ -443,7 +447,7 @@ export default {
   align-items: center;
   height: 100%;
   background-image: url("../assets/images/background1.jpg");
-  background-size:100% 100%;
+  background-size: 100% 100%;
   /* padding-bottom: 55.19%;  */
   background-position: center;
   background-repeat: no-repeat;