江睿更改

public/index.html

@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
 
-    <title>风机运行管理系统</title>
+    <title>机组功率曲线异常检测数据分析系统</title>
     <!-- <script src="./config/config.js"></script> -->
   </head>
 

src/components/HeaderCom.vue

@@ -1,11 +1,9 @@
 <template>
   <div class="header">
     <div class="header-logo">
-      <!-- 大唐logo -->
-      <!-- <img src="@/assets/datang.png" slot="reference" /> -->
-      <!-- 中能 -->
+<!-- 
       <img src="@/assets/logo.png" slot="reference" />
-      <h2 class="conversion">中能智能</h2>
+      <h2 class="conversion">中能智能</h2> -->
     </div>
     <div class="personalCenter">
       <p class="current-time">{{ currentDate }}</p>
@@ -142,12 +140,7 @@ export default {
       padding-left: 10px;
       font-weight: 600;
     }
-// 大唐
-    // img {
-    //   width: 200px;
-    //   height: 40px;
-    // }
-    // 中能
+
     img {
       width: 40px;
       height: 40px;

src/components/map/index.vue

@@ -125,6 +125,7 @@ import icon02 from "../../assets/img/icon02.png";
 import icon03 from "../../assets/img/icon03.png";
 import icon04 from "../../assets/img/icon04.png";
 import icon05 from "../../assets/img/icon05.png";
+import icon06 from "../../assets/img/icon06.png";
 import defaultIcon from "../../assets/img/icon05.png";
 export default {
   props: {
@@ -183,8 +184,8 @@ export default {
       layers: [
         new TileLayer({
           source: new XYZ({
-            // url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
-            url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
+            url: "http://127.0.0.1:8010/tiles/{z}/{x}/{y}.png", //本地
+            // url: "http://192.168.50.235/tiles/{z}/{x}/{y}.png", //内网
             // url: "http://106.120.102.238:18000/tiles/{z}/{x}/{y}.png", //外网
           }),
         }),
@@ -263,6 +264,8 @@ export default {
           return icon04;
         case "5":
           return icon05;
+        case "6":
+          return icon06;
         default:
           return defaultIcon;
       }
@@ -271,57 +274,65 @@ export default {
     /**
      * 初始化地图事件
      */
-    initEvent() {
-      this.map.on("pointermove", (evt) => {
-        const features = this.map.getFeaturesAtPixel(evt.pixel, {
-          hitTolerance: 1,
-        });
-        if (features && features.length > 0) {
-          const feature = features.at(0);
-          const val = feature.get("data").val;
-          if (val == "1") {
-            this.hoverInfo = feature.get("data");
-            this.hoverStyle.left = `${evt.pixel[0] + 10}px`;
-            this.hoverStyle.top = `${evt.pixel[1] - 150}px`;
-          } else if (val == "4") {
-            this.hoverfengji = feature.get("data");
-            this.hoverfengjiStyle.left = `${evt.pixel[0] + 10}px`;
-            this.hoverfengjiStyle.top = `${evt.pixel[1] - 150}px`;
-            this.currentFeatureData = feature.get("data");
-          } else if (val == "5") {
-            this.hoverta = feature.get("data");
-            this.hovertaStyle.left = `${evt.pixel[0] + 10}px`;
-            this.hovertaStyle.top = `${evt.pixel[1] - 150}px`;
-            this.currentFeatureData = feature.get("data");
-          } else {
-            this.hoverInfo = null;
-            this.hoverfengji = false;
-            this.hoverta = false;
-            this.currentFeatureData = null;
-          }
-        } else {
-          this.hoverInfo = null;
-          this.hoverfengji = false;
-          this.hoverta = false;
-          this.currentFeatureData = null;
-        }
-      });
-      this.map.on("click", (evt) => {
-        const features = this.map.getFeaturesAtPixel(evt.pixel, {
-          hitTolerance: 1,
-        });
-        if (features && features.length > 0) {
-          const feature = features.at(0);
-          this.$emit("feature-click", feature.get("data"));
-        }
-        if (this.currentFeatureData && this.currentFeatureData.val === "4") {
-          this.handleFeatureClick(this.currentFeatureData);
-        }
-      });
-    },
-    handleFeatureClick(featureData) {
-      console.log("Feature with val === '4' clicked:", featureData);
-    },
+     initEvent() {
+  this.map.on("pointermove", (evt) => {
+    const features = this.map.getFeaturesAtPixel(evt.pixel, {
+      hitTolerance: 1,
+    });
+    if (features && features.length > 0) {
+      const feature = features.at(0);
+      const val = feature.get("data").val;
+      if (val == "1") {
+        this.hoverInfo = feature.get("data");
+        this.hoverStyle.left = `${evt.pixel[0] + 10}px`;
+        this.hoverStyle.top = `${evt.pixel[1] - 150}px`;
+      } else if (val == "4") {
+        this.hoverfengji = feature.get("data");
+        this.hoverfengjiStyle.left = `${evt.pixel[0] + 10}px`;
+        this.hoverfengjiStyle.top = `${evt.pixel[1] - 150}px`;
+        this.currentFeatureData = feature.get("data");
+      } else if (val == "5") {
+        this.hoverta = feature.get("data");
+        this.hovertaStyle.left = `${evt.pixel[0] + 10}px`;
+        this.hovertaStyle.top = `${evt.pixel[1] - 150}px`;
+        this.currentFeatureData = feature.get("data");
+      } else if (val == "6") {
+        this.currentFeatureData = feature.get("data");
+      } else {
+        this.hoverInfo = null;
+        this.hoverfengji = false;
+        this.hoverta = false;
+        this.currentFeatureData = null;
+      }
+    } else {
+      this.hoverInfo = null;
+      this.hoverfengji = false;
+      this.hoverta = false;
+      this.currentFeatureData = null;
+    }
+  });
+
+  this.map.on("click", (evt) => {
+    const features = this.map.getFeaturesAtPixel(evt.pixel, {
+      hitTolerance: 1,
+    });
+    if (features && features.length > 0) {
+      const feature = features.at(0);
+      const val = feature.get("data").val;
+      if (val === "6") {
+        this.handleFeatureClick(feature.get("data"));
+      } else {
+        this.$emit("feature-click", feature.get("data"));
+      }
+    } else if (this.currentFeatureData && this.currentFeatureData.val === "6") {
+      this.handleFeatureClick(this.currentFeatureData);
+    }
+  });
+},
+handleFeatureClick(featureData) {
+alert('555555')
+},
+
 
     /**
      * 平移缩放

src/views/admin/cockpitManage/Index.vue

@@ -226,8 +226,11 @@ export default {
           path: "cockpitManage/electronic-map",
           query: {
             fieldCode: data.codeNumber,
+            batchCode:data.batchCode
           },
+        
         });
+
       }
     },
     handleSwitchChange() {

src/views/admin/cockpitManage/electronicMap.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="map-ditu">
-    <Tmap ref="map" :windEngineGroupByFieldCodeDetail="windEngineGroupByFieldCodeDetail"></Tmap>
+    <Tmap
+      ref="map"
+      :windEngineGroupByFieldCodeDetail="windEngineGroupByFieldCodeDetail"
+    ></Tmap>
   </div>
 </template>
 
@@ -16,11 +19,13 @@ export default {
   data() {
     return {
       fieldCode: "",
-      windEngineGroupByFieldCodeDetail: {}
+      batchCode: "",
+      windEngineGroupByFieldCodeDetail: {},
     };
   },
   mounted() {
     this.fieldCode = this.$route.query.fieldCode;
+    this.batchCode = this.$route.query.batchCode;
     // this.addMarkersAndZoom();
   },
   watch: {
@@ -33,19 +38,64 @@ export default {
 
   methods: {
     GETfengji() {
-      getWindEngineGroupByFieldCode({ fieldCode: this.fieldCode }).then(
-        (res) => {
-          const result = res.data
-          this.windEngineGroupByFieldCodeDetail = result
-          console.log(result.anemometerTowerList);
-          if (result.anemometerTowerList) {
-            this.addMarkersAndZoom(result.anemometerTowerList, '5')
+      let dataArr = {
+        fieldCode: this.fieldCode,
+        batchCode: this.batchCode,
+      };
+      getWindEngineGroupByFieldCode(dataArr).then((res) => {
+        const result = res.data;
+        this.windEngineGroupByFieldCodeDetail = result;
+        console.log(result.anemometerTowerList);
+        if (result.anemometerTowerList) {
+          this.addMarkersAndZoom(result.anemometerTowerList, "5");
+        }
+        // const windEngineGroupVoList = result.windEngineGroupVoList;
+        // const errorStateFalse = [];
+        // const errorStateTrue = [];
+        // windEngineGroupVoList.forEach((item) => {
+        //   if (item.errorState === false) {
+        //     errorStateFalse.push(item);
+        //   } else if (item.errorState === true) {
+        //     errorStateTrue.push(item);
+        //   }
+        // });
+
+        if (result.windEngineGroupVoList) {
+          // 定义两个数组来存放不同errorState的元素
+          const errorStateFalse = [];
+          const errorStateTrue = [];
+
+          // 遍历数组并根据errorState的值将元素放入不同的数组中
+          result.windEngineGroupVoList.forEach((item) => {
+            if (item.errorState === false) {
+              errorStateFalse.push(item);
+            } else if (item.errorState === true) {
+              errorStateTrue.push(item);
+            }
+          });
+
+          // 调用this.addMarkersAndZoom方法
+          if (errorStateFalse.length > 0) {
+            this.addMarkersAndZoom(errorStateFalse, "4");
           }
-          if (result.windEngineGroupVoList) {
-            this.addMarkersAndZoom(result.windEngineGroupVoList, '4')
+
+          if (errorStateTrue.length > 0) {
+            this.addMarkersAndZoom(errorStateTrue, "6");
           }
         }
-      );
+
+        // if (result.windEngineGroupVoList) {
+        //   this.addMarkersAndZoom(result.windEngineGroupVoList, "4");
+        // }
+        // const allErrorStateFalse = result.windEngineGroupVoList.every(
+        //   (item) => item.errorState === false
+        // );
+        // if (allErrorStateFalse) {
+        //   this.addMarkersAndZoom(result.windEngineGroupVoList, "4");
+        // } else {
+        //   this.addMarkersAndZoom(result.windEngineGroupVoList, "6");
+        // }
+      });
     },
     parseCoordinates(input) {
       if (input && typeof input === "string") {
@@ -64,7 +114,7 @@ export default {
           this.$refs.map.addMarker({
             point: this.parseCoordinates(element.longitudeAndLatitudeString),
             val: type,
-            ...element
+            ...element,
           });
           // this.$refs.map.moveAndZoom({
           //   point: this.parseCoordinates(element.longitudeAndLatitudeString),
@@ -85,7 +135,13 @@ export default {
       // });
 
       // // Zoom to a specific point
-      const zoomPoint = { point: this.parseCoordinates(this.windEngineGroupByFieldCodeDetail.windEngineGroupVoList[0].longitudeAndLatitudeString), zoom: 15 };
+      const zoomPoint = {
+        point: this.parseCoordinates(
+          this.windEngineGroupByFieldCodeDetail.windEngineGroupVoList[0]
+            .longitudeAndLatitudeString
+        ),
+        zoom: 15,
+      };
       this.$refs.map.moveAndZoom(zoomPoint);
     },
   },

src/views/home/components/Menu.vue

@@ -1,7 +1,7 @@
 <template>
   <el-aside :width="!isCollapse ? '250px' : '100px'" class="asideBox">
     <div class="homeBox">
-      <div class="logoItem" :class="{ 'flexCenter ': isCollapse }">
+      <!-- <div class="logoItem" :class="{ 'flexCenter ': isCollapse }">
         <div
           class="logoImg"
           v-show="isCollapse"
@@ -29,9 +29,9 @@
             )
           "
           :class="isCollapse ? 'stop-animation' : 'active-animation'"
-          >风机运行管理平台</span
+          >机组功率曲线异常检测数据分析系统</span
         >
-      </div>
+      </div> -->
     </div>
     <el-menu
       collapse-transition
@@ -128,22 +128,22 @@ export default {
         {
           id: 1,
           path: "cockpitManage",
-          name: "驾驶舱",
+          name: "首页",
           iconName: "gps",
           meta: {
             hidden: false,
           },
-          children: [
-            {
-              id: 11,
-              iconName: "",
-              meta: {
-                hidden: false,
-              },
-              path: "electronic-map",
-              name: "电子地图",
-            },
-          ],
+          // children: [
+          //   {
+          //     id: 11,
+          //     iconName: "",
+          //     meta: {
+          //       hidden: false,
+          //     },
+          //     path: "electronic-map",
+          //     name: "电子地图",
+          //   },
+          // ],
         },
       ],
     };
@@ -248,7 +248,7 @@ export default {
 }
 .stop-animation,
 .active-animation {
-  font-size: 20px;
+  font-size: 0px;
 }
 
 .asideBox {
@@ -425,4 +425,8 @@ export default {
 .asideBox:hover ::-webkit-scrollbar {
   display: block !important;
 }
+
+.el-menu-item{
+margin-left: 18px;
+}
 </style>

src/views/home/components/mockData.js

@@ -28,6 +28,69 @@ export const orgList = [
     ],
   },
   {
+    name: "台账管理",
+    iconName: "Ledger",
+    path: "Ledger",
+    meta: {
+      hidden: false,
+    },
+    id: "4",
+    component: () =>
+      import(/*webpackChunkName:'system'*/ "@/views/system/index.vue"),
+    children: [
+      {
+        id: 41,
+        name: "企业信息",
+        path: "enterprise",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/enterprise.vue"),
+      },
+      {
+        id: 42,
+        name: "风场信息",
+        path: "windsite",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/windsite.vue"),
+      },
+      {
+        id: 43,
+        name: "风机信息",
+        path: "draught",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/draught.vue"),
+      },
+      {
+        id: 44,
+        name: "机型信息",
+        path: "milltype",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/milltype.vue"),
+      },
+      {
+        id: 45,
+        name: "测风塔信息",
+        path: "anemometer",
+        meta: {
+          hidden: false,
+        },
+        component: () =>
+          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/anemometer.vue"),
+      },
+    ],
+  },
+  {
     name: "性能分析",
     id: "2",
     path: "performance",
@@ -74,18 +137,7 @@ export const orgList = [
             /*webpackChunkName:'performance'*/ "@/views/performance/editAssets.vue"
           ),
       },
-      {
-        id: 22,
-        name: "批次管理",
-        path: "batchMag",
-        meta: {
-          hidden: false,
-        },
-        component: () =>
-          import(
-            /*webpackChunkName:'performance'*/ "@/views/performance/batchMag.vue"
-          ),
-      },
+   
     ],
   },
   {
@@ -112,71 +164,21 @@ export const orgList = [
             /*webpackChunkName:'dataManage'*/ "@/views/dataAdministration/index.vue"
           ),
       },
-    ],
-  },
-  {
-    name: "台账管理",
-    iconName: "Ledger",
-    path: "Ledger",
-    meta: {
-      hidden: false,
-    },
-    id: "4",
-    component: () =>
-      import(/*webpackChunkName:'system'*/ "@/views/system/index.vue"),
-    children: [
-      {
-        id: 41,
-        name: "企业信息",
-        path: "enterprise",
-        meta: {
-          hidden: false,
-        },
-        component: () =>
-          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/enterprise.vue"),
-      },
-      {
-        id: 42,
-        name: "风场信息",
-        path: "windsite",
-        meta: {
-          hidden: false,
-        },
-        component: () =>
-          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/windsite.vue"),
-      },
-      {
-        id: 43,
-        name: "风机信息",
-        path: "draught",
-        meta: {
-          hidden: false,
-        },
-        component: () =>
-          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/draught.vue"),
-      },
-      {
-        id: 44,
-        name: "机型信息",
-        path: "milltype",
-        meta: {
-          hidden: false,
-        },
-        component: () =>
-          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/milltype.vue"),
-      },
       {
-        id: 45,
-        name: "测风塔信息",
-        path: "anemometer",
+        id: 32,
+        name: "批次管理",
+        path: "batchMag",
         meta: {
           hidden: false,
         },
         component: () =>
-          import(/*webpackChunkName:'Ledger'*/ "@/views/ledger/anemometer.vue"),
+          import(
+            /*webpackChunkName:'performance'*/ "@/views/performance/batchMag.vue"
+          ),
       },
     ],
   },
+
   {
     name: "权限管理",
     iconName: "jurisdiction",

src/views/ledger/draught.vue

@@ -281,7 +281,7 @@
           <el-form-item label="纬度:" prop="latitude">
             <el-input v-model="ruleForm.latitude" size="small"></el-input>
           </el-form-item>
-          <el-form-item label="轮廓高度:" prop="hubHeight">
+          <el-form-item label="轮毂高度:" prop="hubHeight">
             <el-input v-model="ruleForm.hubHeight" size="small"></el-input>
           </el-form-item>
         </div>
@@ -301,27 +301,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="额定风速:" prop="rated_wind_speed">
-            <el-input
-              v-model="ruleForm.rated_wind_speed"
-              size="small"
-            ></el-input>
-          </el-form-item>
-        </div>
-        <div class="form-row">
-          <el-form-item label="切入风速:" prop="ratedCutInWindspeed">
-            <el-input
-              v-model="ruleForm.ratedCutInWindspeed"
-              size="small"
-            ></el-input>
-          </el-form-item>
-          <el-form-item label="切出风速:" prop="ratedCutOutWindspeed">
-            <el-input
-              v-model="ruleForm.ratedCutOutWindspeed"
-              size="small"
-            ></el-input>
-          </el-form-item>
+
         </div>
+    
       </el-form>
       <div class="form-buttons">
         <el-button type="primary" @click="submitForm('ruleForm')"
@@ -369,26 +351,10 @@
           <p>纬度:</p>
           <span>{{ particularsdata.latitude }}°</span>
         </div>
-        <div class="condition">
-          <p>额定风速:</p>
-          <span>{{ particularsdata.rated_wind_speed }}</span
-          ><span>(m/s)</span>
-        </div>
-
-        <div class="condition">
-          <p>切入风速:</p>
-          <span>{{ particularsdata.ratedCutInWindspeed }}</span
-          ><span>(m/s)</span>
-        </div>
-
-        <div class="condition">
-          <p>切出风速:</p>
-          <span>{{ particularsdata.ratedCutOutWindspeed }}</span
-          ><span>(m/s)</span>
-        </div>
+  
 
         <div class="condition">
-          <p>轮廓高度:</p>
+          <p>轮毂高度:</p>
           <span>{{ particularsdata.hubHeight }}</span> <span>(米)</span>
         </div>
         <div class="condition">
@@ -443,9 +409,7 @@ export default {
         latitude: "",
         hubHeight: "",
         sightcing: "",
-        rated_wind_speed: "",
-        ratedCutInWindspeed: "",
-        ratedCutOutWindspeed: "",
+   
       },
       fieldCodeOptions: [],
       millTypeCodeOptions: [],
@@ -481,7 +445,7 @@ export default {
           { validator: this.validateNumber, trigger: "blur" },
         ],
         hubHeight: [
-          { required: true, message: "请输入轮廓高度", trigger: "blur" },
+          { required: true, message: "请输入轮毂高度", trigger: "blur" },
           { validator: this.validateNumbertwo, trigger: "blur" },
         ],
         elevationHeight: [
@@ -642,9 +606,7 @@ export default {
           latitude: this.ruleForm.latitude,
           hubHeight: this.ruleForm.hubHeight,
           sightcing: this.ruleForm.sightcing,
-          rated_wind_speed: this.ruleForm.rated_wind_speed,
-          ratedCutInWindspeed: this.ruleForm.ratedCutInWindspeed,
-          ratedCutOutWindspeed: this.ruleForm.ratedCutOutWindspeed,
+ 
         };
 
         if (valid) {

src/views/ledger/milltype.vue

@@ -231,6 +231,26 @@
               size="small"
             ></el-input>
           </el-form-item>
+          <el-form-item label="额定风速:" prop="ratedWindSpeed">
+            <el-input
+              v-model="ruleForm.ratedWindSpeed"
+              size="small"
+            ></el-input>
+          </el-form-item>
+        </div>
+        <div class="form-row">
+          <el-form-item label="切入风速:" prop="ratedCutInWindspeed">
+            <el-input
+              v-model="ruleForm.ratedCutInWindspeed"
+              size="small"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="切出风速:" prop="ratedCutOutWindspeed">
+            <el-input
+              v-model="ruleForm.ratedCutOutWindspeed"
+              size="small"
+            ></el-input>
+          </el-form-item>
         </div>
       </el-form>
       <div class="form-actions">
@@ -293,6 +313,18 @@
           <p>传动比-转速比:</p>
           <span>{{ particularsdata.rotationalSpeedRatio }}</span>
         </div>
+        <div class="condition">
+          <p>额定风速:</p>
+          <span>{{ particularsdata.ratedWindSpeed }} m/s</span>
+        </div>
+        <div class="condition">
+          <p>切入风速:</p>
+          <span>{{ particularsdata.ratedCutInWindspeed }} m/s</span>
+        </div>
+        <div class="condition">
+          <p>切出风速:</p>
+          <span>{{ particularsdata.ratedCutOutWindspeed }} m/s</span>
+        </div>
       </div>
       <div class="attachment">
         <p class="model-center" @click="downloadfile">下载标准功率曲线附件</p>
@@ -370,6 +402,9 @@ export default {
         vaneLong: "",
         rotorDiameter: "",
         rotationalSpeedRatio: "",
+        ratedWindSpeed: "",
+        ratedCutInWindspeed: "",
+        ratedCutOutWindspeed: "",
       },
       curvedMotionTypeOptions: [],
       rules: {
@@ -502,6 +537,9 @@ export default {
           vaneLong: this.ruleForm.vaneLong,
           rotorDiameter: this.ruleForm.rotorDiameter,
           rotationalSpeedRatio: this.ruleForm.rotationalSpeedRatio,
+          ratedWindSpeed: this.ruleForm.ratedWindSpeed,
+          ratedCutInWindspeed: this.ruleForm.ratedCutInWindspeed,
+          ratedCutOutWindspeed: this.ruleForm.ratedCutOutWindspeed,
         };
 
         if (this.isEdit) {

src/views/login/Index.vue

@@ -2,7 +2,7 @@
   <div class="background-image" v-loading="loadingView">
     <div class="border">
       <div class="leftLogin">
-        <h1>风机数据管理平台</h1>
+        <h1>机组功率曲线异常检测数据分析系统</h1>
         <el-divider></el-divider>
         <div class="loginText">
           <el-form
@@ -121,13 +121,14 @@ export default {
   left: 50%;
   transform: translate(-50%, -50%);
   padding: 0 50px;
-  width: 400px;
+  width: 430px;
   background: #fff;
   border: 1px solid rgb(231, 231, 231);
   border-radius: 5px;
   box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.4);
   margin: auto;
 
+
   .leftLogin {
     align-items: center;
 
@@ -135,7 +136,7 @@ export default {
       width: 100%;
       text-align: center;
       line-height: 50px;
-      font-size: 26px;
+      font-size: 20px;
       font-weight: 600;
       color: #00baad;
       margin-top: 20px;