Explorar o código

分析事件编辑修改

liujiejie hai 10 meses
pai
achega
8d44e7bd88

+ 9 - 1
src/api/performance.js

@@ -1,12 +1,20 @@
 /*
  * @Author: your name
  * @Date: 2024-06-03 09:29:50
- * @LastEditTime: 2024-07-16 10:10:05
+ * @LastEditTime: 2024-07-17 09:55:52
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/api/performance。.js
  */
 import request from "@/utils/request";
+//转换数据时间
+export function queryDataTime(data) {
+  return request({
+    url: "/energy-manage-service/dataTransfer/queryDataTime",
+    method: "get",
+    params: data,
+  });
+}
 //分析类型查询
 export function queryAnalysisedType(data) {
   return request({

+ 2 - 3
src/views/dataAdministration/index.vue

@@ -63,7 +63,6 @@
         >
         </el-table-column>
         <el-table-column
-          fixed
           prop="batchName"
           align="center"
           label="批次名称"
@@ -505,6 +504,7 @@
             </el-col>
           </el-row>
         </el-form>
+
         <span slot="footer" class="dialog-footer">
           <el-button @click="editstateCancel('editStateForm')" size="small"
             >取 消</el-button
@@ -528,7 +528,6 @@ import {
   editTimeGranularityQuery,
   dataTransfer,
 } from "@/api/dataManage";
-import axios from "axios";
 export default {
   data() {
     return {
@@ -992,7 +991,7 @@ export default {
   }
 }
 ::v-deep .animated-progress .el-progress-bar__outer {
-  height: 20px; /* Adjust height as needed */
+  height: 15px; /* Adjust height as needed */
   background-color: rgb(235, 238, 245);
   background-image: linear-gradient(
     45deg,

+ 1 - 1
src/views/performance/assetssMag.vue

@@ -463,7 +463,7 @@ export default {
   }
 }
 ::v-deep .animated-progress .el-progress-bar__outer {
-  height: 20px; /* Adjust height as needed */
+  height: 15px; /* Adjust height as needed */
   background-color: rgb(235, 238, 245);
   background-image: linear-gradient(
     45deg,

+ 39 - 2
src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-07-15 13:41:20
+ * @LastEditTime: 2024-07-17 14:15:50
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -91,6 +91,7 @@
                   placeholder="请选择SCADA数据"
                   size="small"
                   clearable
+                  @change="handleScada"
                 >
                   <el-option
                     :key="'minute'"
@@ -134,6 +135,7 @@
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
+                  :picker-options="pickerOptions"
                 >
                 </el-date-picker> </el-form-item
             ></el-col>
@@ -685,7 +687,7 @@
   </div>
 </template>
 <script>
-import { analysisEditQuery, analysis } from "@/api/performance";
+import { analysisEditQuery, analysis, queryDataTime } from "@/api/performance";
 import { getWindEngineGroup } from "@/api/ledger";
 export default {
   data() {
@@ -695,6 +697,11 @@ export default {
       htmlLoading: true,
       engineCode: null, //台账机组编号
       picker: [],
+      dataMinTime: null,
+      dataMaxTime: null,
+      pickerOptions: {
+        disabledDate: this.disabledDate,
+      },
       loading: false,
       form: {
         configAnalysis: null, //分析类型
@@ -743,8 +750,38 @@ export default {
   created() {
     //获取分析 分析类型、机组编号 列表
     this.getWindCodeList();
+    this.getQueryDataTime();
   },
   methods: {
+    disabledDate(time) {
+      if (!this.dataMinTime || !this.dataMaxTime) {
+        return false;
+      }
+      const minTime = new Date(this.dataMinTime).getTime();
+      const maxTime = new Date(this.dataMaxTime).getTime();
+      return time.getTime() < minTime || time.getTime() > maxTime;
+    },
+    handleScada() {
+      this.getQueryDataTime();
+    },
+    handleScada() {
+      this.getQueryDataTime();
+    },
+    async getQueryDataTime() {
+      const res = await queryDataTime({
+        batchCode: this.$route.query.batchCode,
+        dataTransferType: this.form.scada,
+      });
+      if (res.data && res.data.dataMinTime && res.data.dataMaxTime) {
+        this.dataMinTime = res.data.dataMinTime; // 可选最小时间
+        this.dataMaxTime = res.data.dataMaxTime; // 可选最大时间
+        // 更新日期选择器的默认范围
+      } else {
+        this.dataMinTime = null; // 可选最小时间
+        this.dataMaxTime = null; // 可选最大时间
+      }
+    },
+
     selectAllTurbines() {
       this.form.turbines = [];
       if (this.checkedTurbines) {

+ 2 - 2
vue.config.js

@@ -66,8 +66,8 @@ module.exports = {
       "/api": {
         // target: "http://192.168.5.4:16200", // 石月
         // target: "http://192.168.50.235:16200", //内网
-        // target: "http://192.168.5.15:16200",
-        target: "http://106.120.102.238:16600", //外网
+        target: "http://192.168.5.15:16200",
+        // target: "http://106.120.102.238:16600", //外网
         changeOrigin: true,
         pathRewrite: {
           "^/api": "", // 需要regit write重写的,