合并

src/main.js

@@ -47,6 +47,7 @@ new Vue({
   methods: {
     applyTheme(theme) {
       const themeFile = theme || this.$store.state.themes.theme;
+      console.log(themeFile, "themeFile");
       import(`./themes/${themeFile}.scss`);
     },
   },

src/views/admin/cockpitManage/Index.vue

@@ -4,23 +4,33 @@
     <div class="ledata">
       <el-input v-model="treeval" @focus="showTree = true"></el-input>
       <div class="Showtree">
-        <el-tree v-if="showTree" :data="treeData" @node-click="handleNodeClick"></el-tree>
+        <el-tree
+          v-if="showTree"
+          :data="treeData"
+          @node-click="handleNodeClick"
+        ></el-tree>
       </div>
 
       <p><span class="SpText">风场总数：</span>20 个</p>
       <p><span class="SpText">已分析风场：</span>10 个</p>
       <p><span class="SpText">未分析风场：</span>10个</p>
       <p><span class="SpText">风机数量：</span>10 个</p>
-      <p><span class="SpText">风机状态：</span>
+      <p>
+        <span class="SpText">风机状态：</span>
         <span class="red"></span>
         <span class="yellow"></span>
         <span class="green"></span>
       </p>
-      <el-switch v-model="value1" active-text="显示" inactive-text="隐藏" @change="handleSwitchChange">
+      <el-switch
+        v-model="value1"
+        active-text="显示"
+        inactive-text="隐藏"
+        @change="handleSwitchChange"
+      >
       </el-switch>
     </div>
     <Rightdata v-show="ShowRi" class="ridata"></Rightdata>
-    <!-- <router-view></router-view> -->
+    <router-view></router-view>
   </div>
 </template>
 
@@ -38,45 +48,43 @@ export default {
       ShowRi: true,
       treeval: "",
       value1: true,
-      treeval: '', // 绑定的输入框值
+      treeval: "", // 绑定的输入框值
       showTree: false, // 控制树列表显示
-      treeData: [ // 树列表数据，根据实际需求自行替换
+      treeData: [
+        // 树列表数据，根据实际需求自行替换
         {
           id: 1,
-          label: 'Node 1',
+          label: "Node 1",
           children: [
             {
               id: 2,
-              label: 'Node 1-1'
-            }
-          ]
+              label: "Node 1-1",
+            },
+          ],
         },
         {
           id: 3,
-          label: 'Node 2'
-        }
-      ]
-
+          label: "Node 2",
+        },
+      ],
     };
   },
 
   mounted() {
-        //模拟地图上的点位
-        const data = [{ point: [120.2, 30.35] }, { point: [121.2, 30.35] }];
+    //模拟地图上的点位
+    const data = [{ point: [120.2, 30.35] }, { point: [121.2, 30.35] }];
     data.forEach((element) => {
       console.log(element);
       this.$refs.map.addMarker(element);
     });
-
-   },
+  },
 
   methods: {
-
     clickEvent(data) {
       console.log(data);
       this.$router.push({ name: "about" });
     },
-    
+
     handleSwitchChange() {
       this.ShowRi = !this.ShowRi;
     },
@@ -85,7 +93,7 @@ export default {
       this.treeval = data.label;
       // 隐藏树列表
       this.showTree = false;
-    }
+    },
   },
 };
 </script>
@@ -132,15 +140,21 @@ export default {
       height: 12px;
       margin-right: 5px;
     }
-    .red { background-color: #E16757; }
-  .yellow { background-color: #EECB5F; }
-  .green { background-color:#7ECF51 }
+    .red {
+      background-color: #e16757;
+    }
+    .yellow {
+      background-color: #eecb5f;
+    }
+    .green {
+      background-color: #7ecf51;
+    }
   }
 }
-.Showtree{
+.Showtree {
   position: absolute;
   top: 55px;
   left: 10px;
-  width: 280px
+  width: 280px;
 }
 </style>

src/views/home/components/Menu.vue

@@ -2,42 +2,81 @@
   <el-aside :width="!isCollapse ? '250px' : '100px'" class="asideBox">
     <div class="homeBox">
       <div class="logoItem" :class="{ 'flexCenter ': isCollapse }">
-        <div class="logoImg" v-show="isCollapse" @click="
-          handleChangeMenuUrl(
-            { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
-            `/home/cockpitManage?name=驾驶舱`
-          )
-          ">
-          <SvgIcons name="dnao" class="dnao" width="40px" height="40px" color="#222"></SvgIcons>
+        <div
+          class="logoImg"
+          v-show="isCollapse"
+          @click="
+            handleChangeMenuUrl(
+              { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
+              `/home/cockpitManage?name=驾驶舱`
+            )
+          "
+        >
+          <SvgIcons
+            name="dnao"
+            class="dnao"
+            width="40px"
+            height="40px"
+            color="#222"
+          ></SvgIcons>
         </div>
-        <span v-if="!isCollapse" @click="
-          handleChangeMenuUrl(
-            { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
-            `/home/cockpitManage?name=驾驶舱`
-          )
-          " :class="isCollapse ? 'stop-animation' : 'active-animation'">
+        <span
+          v-if="!isCollapse"
+          @click="
+            handleChangeMenuUrl(
+              { name: '驾驶舱', id: 1, path: 'cockpitManage', iconName: 'gps' },
+              `/home/cockpitManage?name=驾驶舱`
+            )
+          "
+          :class="isCollapse ? 'stop-animation' : 'active-animation'"
+        >
           风机运行管理平台
         </span>
       </div>
     </div>
-    <el-menu collapse-transition ref="menu" class="mt-3 el-menu-vertical-demo" @open="handleOpen" @close="handleClose"
-      background-color="#eff1f3" text-color="#000" active-text-color="#0754a1" :router="true"
-      :default-active="defaultActive" :unique-opened="true" :collapse="isCollapse">
+    <el-menu
+      collapse-transition
+      ref="menu"
+      class="mt-3 el-menu-vertical-demo"
+      @open="handleOpen"
+      @close="handleClose"
+      background-color="#eff1f3"
+      text-color="#000"
+      active-text-color="#0754a1"
+      :router="true"
+      :default-active="defaultActive"
+      :unique-opened="true"
+      :collapse="isCollapse"
+    >
       <div v-for="item in routerList" :key="item.id">
-        <el-submenu :index="item.path" v-if="item.children && item.children.length > 0">
+        <el-submenu
+          :index="item.path"
+          v-if="item.children && item.children.length > 0"
+        >
           <template slot="title">
             <i class="el-icon-menu" v-if="isElPrefix(item.iconName)"></i>
-            <i v-else class="svnIcon"><svg-icon :icon-class="item.iconName" /></i>
+            <i v-else class="svnIcon"
+              ><svg-icon :icon-class="item.iconName"
+            /></i>
             <span>{{ item.name }}</span>
           </template>
-          <el-menu-item v-for="child in item.children" :key="child.id"
-            :index="`/home/${item.path}/${child.path}?id=${child.id}&name=${child.name}`">
+          <el-menu-item
+            v-for="child in item.children"
+            :key="child.id"
+            :index="`/home/${item.path}/${child.path}?id=${child.id}&name=${child.name}`"
+          >
             <i class="el-icon-menu" v-if="isElPrefix(child.iconName)"></i>
-            <i v-else class="svnIcon"><svg-icon :icon-class="child.iconName" /></i>
+            <i v-else class="svnIcon"
+              ><svg-icon :icon-class="child.iconName"
+            /></i>
             <span>{{ child.name }}</span>
           </el-menu-item>
         </el-submenu>
-        <el-menu-item :key="item.id" :index="`/home/${item.path}?id=${item.id}&name=${item.name}`" v-else>
+        <el-menu-item
+          :key="item.id"
+          :index="`/home/${item.path}?id=${item.id}&name=${item.name}`"
+          v-else
+        >
           <i class="el-icon-menu" v-if="isElPrefix(item.iconName)"></i>
           <i v-else class="svnIcon"><svg-icon :icon-class="item.iconName" /></i>
           <span>{{ item.name }}</span>
@@ -45,10 +84,18 @@
       </div>
     </el-menu>
     <div class="foldBox flexCenter">
-      <span v-show="isCollapse" class="el-icon-s-unfold icon" @click="debouncedToggleCollapse(false)">
+      <span
+        v-show="isCollapse"
+        class="el-icon-s-unfold icon"
+        @click="debouncedToggleCollapse(false)"
+      >
         展开
       </span>
-      <span v-show="!isCollapse" class="el-icon-s-fold icon" @click="debouncedToggleCollapse(true)">
+      <span
+        v-show="!isCollapse"
+        class="el-icon-s-fold icon"
+        @click="debouncedToggleCollapse(true)"
+      >
         收起
       </span>
     </div>
@@ -279,8 +326,7 @@ export default {
           color: #19436d;
         }
 
-        transition: width 0.5s ease,
-        transform 0.5s ease;
+        transition: width 0.5s ease, transform 0.5s ease;
         transform-origin: left;
       }
 

src/views/system/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-17 16:02:11
- * @LastEditTime: 2024-05-27 14:53:07
+ * @LastEditTime: 2024-05-27 17:19:02
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /dasheng/performance-test/src/views/system/index.vue
@@ -18,11 +18,9 @@
 .slide-fade-enter-active {
   transition: all 0.3s ease-out;
 }
-
 .slide-fade-leave-active {
   transition: all 0.5s cubic-bezier(1, 0.5, 0.6, 1);
 }
-
 .slide-fade-enter-from,
 .slide-fade-leave-to {
   transform: translateX(50px);