add 展开收起菜单、按钮美观度、按钮权限配置、

src/directives/permission.js

@@ -8,7 +8,7 @@ export default {
 
     if (value && value instanceof Array && value.length > 0) {
       const permissionFlag = value;
-
+      console.log(permissions, "permissions");
       const hasPermissions = permissions.some((permission) => {
         return (
           all_permission === permission || permissionFlag.includes(permission)

src/styles/global.scss

@@ -7,6 +7,10 @@
 .el-menu-item.is-active {
   color: var(--primary-color) !important;
 }
+.el-switch.is-checked .el-switch__core {
+  border-color: var(--primary-color) !important;
+  background-color: var(--primary-color) !important;
+}
 .headerMessage {
   color: var(--primary-color) !important;
 }

src/views/admin/cockpitManage/component/leftdata.vue

@@ -103,14 +103,30 @@
       <h3 class="centeredh3">
         入库数据
         <span>
-          <span style="cursor: pointer" @click="importdata">导入数据</span>
-          <span style="cursor: pointer" @click="more">更多</span>
-          <span style="cursor: pointer" @click="onlinedata">在线数据</span>
+          <span
+            style="cursor: pointer"
+            @click="importdata"
+            v-hasPermi="['home:importData']"
+            >导入数据</span
+          >
+          <span
+            style="cursor: pointer"
+            @click="more"
+            v-hasPermi="['home:moneData']"
+            >更多</span
+          >
+          <span
+            style="cursor: pointer"
+            @click="onlinedata"
+            v-hasPermi="['home:onlinData']"
+            >在线数据</span
+          >
         </span>
       </h3>
       <div>
         <p class="titleYC"><span>风场名称</span><span>入库时间</span></p>
         <tabroll
+          v-hasPermi="['home:bePutData']"
           :table-data="tableData"
           :shujuloading="shujuloading"
           :columns="YCtableColumns"

src/views/home/components/Menu.vue

@@ -1,38 +1,6 @@
 <template>
   <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>
-        <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>
+    <div class="homeBox"></div>
     <el-menu
       collapse-transition
       ref="menu"
@@ -44,8 +12,8 @@
       :active-text-color="activeTextColor"
       :router="true"
       :default-active="defaultActive"
-      :unique-opened="true"
       :collapse="isCollapse"
+      :default-openeds="openMenus"
     >
       <template v-for="item in routerList">
         <el-submenu
@@ -95,17 +63,25 @@
         </el-menu-item>
       </template>
     </el-menu>
+
     <div class="foldBox flexCenter">
       <span
         v-show="isCollapse"
         class="el-icon-s-unfold icon"
-        @click="isCollapse = false"
+        @click.stop="isCollapse = false"
         >展开</span
       >
+      <el-switch
+        v-show="!isCollapse"
+        :value="isExpanded"
+        @change="toggleAllMenus"
+      >
+        <!-- :inactive-text="isExpanded ? '收起全部菜单' : '展开全部菜单'" -->
+      </el-switch>
       <span
         v-show="!isCollapse"
         class="el-icon-s-fold icon"
-        @click="isCollapse = true"
+        @click.stop="isCollapse = true"
         >收起</span
       >
     </div>
@@ -120,6 +96,8 @@ import Vue from "vue";
 export default {
   data() {
     return {
+      isExpanded: false, // 控制是否展开所有子菜单
+      openMenus: [], // 用来存储展开的菜单
       isCollapse: true,
       orgList: orgList,
       searchInputValue: "",
@@ -162,6 +140,20 @@ export default {
     ...mapState({
       currentMenuIndex: (state) => state.breadStore?.currentUrl?.routeUrl,
     }),
+    // 获取所有父级菜单的 index
+    allMenuIndexes() {
+      return this.routerList.map((item) => {
+        if (
+          item.children &&
+          item.children.length &&
+          item.meta?.hidden === false
+        ) {
+          return item.path;
+        } else {
+          return `${item.path}?id=${item.id}`;
+        }
+      });
+    },
   },
   watch: {
     currentMenuIndex: {
@@ -183,6 +175,24 @@ export default {
   },
   methods: {
     ...mapActions("menuTag", ["addTag"]),
+    // 切换展开/收起所有菜单
+    toggleAllMenus() {
+      this.isExpanded = !this.isExpanded;
+
+      if (this.isExpanded) {
+        // 展开所有子菜单
+        this.openMenus = this.routerList
+          .filter((item) => item.children && item.children.length)
+          .map((item) => item.path);
+      } else {
+        // 收起所有子菜单
+        this.openMenus = [];
+      }
+    },
+    handleChangeMenuUrl(item, path) {
+      this.defaultActive = path;
+      this.$router.push(path); // 跳转到指定的路由
+    },
     isElPrefix(str) {
       const regex = /^el-/;
       return regex.test(str);
@@ -372,7 +382,8 @@ export default {
 .flexCenter {
   display: flex;
   align-items: center !important;
-  justify-content: center !important;
+  justify-content: space-between !important;
+  width: 200px;
 }
 
 .foldBox {

src/views/overview/components/cp/index.vue

@@ -380,7 +380,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/cp_trend/index.vue

@@ -351,7 +351,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/cp_windspeed/index.vue

@@ -380,7 +380,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/data_integrity_minute/index.vue

@@ -358,7 +358,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/data_integrity_second/index.vue

@@ -359,7 +359,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/dicCard/index.vue

@@ -1,20 +1,18 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-13 14:15:47
- * @LastEditTime: 2025-03-14 20:22:13
+ * @LastEditTime: 2025-03-19 16:10:45
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/dicCard/index.vue
 -->
 <template>
   <div>
-    <el-button
-      @click="drawer = true"
-      type="primary"
-      style="margin-left: 16px"
-      icon="el-icon-s-fold"
-    >
-    </el-button>
+    <el-tooltip class="item" effect="dark" content="历史评论" placement="right">
+      <div @click="drawer = true" class="drawerDescription">
+        <i class="el-icon-s-fold"> </i>
+      </div>
+    </el-tooltip>
     <el-drawer :visible.sync="drawer" title="分析评论">
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="当前评论" name="current">
@@ -133,6 +131,24 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.drawerDescription {
+  position: fixed;
+  right: 80px;
+  bottom: 20%;
+  background: rgb(255, 255, 255);
+  border-radius: 50%;
+  width: 50px;
+  height: 50px;
+  color: #707070;
+  font-size: 30px;
+  box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.drawerDescription:hover {
+  background: rgb(196, 199, 206);
+}
 .el-tabs--border-card {
   height: 100%;
   overflow: scroll;

src/views/overview/components/fault_all/index.vue

@@ -467,7 +467,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/fault_unit/index.vue

@@ -463,7 +463,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/min_pitch/index.vue

@@ -360,7 +360,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/pitch_generator_speed/index.vue

@@ -339,7 +339,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/pitch_power/index.vue

@@ -361,7 +361,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/pitch_tsr_cp/index.vue

@@ -358,7 +358,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/power_curve/index.vue

@@ -576,7 +576,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/power_scatter/index.vue

@@ -387,7 +387,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/power_scatter_2D/index.vue

@@ -361,7 +361,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/production_indicator_all/index.vue

@@ -441,7 +441,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/production_indicator_unit/index.vue

@@ -562,7 +562,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/rated_power_windspeed/index.vue

@@ -362,7 +362,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/rated_windspeed/index.vue

@@ -356,7 +356,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/speed_power/index.vue

@@ -441,7 +441,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/speed_torque/index.vue

@@ -434,7 +434,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_environment/index.vue

@@ -386,7 +386,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_Winding_tem/index.vue

@@ -395,7 +395,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_adriven/index.vue

@@ -396,7 +396,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_hig/index.vue

@@ -400,7 +400,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_low/index.vue

@@ -400,7 +400,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_mid/index.vue

@@ -402,7 +402,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_min/index.vue

@@ -396,7 +396,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_tem_deviation/index.vue

@@ -377,7 +377,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/temperature_large_components_undriven/index.vue

@@ -400,7 +400,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/tsr/index.vue

@@ -380,7 +380,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/tsr_cp_power/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2025-01-10 09:10:24
- * @LastEditTime: 2025-02-26 11:24:13
+ * @LastEditTime: 2025-03-19 15:57:47
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/overview/components/tsr_cp_power/index.vue
@@ -381,7 +381,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/tsr_cp_power_scatter/index.vue

@@ -360,7 +360,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/tsr_trend/index.vue

@@ -359,7 +359,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/tsr_windspeed/index.vue

@@ -380,7 +380,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/wind_direction_frequency/index.vue

@@ -381,7 +381,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/wind_speed/index.vue

@@ -361,7 +361,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/wind_speed_frequency/index.vue

@@ -366,7 +366,7 @@ export default {
     }
   }
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/yaw_error/index.vue

@@ -494,7 +494,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/components/yaw_error_density/index.vue

@@ -366,7 +366,7 @@ export default {
   }
 
   .right {
-    width: 50px;
+    width: 0px;
     height: 100%;
     overflow: hidden;
   }

src/views/overview/index.vue

@@ -481,7 +481,7 @@ export default {
   .tousutiwen_box {
     position: fixed;
     right: 80px;
-    bottom: 15%;
+    bottom: 10%;
     background: rgb(255, 255, 255);
     border-radius: 50%;
     width: 50px;

src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2025-03-19 10:49:10
+ * @LastEditTime: 2025-03-19 16:18:02
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -122,7 +122,14 @@
               </el-form-item>
             </el-col>
 
-            <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
+            <el-col
+              :xs="24"
+              :sm="24"
+              :md="12"
+              :lg="8"
+              :xl="5"
+              v-hasPermi="['home:performance:onlineAlsDate']"
+            >
               <el-form-item
                 label="开始时间"
                 v-if="checkedCities.find((item) => item === '分析时间')"
@@ -149,7 +156,14 @@
                 </el-date-picker> -->
               </el-form-item></el-col
             >
-            <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
+            <el-col
+              :xs="24"
+              :sm="24"
+              :md="12"
+              :lg="8"
+              :xl="5"
+              v-hasPermi="['home:performance:onlineAlsDate']"
+            >
               <el-form-item
                 label="结束时间"
                 v-if="checkedCities.find((item) => item === '分析时间')"
@@ -286,278 +300,6 @@
             </el-col>
           </el-row>
         </el-collapse-item>
-        <!-- <el-collapse-item
-          title="图像坐标系设置："
-          name="3"
-          v-if="checkedCities.find((item) => item === '图像设置')"
-        >
-          <el-row :gutter="5">
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="直驱发电机转速坐标系">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.dgeneratorSpeed[0]"
-                    @input="ensureMinValue(form.dgeneratorSpeed, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.dgeneratorSpeed[1]"
-                    @input="ensureMinValue(form.dgeneratorSpeed, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.dgeneratorSpeed[2]"
-                    @input="ensureMinValue(form.dgeneratorSpeed, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="非直驱发电机转速坐标系设置">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.igeneratorSpeed[0]"
-                    @input="ensureMinValue(form.igeneratorSpeed, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.igeneratorSpeed[1]"
-                    @input="ensureMinValue(form.igeneratorSpeed, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.igeneratorSpeed[2]"
-                    @input="ensureMinValue(form.igeneratorSpeed, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="直驱发电机转矩坐标系">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.dgeneratorTorque[0]"
-                    @input="ensureMinValue(form.dgeneratorTorque, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.dgeneratorTorque[1]"
-                    @input="ensureMinValue(form.dgeneratorTorque, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.dgeneratorTorque[2]"
-                    @input="ensureMinValue(form.dgeneratorTorque, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="非直驱发电机转矩坐标系">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.igeneratorTorque[0]"
-                    @input="ensureMinValue(form.igeneratorTorque, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.igeneratorTorque[1]"
-                    @input="ensureMinValue(form.igeneratorTorque, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.igeneratorTorque[2]"
-                    @input="ensureMinValue(form.igeneratorTorque, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="风能利用系数">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.cp[0]"
-                    @input="ensureMinValue(form.cp, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.cp[1]"
-                    @input="ensureMinValue(form.cp, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.cp[2]"
-                    @input="ensureMinValue(form.cp, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="叶尖转速比">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.tsr[0]"
-                    @input="ensureMinValue(form.tsr, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.tsr[1]"
-                    @input="ensureMinValue(form.tsr, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.tsr[2]"
-                    @input="ensureMinValue(form.tsr, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="有功功率">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.activePower[0]"
-                    @input="ensureMinValue(form.activePower, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.activePower[1]"
-                    @input="ensureMinValue(form.activePower, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.activePower[2]"
-                    @input="ensureMinValue(form.activePower, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-            <el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12">
-              <el-form-item label="桨距角">
-                <div class="demo-input-suffix">
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="步长"
-                    v-model="form.pitchAngle[0]"
-                    @input="ensureMinValue(form.pitchAngle, 0)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最小值"
-                    v-model="form.pitchAngle[1]"
-                    @input="ensureMinValue(form.pitchAngle, 1)"
-                  >
-                  </el-input>
-                  <el-input
-                    type="number"
-                    :min="1"
-                    size="small"
-                    placeholder="最大值"
-                    v-model="form.pitchAngle[2]"
-                    @input="ensureMinValue(form.pitchAngle, 2)"
-                  >
-                  </el-input>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-collapse-item> -->
       </el-collapse>
     </el-form>
     <el-card shadow="always" class="box-card">
@@ -634,24 +376,13 @@
                 city
               }}</el-checkbox>
               <el-checkbox label="数据源过滤" key="数据源过滤"></el-checkbox>
-              <div class="checkFromRow">
+              <!-- <div class="checkFromRow">
                 <el-row>
                   <el-col :span="12">发电机转速测点</el-col>
                   <el-col :span="12">桨距角值测点</el-col>
                   <el-col :span="12">有功功率测点</el-col>
                   <el-col :span="12">风速速度测点</el-col>
                 </el-row>
-              </div>
-
-              <!-- <el-checkbox label="图像设置" key="图像设置"></el-checkbox>
-              <div class="checkFromRow">
-                <el-row>
-                  <el-col :span="12">发电机转矩坐标系</el-col>
-                  <el-col :span="12">桨距角坐标系</el-col>
-                  <el-col :span="12">叶尖速比坐标系</el-col>
-                  <el-col :span="12">有功功率坐标系</el-col>
-                  <el-col :span="12">发电机转矩坐标系</el-col>
-                </el-row>
               </div> -->
             </el-checkbox-group>
           </div></el-col
@@ -806,8 +537,9 @@ export default {
       if (this.form.scada) {
         scada.push(this.form.scada);
       } else {
+        console.log(this.form.configAnalysis, "this.form.scada");
         scada = this.form.configAnalysis.map((item) => {
-          console.log(item.split("|")[1]);
+          console.log(item, "item");
           return item.split("|")[1];
         });
         console.log([...new Set(scada)], "scada");
@@ -897,11 +629,12 @@ export default {
       this.form.configAnalysis = [];
       if (this.checked) {
         this.analysisTypeList.map((item) => {
-          this.form.configAnalysis.push(item.typeCode);
+          this.form.configAnalysis.push(`${item.typeCode}|${item.typeFlag}`);
         });
       } else {
         this.form.configAnalysis = [];
       }
+      this.getTimeList();
     },
 
     ensureMinValue(field, index) {

src/views/system/menuMag/index.vue

@@ -151,14 +151,15 @@
               >停用</el-button
             >
             <el-button
+              v-hasPermi="['system:menu:delete']"
               style="color: #f00"
               @click="deleted(scope.row)"
               type="text"
               size="small"
-              v-hasPermi="['system:menu:delete']"
-              :disabled="scope.row.permissionState == 1"
               >删除</el-button
             >
+            <!-- :disabled="scope.row.permissionState == 1" -->
+            <!--  -->
           </template>
         </el-table-column>
       </el-table>