合并

src/api/performance.js

@@ -1,12 +1,36 @@
 /*
  * @Author: your name
  * @Date: 2024-06-03 09:29:50
- * @LastEditTime: 2024-07-05 15:35:24
+ * @LastEditTime: 2024-07-16 10:10:05
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/api/performance。.js
  */
 import request from "@/utils/request";
+//分析类型查询
+export function queryAnalysisedType(data) {
+  return request({
+    url: "/energy-manage-service/analysis/queryAnalysisedType",
+    method: "get",
+    params: data,
+  });
+}
+//风机机组编号查询
+export function queryAnalysisedEngine(data) {
+  return request({
+    url: "/energy-manage-service/analysis/queryAnalysisedEngine",
+    method: "get",
+    params: data,
+  });
+}
+//开启自动分析开关接口
+export function onOffAutoAnalysis(data) {
+  return request({
+    url: "/energy-manage-service/analysis/onOffAutoAnalysis",
+    method: "post",
+    data,
+  });
+}
 //自动生成批次名称
 export function createBatchName(data) {
   return request({

src/components/map/index.vue

@@ -105,24 +105,12 @@
       </div>
     </div>
 
-    <el-dialog title="异常描述"  :visible.sync="dialogVisible" width="50%">
-
-      <el-table
-      :data="tableData"
-       max-height="500"
-      style="width: 100%">
-      <el-table-column
-        prop="analysisTypeName"
-        label="类型"
-        width="300">
-      </el-table-column>
-      <el-table-column
-        prop="errDesc"
-        label="描述"
-        >
-      </el-table-column>
- 
-    </el-table>
+    <el-dialog title="异常描述" :visible.sync="dialogVisible" width="50%">
+      <el-table :data="tableData" max-height="500" style="width: 100%">
+        <el-table-column prop="analysisTypeName" label="类型" width="300">
+        </el-table-column>
+        <el-table-column prop="errDesc" label="描述"> </el-table-column>
+      </el-table>
     </el-dialog>
   </div>
 </template>
@@ -162,7 +150,7 @@ export default {
   data() {
     return {
       dialogVisible: false,
-      tableData:[],
+      tableData: [],
       hoverInfo: null,
       hoverStyle: {
         position: "absolute",
@@ -209,8 +197,8 @@ export default {
         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://106.120.102.238:18000/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", //外网
           }),
         }),
         new VectorLayer({
@@ -357,14 +345,13 @@ export default {
       });
     },
     handleFeatureClick(featureData) {
-
       let dateArr = {
         batchCode: this.$route.query.batchCode,
         engineCode: featureData.engineCode,
       };
       queryErrDescByEngine(dateArr).then((res) => {
         this.dialogVisible = true;
-      this.tableData=res.data
+        this.tableData = res.data;
       });
     },
 

src/views/dataAdministration/index.vue

@@ -56,20 +56,21 @@
       >
         <!-- Table Columns -->
         <el-table-column
-          fixed
-          prop="batchName"
+          prop="fieldName"
           align="center"
-          label="批次名称"
+          label="风场名称"
           min-width="200"
         >
         </el-table-column>
         <el-table-column
-          prop="fieldName"
+          fixed
+          prop="batchName"
           align="center"
-          label="风场名称"
+          label="批次名称"
           min-width="200"
         >
         </el-table-column>
+
         <el-table-column
           prop="engineCount"
           align="center"
@@ -647,21 +648,28 @@ export default {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.loadingViewEdit = true;
-          dataTransfer({
-            dataTransferAddr: this.editTransferStateForm.dataTransferTypePath,
-            dataTransferType: this.editTransferStateForm.transferType,
-            batchCode: this.editTransferStateForm.batchCode,
-            timeGranularity: this.editTransferStateForm.timeGranularity,
-          })
-            .then((res) => {
-              this.$message({
-                message: "操作成功",
-                type: "success",
-              });
-              this.getTableList();
-              this.editstateCancel();
+          this.$confirm("请检查平台内的风机名称和转换数据的风机名称是否一致!")
+            .then((_) => {
+              dataTransfer({
+                dataTransferAddr:
+                  this.editTransferStateForm.dataTransferTypePath,
+                dataTransferType: this.editTransferStateForm.transferType,
+                batchCode: this.editTransferStateForm.batchCode,
+                timeGranularity: this.editTransferStateForm.timeGranularity,
+              })
+                .then((res) => {
+                  this.$message({
+                    message: "操作成功",
+                    type: "success",
+                  });
+                  this.getTableList();
+                  this.editstateCancel();
+                })
+                .catch((error) => {
+                  this.loadingViewEdit = false;
+                });
             })
-            .catch((error) => {
+            .catch((_) => {
               this.loadingViewEdit = false;
             });
         } else {
@@ -689,14 +697,16 @@ export default {
       this.newEditForm.batchName = row.batchName;
       this.newEditForm.dataTransferTypePathDtoList[0] = { ...row };
     },
-    editCancel() {
+    editCancel(name) {
       this.newform = {
         batchCode: "",
         dataTransferTypePathDtoList: [{}],
       };
       this.editNuedialog = false;
       this.loadingViewEdit = false;
-      this.getTableList();
+      if (!name) {
+        this.getTableList();
+      }
       this.getBatchCodeList();
     },
     editly(formName) {
@@ -915,6 +925,7 @@ export default {
         this.loading = false;
       }
     },
+
     async fetchData() {
       try {
         const result = await queryDataTransferList({

src/views/ledger/draught.vue

@@ -473,7 +473,7 @@ export default {
       elevationHeight: "",
       latitude: "",
       sightcing: "",
-thisrow:"",
+      thisrow: "",
       fileList: [],
       globalFileList: [],
       nuedialog: false,
@@ -596,7 +596,6 @@ thisrow:"",
     },
     // 确认
     submitForm(formName) {
-    
       this.$refs[formName].validate((valid) => {
         const objData = {
           fieldCode: this.ruleForm.fieldCode,
@@ -608,7 +607,7 @@ thisrow:"",
           latitude: this.ruleForm.latitude,
           hubHeight: this.ruleForm.hubHeight,
           sightcing: this.ruleForm.sightcing,
-          engineCode:this.thisrow
+          engineCode: this.thisrow,
         };
 
         if (valid) {
@@ -716,14 +715,13 @@ thisrow:"",
 
     // 编辑
     compile(row) {
-      this.thisrow=row.engineCode
+      this.thisrow = row.engineCode;
       getWindEngineGroup({ engineCode: row.engineCode }).then((res) => {
         const item = JSON.parse(JSON.stringify(res.data));
         this.detail = item;
         Object.keys(this.ruleForm).forEach((key) => {
           this.ruleForm[key] = item[key];
         });
-
       });
       this.nuedialog = true;
       this.title = "编辑";

src/views/performance/assetssDetail.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:25:45
- * @LastEditTime: 2024-07-09 15:37:46
+ * @LastEditTime: 2024-07-16 15:02:10
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
@@ -14,7 +14,7 @@
           type="text"
           style="font-size: 20px"
           icon="el-icon-arrow-left"
-          @click="() => $router.go(-1)"
+          @click="() => $router.push('/home/performance/assetssMag')"
           >返回</el-button
         ></el-col
       >
@@ -44,9 +44,9 @@
               <el-select v-model="formInfo.analysisTypeCode" size="small">
                 <el-option
                   v-for="item in analysisTypeList"
-                  :key="item.typeCode"
-                  :label="item.typeName"
-                  :value="item.typeCode"
+                  :key="item.analysisTypeCode"
+                  :label="item.analysisTypeName"
+                  :value="item.analysisTypeCode"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -88,12 +88,16 @@
           >
         </div>
         <el-row class="assetssConent">
+          <!-- :span="getSpan(index, 'generalFiles')" -->
           <el-col
             v-for="(file, index) in generalFiles"
             :key="index"
-            :span="getSpan(index, 'generalFiles')"
+            :span="24"
             v-loading="loadings[index] && getFileType(file.fileAddr) === 'html'"
             class="col_content"
+            :style="{
+              display: getFileType(file.fileAddr) === 'html' ? 'block' : 'none',
+            }"
           >
             <iframe
               v-if="getFileType(file.fileAddr) === 'html'"
@@ -140,11 +144,14 @@
           <el-col
             v-for="(file, index) in diagramRelations"
             :key="index"
-            :span="getSpan(index, 'diagramRelations')"
+            :span="24"
             v-loading="
               loadings[index + generalFiles.length] &&
               getFileType(file.fileAddr) === 'html'
             "
+            :style="{
+              display: getFileType(file.fileAddr) === 'html' ? 'block' : 'none',
+            }"
             class="col_content"
           >
             <!-- <div>{{ file.fileAddr }}</div> -->
@@ -204,7 +211,12 @@
   </div>
 </template>
 <script>
-import { analysisDetail, analysisEditQuery } from "@/api/performance";
+import {
+  analysisDetail,
+  analysisEditQuery,
+  queryAnalysisedType,
+  queryAnalysisedEngine,
+} from "@/api/performance";
 import axios from "axios";
 
 export default {
@@ -310,49 +322,45 @@ export default {
     async getWindCodeList() {
       this.loading = true;
       try {
-        const response = await analysisEditQuery({
+        const resAnalysisedType = await queryAnalysisedType({
           batchCode: this.$route.query.batchCode,
         });
-        // if (
-        //   response.data.windEngineGroupList === null ||
-        //   response.data.windEngineGroupList.length === 0
-        // ) {
-        //   this.$message({
-        //     type: "warning",
-        //     message: "当前风场没有风机，无法进行分析",
-        //   });
-        // }
-        this.analysisTypeList = response.data.analysisTypeList;
-        this.windEngineGroupList = response.data.windEngineGroupList;
-        this.formInfo.fieldEngineCode =
-          response.data.windEngineGroupList !== null &&
-          response.data.windEngineGroupList.length > 0
-            ? response.data.windEngineGroupList[0].engineCode
-            : null;
-        this.formInfo.analysisTypeCode =
-          response.data.analysisTypeList.length > 0
-            ? response.data.analysisTypeList[0].typeCode
-            : "";
-        this.loading = false;
+        if (resAnalysisedType.data && resAnalysisedType.data.length > 0) {
+          const resEngineList = await queryAnalysisedEngine({
+            batchCode: this.$route.query.batchCode,
+            analysisTypeCode: resAnalysisedType.data[0].analysisTypeCode,
+          });
+          this.analysisTypeList = resAnalysisedType.data;
+          this.windEngineGroupList = resEngineList.data;
+          this.formInfo.fieldEngineCode =
+            resEngineList.data !== null && resEngineList.data.length > 0
+              ? resEngineList.data[0].engineCode
+              : null;
+          this.formInfo.analysisTypeCode =
+            resAnalysisedType.data.length > 0
+              ? resAnalysisedType.data[0].analysisTypeCode
+              : "";
+          this.loading = false;
+        }
         this.getDetailInfo();
       } catch (error) {
         this.loading = false;
         console.error(error);
       }
     },
-    getSpan(index, type) {
-      let isLastElement = false;
-      if (type === "generalFiles") {
-        isLastElement = index === this.generalFiles.length - 1;
-      } else if (type === "diagramRelations") {
-        isLastElement = index === this.diagramRelations.length - 1;
-      }
-      const isOddPosition = (index + 1) % 2 !== 0;
-      if (isLastElement && isOddPosition) {
-        return 24;
-      }
-      return 12;
-    },
+    // getSpan(index, type) {
+    //   let isLastElement = false;
+    //   if (type === "generalFiles") {
+    //     isLastElement = index === this.generalFiles.length - 1;
+    //   } else if (type === "diagramRelations") {
+    //     isLastElement = index === this.diagramRelations.length - 1;
+    //   }
+    //   const isOddPosition = (index + 1) % 2 !== 0;
+    //   if (isLastElement && isOddPosition) {
+    //     return 24;
+    //   }
+    //   return 12;
+    // },
     getFileType(url) {
       // 使用 URL 对象解析 URL
       // 获取路径名部分
@@ -389,7 +397,7 @@ export default {
 }
 .analysisType {
   .assetssConent {
-    height: 450px !important;
+    height: 550px !important;
     .el-col-12 {
       height: 100%;
     }

src/views/performance/assetssMag.vue

@@ -57,7 +57,7 @@
               v-if="scope.row.analysisState == 0"
               :text-inside="true"
               :stroke-width="20"
-              :percentage="30"
+              :percentage="scope.row.analysisProgress"
               :class="{
                 'indeterminate-progress': scope.row.analysisProgress < 100,
                 'animated-progress': true,
@@ -74,9 +74,16 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.analysisState == -1">未分析</span>
-            <span v-else-if="scope.row.analysisState == 0" style="color: #f90"
+            <span
+              v-else-if="
+                scope.row.analysisState == 0 && scope.row.errState == 0
+              "
+              style="color: #f90"
               >分析中</span
             >
+            <span v-else-if="scope.row.errState == 1" style="color: #f00"
+              >分析异常</span
+            >
             <span
               v-else-if="scope.row.analysisState == 1"
               style="color: #4caf50"
@@ -94,9 +101,9 @@
           <template slot-scope="scope">
             <span>
               {{
-                scope.row.errState == 0
+                scope.row.errState == 0 && scope.row.analysisState !== -1
                   ? "未异常"
-                  : scope.row.errState == 1
+                  : scope.row.errState === 1
                   ? "异常"
                   : "/"
               }}</span
@@ -127,13 +134,25 @@
           min-width="120"
         >
           <template slot-scope="scope">
+            <!-- 分析完成 -->
             <el-button
               v-if="scope.row.analysisState == 1 && scope.row.errState !== 1"
-              @click="handleAssetssDetail(scope.row)"
+              @click="handleAssetssDetail(scope.row, '1')"
+              type="text"
+              size="small"
+              >分析详情</el-button
+            >
+            <!-- 分析中 -->
+            <el-button
+              v-else-if="
+                scope.row.analysisState == 0 && scope.row.errState == 0
+              "
+              @click="handleAssetssDetail(scope.row, '0')"
               type="text"
               size="small"
               >分析详情</el-button
             >
+
             <span v-else>/</span>
           </template>
         </el-table-column>
@@ -149,7 +168,7 @@
           align="center"
           fixed="right"
           label="操作"
-          min-width="200"
+          min-width="220"
         >
           <template slot-scope="scope">
             <el-button
@@ -164,6 +183,14 @@
               size="small"
               >异常描述</el-button
             >
+            <el-button
+              @click="HandleOnOffAuto(scope.row)"
+              type="text"
+              size="small"
+              >{{
+                scope.row.onOffCall === 0 ? "开启自动分析" : "关闭自动分析"
+              }}</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
@@ -195,8 +222,9 @@
 </template>
 
 <script>
+import { fromCircle } from "ol/geom/Polygon";
 import MyDialog from "./components/dialogCom.vue";
-import { getAnalysisResultList } from "@/api/performance";
+import { getAnalysisResultList, onOffAutoAnalysis } from "@/api/performance";
 export default {
   components: {
     MyDialog,
@@ -230,6 +258,24 @@ export default {
   },
 
   methods: {
+    async HandleOnOffAuto(row) {
+      try {
+        const form = new FormData();
+        form.append("batchCode", row.batchCode);
+        form.append("onOffCall", row.onOffCall === 0 ? 1 : 0);
+        const res = await onOffAutoAnalysis(form);
+        // console.log(res, "res");
+        if (res.code === 200) {
+          this.getTableList();
+          this.$message({
+            type: "success",
+            message: `${row.onOffCall === 0 ? "开启" : "关闭"}成功`,
+          });
+        }
+      } catch (err) {
+        console.error(err);
+      }
+    },
     //分析
     handleAssetss(row) {
       this.$router.push({
@@ -242,15 +288,29 @@ export default {
       });
     },
     //分析详情
-    handleAssetssDetail(row) {
-      this.$router.push({
-        path: "/home/performance/assetssDetail",
-        query: {
-          batchCode: row.batchCode,
-          analysisTypeCode: row.analysisTypeCode,
-          fieldEngineCode: row.fieldEngineCode,
-        },
-      });
+    handleAssetssDetail(row, state) {
+      const navigateToDetails = () => {
+        this.$router.push({
+          path: "/home/performance/assetssDetail",
+          query: {
+            batchCode: row.batchCode,
+            analysisTypeCode: row.analysisTypeCode,
+            fieldEngineCode: row.fieldEngineCode,
+          },
+        });
+      };
+      if (state === "0") {
+        // 分析状态为分析中
+        this.$confirm(
+          "当前查看的分析记录为历史分析结果，最新分析记录还未分析完成不展示！"
+        )
+          .then(() => {
+            navigateToDetails();
+          })
+          .catch(() => {});
+      } else {
+        navigateToDetails();
+      }
     },
     abnormalDialog(row, title) {
       this.dialogVisible = true;

src/views/performance/batchMag.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:23:37
- * @LastEditTime: 2024-07-10 10:26:17
+ * @LastEditTime: 2024-07-15 11:31:41
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/batchMag.vue
@@ -67,21 +67,22 @@
         :cell-style="rowStyle"
       >
         <el-table-column
+          prop="fieldName"
           align="center"
           min-width="100"
-          label="批次名称"
-          prop="batchName"
+          label="关联风场"
         >
         </el-table-column>
-        <!-- <el-table-column align="center" label="批次编号" prop="batchCode">
-        </el-table-column> -->
         <el-table-column
-          prop="fieldName"
           align="center"
           min-width="100"
-          label="关联风场"
+          label="批次名称"
+          prop="batchName"
         >
         </el-table-column>
+        <!-- <el-table-column align="center" label="批次编号" prop="batchCode">
+        </el-table-column> -->
+
         <el-table-column
           prop="batchState"
           align="center"

src/views/performance/components/EditAnalysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:14:23
- * @LastEditTime: 2024-07-09 15:38:39
+ * @LastEditTime: 2024-07-16 14:53:55
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue
@@ -19,12 +19,13 @@
                   placeholder="请选择分析类型"
                   size="small"
                   clearable
+                  @change="handleAnalysisType"
                 >
                   <el-option
                     v-for="item in analysisTypeList"
-                    :key="item.typeCode"
-                    :label="item.typeName"
-                    :value="item.typeCode"
+                    :key="item.analysisTypeCode"
+                    :label="item.analysisTypeName"
+                    :value="item.analysisTypeCode"
                   ></el-option>
                 </el-select> </el-form-item
             ></el-col>
@@ -55,7 +56,11 @@
         </el-collapse-item>
       </el-collapse>
     </el-form>
-    <el-card shadow="always" class="box-card">
+    <el-empty
+      v-if="noData"
+      description="暂无分析任何数据,无法进行手动分析描述"
+    ></el-empty>
+    <el-card v-if="!noData" shadow="always" class="box-card">
       <el-row>
         <el-col :span="12"
           ><div class="left">
@@ -141,7 +146,7 @@
       </el-row>
     </el-card>
     <el-empty :image-size="200" v-if="flage"></el-empty>
-    <div class="abalysisType" v-else>
+    <div class="abalysisType" v-else-if="!flage && !noData">
       <el-tabs
         v-model="editableTabsValue"
         type="card"
@@ -207,6 +212,8 @@ import {
   delAnalysisCommentType,
   addAnalysisCommentType,
   analysisCommentEdit,
+  queryAnalysisedType, //查询分析类型
+  queryAnalysisedEngine, //查询机组
 } from "@/api/performance";
 import { getWindEngineGroup } from "@/api/ledger";
 import TinymceEditor from "@/components/Tinymce.vue";
@@ -216,6 +223,7 @@ export default {
   },
   data() {
     return {
+      noData: false,
       htmlLoading: true,
       loading: false,
       engineCode: null, //台账机组编号
@@ -259,6 +267,25 @@ export default {
     iframeLoad() {
       this.htmlLoading = false;
     },
+    async handleAnalysisType(e) {
+      const resEngineList = await queryAnalysisedEngine({
+        batchCode: this.$route.query.batchCode,
+        analysisTypeCode: e,
+      });
+      this.windEngineGroupList = resEngineList.data;
+      this.form.turbines =
+        resEngineList.data !== null && resEngineList.data.length > 0
+          ? resEngineList.data[0].engineCode
+          : null;
+      this.engineCode =
+        resEngineList.data !== null && resEngineList.data.length > 0
+          ? resEngineList.data[0].engineCode
+          : null;
+      if (resEngineList.data.length > 0) {
+        //获取台账机组编号
+        this.getWindEngList();
+      }
+    },
     async handleComment() {
       this.loading = true;
       try {
@@ -291,6 +318,7 @@ export default {
       });
     },
     handleEngineCode(e) {
+      console.log(e, "e");
       this.engineCode = e;
       this.getWindEngList();
     },
@@ -327,6 +355,7 @@ export default {
             response.data[0].commentDescriptionVos,
             response.data[0].commentTypeRelations
           );
+          console.log(this.editableTabs, "this.editableTabs");
           this.editableTabsValue =
             this.editableTabs.length > 0
               ? this.editableTabs[0].commentTypeCode
@@ -368,30 +397,39 @@ export default {
         })
         .catch((_) => {});
     },
+    //修改赋值
     async getWindCodeList() {
       this.loading = true;
       try {
-        const response = await analysisEditQuery({
+        const resAnalysisedType = await queryAnalysisedType({
           batchCode: this.$route.query.batchCode,
         });
-        this.analysisTypeList = response.data.analysisTypeList;
-        this.windEngineGroupList = response.data.windEngineGroupList;
-        this.form.configAnalysis = response.data.analysisTypeList[0].typeCode;
-        this.form.turbines =
-          response.data.windEngineGroupList !== null &&
-          response.data.windEngineGroupList.length > 0
-            ? response.data.windEngineGroupList[0].engineCode
-            : null;
-        this.engineCode =
-          response.data.windEngineGroupList !== null &&
-          response.data.windEngineGroupList.length > 0
-            ? response.data.windEngineGroupList[0].engineCode
-            : null;
-        this.getDetailInfo();
-        if (response.data.windEngineGroupList.length > 0) {
-          //获取台账机组编号
-          this.getWindEngList();
+        if (resAnalysisedType.data && resAnalysisedType.data.length > 0) {
+          this.noData = false;
+          const resEngineList = await queryAnalysisedEngine({
+            batchCode: this.$route.query.batchCode,
+            analysisTypeCode: resAnalysisedType.data[0].analysisTypeCode,
+          });
+          this.analysisTypeList = resAnalysisedType.data;
+          this.windEngineGroupList = resEngineList.data;
+          this.form.configAnalysis = resAnalysisedType.data[0].analysisTypeCode;
+          this.form.turbines =
+            resEngineList.data !== null && resEngineList.data.length > 0
+              ? resEngineList.data[0].engineCode
+              : null;
+          this.engineCode =
+            resEngineList.data !== null && resEngineList.data.length > 0
+              ? resEngineList.data[0].engineCode
+              : null;
+          this.getDetailInfo();
+          if (resEngineList.data.length > 0) {
+            //获取台账机组编号
+            this.getWindEngList();
+          }
+        } else {
+          this.noData = true;
         }
+
         this.loading = false;
       } catch (error) {
         console.error(error);

src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-07-09 09:37:35
+ * @LastEditTime: 2024-07-15 13:41:20
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -257,8 +257,8 @@
                     :min="1"
                     size="small"
                     placeholder="步长"
-                    v-model="form.dGeneratorSpeed[0]"
-                    @input="ensureMinValue(form.dGeneratorSpeed, 0)"
+                    v-model="form.dgeneratorSpeed[0]"
+                    @input="ensureMinValue(form.dgeneratorSpeed, 0)"
                   >
                   </el-input>
                   <el-input
@@ -266,8 +266,8 @@
                     :min="1"
                     size="small"
                     placeholder="最小值"
-                    v-model="form.dGeneratorSpeed[1]"
-                    @input="ensureMinValue(form.dGeneratorSpeed, 1)"
+                    v-model="form.dgeneratorSpeed[1]"
+                    @input="ensureMinValue(form.dgeneratorSpeed, 1)"
                   >
                   </el-input>
                   <el-input
@@ -275,8 +275,8 @@
                     :min="1"
                     size="small"
                     placeholder="最大值"
-                    v-model="form.dGeneratorSpeed[2]"
-                    @input="ensureMinValue(form.dGeneratorSpeed, 2)"
+                    v-model="form.dgeneratorSpeed[2]"
+                    @input="ensureMinValue(form.dgeneratorSpeed, 2)"
                   >
                   </el-input>
                 </div>
@@ -290,8 +290,8 @@
                     :min="1"
                     size="small"
                     placeholder="步长"
-                    v-model="form.iGeneratorSpeed[0]"
-                    @input="ensureMinValue(form.iGeneratorSpeed, 0)"
+                    v-model="form.igeneratorSpeed[0]"
+                    @input="ensureMinValue(form.igeneratorSpeed, 0)"
                   >
                   </el-input>
                   <el-input
@@ -299,8 +299,8 @@
                     :min="1"
                     size="small"
                     placeholder="最小值"
-                    v-model="form.iGeneratorSpeed[1]"
-                    @input="ensureMinValue(form.iGeneratorSpeed, 1)"
+                    v-model="form.igeneratorSpeed[1]"
+                    @input="ensureMinValue(form.igeneratorSpeed, 1)"
                   >
                   </el-input>
                   <el-input
@@ -308,8 +308,8 @@
                     :min="1"
                     size="small"
                     placeholder="最大值"
-                    v-model="form.iGeneratorSpeed[2]"
-                    @input="ensureMinValue(form.iGeneratorSpeed, 2)"
+                    v-model="form.igeneratorSpeed[2]"
+                    @input="ensureMinValue(form.igeneratorSpeed, 2)"
                   >
                   </el-input>
                 </div>
@@ -323,8 +323,8 @@
                     :min="1"
                     size="small"
                     placeholder="步长"
-                    v-model="form.dGeneratorTorque[0]"
-                    @input="ensureMinValue(form.dGeneratorTorque, 0)"
+                    v-model="form.dgeneratorTorque[0]"
+                    @input="ensureMinValue(form.dgeneratorTorque, 0)"
                   >
                   </el-input>
                   <el-input
@@ -332,8 +332,8 @@
                     :min="1"
                     size="small"
                     placeholder="最小值"
-                    v-model="form.dGeneratorTorque[1]"
-                    @input="ensureMinValue(form.dGeneratorTorque, 1)"
+                    v-model="form.dgeneratorTorque[1]"
+                    @input="ensureMinValue(form.dgeneratorTorque, 1)"
                   >
                   </el-input>
                   <el-input
@@ -341,8 +341,8 @@
                     :min="1"
                     size="small"
                     placeholder="最大值"
-                    v-model="form.dGeneratorTorque[2]"
-                    @input="ensureMinValue(form.dGeneratorTorque, 2)"
+                    v-model="form.dgeneratorTorque[2]"
+                    @input="ensureMinValue(form.dgeneratorTorque, 2)"
                   >
                   </el-input>
                 </div>
@@ -356,8 +356,8 @@
                     :min="1"
                     size="small"
                     placeholder="步长"
-                    v-model="form.iGeneratorTorque[0]"
-                    @input="ensureMinValue(form.iGeneratorTorque, 0)"
+                    v-model="form.igeneratorTorque[0]"
+                    @input="ensureMinValue(form.igeneratorTorque, 0)"
                   >
                   </el-input>
                   <el-input
@@ -365,8 +365,8 @@
                     :min="1"
                     size="small"
                     placeholder="最小值"
-                    v-model="form.iGeneratorTorque[1]"
-                    @input="ensureMinValue(form.iGeneratorTorque, 1)"
+                    v-model="form.igeneratorTorque[1]"
+                    @input="ensureMinValue(form.igeneratorTorque, 1)"
                   >
                   </el-input>
                   <el-input
@@ -374,8 +374,8 @@
                     :min="1"
                     size="small"
                     placeholder="最大值"
-                    v-model="form.iGeneratorTorque[2]"
-                    @input="ensureMinValue(form.iGeneratorTorque, 2)"
+                    v-model="form.igeneratorTorque[2]"
+                    @input="ensureMinValue(form.igeneratorTorque, 2)"
                   >
                   </el-input>
                 </div>
@@ -710,10 +710,10 @@ export default {
         valueActivePower: [], //有功功率
         valueGeneratorSpeed: [], //发电机转速
         //图像
-        dGeneratorSpeed: [], //直驱发电机转速轴系 第一个值为步长 第二个min 第三个 max
-        iGeneratorSpeed: [], //非直驱发电机转速轴系设置
-        dGeneratorTorque: [], //直驱发电机转矩轴系
-        iGeneratorTorque: [], //非直驱发电机转矩轴系
+        dgeneratorSpeed: [], //直驱发电机转速轴系 第一个值为步长 第二个min 第三个 max
+        igeneratorSpeed: [], //非直驱发电机转速轴系设置
+        dgeneratorTorque: [], //直驱发电机转矩轴系
+        igeneratorTorque: [], //非直驱发电机转矩轴系
         cp: [], //风能利用系数轴系
         tsr: [], //叶尖速比轴系
         pitchAngle: [], //桨距角轴系
@@ -825,21 +825,21 @@ export default {
               ? this.form.valueGeneratorSpeed
               : undefined, //发电机转速
           //图像
-          dGeneratorSpeed:
-            this.form.dGeneratorSpeed.length > 0
-              ? this.form.dGeneratorSpeed
+          dgeneratorSpeed:
+            this.form.dgeneratorSpeed.length > 0
+              ? this.form.dgeneratorSpeed
               : undefined, //直驱发电机转速轴系 第一个值为步长 第二个min 第三个 max
-          iGeneratorSpeed:
-            this.form.iGeneratorSpeed.length > 0
-              ? this.form.iGeneratorSpeed
+          igeneratorSpeed:
+            this.form.igeneratorSpeed.length > 0
+              ? this.form.igeneratorSpeed
               : undefined, //非直驱发电机转速轴系设置
-          dGeneratorTorque:
-            this.form.dGeneratorTorque.length > 0
-              ? this.form.dGeneratorTorque
+          dgeneratorTorque:
+            this.form.dgeneratorTorque.length > 0
+              ? this.form.dgeneratorTorque
               : undefined, //直驱发电机转矩轴系
-          iGeneratorTorque:
-            this.form.iGeneratorTorque.length > 0
-              ? this.form.iGeneratorTorque
+          igeneratorTorque:
+            this.form.igeneratorTorque.length > 0
+              ? this.form.igeneratorTorque
               : undefined, //非直驱发电机转矩轴系
           cp: this.form.cp.length > 0 ? this.form.cp : undefined, //风能利用系数轴系
           tsr: this.form.tsr.length > 0 ? this.form.tsr : undefined, //叶尖速比轴系
@@ -876,7 +876,7 @@ export default {
             type: "warning",
             message: "当前风场没有风机，无法进行分析",
           });
-          this.$router.go(-1);
+          this.$router.push("/home/performance/assetssMag");
         }
         this.form.powerFarmID = this.$route.query.fieldEngineCode;
         this.form.dataBatchNum = this.$route.query.batchCode;
@@ -898,7 +898,7 @@ export default {
           message: error,
         });
         this.loading = false;
-        this.$router.go(-1);
+        this.$router.push("/home/performance/assetssMag");
       }
     },
     handleCheckAllChange(val) {
@@ -945,10 +945,10 @@ export default {
         valueActivePower: [], //有功功率
         valueGeneratorSpeed: [], //发电机转速
         //图像
-        dGeneratorSpeed: [], //直驱发电机转速轴系 第一个值为步长 第二个min 第三个 max
-        iGeneratorSpeed: [], //非直驱发电机转速轴系设置
-        dGeneratorTorque: [], //直驱发电机转矩轴系
-        iGeneratorTorque: [], //非直驱发电机转矩轴系
+        dgeneratorSpeed: [], //直驱发电机转速轴系 第一个值为步长 第二个min 第三个 max
+        igeneratorSpeed: [], //非直驱发电机转速轴系设置
+        dgeneratorTorque: [], //直驱发电机转矩轴系
+        igeneratorTorque: [], //非直驱发电机转矩轴系
         cp: [], //风能利用系数轴系
         tsr: [], //叶尖速比轴系
         pitchAngle: [], //桨距角轴系

src/views/performance/editAssets.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:26:31
- * @LastEditTime: 2024-07-09 15:38:08
+ * @LastEditTime: 2024-07-15 13:35:47
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/editAssets.vue
@@ -14,7 +14,7 @@
           type="text"
           style="font-size: 20px"
           icon="el-icon-arrow-left"
-          @click="() => $router.go(-1)"
+          @click="() => $router.push('/home/performance/assetssMag')"
           >返回</el-button
         ></el-col
       >
@@ -43,8 +43,7 @@ export default {
     };
   },
   methods: {
-    handleClick(tab, event) {
-    },
+    handleClick(tab, event) {},
   },
 };
 </script>

vue.config.js

@@ -73,6 +73,13 @@ module.exports = {
           "^/api": "", // 需要regit write重写的,
         },
       },
+      "/transDataWeb": {
+        target: "http://192.168.50.241:9000/trans_data_web",
+        changeOrigin: true,
+        pathRewrite: {
+          "^/transDataWeb": "", // 需要regit write重写的,
+        },
+      },
       // "/downLoadApi": {
       //   target: "http://192.168.50.241:8080", //http://192.168.50.241:8080/
       //   changeOrigin: true,