diff --git a/package.json b/package.json index f72be292..6124def0 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "axios": "^1.6.2", "crypto-js": "^4.2.0", "echarts": "^5.4.3", + "echarts-gl": "^2.0.9", "echarts4": "npm:echarts@^4.9.0", "element-plus": "^2.5.3", "exceljs": "^4.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e814934..04cdbc8c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,6 +25,9 @@ dependencies: echarts: specifier: ^5.4.3 version: 5.4.3 + echarts-gl: + specifier: ^2.0.9 + version: 2.0.9(echarts@5.4.3) echarts4: specifier: npm:echarts@^4.9.0 version: /echarts@4.9.0 @@ -1743,6 +1746,10 @@ packages: optionalDependencies: fsevents: 2.3.3 + /claygl@1.3.0: + resolution: {integrity: sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ==} + dev: false + /color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} dependencies: @@ -1876,6 +1883,16 @@ packages: readable-stream: 2.3.8 dev: false + /echarts-gl@2.0.9(echarts@5.4.3): + resolution: {integrity: sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==} + peerDependencies: + echarts: ^5.1.2 + dependencies: + claygl: 1.3.0 + echarts: 5.4.3 + zrender: 5.4.4 + dev: false + /echarts@4.9.0: resolution: {integrity: sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==} dependencies: diff --git a/src/api/event-boot/monitor.ts b/src/api/event-boot/monitor.ts index a04c2094..46cc4b42 100644 --- a/src/api/event-boot/monitor.ts +++ b/src/api/event-boot/monitor.ts @@ -61,4 +61,32 @@ export function getStatistic(data: any) { method: 'post', data }) +} + +// 暂降分布统计 右 获取数据 +export function getProbabilityDistribution(data: any) { + return request({ + url: '/event-boot/monitor/getProbabilityDistribution', + method: 'post', + data + }) +} + +// 事件分析 获取数据 +export function getMonitorEventAnalyseQuery(data: any) { + return request({ + url: '/event-boot/monitor/getMonitorEventAnalyseQuery', + method: 'post', + data + }) +} + +// 事件分析 下载 +export function downloadMonitorEventWaveFile(data: any) { + return request({ + url: '/event-boot/monitor/downloadMonitorEventWaveFile', + method: 'post', + data: data.lineId, + responseType: 'blob' + }) } \ No newline at end of file diff --git a/src/api/event-boot/transient.ts b/src/api/event-boot/transient.ts new file mode 100644 index 00000000..0fa54e99 --- /dev/null +++ b/src/api/event-boot/transient.ts @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +export function downloadWaveFile(data: any) { + return request({ + url: '/event-boot/transient/downloadWaveFile', + method: 'post', + data: data.lineId, + responseType: 'blob' + }) +} + +// 事件分析 shushiboxi 获取数据 +export function getMonitorEventAnalyseWave(data:any) { + return request({ + url: "/event-boot/transient/getTransientAnalyseWave", + method: "post", + data + }); +} + diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue index 833385f7..fcb634a0 100644 --- a/src/components/echarts/MyEchart.vue +++ b/src/components/echarts/MyEchart.vue @@ -6,7 +6,7 @@ import { onBeforeUnmount, onMounted, ref, defineExpose, watch } from 'vue' // import echarts from './echarts' import * as echarts from 'echarts' // 全引入 - +import 'echarts-gl' import 'echarts/lib/component/dataZoom' const chartRef = ref() @@ -66,7 +66,6 @@ const initChart = () => { itemHeight: 10, ...(props.options.legend || null) }, - grid: { top: '50px', left: '10px', @@ -74,8 +73,8 @@ const initChart = () => { bottom: props.options.options?.dataZoom === null ? '10px' : '40px', containLabel: true }, - xAxis: handlerXAxis(), - yAxis: handlerYAxis(), + xAxis: props.options.xAxis ? handlerXAxis() : null, + yAxis: props.options.yAxis ? handlerYAxis() : null, dataZoom: [ { type: 'inside', @@ -95,7 +94,7 @@ const initChart = () => { ], color: [ ...(props.options.color || ''), - '#07CCCA ', + '#07CCCA', '#00BFF5', '#FFBF00', '#77DA63', @@ -106,11 +105,12 @@ const initChart = () => { '#66FFCC', '#B3B3B3' ], + series: props.options.series, ...props.options.options }) setTimeout(() => { chart.resize() - },0) + }, 0) } const handlerYAxis = () => { let temp = { diff --git a/src/main.ts b/src/main.ts index 0b7b5cb2..d552c70f 100644 --- a/src/main.ts +++ b/src/main.ts @@ -17,7 +17,6 @@ import { ElDialog } from 'element-plus' import BaiduMap from 'vue-baidu-map-3x' import ExcelJS from 'exceljs' import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx' - // 方式1:NPM 安装,注入 ExcelJS 对象 VXETable.use(VXETablePluginExportXLSX, { ExcelJS diff --git a/src/template/README.md b/src/template/README.md index 5f41d454..3997be7e 100644 --- a/src/template/README.md +++ b/src/template/README.md @@ -1,2 +1,2 @@ -dialog 弹框标准模版 -表格模版参照 /views/userList/index.vue +dialog 弹框标准模版 +table 表格模版 diff --git a/src/template/table.vue b/src/template/table.vue new file mode 100644 index 00000000..421411d2 --- /dev/null +++ b/src/template/table.vue @@ -0,0 +1,175 @@ + + diff --git a/src/utils/tableStore.ts b/src/utils/tableStore.ts index 20bc53d4..0514c421 100644 --- a/src/utils/tableStore.ts +++ b/src/utils/tableStore.ts @@ -3,6 +3,7 @@ import createAxios from '@/utils/request' import { requestPayload } from '@/utils/request' import { Method } from 'axios' import { mainHeight } from '@/utils/layout' + interface TableStoreParams { url: string pk?: string @@ -39,7 +40,7 @@ export default class TableStore { loadCallback: null, resetCallback: null, beforeSearchFun: null, - height: mainHeight(20 + (this.showPage ? 58 : 0)).height as string, + height: 0, publicHeight: 0 }) @@ -55,6 +56,7 @@ export default class TableStore { this.table.loadCallback = options.loadCallback || null this.table.beforeSearchFun = options.beforeSearchFun || null Object.assign(this.table.params, options.params) + this.table.height = mainHeight(20 + (this.showPage ? 58 : 0) + this.table.publicHeight).height as string } index() { diff --git a/src/views/auth/audit/index.vue b/src/views/auth/audit/index.vue index f9a7b5d8..24b64a78 100644 --- a/src/views/auth/audit/index.vue +++ b/src/views/auth/audit/index.vue @@ -23,7 +23,7 @@ const tableStore = new TableStore({ method: 'POST', url: '/user-boot/user/checkUserList', column: [ - // { width: '60', type: 'checkbox' }, + { width: '60', type: 'checkbox' }, { title: '名称', field: 'name' }, { title: '登录名', field: 'loginName' }, { title: '角色', field: 'roleName' }, diff --git a/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue b/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue index 381890af..80223d52 100644 --- a/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue +++ b/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/chixushijiangailvfenbu/index.vue @@ -1,10 +1,172 @@ diff --git a/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue b/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue index d32ce2cf..4493784a 100644 --- a/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue +++ b/src/views/pms/voltageSags/monitoringPoint/online/eventStatistics/dianyazanjiangbiaojimidu/index.vue @@ -1,5 +1,5 @@