diff --git a/src/api/dataVisual/index.ts b/src/api/dataVisual/index.ts new file mode 100644 index 0000000..a73f5c8 --- /dev/null +++ b/src/api/dataVisual/index.ts @@ -0,0 +1,76 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { weatherVo } from './types'; + +/** + * 获取热源列表 + */ +export function getDeptList(data: any) { + return request({ + url: '/system/dept/selectList', + method: 'post', + data: data + }); +} +/** + * 获取图表数据 + */ +export function getrealTime(queryParams: any) { + return request({ + url: 'dc/heatSourceScreen/heatSource/realTime/data', + method: 'get', + params: queryParams + }); +} +/** + * 温度曲线 + */ +export function getTempChart(queryParams: any) { + return request({ + url: '/dc/heatSourceScreen/heatExchangeStation/temperature/history/Data', + method: 'get', + params: queryParams + }); +} +/** + * 温度曲线 + */ +export function getTempChartPolling(queryParams: any) { + return request({ + url: '/dc/heatSourceScreen/heatExchangeStation/temperature/realTime/data', + method: 'get', + params: queryParams + }); +} + +/** + * 压力曲线 + */ +export function getPressChart(queryParams: any) { + return request({ + url: '/dc/heatSourceScreen/heatExchangeStation/stress/history/data', + method: 'get', + params: queryParams + }); +} +/** + * 压力曲线 + */ +export function getPressChartPolling(queryParams: any) { + return request({ + url: '/dc/heatSourceScreen/heatExchangeStation/stress/realTime/data', + method: 'get', + params: queryParams + }); +} + +/** + * 获取换热站Table列表 + */ +export function getTableData(data: any) { + return request({ + url: '/dc/heatSourceScreen/heatSource/table/data', + method: 'post', + data: data + }); +} diff --git a/src/api/dataVisual/types.ts b/src/api/dataVisual/types.ts new file mode 100644 index 0000000..51a9603 --- /dev/null +++ b/src/api/dataVisual/types.ts @@ -0,0 +1,22 @@ +/** + * 天气参数 + */ +export interface weatherVo { + date: string; + tem_day: string; + tem_night: string; + wea: string; + wea_img: string; + win: string; + win_speed: string; +} + +/** + * 水消耗参数 + */ +export interface waterVo { + field1: number; + field2: number; + field3: number; + name: string; +} diff --git a/src/assets/images/dataVisual/title_bg.png b/src/assets/images/dataVisual/title_bg.png index 224cd4c..4c7f9ef 100644 Binary files a/src/assets/images/dataVisual/title_bg.png and b/src/assets/images/dataVisual/title_bg.png differ diff --git a/src/assets/images/dataVisual/title_bg_l.png b/src/assets/images/dataVisual/title_bg_l.png index 4d93d1a..d7e751d 100644 Binary files a/src/assets/images/dataVisual/title_bg_l.png and b/src/assets/images/dataVisual/title_bg_l.png differ diff --git a/src/store/modules/date.js b/src/store/modules/date.js index 38b20e3..12a786b 100644 --- a/src/store/modules/date.js +++ b/src/store/modules/date.js @@ -5,7 +5,9 @@ const useCounter = defineStore('date', { * 存储全局状态 */ state: () => ({ - dateStr: '' + deptIdStr:'', + dateStr: '', + orgStr:'' }), /** @@ -17,8 +19,14 @@ const useCounter = defineStore('date', { * 编辑业务逻辑 类似于methods */ actions: { + deptStore(val) { + this.deptIdStr = val; + }, dateStore(val) { this.dateStr = val; + }, + orgStore(val) { + this.orgStr = val; } } }); diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts index acba637..5742656 100644 --- a/src/types/auto-imports.d.ts +++ b/src/types/auto-imports.d.ts @@ -2,9 +2,11 @@ export {} declare global { const EffectScope: typeof import('vue')['EffectScope'] + const ElForm: typeof import('element-plus/es')['ElForm'] const ElMessage: typeof import('element-plus/es')['ElMessage'] const ElMessageBox: typeof import('element-plus/es')['ElMessageBox'] const ElNotification: typeof import('element-plus/es')['ElNotification'] + const NEllipsis: typeof import('naive-ui')['NEllipsis'] const asyncComputed: typeof import('@vueuse/core')['asyncComputed'] const autoResetRef: typeof import('@vueuse/core')['autoResetRef'] const computed: typeof import('vue')['computed'] @@ -271,9 +273,11 @@ import { UnwrapRef } from 'vue' declare module 'vue' { interface ComponentCustomProperties { readonly EffectScope: UnwrapRef + readonly ElForm: UnwrapRef readonly ElMessage: UnwrapRef readonly ElMessageBox: UnwrapRef readonly ElNotification: UnwrapRef + readonly NEllipsis: UnwrapRef readonly asyncComputed: UnwrapRef readonly autoResetRef: UnwrapRef readonly computed: UnwrapRef diff --git a/src/types/components.d.ts b/src/types/components.d.ts index e77c575..ff9cf43 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -9,33 +9,27 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] Button: typeof import('./../components/Widgets/button.vue')['default'] - ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] - ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] ElCard: typeof import('element-plus/es')['ElCard'] ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] - ElDivider: typeof import('element-plus/es')['ElDivider'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem'] ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu'] ElForm: typeof import('element-plus/es')['ElForm'] ElFormItem: typeof import('element-plus/es')['ElFormItem'] - ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] - ElMenuItemGroup: typeof import('element-plus/es')['ElMenuItemGroup'] ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRow: typeof import('element-plus/es')['ElRow'] ElScrollbar: typeof import('element-plus/es')['ElScrollbar'] ElSelect: typeof import('element-plus/es')['ElSelect'] - ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index ade526c..ec80068 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -171,6 +171,7 @@ const timePeriod = computed(() => { onMounted(() => { getWeatherData(); const webVersion = sessionStorage.getItem('webVersion'); + debugger if (webVersion != '') { const version = JSON.parse(webVersion); notice.value = ElNotification({ diff --git a/src/views/data-visual/components/bar.vue b/src/views/data-visual/components/bar - 副本.vue similarity index 100% rename from src/views/data-visual/components/bar.vue rename to src/views/data-visual/components/bar - 副本.vue diff --git a/src/views/data-visual/components/boxPlot.vue b/src/views/data-visual/components/boxPlot - 副本.vue similarity index 100% rename from src/views/data-visual/components/boxPlot.vue rename to src/views/data-visual/components/boxPlot - 副本.vue diff --git a/src/views/data-visual/components/charts.vue b/src/views/data-visual/components/charts.vue index a8e05a1..0465ae1 100644 --- a/src/views/data-visual/components/charts.vue +++ b/src/views/data-visual/components/charts.vue @@ -6,15 +6,15 @@ 一网温度
- +
- 一网热力站流量 + 一网压力
- +
@@ -24,7 +24,7 @@ 温度
- +
@@ -32,7 +32,7 @@ 压力
- +
@@ -42,26 +42,27 @@ 二网温度
- +
- 二网热力站压力 + 二网压力
- +
diff --git a/src/views/data-visual/components/hxTemp.vue b/src/views/data-visual/components/hxTemp.vue new file mode 100644 index 0000000..a3f41c0 --- /dev/null +++ b/src/views/data-visual/components/hxTemp.vue @@ -0,0 +1,708 @@ + + + diff --git a/src/views/data-visual/components/line.vue b/src/views/data-visual/components/line.vue index 974d125..f03a8a7 100644 --- a/src/views/data-visual/components/line.vue +++ b/src/views/data-visual/components/line.vue @@ -25,7 +25,7 @@ const options = { itemWidth: 11, itemHeight: 2, textStyle: { - color: '#fff', + color: '#D1E1FF', fontSize: 14 } }, @@ -48,7 +48,7 @@ const options = { boundaryGap: false, axisLabel: { show: true, - color: '#99CFFF' + color: '#D1E1FF' }, axisLine: { lineStyle: { @@ -61,7 +61,7 @@ const options = { type: 'value', name: '单位', nameTextStyle: { - color: '#546778', + color: '#D1E1FF', fontSize: 12, padding: [0, 0, 0, 0] //name文字位置 对应 上右下左 }, @@ -71,7 +71,7 @@ const options = { }, axisLabel: { show: true, - color: '#546778' + color: '#D1E1FF' }, splitLine: { // 网格线 diff --git a/src/views/data-visual/components/priPress.vue b/src/views/data-visual/components/priPress.vue new file mode 100644 index 0000000..d2b31e3 --- /dev/null +++ b/src/views/data-visual/components/priPress.vue @@ -0,0 +1,208 @@ + + + diff --git a/src/views/data-visual/components/priTemp.vue b/src/views/data-visual/components/priTemp.vue new file mode 100644 index 0000000..d5e6052 --- /dev/null +++ b/src/views/data-visual/components/priTemp.vue @@ -0,0 +1,188 @@ + + + diff --git a/src/views/data-visual/components/secPress.vue b/src/views/data-visual/components/secPress.vue new file mode 100644 index 0000000..90c198e --- /dev/null +++ b/src/views/data-visual/components/secPress.vue @@ -0,0 +1,208 @@ + + + diff --git a/src/views/data-visual/components/secTemp.vue b/src/views/data-visual/components/secTemp.vue new file mode 100644 index 0000000..73fac6d --- /dev/null +++ b/src/views/data-visual/components/secTemp.vue @@ -0,0 +1,208 @@ + + + diff --git a/src/views/data-visual/components/table - 副本.vue b/src/views/data-visual/components/table - 副本.vue new file mode 100644 index 0000000..c0ad83d --- /dev/null +++ b/src/views/data-visual/components/table - 副本.vue @@ -0,0 +1,142 @@ + + + diff --git a/src/views/data-visual/components/table.vue b/src/views/data-visual/components/table.vue index 578a5d3..f01c432 100644 --- a/src/views/data-visual/components/table.vue +++ b/src/views/data-visual/components/table.vue @@ -1,143 +1,258 @@ diff --git a/src/views/data-visual/components/temp.vue b/src/views/data-visual/components/temp.vue deleted file mode 100644 index ef52d60..0000000 --- a/src/views/data-visual/components/temp.vue +++ /dev/null @@ -1,1221 +0,0 @@ - - - diff --git a/src/views/data-visual/index.scss b/src/views/data-visual/index.scss index 033ed57..fa3ab23 100644 --- a/src/views/data-visual/index.scss +++ b/src/views/data-visual/index.scss @@ -7,14 +7,14 @@ transition: 0.3s; color: #fff; font-size: 16px; - background-color: #142036; + background-color: #24344E; z-index: 100; .header { position: relative; height: 125px; padding: 21px 40px 0 40px; - background-color: #0C182C; - border-bottom: 1px solid #3D4C64; + background-color: #1A2537; + border-bottom: 1px solid #47556C; // span { // line-height: 62px; // font-size: 30px;