Przeglądaj źródła

feat: 组态样式调整

justkang 1 tydzień temu
rodzic
commit
0f423e000d

+ 3 - 4
src/layout/components/Sidebar/Logo.vue

@@ -79,7 +79,7 @@ export default {
 .sidebar-logo-container {
     position: relative;
     // width: 100%;
-    height: 70px;
+    height: 50px;
     line-height: 50px;
     background: #2b2f3a;
     overflow: hidden;
@@ -92,13 +92,14 @@ export default {
         height: 100%;
         width: 100%;
         display: flex !important;
-        flex-direction: column !important;
+        flex-direction: row !important;
         justify-content: center;
         align-items: center;
         & .sidebar-logo {
             width: 30px; // 30
             height: 30px; // 30
             vertical-align: middle;
+            margin-right: 10px;
         }
 
         & .sidebar-title {
@@ -108,13 +109,11 @@ export default {
             font-weight: 400;
             line-height: 50px;
             font-size: 18px; // 18
-            width: 100%;
             font-family: '微软雅黑';
             vertical-align: middle;
             position: relative; /* 相对定位以便绝对定位子元素 */
             white-space: nowrap; // 防止换行
             overflow: hidden; // 隐藏溢出部分
-            width: calc(100%);
             text-align: center;
             padding-left: 0 !important;
         }

+ 2 - 2
src/views/index.vue

@@ -260,7 +260,7 @@
                 <div class="">
                     <!-- 登录用户数量 -->
                     <el-card class="line-card" shadow="hover">
-                        <div ref="lineChart" style="height: 300px; width: 100%; margin: 0 10px 24px 0" v-if="isAdmin && linechart.counts"></div>
+                        <div ref="lineChart" style="height: 440px; width: 100%; margin: 0 10px 24px 0" v-if="isAdmin && linechart.counts"></div>
                         <div v-else class="message-title" style="margin: 0px 0 10px">
                             {{ $t('views.index.394840-16') }}
                             <el-empty style="height: 250px" :description="$t('dataCenter.analysis.349202-7')"></el-empty>
@@ -2272,7 +2272,7 @@ export default {
     //信息完
     // 登录用户数量
     .line-card {
-        height: 320px;
+        height: 460px;
         width: 100%;
         border-radius: 10px;
         padding: 4px;

+ 10 - 0
src/views/scada/topo/components/topoToolbox.vue

@@ -444,4 +444,14 @@ export default {
 .white-icon {
   filter: brightness(0) invert(1);
 }
+::v-deep .el-menu {
+  background: #222b3c;
+  .el-submenu .el-submenu__title {
+    color: white !important;
+  }
+  .el-submenu__title:hover {
+    color: black !important;
+  }
+}
+
 </style>

+ 1 - 4
src/views/scada/topo/editor.vue

@@ -594,15 +594,12 @@ export default {
         .aside-wrap {
             margin-bottom: 0;
             padding: 0;
-            background: #222b3c;
-            img {
-
-            }
         }
 
         .left-aside-open {
             width: 290px !important;
             transition: width 0.5s;
+            background: #222b3c;
         }
 
         .right-aside-open {