From 78fcd8600713720a1b3529cd7bf52c3e571cee3b Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 7 Aug 2023 11:32:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A1=EF=BC=89Alarm=20=E5=AF=BC?= =?UTF-8?q?=E8=88=AAmenu-item=E9=AB=98=E5=BA=A6=E6=94=B9=E4=B8=BA43px=202?= =?UTF-8?q?=EF=BC=89=E6=89=80=E6=9C=89history=E8=A1=A8=E5=A4=B4=E4=B8=AD?= =?UTF-8?q?=E5=87=BA=E4=BA=86alarm=20info=E9=83=BD=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/abnormalAlarm/RouteView.vue | 2 ++ .../abnormalAlarm/alarmCenter/alarmHistory/index.vue | 6 +++--- .../abnormalAlarm/analysisMonitor/alarmHistory/index.vue | 8 ++++---- .../abnormalAlarm/databaseMonitor/alarmHistory/index.vue | 4 ++-- .../abnormalAlarm/emailMonitor/alarmHistory/index.vue | 4 ++-- .../abnormalAlarm/serverMonitor/alarmHistory/index.vue | 4 ++-- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/views/abnormalAlarm/RouteView.vue b/src/views/abnormalAlarm/RouteView.vue index 3d10e1d..5262f42 100644 --- a/src/views/abnormalAlarm/RouteView.vue +++ b/src/views/abnormalAlarm/RouteView.vue @@ -200,6 +200,8 @@ export default { .ant-menu-submenu > .ant-menu-submenu-title, .ant-menu-item { font-size: 20px; + height: 43px; + line-height: 43px; } .ant-menu-sub.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title { font-size: 18px; diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue index 31d31f6..2573c64 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue @@ -68,19 +68,19 @@ import * as echarts from 'echarts' const columns = [ { title: 'NAME', - align: 'left', + align: 'center', dataIndex: 'name', width: 250, }, { title: 'TYPE', - align: 'left', + align: 'center', dataIndex: 'sourceType', width: 150, }, { title: 'ALARM START DATE', - align: 'left', + align: 'center', dataIndex: 'alarmStartDate', width: 200, }, diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue index 1fe1775..0d341ad 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue @@ -188,7 +188,7 @@ import TableList from '../../components/tableList.vue'; import { getAction, postAction, httpAction, deleteAction } from '@/api/manage' const columns = [{ title: 'STATION', - align: 'left', + align: 'center', dataIndex: 'station', width: 160, ellipsis: true, @@ -197,17 +197,17 @@ const columns = [{ } },{ title: 'COLLECTION START', - align: 'left', + align: 'center', dataIndex: 'collectionStartTime', width: 200, },{ title: 'ALARM TIME', - align: 'left', + align: 'center', dataIndex: 'alarmStartDate', width: 200, },{ title: 'DATA SOURCES ', - align: 'left', + align: 'center', dataIndex: 'dataSource', width: 180, ellipsis: true, diff --git a/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue index 2876055..71d08d5 100644 --- a/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/databaseMonitor/alarmHistory/index.vue @@ -40,12 +40,12 @@ import TableList from '../../components/tableList.vue'; import { getAction,postAction,httpAction,deleteAction } from '@/api/manage' const columns = [{ title: 'NAME', - align: 'left', + align: 'center', dataIndex: 'name', width: 250, },{ title: 'ALARM START DATE', - align: 'left', + align: 'center', dataIndex: 'alarmStartDate', width: 300, },{ diff --git a/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue index 1e5e932..c1b507c 100644 --- a/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/emailMonitor/alarmHistory/index.vue @@ -40,12 +40,12 @@ import TableList from '../../components/tableList.vue'; import { getAction,postAction,httpAction,deleteAction } from '@/api/manage' const columns = [{ title: 'NAME', - align: 'left', + align: 'center', dataIndex: 'name', width: 250, },{ title: 'ALARM START DATE', - align: 'left', + align: 'center', dataIndex: 'alarmStartDate', width: 300, },{ diff --git a/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue index c7bf57b..b232391 100644 --- a/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/serverMonitor/alarmHistory/index.vue @@ -40,12 +40,12 @@ import TableList from '../../components/tableList.vue'; import { getAction,postAction,httpAction,deleteAction } from '@/api/manage' const columns = [{ title: 'NAME', - align: 'left', + align: 'center', dataIndex: 'name', width: 250, },{ title: 'ALARM START DATE', - align: 'left', + align: 'center', dataIndex: 'alarmStartDate', width: 300, },{ From a85ddf23d197b19d58603624f748dc5e0e04ede0 Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 7 Aug 2023 13:42:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4Alarm?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8B=E7=9A=84=E5=AF=BC=E8=88=AAicon?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/abnormalAlarm/RouteView.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/abnormalAlarm/RouteView.vue b/src/views/abnormalAlarm/RouteView.vue index 5262f42..82e7991 100644 --- a/src/views/abnormalAlarm/RouteView.vue +++ b/src/views/abnormalAlarm/RouteView.vue @@ -264,26 +264,26 @@ export default { //菜单打开状态/\箭头左\ .ant-menu-submenu-open.ant-menu-submenu[menuindex] > .ant-menu-submenu-title > .ant-menu-submenu-arrow::before { width: 0px; - transform: rotate(45deg) translateX(4.5px); + // transform: rotate(45deg) translateX(4.5px); } //菜单打开状态/\箭头右\ .ant-menu-submenu-open.ant-menu-submenu[menuindex] > .ant-menu-submenu-title > .ant-menu-submenu-arrow::after { content: url(~@/assets/images/station-operation/toggle.png); width: 0px; - transform: rotate(-90deg) translateX(-6.5px) translateY(-8.5px);; + transform: rotate(90deg) translateX(-9.5px) translateY(-19.5px); } //菜单收起状态\/箭头左\ .ant-menu-inline-collapsed .ant-menu-submenu-arrow::before, .ant-menu-submenu[menuindex] > .ant-menu-submenu-title .ant-menu-submenu-arrow::before { width: 0px; - transform: rotate(-45deg) translateX(4.5px); + // transform: rotate(-45deg) translateX(4.5px); } //菜单收起状态\/箭头右/ .ant-menu-inline-collapsed .ant-menu-submenu-arrow::after, .ant-menu-submenu[menuindex] > .ant-menu-submenu-title .ant-menu-submenu-arrow::after { content: url(~@/assets/images/station-operation/toggle.png); width: 0px; - transform: rotate(90deg) translateX(-5.5px) translateY(-19.5px); + transform: rotate(-90deg) translateX(-3.5px) translateY(-11.5px); } .ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected { From 51be141a39ecceb46a1b58aa18733d9ee49ff0a0 Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 7 Aug 2023 18:19:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E5=88=86=E6=9E=90=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E7=9B=91=E6=8E=A7=20-=20history=20=E5=AF=B9=E6=8E=A5=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysisMonitor/alarmHistory/index.vue | 198 +++++++++--------- 1 file changed, 103 insertions(+), 95 deletions(-) diff --git a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue index 0d341ad..cea3161 100644 --- a/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/analysisMonitor/alarmHistory/index.vue @@ -10,9 +10,9 @@ :list="dataSource" :loading="loading" :pagination="false" - :selectRowClick="rowClick" + @selectRowClick="rowClick" > -