Bladeren bron

修复bug6-25am 合并

liujiejie 11 maanden geleden
bovenliggende
commit
f2199f5401

+ 19 - 6
src/views/performance/assetssDetail.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:25:45
- * @LastEditTime: 2024-06-25 17:07:05
+ * @LastEditTime: 2024-06-26 14:06:43
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
@@ -52,13 +52,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="机组编号" prop="fieldEngineCode">
+            <el-form-item label="机组名称" prop="fieldEngineCode">
               <el-select v-model="formInfo.fieldEngineCode" size="small">
                 <el-option
                   v-for="item in windEngineGroupList"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                  :key="item.engineCode"
+                  :label="item.engineName"
+                  :value="item.engineCode"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -311,9 +311,22 @@ export default {
         const response = await analysisEditQuery({
           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[0];
+        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

+ 21 - 13
src/views/performance/components/EditAnalysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:14:23
- * @LastEditTime: 2024-06-25 17:03:54
+ * @LastEditTime: 2024-06-26 14:05:59
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue
@@ -29,18 +29,18 @@
                 </el-select> </el-form-item
             ></el-col>
             <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5" prop="turbines">
-              <el-form-item label="机组编号">
+              <el-form-item label="机组名称">
                 <el-select
                   clearable
                   v-model="form.turbines"
-                  placeholder="请选择机组编号"
+                  placeholder="请选择机组名称"
                   size="small"
                 >
                   <el-option
                     v-for="item in windEngineGroupList"
-                    :key="item"
-                    :label="item"
-                    :value="item"
+                    :key="item.engineCode"
+                    :label="item.engineName"
+                    :value="item.engineCode"
                   ></el-option>
                 </el-select> </el-form-item
             ></el-col>
@@ -60,19 +60,19 @@
         <el-col :span="12"
           ><div class="left">
             <div>
-              <span>机组编号:</span>
+              <span>机组名称:</span>
               <el-select
                 v-model="engineCode"
-                placeholder="请选择机组编号"
+                placeholder="请选择机组名称"
                 size="small"
                 clearable
                 @change="handleEngineCode"
               >
                 <el-option
                   v-for="item in windEngineGroupList"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                  :key="item.engineCode"
+                  :label="item.engineName"
+                  :value="item.engineCode"
                 ></el-option>
               </el-select>
             </div>
@@ -378,8 +378,16 @@ export default {
         this.analysisTypeList = response.data.analysisTypeList;
         this.windEngineGroupList = response.data.windEngineGroupList;
         this.form.configAnalysis = response.data.analysisTypeList[0].typeCode;
-        this.form.turbines = response.data.windEngineGroupList[0];
-        this.engineCode = response.data.windEngineGroupList[0];
+        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();
         this.getWindEngList();
         this.loading = false;

+ 4 - 4
src/views/performance/components/abnormalDetail.vue

@@ -51,15 +51,15 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="机组编号" align="center">
+      <el-table-column prop="address" label="机组名称" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.isEditing && setDataState === 'add'">
             <el-select v-model="scope.row.engineCode" size="small">
               <el-option
                 v-for="item in windEngineGroupList"
-                :key="item"
-                :label="item"
-                :value="item"
+                :key="item.engineCode"
+                :label="item.engineName"
+                :value="item.engineCode"
               ></el-option>
             </el-select>
           </div>

+ 35 - 18
src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-06-26 09:08:48
+ * @LastEditTime: 2024-06-26 14:07:58
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -47,22 +47,22 @@
             ></el-col>
             <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="5">
               <el-form-item
-                label="机组编号"
-                v-if="checkedCities.find((item) => item === '机组编号')"
+                label="机组名称"
+                v-if="checkedCities.find((item) => item === '机组名称')"
               >
                 <el-select
                   multiple
                   collapse-tags
                   v-model="form.turbines"
-                  placeholder="请选择机组编号"
+                  placeholder="请选择机组名称"
                   size="small"
                   clearable
                 >
                   <el-option
                     v-for="item in windEngineGroupList"
-                    :key="item"
-                    :label="item"
-                    :value="item"
+                    :key="item.engineCode"
+                    :label="item.engineName"
+                    :value="item.engineCode"
                   ></el-option>
                 </el-select>
               </el-form-item>
@@ -97,7 +97,7 @@
                 v-if="checkedCities.find((item) => item === '滤除月份')"
               >
                 <el-date-picker
-                  value-format="timestamp"
+                  value-format="yyyy-MM"
                   width="200"
                   size="small"
                   type="months"
@@ -113,7 +113,7 @@
                 v-if="checkedCities.find((item) => item === '分析时间')"
               >
                 <el-date-picker
-                  value-format="timestamp"
+                  value-format="yyyy-MM-dd"
                   size="small"
                   v-model="picker"
                   type="daterange"
@@ -508,19 +508,19 @@
         <el-col :span="12"
           ><div class="left">
             <div>
-              <span>机组编号:</span>
+              <span>机组名称:</span>
               <el-select
                 v-model="engineCode"
-                placeholder="请选择机组编号"
+                placeholder="请选择机组名称"
                 size="small"
                 clearable
                 @change="handleEngineCode"
               >
                 <el-option
                   v-for="item in windEngineGroupList"
-                  :key="item"
-                  :label="item"
-                  :value="item"
+                  :key="item.engineCode"
+                  :label="item.engineName"
+                  :value="item.engineCode"
                 ></el-option>
               </el-select>
             </div>
@@ -710,9 +710,9 @@ export default {
         "SCADA数据",
         "分析时间",
         "滤除月份",
-        "机组编号",
+        "机组名称",
       ],
-      cities: ["分析类型", "SCADA数据", "分析时间", "滤除月份", "机组编号"],
+      cities: ["分析类型", "SCADA数据", "分析时间", "滤除月份", "机组名称"],
       isIndeterminate: true,
       drawer: false,
       direction: "rtl",
@@ -835,18 +835,35 @@ export default {
         const response = await analysisEditQuery({
           batchCode: this.$route.query.batchCode,
         });
+        if (
+          response.data.windEngineGroupList === null ||
+          response.data.windEngineGroupList.length === 0
+        ) {
+          this.$message({
+            type: "warning",
+            message: "当前风场没有风机,无法进行分析",
+          });
+          this.$router.go(-1);
+        }
         this.form.powerFarmID = this.$route.query.fieldEngineCode;
         this.form.dataBatchNum = this.$route.query.batchCode;
         this.analysisTypeList = response.data.analysisTypeList;
         this.windEngineGroupList = response.data.windEngineGroupList;
-        this.engineCode = response.data.windEngineGroupList[0];
+        this.engineCode =
+          response.data.windEngineGroupList !== null &&
+          response.data.windEngineGroupList.length > 0
+            ? response.data.windEngineGroupList[0].engineCode
+            : null;
         if (response.data.windEngineGroupList.length > 0) {
           //获取台账机组编号
           this.getWindEngList();
         }
         this.loading = false;
       } catch (error) {
-        console.error(error);
+        this.$message({
+          type: "error",
+          message: error,
+        });
         this.loading = false;
         this.$router.go(-1);
       }

+ 2 - 2
vue.config.js

@@ -65,8 +65,8 @@ module.exports = {
     proxy: {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
-        target: "http://192.168.50.235:16200", //内网
-        // target: "http://192.168.5.15:16200",
+        // target: "http://192.168.50.235:16200", //内网
+        target: "http://192.168.5.15:16200",
         // target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {