ming 3 vuotta sitten
vanhempi
commit
ab9af5a8c5
3 muutettua tiedostoa jossa 22 lisäystä ja 13 poistoa
  1. 1 1
      src/layout/index.vue
  2. 18 12
      src/layout/vab-avatar/index.vue
  3. 3 0
      src/views/siteManage/index.vue

+ 1 - 1
src/layout/index.vue

@@ -31,7 +31,7 @@
     >
       <!-- 导航及缩进 start -->
       <div style="line-height: 50px; text-align: right;border-bottom:1px solid rgba(0,0,0,.04)">
-        <span  v-if="!collapse" style="margin-right:50px">导航</span>
+        <span  v-if="!collapse" style="margin-right:79px">导航</span>
 
         <!-- 缩进按钮 start -->
         <div

+ 18 - 12
src/layout/vab-avatar/index.vue

@@ -6,11 +6,20 @@
     </span>
 
     <span class="goPanelBlock">
-      <a  @click="goPanel">
+      <a  @click="goPanel" target="_blank">
         <img src="/static/svgIcons/home.svg" alt="" width="12">
         大屏</a>
     </span>
 
+    <span class="bell">
+      <img
+        src="../../assets/images/bell.png"
+        alt=""
+        width="15"
+        @click="goAlarmingPage"
+      />
+    </span>
+
     <a-dropdown>
       <span class="ant-dropdown-link">
         <!-- <a-avatar :src="avatar" /> -->
@@ -38,14 +47,7 @@
       </template>
     </a-dropdown>
 
-    <span class="bell">
-      <img
-        src="../../assets/images/bell.png"
-        alt=""
-        width="15"
-        @click="goAlarmingPage"
-      />
-    </span>
+    
 
     <!-- <span><img src="../../assets/images/switch.png" alt="" width="15" /></span> -->
   </div>
@@ -101,10 +103,10 @@ export default {
       if (window.location.host.indexOf('localhost') != -1) {
 
      
-            window.location.href = "http://localhost:8080/#/home";
+            window.open("http://localhost:8080/#/home");
             
         } else {
-            window.location.href = "http://101.133.214.75:13201/";
+            window.open("http://101.133.214.75:13201/");
         }
     },
     goAlarmingPage() {
@@ -154,8 +156,12 @@ export default {
     opacity: 0.7;
   }
   .bell {
-    margin: 0 0px 0 18px;
+    margin: 0 18px 0 18px;
     cursor: pointer;
+    img{
+      position:relative;
+      top:-1px
+    }
   }
   .bell:hover {
     opacity: 0.7;

+ 3 - 0
src/views/siteManage/index.vue

@@ -496,6 +496,9 @@ export default defineComponent({
   text-overflow: ellipsis;
   display: block;
 }
+.el-tree-node__content{
+  font-size:14px
+}
 .app-container.page-nesting {
   padding: 0;
   background: rgba(0, 0, 0, 0);