diff --git a/src/api/manage_wx/index.ts b/src/api/manage_wx/index.ts index a6fd670..0748cc7 100644 --- a/src/api/manage_wx/index.ts +++ b/src/api/manage_wx/index.ts @@ -95,8 +95,8 @@ export function getEventList(data) { export function clickImage(data) { return http.request({ url: "/scale/clickImage", - method: "get", - params: data, + method: "post", + data: data, }); } diff --git a/src/api/statistics/index.ts b/src/api/statistics/index.ts index 34bdee6..8080fb3 100644 --- a/src/api/statistics/index.ts +++ b/src/api/statistics/index.ts @@ -258,7 +258,6 @@ export function rightImportOpenDetail(data: object) { }); } - // 对象类型 export function getDicTree(data: object) { return service({ @@ -295,13 +294,12 @@ export function exportForms(data: object) { responseType: "blob", }); } +// 报表导出 +export function exportLineData() { + return service({ + url: "/largescreen/exportLineData", + method: "post", - - - - - - - - - + responseType: "blob", + }); +} diff --git a/src/components/BX/rmsboxi.vue b/src/components/BX/rmsboxi.vue index 663724c..0d0c12a 100644 --- a/src/components/BX/rmsboxi.vue +++ b/src/components/BX/rmsboxi.vue @@ -802,7 +802,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin }, 500) if (waveDatas && waveDatas.length > 1) { - const waveDatasTemp = waveDatas.slice(1).reverse() + const waveDatasTemp = waveDatas.slice(1) for (let step = 0; step < waveDatasTemp.length; step++) { drawPics(waveDatasTemp[step], picHeight, step, show, myChartes, rmscm, rmscu, titleText) } @@ -881,19 +881,14 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show: const option = { tooltip: { + top: '10px', trigger: 'axis', borderColor: 'grey', - backgroundColor: '#fff', - style: { - color: '#fff', - fontSize: '15px', - padding: 10 - }, formatter: function (params: any) { let tips = '时刻:' + params[0].data[0] + '' for (let i = 0; i < params.length; i++) { if (params[i].seriesName != '暂降触发点') { - tips += params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '' + tips += params[i].marker + params[i].seriesName + ':' + (params[i].value[1] - 0).toFixed(2) + '' } } return tips @@ -904,11 +899,12 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show: opacity: 0.35, fontSize: 14 }, + backgroundColor: 'rgba(0,0,0,0.55)', borderWidth: 0 }, title: { left: 'center', - text: titlename || title, + text: '',//titlename || title, textStyle: { fontSize: '0.8rem', color: props.DColor ? '#fff' : echartsColor.WordColor diff --git a/src/components/BX/shushiboxi.vue b/src/components/BX/shushiboxi.vue index e8d7797..6828bb4 100644 --- a/src/components/BX/shushiboxi.vue +++ b/src/components/BX/shushiboxi.vue @@ -530,7 +530,7 @@ const initWave = (waveDatas: WaveData[] | null, time: string | null, type: strin }, 400) if (waveDatas && waveDatas.length > 1) { - const waveDatasTemp = waveDatas.slice(1).reverse() + const waveDatasTemp = waveDatas.slice(1) for (let step = 0; step < waveDatasTemp.length; step++) { drawPics(waveDatasTemp[step], picHeight, step, show, myChartes, titleText) } @@ -638,7 +638,7 @@ const drawPics = (waveDataTemp: WaveData, picHeight: string, step: number, show: }, title: { left: 'center', - text: titlename || title, + text: '',//titlename || title, textStyle: { fontSize: '0.8rem', color: props.DColor ? '#fff' : echartsColor.WordColor diff --git a/src/store/index.ts b/src/store/index.ts index 8310ec7..2ae6f53 100644 --- a/src/store/index.ts +++ b/src/store/index.ts @@ -1,6 +1,7 @@ import { createStore, Store, useStore } from "vuex"; import { login } from "@/api/login/login"; import { initLedger, queryConfig } from "@/api/statistics/index"; +import { set } from "xe-utils"; // const store = useStore(); // 定义状态接口 @@ -18,6 +19,7 @@ interface State { eventValue: number; eventDuration: number; realData: []; //实时数据 + iframeLoad: boolean; } // 初始状态 @@ -35,11 +37,13 @@ const state: State = { eventValue: 0.7, eventDuration: 5, realData: [], //实时数据 + iframeLoad: false, }; // 定义Mutation类型 enum Mutations { INCREMENT = "INCREMENT", + IFRAMELOAD = "IFRAMELOAD", SET_TOKEN = "SET_TOKEN", SET_TIME = "SET-TIME", SET_CONFIG = "SET-CONFIG-TIME", @@ -51,6 +55,9 @@ export default createStore({ [Mutations.INCREMENT](state: State) { state.count++; }, + [Mutations.IFRAMELOAD](state: State, data: boolean) { + state.iframeLoad = data; + }, [Mutations.SET_TOKEN](state: State, data: any) { window.sessionStorage.setItem("token", data.token); window.sessionStorage.setItem("deptId", data.deptId); @@ -96,6 +103,9 @@ export default createStore({ increment({ commit }) { commit(Mutations.INCREMENT); }, + setIframeLoad({ commit }, data: any) { + commit(Mutations.IFRAMELOAD,data); + }, setTimeType({ commit }, data: any) { commit(Mutations.SET_TIME, data); }, diff --git a/src/views/SagTraceResult_WX/components/eventStatistics/dipDetail.vue b/src/views/SagTraceResult_WX/components/eventStatistics/dipDetail.vue index 6bf4dc3..2dced31 100644 --- a/src/views/SagTraceResult_WX/components/eventStatistics/dipDetail.vue +++ b/src/views/SagTraceResult_WX/components/eventStatistics/dipDetail.vue @@ -74,7 +74,7 @@ @@ -203,7 +203,7 @@ const exportTable = async () => { "用户", "触发类型", "残余电压(%)", - "持续时间(S)", + "持续时间(s)", ], ]; diff --git a/src/views/SagTraceResult_WX/components/eventStatistics/dipDetailTotal.vue b/src/views/SagTraceResult_WX/components/eventStatistics/dipDetailTotal.vue index d7b9785..fb4f7ab 100644 --- a/src/views/SagTraceResult_WX/components/eventStatistics/dipDetailTotal.vue +++ b/src/views/SagTraceResult_WX/components/eventStatistics/dipDetailTotal.vue @@ -44,6 +44,7 @@ (e == null ? (eventForm.eventValueMin = 1) : null) " @@ -112,8 +113,8 @@ style="width: 150px" size="small" :max="100" - :precision="1" - :step="1" + :precision="2" + :step="0.1" @change=" (e) => (e == null ? (eventForm.eventValueMax = 1) : null) " @@ -129,13 +130,13 @@ style="width: 150px" size="small" :max="1000000" - :precision="1" - :step="1" + :precision="2" + :step="0.1" @change=" (e) => (e == null ? (eventForm.eventDurationMin = 1) : null) " > - ms + s < 持续时间 < @@ -146,13 +147,13 @@ style="width: 150px" size="small" :max="1000000" - :precision="1" - :step="1" + :precision="2" + :step="0.1" @change=" (e) => (e == null ? (eventForm.eventDurationMax = 1) : null) " > - ms + s @@ -261,7 +262,7 @@ @@ -489,7 +490,7 @@ const exportTable = async () => { "用户", "触发类型", "残余电压(%)", - "持续时间(S)", + "持续时间(s)", ], ]; diff --git a/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue b/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue index 4bf1c65..a1ac9c7 100644 --- a/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue +++ b/src/views/SagTraceResult_WX/components/eventStatistics/distributionNetwork.vue @@ -1,12 +1,19 @@ - + - + - @@ -15,86 +22,217 @@ - - + + - - + + - 确定 + 确定 - + 时间范围 - - + + 执行 - + - + - + - + - + - + - + 生成动态谐波责任数据 - + 生成谐波责任指标 - - - + + + - - - - - - + + + + + + {{ - Math.floor(scope.row.responsibilityData * 10000) / - 10000 + Math.floor(scope.row.responsibilityData * 10000) / 10000 }} @@ -106,7 +244,6 @@ -