Browse Source

分析详情生成分析结果图

liujiejie 10 months ago
parent
commit
4ea0db33b8

File diff suppressed because it is too large
+ 798 - 33
package-lock.json


+ 3 - 0
package.json

@@ -19,7 +19,10 @@
     "element-ui": "^2.15.14",
     "happypack": "^5.0.1",
     "ol": "^9.2.3",
+    "plotly.js": "^2.34.0",
     "plotly.js-dist": "^2.34.0",
+    "plotly.js-dist-min": "^2.34.0",
+    "plotly.js-with-locales": "^1.31.2",
     "qs": "^6.12.0",
     "quill": "^2.0.2",
     "svg-sprite-loader": "^6.0.11",

+ 229 - 229
src/api/ledger.js

@@ -1,332 +1,339 @@
-import { jsonToFormData } from '@/utils/common'
-import request from '@/utils/request'
-
+import { jsonToFormData } from "@/utils/common";
+import request from "@/utils/request";
+//查询标准风机信息
+export function getWindEngineGroupRatedListByFieldCodePage(data) {
+  return request({
+    url: "/energy-manage-service/api/wind/engine/group/getWindEngineGroupRatedListByFieldCodePage",
+    method: "post",
+    data,
+  });
+}
 // 查询
 export function getAllWindCompany(data) {
   return request({
-    url: '/energy-manage-service/api/wind/company/getAllWindCompany',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/company/getAllWindCompany",
+    method: "post",
+    data,
+  });
 }
 // 新增
 export function addCompany(data) {
   return request({
-    url: '/energy-manage-service/api/wind/company/addCompany',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/company/addCompany",
+    method: "post",
+    data,
+  });
 }
 // 编辑
 export function updateCompany(data) {
   return request({
-    url: '/energy-manage-service/api/wind/company/updateCompany',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/company/updateCompany",
+    method: "post",
+    data,
+  });
 }
 // 更改状态
 export function updateStateCompany(data) {
   return request({
-    url: '/energy-manage-service/api/wind/company/updateStateCompany',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/company/updateStateCompany",
+    method: "post",
+    data,
+  });
 }
 
 // 省
 export function findAllProvince(data) {
   return request({
-    url: '/energy-manage-service/api/area/findAllProvince',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/area/findAllProvince",
+    method: "post",
+    data,
+  });
 }
 
 // 省
 export function getCitiesByPId(data) {
   return request({
-    url: '/energy-manage-service/api/area/getCitiesByPId',
-    method: 'get',
-    data
-  })
+    url: "/energy-manage-service/api/area/getCitiesByPId",
+    method: "get",
+    data,
+  });
 }
 
 //编辑回显
 export function getWindCompany(data) {
   return request({
-    url: '/energy-manage-service/api/wind/company/getWindCompany',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/company/getWindCompany",
+    method: "post",
+    data,
+  });
 }
 
 //删除
 export function delCompany(data) {
   return request({
-    url: '/energy-manage-service/api/wind/company/delCompany',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/company/delCompany",
+    method: "post",
+    data,
+  });
 }
 //企业查询风场
 export function getWindFieldVos(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/getWindFieldVos',
-    method: 'post',
-    data: jsonToFormData(data)
-  })
+    url: "/energy-manage-service/api/wind/field/getWindFieldVos",
+    method: "post",
+    data: jsonToFormData(data),
+  });
 }
 
 // .........................测风塔页面
 // 查询
 export function getAnemometerTowerPage(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/getAnemometerTowerPage',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/getAnemometerTowerPage",
+    method: "post",
+    data,
+  });
 }
 // 创建测风塔
 export function createAnemometerTower(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/createAnemometerTower',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/createAnemometerTower",
+    method: "post",
+    data,
+  });
 }
 
 // 更新测风塔
 export function updateAnemometerTower(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/updateAnemometerTower',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/updateAnemometerTower",
+    method: "post",
+    data,
+  });
 }
 
 // 查看详情
 export function getAnemometerTower(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/getAnemometerTower',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/getAnemometerTower",
+    method: "post",
+    data,
+  });
 }
 
 // 测风塔状态
 export function updateAnemometerTowerState(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/updateAnemometerTowerState',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/updateAnemometerTowerState",
+    method: "post",
+    data,
+  });
 }
 
 // 删除测风塔
 export function delAnemometerTower(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/delAnemometerTower',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/delAnemometerTower",
+    method: "post",
+    data,
+  });
 }
 
 // .....................机型信息
 // 查询
 export function windEngineMillPage(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/mill/windEngineMillPage',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/mill/windEngineMillPage",
+    method: "post",
+    data,
+  });
 }
 
 // 更改状态/修改
 export function updateWindEngineMill(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/mill/updateWindEngineMill',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/mill/updateWindEngineMill",
+    method: "post",
+    data,
+  });
 }
 
 // 获取机型类型
 export function getDictList(data) {
   return request({
-    url: '/energy-manage-service/dict/getDictList',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/dict/getDictList",
+    method: "post",
+    data,
+  });
 }
 // 创建机型
 export function createEngineMill(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/mill/createEngineMill',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/mill/createEngineMill",
+    method: "post",
+    data,
+  });
 }
 
 // 删除机型
 export function delWindEngineMill(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/mill/delWindEngineMill',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/mill/delWindEngineMill",
+    method: "post",
+    data,
+  });
 }
 
 // 机型详情
 export function getWindEngineMillPageVo(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/mill/getWindEngineMillPageVo',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/mill/getWindEngineMillPageVo",
+    method: "post",
+    data,
+  });
 }
 //
 // 风机查询
 export function windEngineGrouPage(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/windEngineGrouPage',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/windEngineGrouPage",
+    method: "post",
+    data,
+  });
 }
 // 风机状态
 export function updateStateWindEngineGroup(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/updateStateWindEngineGroup',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/updateStateWindEngineGroup",
+    method: "post",
+    data,
+  });
 }
 
 // 风机详情
 export function getWindEngineGroup(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/getWindEngineGroup',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/getWindEngineGroup",
+    method: "post",
+    data,
+  });
 }
 
 // 获取风场
 export function getWindFieldNames(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/getWindFieldNames',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/getWindFieldNames",
+    method: "post",
+    data,
+  });
 }
 
 // 删除风机
 export function delWindEngineGroup(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/delWindEngineGroup',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/delWindEngineGroup",
+    method: "post",
+    data,
+  });
 }
 
 // 编辑风机
 export function updateWindEngineGroup(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/updateWindEngineGroup',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/updateWindEngineGroup",
+    method: "post",
+    data,
+  });
 }
 
 // 创建
 export function createWindEngineGroup(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/createWindEngineGroup',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/createWindEngineGroup",
+    method: "post",
+    data,
+  });
 }
 
 // 关联机型
 export function getWindEngineMillList(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/mill/getWindEngineMillList',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/mill/getWindEngineMillList",
+    method: "post",
+    data,
+  });
 }
 
 // 。。。。。。。。。。。。。。。。。。。。。。。。。
 // 风场查询
 export function WindFieldListPage(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/WindFieldListPage',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/WindFieldListPage",
+    method: "post",
+    data,
+  });
 }
 // 获取测风塔集合
 export function getAnemometerTowerNameList(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/getAnemometerTowerNameList',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/getAnemometerTowerNameList",
+    method: "post",
+    data,
+  });
 }
 
 // 获取风场状态
 export function updateWindFieldStateById(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/updateWindFieldStateById',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/updateWindFieldStateById",
+    method: "post",
+    data,
+  });
 }
 
 // 查看风场详情
 export function getWindFieldVo(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/getWindFieldVo',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/getWindFieldVo",
+    method: "post",
+    data,
+  });
 }
 
 // 创建风场
 export function createWindField(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/createWindField',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/createWindField",
+    method: "post",
+    data,
+  });
 }
 
 // 编辑风场
 export function windFieldDto(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/WindFieldDto',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/WindFieldDto",
+    method: "post",
+    data,
+  });
 }
 
 // 查看车缝他
 export function getAnemometerTowerByField(data) {
   return request({
-    url: '/energy-manage-service/api/anemometer/tower/getAnemometerTowerByField',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/anemometer/tower/getAnemometerTowerByField",
+    method: "post",
+    data,
+  });
 }
 
 // 查看车缝他
 export function delWindFieldById(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/delWindFieldById',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/delWindFieldById",
+    method: "post",
+    data,
+  });
 }
 
 // 。。。。。。。。。。。。。。。。。。。。。上传下载
@@ -334,164 +341,157 @@ export function delWindFieldById(data) {
 // 下载模板
 export function getAllTemplate(data) {
   return request({
-    url: '/energy-manage-service/sysTemplate/getAllTemplate',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/sysTemplate/getAllTemplate",
+    method: "post",
+    data,
+  });
 }
 // 机型上传附件
 export function powerWordCriterionImportData(data) {
   return request({
-    url: '/energy-manage-service/api/powerword/criterion/powerWordCriterionImportData',
-    method: 'post',
-    data: jsonToFormData(data)
-  })
+    url: "/energy-manage-service/api/powerword/criterion/powerWordCriterionImportData",
+    method: "post",
+    data: jsonToFormData(data),
+  });
 }
 
 // 风机上传附件
 export function uploadFile(data) {
   return request({
-    url: '/upload',
-    method: 'post',
-    data
-  })
+    url: "/upload",
+    method: "post",
+    data,
+  });
 }
 
 // 风场导入
 export function windFieldImportData(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/windFieldImportData',
-    method: 'post',
-    data: jsonToFormData(data)
-  })
+    url: "/energy-manage-service/api/wind/field/windFieldImportData",
+    method: "post",
+    data: jsonToFormData(data),
+  });
 }
-                                                                                                                                                                       
 
 // 合同附件提交
 export function powerWordContractImportData(data) {
   return request({
-    url: '/energy-manage-service/api/powerword/contract/powerWordContractImportData',
-    method: 'post',
-    data: jsonToFormData(data)
-  })
+    url: "/energy-manage-service/api/powerword/contract/powerWordContractImportData",
+    method: "post",
+    data: jsonToFormData(data),
+  });
 }
 
-
 // 风场导入
 export function windEngineGroupImportData(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/windEngineGroupImportData',
-    method: 'post',
-    data: jsonToFormData(data)
-  })
+    url: "/energy-manage-service/api/wind/engine/group/windEngineGroupImportData",
+    method: "post",
+    data: jsonToFormData(data),
+  });
 }
 
-
 // 风场资源文件上传
 export function saveWindFieldResource(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/saveWindFieldResource',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/saveWindFieldResource",
+    method: "post",
+    data,
+  });
 }
 
 // 风场资源文件删除
 export function delWindFieldResource(data) {
   return request({
-    url: '/energy-manage-service/api/wind/field/delWindFieldResource',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/field/delWindFieldResource",
+    method: "post",
+    data,
+  });
 }
 
-
-
 // 驾驶舱接口
 // 获取统计数
 export function getCompanyFieldNumberVo(data) {
   return request({
-    url: '/energy-manage-service/sysOrganizationAuth/getCompanyFieldNumberVo',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/sysOrganizationAuth/getCompanyFieldNumberVo",
+    method: "post",
+    data,
+  });
 }
 // 驾驶舱tree树接口
 export function getSysOrganizationAuthTreeByRoleId(data) {
   return request({
-    url: '/energy-manage-service/sysOrganizationAuth/getSysOrganizationAuthTreeByRoleId',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/sysOrganizationAuth/getSysOrganizationAuthTreeByRoleId",
+    method: "post",
+    data,
+  });
 }
 
 // 电子地图接口
 export function getWindEngineGroupByFieldCode(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/getWindEngineGroupByFieldCode',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/getWindEngineGroupByFieldCode",
+    method: "post",
+    data,
+  });
 }
 
 // 驾驶舱右侧
 export function queryStatistics(data) {
   return request({
-    url: '/energy-manage-service/homePage/queryStatistics',
+    url: "/energy-manage-service/homePage/queryStatistics",
     method: "get",
-    data
-  })
+    data,
+  });
 }
 
 export function queryOptionRecords(data) {
   return request({
-    url: '/energy-manage-service/homePage/queryOptionRecords',
-    method: 'get',
-    data
-  })
+    url: "/energy-manage-service/homePage/queryOptionRecords",
+    method: "get",
+    data,
+  });
 }
 // 风机异常信息
 export function queryErrDescByEngine(data) {
   return request({
-    url: '/energy-manage-service/analysisErr/queryErrDescByEngine',
-    method: 'get',
-    data
-  })
+    url: "/energy-manage-service/analysisErr/queryErrDescByEngine",
+    method: "get",
+    data,
+  });
 }
 
 // 获取批量更改
 export function getWindEngineGroupListByFieldCode(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/getWindEngineGroupListByFieldCode',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/getWindEngineGroupListByFieldCode",
+    method: "post",
+    data,
+  });
 }
 // 获取批量更改
 export function bathUpdateWindEngineGroup(data) {
   return request({
-    url: '/energy-manage-service/api/wind/engine/group/bathUpdateWindEngineGroup',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/wind/engine/group/bathUpdateWindEngineGroup",
+    method: "post",
+    data,
+  });
 }
 
 // 合同功率曲线
 export function getWindFieldContractByFieldCode(data) {
   return request({
-    url: '/energy-manage-service/api/powerword/contract/getWindFieldContractByFieldCode',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/powerword/contract/getWindFieldContractByFieldCode",
+    method: "post",
+    data,
+  });
 }
 
-
 // 删除合同功率曲线
 export function delWindFieldContractById(data) {
   return request({
-    url: '/energy-manage-service/api/powerword/contract/delWindFieldContractById',
-    method: 'post',
-    data
-  })
+    url: "/energy-manage-service/api/powerword/contract/delWindFieldContractById",
+    method: "post",
+    data,
+  });
 }
-

+ 73 - 0
src/assets/js/plotly-locale-zh-cn.js

@@ -0,0 +1,73 @@
+import Plotly from "plotly.js-dist-min";
+
+export const customModeBarButtons = [
+  {
+    name: "保存图片",
+    icon: Plotly.Icons.camera,
+    click: function (gd) {
+      Plotly.downloadImage(gd, { format: "png", filename: "plotly_chart" });
+    },
+  },
+
+  {
+    name: "套索选择",
+    icon: Plotly.Icons.lasso,
+    click: function (gd) {
+      // 处理套索选择功能
+    },
+  },
+  {
+    name: "平移",
+    icon: Plotly.Icons.pan,
+    click: function (gd) {
+      // 处理平移功能
+    },
+  },
+  {
+    name: "重置视图",
+    icon: Plotly.Icons.selectbox,
+    click: function (gd) {},
+  },
+  //     "undo": {},//刷新
+  //     "home": {},重置图表
+  //     "camera_retro": {},
+  //     "zoombox": {},
+  //     "pan": {},
+  //     "zoom_plus": {},放大
+  //     "zoom_minus": { },缩小
+  //     "autoscale": {},全凭
+  //     "tooltip_basic": {},
+  //     "tooltip_compare": {},
+  //     "plotlylogo": { },官网logo
+  //     "z-axis": { },
+  //     "3d_rotate": { },
+  //     "camera": { },
+  //     "movie": { },摄像
+  //     "question": {},问号
+  //     "disk": {},保存
+  //     "drawopenpath": {},//划线
+  //     "drawclosedpath": {},
+  //     "lasso": {},//套索
+  //     "selectbox":
+  {
+    name: "缩放",
+    icon: Plotly.Icons.zoom2d,
+    click: function (gd) {
+      // 处理缩放功能
+    },
+  },
+  {
+    name: "放大",
+    icon: Plotly.Icons.zoomIn2d,
+    click: function (gd) {
+      // 处理放大功能
+    },
+  },
+  {
+    name: "缩小",
+    icon: Plotly.Icons.zoomOut2d,
+    click: function (gd) {
+      // 处理缩小功能
+    },
+  },
+];

+ 35 - 36
src/components/EchartsCom.vue

@@ -7,66 +7,65 @@
     v-if="option"
     :style="{
       width: width,
-      height: height
+      height: height,
     }"
   ></div>
 </template>
 
 <script>
-import { myMixin } from '@/mixins/echartsMixin'
-import * as echarts from 'echarts'
-import 'echarts/extension/bmap/bmap'
+import { myMixin } from "@/mixins/echartsMixin";
+import * as echarts from "echarts";
+import "echarts/extension/bmap/bmap";
 // 2.生成一个 id 值给标签,目的是为了当多次使用组件防止id重复
 const uid = function () {
-  return new Date().getTime()
-}
+  return new Date().getTime();
+};
 export default {
   mixins: [myMixin],
   //1.获取传过来的值
   props: {
     width: {
       type: String,
-      default: ''
+      default: "",
     },
     height: {
       type: String,
-      default: ''
+      default: "",
     },
     option: {
       typeof: Object,
       default() {
-        return {}
-      }
-    }
+        return {};
+      },
+    },
   },
   data() {
     return {
       //3.在这定义 id 与 myChart图表实例 , 方便管理
       id: null,
-      myChart: null
-    }
+      myChart: null,
+    };
   },
   watch: {
     option: {
       handler(newVal, oldVal) {
-        // console.log(newVal, '2dbwquduiqh')
         if (this.myChart) {
-          this.id = uid()
+          this.id = uid();
           this.$nextTick(() => {
-            this.myChart.setOption(newVal)
-          })
+            this.myChart.setOption(newVal);
+          });
         }
       },
-      deep: true // 深度监听,
+      deep: true, // 深度监听,
       // immediate: true, //要立即监听
-    }
+    },
   },
   mounted() {
     setTimeout(() => {
-      window.addEventListener('resize', this.myChart)
-      this.id = uid()
-      this.initEcharts()
-    }, 0)
+      window.addEventListener("resize", this.myChart);
+      this.id = uid();
+      this.initEcharts();
+    }, 0);
   },
   created() {
     // 4.id赋值
@@ -74,23 +73,23 @@ export default {
   methods: {
     initEcharts() {
       this.$nextTick(() => {
-        const _this = this
+        const _this = this;
         //   5. 创建echarts图表实例
-        _this.myChart = echarts.init(document.getElementById(this.id))
+        _this.myChart = echarts.init(document.getElementById(this.id));
         // 指定图表的配置项和数据
-        const option = this.option
+        const option = this.option;
         // 使用刚指定的配置项和数据显示图表。
-        _this.myChart.clear()
-        const that = _this
-        _this.myChart.setOption(option)
+        _this.myChart.clear();
+        const that = _this;
+        _this.myChart.setOption(option);
         window.onresize = function () {
-          that.myChart.resize()
-        }
-      })
-    }
+          that.myChart.resize();
+        };
+      });
+    },
   },
   destroyed() {
-    window.removeEventListener('resize', this.myChart)
-  }
-}
+    window.removeEventListener("resize", this.myChart);
+  },
+};
 </script>

+ 0 - 1
src/components/Tinymce.vue

@@ -90,7 +90,6 @@ export default Vue.extend({
           // 上传图片
           uploadImage: {
             async customUpload(file, insertFn) {
-              console.log(file, "上传文件");
               if (!/^(image\/png|image\/jpeg|image\/jpg)$/i.test(file.type)) {
                 alert("只能上传格式为png、jpg、jpeg的图片文件!");
                 return;

+ 1 - 3
src/components/map/index.vue

@@ -69,8 +69,7 @@
           <span>{{ hoverfengji.sightcing == 1 ? "是" : "否" }}</span>
         </p>
         <p>
-          <span>额定风速</span
-          ><span>{{ hoverfengji.rated_wind_speed }} m/s</span>
+          <span>额定风速</span><span>{{ hoverfengji.ratedWindSpeed }} m/s</span>
         </p>
         <p>
           <span>切入风速</span
@@ -217,7 +216,6 @@ export default {
      * @param data
      */
     addMarker(data = { point: [120.2, 30.35], val: "1" }) {
-      console.log(data);
       const layer = this.map
         .getLayers()
         .getArray()

+ 116 - 0
src/locale/zh-CN.js

@@ -0,0 +1,116 @@
+var locale = {
+  moduleType: "locale",
+  name: "zh-CN",
+  dictionary: {
+    Autoscale: "自动缩放",
+    "Box Select": "矩形框选",
+    "Click to enter Colorscale title": "点击输入色阶的标题",
+    "Click to enter Component A title": "点击输入组件A的标题",
+    "Click to enter Component B title": "点击输入组件B的标题",
+    "Click to enter Component C title": "点击输入组件C的标题",
+    "Click to enter Plot title": "点击输入图表的标题",
+    "Click to enter X axis title": "点击输入X轴的标题",
+    "Click to enter Y axis title": "点击输入Y轴的标题",
+    "Compare data on hover": "悬停时比较数据",
+    "Double-click on legend to isolate one trace": "双击图例来突出显示对应轨迹",
+    "Double-click to zoom back out": "双击返回缩小显示",
+    "Download plot as a png": "保存图片",
+    "Download plot": "下载图表",
+    "Edit in Chart Studio": "在Chart Studio中编辑",
+    "IE only supports svg.  Changing format to svg.":
+      "IE只支持SVG。转换格式为SVG。",
+    "Lasso Select": "套索选择",
+    "Orbital rotation": "轨道旋转",
+    Pan: "平移",
+    "Produced with Plotly.js": "由Plotly.js生成",
+    Reset: "重置",
+    "Reset axes": "重置轴",
+    "Reset camera to default": "重置镜头视角为默认状态",
+    "Reset camera to last save": "重置镜头视角为上次保存状态",
+    "Reset view": "重置视图",
+    "Reset views": "重置视图",
+    "Show closest data on hover": "悬停时显示最近的数据",
+    "Snapshot succeeded": "生成快照成功",
+    "Sorry, there was a problem downloading your snapshot!":
+      "抱歉,下载快照出现问题!",
+    "Taking snapshot - this may take a few seconds":
+      "正在生成快照 - 可能需要几秒钟",
+    Zoom: "缩放",
+    "Zoom in": "放大",
+    "Zoom out": "缩小",
+    "close:": "关闭:",
+    "trace:": "轨迹:",
+    "lat:": "纬度:",
+    "lon:": "经度:",
+    "q1:": "第一四分位数:",
+    "q3:": "第三四分位数:",
+    "source:": "源:",
+    "target:": "目标:",
+    "lower fence:": "内侧栏(lower fence):",
+    "upper fence": "外侧栏(upper fence):",
+    "max:": "最大值:",
+    "mean ± σ:": "平均值 ± 标准差:",
+    "mean:": "平均值:",
+    "median:": "中位数:",
+    "min:": "最小值:",
+    "Turntable rotation": "旋转转盘:",
+    "Toggle Spike Lines": "切换显示数据点辅助线(Spike Lines)",
+    "open:": "打开:",
+    "high:": "高:",
+    "low:": "低:",
+    "Toggle show closest data on hover": "切换悬停时显示最近的数据点",
+    "incoming flow count:": "流入数量:",
+    "outgoing flow count:": "流出数量:",
+    "kde:": "kde:",
+    "Click to enter radial axis title": "点击输入径向轴标题",
+    "new text": "新建文本",
+  },
+  format: {
+    days: [
+      "星期日",
+      "星期一",
+      "星期二",
+      "星期三",
+      "星期四",
+      "星期五",
+      "星期六",
+    ],
+    shortDays: ["周日", "周一", "周二", "周三", "周四", "周五", "周六"],
+    months: [
+      "一月",
+      "二月",
+      "三月",
+      "四月",
+      "五月",
+      "六月",
+      "七月",
+      "八月",
+      "九月",
+      "十月",
+      "十一月",
+      "十二月",
+    ],
+    shortMonths: [
+      "一",
+      "二",
+      "三",
+      "四",
+      "五",
+      "六",
+      "七",
+      "八",
+      "九",
+      "十",
+      "十一",
+      "十二",
+    ],
+    date: "%Y-%m-%d",
+  },
+};
+
+if (typeof Plotly === "undefined") {
+  window.PlotlyLocales = window.PlotlyLocales || [];
+  window.PlotlyLocales.push(locale);
+} else {
+  Plotly.register(locale);
+}

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

@@ -645,12 +645,10 @@ export default {
       }
     },
     load(tree, treeNode, resolve) {
-      console.log(tree, "tree");
       const { batchCode } = tree; // 假设每行都有唯一的 id
       // 调用接口获取子级数据
       queryDataTransferByBatchCode({ batchCode })
         .then((data) => {
-          console.log(data, "data");
           resolve(data.data);
         })
         .catch((error) => {

+ 0 - 6
src/views/ledger/draught.vue

@@ -631,7 +631,6 @@ export default {
             this.onSubmit();
           }).catch((error) => {});
         } else {
-          console.log("表单验证失败");
           return false;
         }
       });
@@ -685,7 +684,6 @@ export default {
       } else {
         windEngineGroupImportData(filedata)
           .then((res) => {
-            console.log(res);
             this.uploadingPOP = false;
             if (res.code === -1) {
               this.$message({
@@ -705,7 +703,6 @@ export default {
           .catch((error) => {});
       }
 
-      console.log(filedata);
       // this.tolead = false
     },
     // 新增
@@ -730,7 +727,6 @@ export default {
 
     // 删除
     deleted(row) {
-      console.log(row, "row");
       if (row.state == "1") {
         this.$message({
           type: "error",
@@ -784,11 +780,9 @@ export default {
       if (!isLt5MB) {
         this.$message.error("文件大小不能超过5MB");
       }
-      console.log(fileList, "fileList");
       return isXLSX && isLt5MB;
     },
     handleOnChange(fileList) {
-      console.log(fileList);
       this.globalFileList = fileList.raw;
     },
 

+ 16 - 10
src/views/performance/assetssDetail.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-27 09:25:45
- * @LastEditTime: 2024-08-05 09:52:56
+ * @LastEditTime: 2024-08-08 13:53:25
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/assetssDetail.vue
@@ -30,6 +30,7 @@
         </div>
       </el-col>
     </el-row>
+
     <el-card class="box-card analysisType">
       <el-form
         :model="formInfo"
@@ -69,19 +70,24 @@
               class="searchFrom"
               style="display: flex; justify-content: end"
             >
-              <el-button type="primary" @click="onSubmit" size="small"
-                >查询</el-button
-              >
-              <el-button @click="reset('ruleForm')" size="small"
-                >重置</el-button
-              >
+              <el-button type="primary" @click="onSubmit" size="small">
+                查询
+              </el-button>
+              <el-button @click="reset('ruleForm')" size="small">
+                重置
+              </el-button>
+              <!-- <el-button type="primary" @click="" size="small">
+                一键下载分析结果图
+              </el-button> -->
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
     </el-card>
+
     <el-empty :image-size="200" v-if="flage"></el-empty>
     <div v-else>
+      <!-- <DetailCharts></DetailCharts> -->
       <el-card class="box-card analysisType" v-if="generalFiles.length > 0">
         <div slot="header" class="clearfix">
           <span style="font-weight: 700; font-size: 16px">
@@ -167,8 +173,9 @@ import {
   queryAnalysisedEngine,
   queryAnalysisTypeConfig,
 } from "@/api/performance";
-
+import DetailCharts from "./components/DetailCharts.vue";
 export default {
+  components: { DetailCharts },
   data() {
     return {
       loadings: [],
@@ -197,9 +204,9 @@ export default {
     this.chartsTypeConfig();
   },
   methods: {
+    //分析类型图表样式
     async chartsTypeConfig() {
       const result = await queryAnalysisTypeConfig();
-      console.log(result.data, "result");
     },
     iframeLoad(index) {
       this.$set(this.loadings, index, false);
@@ -247,7 +254,6 @@ export default {
             response.data.length > 0 &&
             response.data[0].diagramRelations) ||
           [];
-        console.log(this.diagramRelations, "this.diagramRelations");
         this.commentDescriptionVos =
           (response.data &&
             response.data.length > 0 &&

+ 155 - 0
src/views/performance/components/DetailCharts.vue

@@ -0,0 +1,155 @@
+<template>
+  <div>
+    <div id="mainChart"></div>
+    <div
+      v-for="(engine, index) in data.data"
+      :key="index"
+      :id="'chart-' + index"
+    ></div>
+    <div v-for="(item, ind) in imageDataUri">
+      <img :src="item" alt="" style="width: 80%; height: auto" />
+    </div>
+  </div>
+</template>
+
+<script>
+import Plotly from "plotly.js-dist";
+
+export default {
+  name: "PlotlyChart",
+  data() {
+    return {
+      data: {
+        analysisTypeCode: "power_curve",
+        graphType: "scatter",
+        data: [
+          {
+            engineName: "#1",
+            windSpeed: [
+              3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+              27, 30,
+            ],
+            power: [
+              6.06, 76.54, 184.1, 345.94, 574.4, 879.9, 1274.73, 1664.94,
+              1942.96, 2004.78, 2004.78, 2004.78, 2004.78, 2004.78, 2004.78,
+              2004.78, 2004.78, 2004.78, 2230,
+            ],
+          },
+          {
+            engineName: "#2",
+            windSpeed: [
+              2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5,
+              10, 10.5, 11, 11.5, 12, 12.5, 13, 13.5, 14, 14.5, 15, 15.5, 16,
+              16.5, 33,
+            ],
+            power: [
+              2, 9.23, 100.12, 155.51, 230.09, 400.15, 500.95, 689.55, 961.09,
+              1257.53, 1346.02, 1479.78, 1528.01, 1618.52, 1789.09, 1819.35,
+              1920.29, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2153.52, 2159,
+            ],
+          },
+          {
+            engineName: "#3",
+            windSpeed: [
+              2.7, 3.7, 4.7, 5.7, 6.7, 7.7, 8.7, 9.7, 10.7, 11.5, 12, 13.5, 14,
+              15.5, 16, 17.5, 18, 19.5, 21, 21.5, 22, 22.5, 23, 23.5, 24, 27.5,
+              28, 29.5, 30, 36.5,
+            ],
+            power: [
+              2, 9.23, 100.12, 155.51, 230.09, 400.15, 500.95, 689.55, 961.09,
+              1257.53, 1346.02, 1479.78, 1528.01, 1618.52, 1789.09, 1819.35,
+              1920.29, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+            ],
+          },
+        ],
+      },
+      imageDataUri: [],
+      currentEngineIndex: 0,
+    };
+  },
+  mounted() {
+    this.initializeMainChart();
+    this.initializeEngineCharts();
+  },
+  methods: {
+    initializeMainChart() {
+      const layout = {
+        title: "功率曲线图",
+        xaxis: { title: "Wind Speed (m/s)" },
+        yaxis: { title: "Power (kW)" },
+        legend: {
+          orientation: "h",
+          y: -0.2,
+          x: 0.5,
+          xanchor: "center",
+        },
+      };
+
+      const plotlyData = this.data.data.map((engine) => ({
+        x: engine.windSpeed,
+        y: engine.power,
+        mode: "lines+markers",
+        name: engine.engineName,
+      }));
+
+      const config = {
+        displaylogo: false,
+      };
+
+      Plotly.newPlot("mainChart", plotlyData, layout, config).then((gd) => {
+        //生成图片方法
+        Plotly.toImage(gd, { format: "png" }).then((dataUrl) => {
+          // console.log(dataUrl, "dataUrl");
+          this.imageDataUri.push(dataUrl);
+        });
+      });
+    },
+    initializeEngineCharts() {
+      this.data.data.forEach((engine, index) => {
+        const layout = {
+          title: engine.engineName + "风机",
+          xaxis: { title: "风速 (m/s)" },
+          yaxis: { title: "功率 (kW)" },
+          legend: {
+            orientation: "h",
+            y: -0.2,
+            x: 0.5,
+            xanchor: "center",
+          },
+        };
+
+        const plotlyData = this.data.data.map((eng, i) => ({
+          x: eng.windSpeed,
+          y: eng.power,
+          mode: "lines+markers",
+          name: eng.engineName,
+          line: {
+            color: index === i ? "blue" : "grey",
+          },
+        }));
+
+        const config = {
+          displaylogo: false,
+        };
+
+        Plotly.newPlot(`chart-${index}`, plotlyData, layout, config).then(
+          (gd) => {
+            //生成图片方法
+            Plotly.toImage(gd, { format: "png" }).then((dataUrl) => {
+              console.log(dataUrl, "dataUrl");
+              this.imageDataUri.push(dataUrl);
+            });
+          }
+        );
+      });
+    },
+  },
+};
+</script>
+
+<style scoped>
+/* 样式可选 */
+</style>

+ 4 - 5
src/views/performance/components/EditAnalysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:14:23
- * @LastEditTime: 2024-08-06 13:34:14
+ * @LastEditTime: 2024-08-08 11:03:42
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/EditAnalysis.vue
@@ -51,9 +51,9 @@
                 <el-button type="primary" @click="onSubmit" size="small"
                   >查询</el-button
                 >
-                <el-button type="primary" @click="" size="small"
+                <!-- <el-button type="primary" @click="" size="small"
                   >一键下载分析结果</el-button
-                >
+                > -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -283,6 +283,7 @@ import {
 import { getWindEngineGroup } from "@/api/ledger";
 import TinymceEditor from "@/components/Tinymce.vue";
 import PlotlyCharts from "./PlotlyCharts.vue";
+
 export default {
   components: {
     TinymceEditor,
@@ -386,7 +387,6 @@ export default {
       });
     },
     handleEngineCode(e) {
-      console.log(e, "e");
       this.engineCode = e;
       this.getWindEngList();
     },
@@ -423,7 +423,6 @@ 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

+ 180 - 54
src/views/performance/components/PlotlyCharts.vue

@@ -1,74 +1,200 @@
-<!--
- * @Author: your name
- * @Date: 2024-08-05 17:19:47
- * @LastEditTime: 2024-08-05 17:27:32
- * @LastEditors: bogon
- * @Description: In User Settings Edit
- * @FilePath: /performance-test/src/views/performance/components/plotlyCharts.vue
--->
 <template>
-  <div id="plotly-chart"></div>
+  <div id="myDiv"></div>
 </template>
 
 <script>
 import Plotly from "plotly.js-dist";
 
 export default {
-  name: "PowerCurvePlot",
+  name: "PlotlyChart",
   mounted() {
-    const data = {
-      analysisTypeCode: "power_curve",
-      graphType: "scatter",
-      data: [
+    this.initializeChart();
+  },
+  data() {
+    return {
+      imageDataUri: "",
+    };
+  },
+  methods: {
+    initializeChart() {
+      const layout = {
+        title: "Power Curve",
+        xaxis: { title: "Wind Speed (m/s)" },
+        yaxis: { title: "Power (kW)" },
+      };
+      const data = {
+        analysisTypeCode: "power_curve",
+        graphType: "scatter",
+        data: [
+          {
+            engineName: "#1",
+            windSpeed: [
+              3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+              27, 30,
+            ],
+            power: [
+              6.06, 76.54, 184.1, 345.94, 574.4, 879.9, 1274.73, 1664.94,
+              1942.96, 2004.78, 2004.78, 2004.78, 2004.78, 2004.78, 2004.78,
+              2004.78, 2004.78, 2004.78, 2230,
+            ],
+          },
+          {
+            engineName: "#2",
+            windSpeed: [
+              2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5,
+              10, 10.5, 11, 11.5, 12, 12.5, 13, 13.5, 14, 14.5, 15, 15.5, 16,
+              16.5, 33,
+            ],
+            power: [
+              2, 9.23, 100.12, 155.51, 230.09, 400.15, 500.95, 689.55, 961.09,
+              1257.53, 1346.02, 1479.78, 1528.01, 1618.52, 1789.09, 1819.35,
+              1920.29, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2153.52, 2159,
+            ],
+          },
+          {
+            engineName: "#3",
+            windSpeed: [
+              2.7, 3.7, 4.7, 5.7, 6.7, 7.7, 8.7, 9.7, 10.7, 11.5, 12, 13.5, 14,
+              15.5, 16, 17.5, 18, 19.5, 21, 21.5, 22, 22.5, 23, 23.5, 24, 27.5,
+              28, 29.5, 30, 36.5,
+            ],
+            power: [
+              2, 9.23, 100.12, 155.51, 230.09, 400.15, 500.95, 689.55, 961.09,
+              1257.53, 1346.02, 1479.78, 1528.01, 1618.52, 1789.09, 1819.35,
+              1920.29, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
+              2053.52,
+            ],
+          },
+        ],
+      };
+
+      const plotlyData = data.data.map((engine) => ({
+        x: engine.windSpeed,
+        y: engine.power,
+        mode: "lines+markers",
+        name: engine.engineName,
+      }));
+      const modeBarButtons = [
         {
-          engineName: "#1",
-          windSpeed: [
-            3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
-          ],
-          power: [
-            6.06, 76.54, 184.1, 345.94, 574.4, 879.9, 1274.73, 1664.94, 1942.96,
-            2004.78, 2004.78, 2004.78, 2004.78, 2004.78, 2004.78, 2004.78,
-            2004.78, 2004.78,
-          ],
+          name: "套索选择",
+          icon: Plotly.Icons.lasso,
+          click: function (gd) {
+            // 处理套索选择功能
+            Plotly.relayout(gd, { dragmode: "lasso" });
+          },
         },
         {
-          engineName: "#2",
-          windSpeed: [
-            2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5, 10,
-            10.5, 11, 11.5, 12, 12.5, 13, 13.5, 14, 14.5, 15, 15.5, 16, 16.5,
-          ],
-          power: [
-            2, 9.23, 100.12, 155.51, 230.09, 400.15, 500.95, 689.55, 961.09,
-            1257.53, 1346.02, 1479.78, 1528.01, 1618.52, 1789.09, 1819.35,
-            1920.29, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
-            2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52, 2053.52,
-            2053.52,
-          ],
+          name: "恢复",
+          icon: Plotly.Icons.home,
+          click: function (gd) {
+            Plotly.relayout(gd, {
+              "xaxis.autorange": true,
+              "yaxis.autorange": true,
+            });
+          },
         },
-      ],
-    };
-
-    const plotlyData = data.data.map((engine) => ({
-      x: engine.windSpeed,
-      y: engine.power,
-      mode: "lines",
-      name: engine.engineName,
-    }));
+        {
+          name: "拍照",
+          icon: Plotly.Icons.camera,
+          click: function (gd) {
+            Plotly.downloadImage(gd);
+          },
+        },
+        {
+          name: "放大",
+          icon: Plotly.Icons.zoom_plus,
+          click: function (gd) {
+            Plotly.relayout(gd, {
+              "xaxis.range": [
+                gd._fullLayout.xaxis.range[0],
+                gd._fullLayout.xaxis.range[1] * 0.5,
+              ],
+            });
+          },
+        },
+        {
+          name: "缩小",
+          icon: Plotly.Icons.zoom_minus,
+          click: function (gd) {
+            Plotly.relayout(gd, {
+              "xaxis.range": [
+                gd._fullLayout.xaxis.range[0],
+                gd._fullLayout.xaxis.range[1] * 2,
+              ],
+            });
+          },
+        },
+        {
+          name: "平移",
+          icon: Plotly.Icons.pan,
+          click: function (gd) {
+            Plotly.relayout(gd, { dragmode: "pan" });
+          },
+        },
+        {
+          name: "自动缩放",
+          icon: Plotly.Icons.autoscale,
+          click: function (gd) {
+            Plotly.relayout(gd, {
+              "xaxis.autorange": true,
+              "yaxis.autorange": true,
+            });
+          },
+        },
+        // 添加更多的自定义按钮
+      ];
 
-    const layout = {
-      title: "Power Curve",
-      xaxis: { title: "Wind Speed (m/s)" },
-      yaxis: { title: "Power (kW)" },
-    };
+      const config = {
+        modeBarButtonsToAdd: modeBarButtons,
+        modeBarButtonsToRemove: [
+          "toImage",
+          "zoom2d",
+          "pan2d",
+          "select2d",
+          "lasso2d",
+          "zoomIn2d",
+          "zoomOut2d",
+          "autoScale2d",
+          "resetScale2d",
+          "hoverClosestCartesian",
+          "hoverCompareCartesian",
+        ],
+        displaylogo: false, // 移除plotly logo
+      };
+      Plotly.newPlot("myDiv", plotlyData, layout, config).then((gd) => {
+        //生成图片方法
+        Plotly.toImage(gd, { format: "png" }).then((dataUrl) => {
+          console.log(dataUrl, "dataUrl");
+          this.imageDataUri = dataUrl;
+        });
+        // 处理选择事件
+        gd.on("plotly_selected", (eventData) => {
+          if (eventData) {
+            const selectedPoints = eventData.points.map((point) => ({
+              x: point.x,
+              y: point.y,
+            }));
+            console.log("选中的点:", selectedPoints);
+            // 这里可以保存选中的数据进行后续处理
+          }
+        });
 
-    Plotly.newPlot("plotly-chart", plotlyData, layout);
+        // 处理套索结束事件
+        gd.on("plotly_relayout", (eventData) => {
+          if (eventData["dragmode"] === "lasso") {
+            console.log("套索选择模式激活");
+            // 可以处理用户开始新的套索选择操作
+          }
+        });
+      });
+    },
   },
 };
 </script>
 
 <style scoped>
-#plotly-chart {
-  width: 100%;
-  height: 100%;
-}
+/* 样式可选 */
 </style>

+ 0 - 10
src/views/performance/components/abnormalDetail.vue

@@ -78,16 +78,6 @@
           </div>
         </template>
       </el-table-column>
-      <!-- <el-table-column prop="address" label="创建时间" align="center">
-        <template slot-scope="scope">
-          <div v-if="scope.row.isEditing">
-            {{ scope.row.createTime ? scope.row.createTime : "/" }}
-          </div>
-          <div v-else>
-            {{ scope.row.createTime ? scope.row.createTime : "/" }}
-          </div>
-        </template>
-      </el-table-column> -->
       <el-table-column prop="address" label="更新时间" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.isEditing">

+ 11 - 5
src/views/performance/components/analysisEvent.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2024-05-29 09:13:51
- * @LastEditTime: 2024-08-05 16:04:48
+ * @LastEditTime: 2024-08-06 16:25:51
  * @LastEditors: bogon
  * @Description: In User Settings Edit
  * @FilePath: /performance-test/src/views/performance/components/analysisEvent.vue
@@ -561,8 +561,10 @@
               </el-table-column>
               <el-table-column prop="ratedCapacity" label="额定容量/KW">
               </el-table-column>
-              <el-table-column prop="longitude" label="经度"> </el-table-column>
-              <el-table-column prop="latitude" label="纬度"> </el-table-column>
+              <el-table-column prop="ratedWindSpeed" label="额定风速(m/s)">
+              </el-table-column>
+              <el-table-column prop="hubHeight" label="轮毂高度(m)">
+              </el-table-column>
               <el-table-column prop="sightcing" label="是否标杆">
                 <template slot-scope="{ row }">
                   {{ row.sightcing == 1 ? "是" : "否" }}
@@ -664,7 +666,11 @@
 </template>
 <script>
 import { analysisEditQuery, analysis, queryDataTime } from "@/api/performance";
-import { getWindEngineGroup, windEngineGrouPage } from "@/api/ledger";
+import {
+  getWindEngineGroup,
+  windEngineGrouPage,
+  getWindEngineGroupRatedListByFieldCodePage,
+} from "@/api/ledger";
 import Map from "./map.vue";
 
 export default {
@@ -742,7 +748,7 @@ export default {
   },
   methods: {
     getFengjiList() {
-      windEngineGrouPage({
+      getWindEngineGroupRatedListByFieldCodePage({
         fieldCode: this.$route.query.fieldEngineCode,
         ...this.formInline,
         totalSize: undefined,

+ 8 - 7
src/views/performance/components/map.vue

@@ -3,14 +3,15 @@
     <Tmap
       ref="map"
       :windEngineGroupByFieldCodeDetail="windEngineGroupByFieldCodeDetail"
-    ></Tmap>
+    >
+    </Tmap>
   </div>
 </template>
 
 <script>
 import {
   getWindEngineGroupByFieldCode,
-  getWindEngineGroupListByFieldCode,
+  getWindEngineGroupRatedListByFieldCodePage,
 } from "@/api/ledger.js";
 import Tmap from "@/components/map";
 
@@ -52,15 +53,17 @@ export default {
           this.addMarkersAndZoom(result.anemometerTowerList, "5");
         }
         if (this.$route.query.fieldEngineCode) {
-          getWindEngineGroupListByFieldCode({
+          getWindEngineGroupRatedListByFieldCodePage({
             fieldCode: this.$route.query.fieldEngineCode,
+            pageSize: 9999999,
           }).then((windRes) => {
-            if (windRes.data) {
+            if (windRes.data && windRes.data.list) {
               // 定义两个数组来存放不同errorState的元素
               const errorStateFalse = [];
               const errorStateTrue = [];
               // 遍历数组并根据errorState的值将元素放入不同的数组中
-              windRes.data.forEach((item) => {
+
+              windRes.data.list.forEach((item) => {
                 errorStateFalse.push({
                   ...item,
                   longitudeAndLatitudeString: `${item.longitude}00,${item.latitude}00`,
@@ -87,10 +90,8 @@ export default {
       return [];
     },
     addMarkersAndZoom(data, type) {
-      console.log(data, type);
       const dataMapList = data;
       dataMapList.forEach((element) => {
-        console.log(element);
         if (
           this.parseCoordinates(element.longitudeAndLatitudeString).length > 0
         ) {

+ 2 - 3
vue.config.js

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

Some files were not shown because too many files changed in this diff