提交

src/layout/header-aside/layout.vue

@@ -22,18 +22,17 @@
               <div class="current-time">{{ time | formatDate }}</div>
               <div class="current-date">{{ time | formatDate2 }}</div>
             </div>
-            <div class="subway-container">
+            <!-- <div class="subway-container">
               <div class="subway-info">
                 <span :class="station.length < 6 ? 'lineFeed' : ''">{{
                   station
                 }}</span>
-                <!-- <div class="out-img">
-                </div> -->
               </div>
               <div class="user-img"><img src="./imgs/subway.png" /></div>
-            </div>
-            <d2-header-theme />
+            </div> -->
+
             <!-- 主题 -->
+            <d2-header-theme />
             <el-badge
               class="msg-img"
               :value="countNum == 0 ? '' : countNum > 99 ? '99+' : countNum"
@@ -287,6 +286,8 @@ export default {
 }
 .time-container {
   width: 93px;
+  margin-right: 10px;
+
   text-align: right;
   // border:1px solid red;
   padding: 2px;

src/pages/sys/point/index.vue

@@ -812,7 +812,7 @@ export default {
         }
       }).then((data) => {
         if (data && data.code === 0) {
-          this.treeData = data.tree
+          this.treeData = data.nodes
           this.defaultExpandedKeys = []
           this.$nextTick(() => {
             if (