diff --git a/src/api/event-boot/report.ts b/src/api/event-boot/report.ts index 445ac903..1453ef74 100644 --- a/src/api/event-boot/report.ts +++ b/src/api/event-boot/report.ts @@ -40,17 +40,24 @@ export function getLineExport(data) { responseType: 'blob' }) } -export function getVoltage(data:any) { +export function getVoltage(data: any) { return createAxios({ url: '/event-boot/report/getVoltage', method: 'post', data }) } -export function getGeneralSituation(data:any) { +export function getGeneralSituation(data: any) { return createAxios({ url: '/event-boot/report/getGeneralSituation', method: 'post', data }) } +export function getTransientValue(data: any) { + return createAxios({ + url: '/event-boot/transient/getTransientValue', + method: 'post', + data + }) +} diff --git a/src/views/pqs/voltageSags/analyse/eventCorrelation/boxi.vue b/src/components/echarts/analytics.vue similarity index 100% rename from src/views/pqs/voltageSags/analyse/eventCorrelation/boxi.vue rename to src/components/echarts/analytics.vue diff --git a/src/components/echarts/waveForm.vue b/src/components/echarts/waveForm.vue new file mode 100644 index 00000000..8309cdcc --- /dev/null +++ b/src/components/echarts/waveForm.vue @@ -0,0 +1,140 @@ + + + diff --git a/src/components/form/datePicker/index.vue b/src/components/form/datePicker/index.vue index 207ac964..b708c1c5 100644 --- a/src/components/form/datePicker/index.vue +++ b/src/components/form/datePicker/index.vue @@ -86,8 +86,15 @@ const timeChange = (e: number) => { disabledPicker.value = true timeValue.value = [setTime(3), setTime()] } else if (e == 4) { + let year = parseInt(setTime().substring(0, 4)) + let month = parseInt(setTime().substring(5, 7)) + let date = parseInt(setTime().substring(8, 10)) + + var start = new Date(year, month - 1, date) + var dayOfWeek = start.getDay() == 0 ? 7 : start.getDay() - 1 // 如果为周日,则置为7天 + disabledPicker.value = true - timeValue.value = [setTime(0, 7), setTime()] + timeValue.value = [setTime(0, dayOfWeek), setTime(0, -6 + dayOfWeek)] } else if (e == 5) { disabledPicker.value = false backDisabled.value = true @@ -133,6 +140,7 @@ const preClick = () => { //按周 } else if (interval.value == 4) { //根据开始时间推 + let start = new Date(year, month - 1, date) start.setDate(start.getDate() - 7) startTime = formatTime(start) @@ -385,8 +393,9 @@ const next = () => { const setTime = (flag = 0, e = 0) => { let dd = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'dd') + let data = '' - if (dd < 4) { + if (dd < 4 && dd == 0) { data = window.XEUtils.toDateString(new Date().getTime() - (e + dd) * 3600 * 1000 * 24, 'yyyy-MM-dd') } else { data = window.XEUtils.toDateString(new Date().getTime() - e * 3600 * 1000 * 24, 'yyyy-MM-dd') @@ -450,6 +459,10 @@ const NowgetEndTime = () => { const setTimeOptions = (list: any) => { timeOptions.value = list } +const setInterval = (value: any) => { + interval.value = value + timeChange(value) +} // 获取时间范围的同比 function getYearOnYear(startDate: string, endDate: string): [string, string] { @@ -483,7 +496,7 @@ function formatDate(date: Date): string { const day = String(date.getDate()).padStart(2, '0') return `${year}-${month}-${day}` } -defineExpose({ timeValue, interval, timeFlag, setTimeOptions, getYearOnYear, getMonthOnMonth }) +defineExpose({ timeValue, interval, timeFlag, setTimeOptions, setInterval, getYearOnYear, getMonthOnMonth }) diff --git a/src/views/pqs/bearingCapacity/evaluationList/index.vue b/src/views/pqs/bearingCapacity/evaluationList/index.vue new file mode 100644 index 00000000..b1efa011 --- /dev/null +++ b/src/views/pqs/bearingCapacity/evaluationList/index.vue @@ -0,0 +1,201 @@ + + diff --git a/src/views/pqs/bearingCapacity/evaluationList/policy.vue b/src/views/pqs/bearingCapacity/evaluationList/policy.vue new file mode 100644 index 00000000..4e6b3d10 --- /dev/null +++ b/src/views/pqs/bearingCapacity/evaluationList/policy.vue @@ -0,0 +1,231 @@ + + + + diff --git a/src/views/pqs/bearingCapacity/userManagement/index.vue b/src/views/pqs/bearingCapacity/userManagement/index.vue new file mode 100644 index 00000000..3eaf13ad --- /dev/null +++ b/src/views/pqs/bearingCapacity/userManagement/index.vue @@ -0,0 +1,242 @@ + + diff --git a/src/views/pqs/business/terminal/ProgramManagement/index.vue b/src/views/pqs/business/terminal/ProgramManagement/index.vue index 4ee540d0..912841b8 100644 --- a/src/views/pqs/business/terminal/ProgramManagement/index.vue +++ b/src/views/pqs/business/terminal/ProgramManagement/index.vue @@ -43,12 +43,12 @@ - +
@@ -71,7 +71,7 @@