diff --git a/src/components/echarts/MyEchart.vue b/src/components/echarts/MyEchart.vue index 47303ed..4682ddb 100644 --- a/src/components/echarts/MyEchart.vue +++ b/src/components/echarts/MyEchart.vue @@ -144,6 +144,7 @@ const handlerYAxis = () => { nameTextStyle: { color: '#000' }, + splitNumber:5, minInterval: 1, axisLine: { show: true, diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index 7bf540e..9190c9e 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -48,6 +48,7 @@ import { mainHeight } from '@/utils/layout' import { useDictData } from '@/stores/dictData' import { Search, RefreshLeft } from '@element-plus/icons-vue' import { defineProps } from 'vue' +const emit = defineEmits(['selectChange',]) const tableStore = inject('tableStore') as TableStore const tableHeader = ref() @@ -147,6 +148,7 @@ const computedSearchRow = () => { const showSelect = ref(false) const showSelectChange = () => { showSelect.value = !showSelect.value + emit('selectChange', showSelect.value) } const onComSearch = async () => { if (props.datePicker) { diff --git a/src/styles/app.scss b/src/styles/app.scss index 3d1f574..fcfadf4 100644 --- a/src/styles/app.scss +++ b/src/styles/app.scss @@ -381,12 +381,14 @@ body, height: 100%; width: 100%; background: #fff; - z-index: 2; + z-index: 10; } .bjs-powered-by { display: none; } - +.el-select__wrapper{ + height: 32px !important; +} @font-face { font-family: 'AlimamaFangYuanTiVF'; src: url('../assets/font/ali/AlimamaFangYuanTiVF-Thin.woff') format('woff'), diff --git a/src/views/govern/device/control/detail.vue b/src/views/govern/device/control/detail.vue index 0d60ac0..431820f 100644 --- a/src/views/govern/device/control/detail.vue +++ b/src/views/govern/device/control/detail.vue @@ -119,7 +119,7 @@ const init = () => { res.data.forEach((item: any[]) => { arr.push(...item) }) - let [min, max, interval] = yMethod(arr.map((item: any) => item.statisticalData)) + let [min, max] = yMethod(arr.map((item: any) => item.statisticalData.toFixed(2))) echartsData.value = { options: { grid: { @@ -132,7 +132,7 @@ const init = () => { series: res.data.map((item: any) => { return { data: item.map((item: any, i: any) => { - return [res.data[0][i].time, item.statisticalData] + return [res.data[0][i].time, item.statisticalData.toFixed(2)] }), // data: [ // [1584086222000, '573'], @@ -189,7 +189,7 @@ const init = () => { min: min, max: max, // interval:interval, - splitNumber:5 + // min: 134, // max: 500, // min: Math.ceil( diff --git a/src/views/govern/device/control/supplementaryRecruitment/current.vue b/src/views/govern/device/control/supplementaryRecruitment/current.vue index ff2fdcf..75b0318 100644 --- a/src/views/govern/device/control/supplementaryRecruitment/current.vue +++ b/src/views/govern/device/control/supplementaryRecruitment/current.vue @@ -20,7 +20,7 @@ - + - + - + - + { - row.cellValue = row.cellValue ? row.cellValue : '/' + row.cellValue = row.cellValue ? row.cellValue.toFixed(2) : '/' return row.cellValue } }, diff --git a/src/views/govern/device/control/tabs/trend.vue b/src/views/govern/device/control/tabs/trend.vue index 205a0cc..4ec2dd4 100644 --- a/src/views/govern/device/control/tabs/trend.vue +++ b/src/views/govern/device/control/tabs/trend.vue @@ -1,9 +1,10 @@ + - + -
+
@@ -68,7 +69,7 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage') const volConTypeList = dictData.getBasicData('Dev_Connect') //值类型 -const pageHeight = mainHeight(20) +const pageHeight = ref(mainHeight(290)) const loading = ref(true) const searchForm = ref({}) const typeOptions = [ @@ -231,27 +232,27 @@ const init = async () => { // } } }, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'shadow' - }, - formatter: function (params: any) { - var res = params[0].name + '
' - for (var i = 0, l = params.length; i < l; i++) { - params[i].unit = - echartsData.value.options.yAxis[ - echartsData.value.options.series[params[i].seriesIndex].yAxisIndex - ]?.name - res += - params[i].seriesName + - ' ' + - `
` + - `
${params[i].value} ${params[i].unit}

` - } - return res - } - }, + // tooltip: { + // trigger: 'axis', + // // axisPointer: { + // // type: 'shadow' + // // }, + // // formatter: function (params: any) { + // // var res = params[0].name + '
' + // // for (var i = 0, l = params.length; i < l; i++) { + // // params[i].unit = + // // echartsData.value.options.yAxis[ + // // echartsData.value.options.series[params[i].seriesIndex].yAxisIndex + // // ]?.name + // // res += + // // params[i].seriesName + + // // ' ' + + // // `
` + + // // `
${params[i].value} ${params[i].unit}

` + // // } + // // return res + // // } + // }, legend: { //legend使用iconfont图标 data: [], @@ -433,6 +434,15 @@ const init = async () => { } } } +const selectChange = (flag: boolean) => { + console.log("🚀 ~ selectChange ~ flag:", flag) + if (flag) { + pageHeight.value = mainHeight(345) + } else { + pageHeight.value = mainHeight(290) + } + +} //导出 const historyChart = ref() // const chart: any = ref(null) @@ -685,7 +695,7 @@ defineExpose({ getTrendRequest }) .history_chart { width: 100%; - height: calc(100vh - 400px) !important; + // flex: 1; margin-top: 10px; } diff --git a/src/views/govern/manage/basic/popupDictionary.vue b/src/views/govern/manage/basic/popupDictionary.vue index eb7522b..90abf32 100644 --- a/src/views/govern/manage/basic/popupDictionary.vue +++ b/src/views/govern/manage/basic/popupDictionary.vue @@ -4,7 +4,7 @@
基础数据
- + - + @@ -106,7 +106,7 @@
拓展数据
- + diff --git a/src/views/govern/manage/basic/popupVersion.vue b/src/views/govern/manage/basic/popupVersion.vue index 9a6259c..3d62219 100644 --- a/src/views/govern/manage/basic/popupVersion.vue +++ b/src/views/govern/manage/basic/popupVersion.vue @@ -1,7 +1,7 @@