p

ruoyi-ui/src/layout/components/Sidebar/Logo.vue

@@ -43,9 +43,8 @@ export default {
     }
   },
   created() {
-    eventBus.$on('toLogo', (route) => {
+    eventBus.$on('toLogo', (route,str) => {
-      this.navTitle = route.meta.title;
+      this.navTitle = str || route.meta.title;
-      console.log(this.navTitle,'kkkkkkkkk');
     });
   },
 }

ruoyi-ui/src/views/ehs/ehsHiddenDanger/index.vue

@@ -681,6 +681,7 @@ import { listEhsHiddenDanger, getEhsHiddenDanger, delEhsHiddenDanger, addEhsHidd
 import {listAllDept } from "@/api/system/dept";
 import enterpriseSelect from "./enterpriseSelect"
 import importUpload from "@/components/upload/upload";
+import { eventBus } from '@/main.js';
 export default {
   name: "EhsHiddenDanger",
   dicts: ['hidden_danger_type', 'hidden_danger_grade', 'hidden_danger_label', 'enterprise_type','enterprise_scale',
@@ -831,6 +832,7 @@ export default {
     };
   },
   created() {
+    eventBus.$emit('toLogo', this.$route,'安全生产隐患管理');
     this.queryParams.overTime = this.$route.query.overTime;
     this.getList();
     this.$route.query.overTime = null;
@@ -839,6 +841,9 @@ export default {
     console.log(this.$route.query.overTime);
 
   },
+  beforeDestroy() {
+    eventBus.$emit('toLogo', this.$router,'');
+  },
   methods: {
     /** 查询隐患信息列表 */
     getList() {

ruoyi-ui/src/views/login.vue

@@ -19,8 +19,8 @@
             <span class="slogan">
               <!-- <p>对党忠诚  纪律严明</p>
             <p>赴汤蹈火  竭诚为民</p> -->
-              <img class="ft" src="../assets/images/ftdh.png" alt="" />
               <img class="ft" src="../assets/images/ddzc.png" alt="" />
+              <img class="ft" src="../assets/images/ftdh.png" alt="" />
             </span>
           </div>
         </div>
@@ -272,6 +272,7 @@ export default {
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+  z-index: 9999;
   .el-input {
     height: 38px;
     input {
@@ -299,7 +300,7 @@ export default {
   }
 }
 .el-login-footer {
-  height: 30%;
+  height: 36%;
   line-height: 40px;
   position: fixed;
   bottom: 0;
@@ -335,9 +336,7 @@ export default {
         align-items: center;
         flex: 1;
         img {
-          // object-fit: none;
+          height: 60px;
-          width: 50px;
-          height: 50px;
           margin-right: 15px;
         }
 
@@ -349,7 +348,8 @@ export default {
 .leftBox {
   .pChina {
     display: table-row;
-    font-size: 40px;
+    font-size: 45px;
+    font-weight: bolder;
   }
   .pEnglish {
     display: table-row;
@@ -367,7 +367,7 @@ export default {
     flex-direction: column;
     .ft {
       object-fit: contain;
-      width: 300px !important;
+      width: 430px !important;
     }
   }
 }
@@ -379,14 +379,14 @@ export default {
 .el-login-footer {
   .rightBox {
     display: flex;
-        margin-left: -30%;
+    margin-left: -29%;
     flex: 1;
     justify-content: space-evenly;
     align-items: center;
     img {
       // object-fit: none;
       width: auto;
-      height: 200px;
+      height: 245px;
       margin-left: -333px;
     }
     span {