From caabe0e6e97d8e3d33f976b7ae928e1de68f3ff6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Sat, 7 Oct 2023 14:46:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=84=E7=90=86=20CPU=20usage=20of=20dif?= =?UTF-8?q?erent=20cores=20=E6=8A=98=E7=BA=BF=E5=9B=BE=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E4=BE=8B=E7=9A=84=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E4=BE=8B=E7=BF=BB=E9=A1=B5=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E5=A4=84=E7=90=86cup=20tab=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E6=97=A5=E6=9C=9F=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E6=9C=8D=E5=8A=A1=E5=99=A8server=20?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20tabs=20=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=87=E6=8D=A2=E6=9C=8D=E5=8A=A1=E5=99=A8?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abnormalAlarm/serverMonitor/instances/cpu.vue | 10 ++++++++-- .../abnormalAlarm/serverMonitor/instances/details.vue | 10 ++++++---- .../serverMonitor/instances/serviceProcess.vue | 1 - 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue index 574817f..5b75ac1 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue @@ -231,7 +231,6 @@ export default { }, methods: { getTheData() { - console.log(this.serverOptions) let hostId = this.serverOptions.find((item) => { return item.value == this.currId }).hostId @@ -278,7 +277,6 @@ export default { totalCpu.push(item) } }) - console.log(totalCpu) this.cpuDiff_xData = totalCpu[0].list.map((item) => { return dateFormat(new Date(item.date * 1000), 'hh:mm') }) @@ -357,14 +355,17 @@ export default { onServerChange(val) { this.currId = val.key this.currLabel = val.label + this.getTheData() }, onTimeChange(val) { this.getBeforeHours(val) + this.getTheData() }, onRangeDateChange(date, dateString) { this.queryParams.timer = 0 this.queryParams.startDate = dateString[0] this.queryParams.endDate = dateString[1] + this.getTheData() }, drawChart1() { let myLine = echarts.init(document.getElementById('chart1')) @@ -754,6 +755,11 @@ export default { data: item.data, } }) + option.legend.type = 'scroll' + option.legend.pageIconColor = '#9ab1bc' + option.legend.pageTextStyle = { + color: '#9ab1bc', + } this.drawLine(option) } else { this.drawLine(option) diff --git a/src/views/abnormalAlarm/serverMonitor/instances/details.vue b/src/views/abnormalAlarm/serverMonitor/instances/details.vue index 2313a9f..45063fd 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/details.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/details.vue @@ -15,7 +15,7 @@ :class="{ 'ant-list-item-active': index === currIndex }" slot="renderItem" slot-scope="item, index" - @click="handleBasicItem(index)" + @click="handleBasicItem(index, item)" >
{{ item.sourceName }}
@@ -512,7 +512,6 @@ export default { methods: { // Echarts (时间线) EchartsTimeline() { - console.log(3456789) const params = { itemId: '37550', itemType: 0, @@ -647,7 +646,6 @@ export default { } getAction('/systemMonitor/queryItemHistoryData', params).then((res) => { const arr = res.result.map((x) => x.value) - console.log(Math.max(...arr), Math.min(...arr)) this.cpuData.max = Math.max(...arr).toFixed(2) this.cpuData.min = Math.min(...arr).toFixed(2) let sum = arr.reduce((tatal, num) => tatal + num, 0) @@ -743,8 +741,12 @@ export default { } } }, - handleBasicItem(i) { + handleBasicItem(i, item) { this.currIndex = i + this.currItemId = item.cpuUsedItemId + this.getBasiclnfo(item.hostId) + this.getCpuUtilizationData() + this.getTimeLineData() }, getServerAlarmHistory(callBack) { this.loading = true diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue index 1e32ea8..43a213a 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue @@ -333,7 +333,6 @@ export default { let oneHourAgo = moment().subtract(num, 'hours') this.queryParams.startDate = oneHourAgo.format('YYYY-MM-DD HH:mm:ss') this.queryParams.endDate = currentTime.format('YYYY-MM-DD HH:mm:ss') - console.log(this.queryParams) }, moment, onRangeDateChange(date, dateString) { From ae1a1c393a3ba83919144becd81f5641184048dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Sun, 8 Oct 2023 14:01:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=20=E5=A4=84=E7=90=86system=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E9=A1=B5=E9=9D=A2=20menuManage=20tab=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=B8=AD=E7=BC=96=E8=BE=91=E5=BC=B9=E7=AA=97=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/modules/PermissionModal.vue | 611 +++++++++---------- 1 file changed, 279 insertions(+), 332 deletions(-) diff --git a/src/views/system/modules/PermissionModal.vue b/src/views/system/modules/PermissionModal.vue index d24776c..d21910f 100644 --- a/src/views/system/modules/PermissionModal.vue +++ b/src/views/system/modules/PermissionModal.vue @@ -4,171 +4,115 @@ :width="drawerWidth" @close="handleCancel" :visible="visible" - :confirmLoading="confirmLoading"> + :confirmLoading="confirmLoading" + > +
+ + + + + First Level Menu + Child Menu + Button/Permission + + -
- - + + + - - - First Level Menu - Child Menu - Button/Permission - - + + {{ validateStatus == 'error' ? 'Please Select Parent Menu' : '  ' }} + + + - - - + + + + + + - - {{ validateStatus=='error'?'Please Select Parent Menu':'  ' }} - - - + + + - - - + + + - - - + + + + + + - - - + + + + + - - - + + + - - + + + + + + - - - + + + - + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cancel - + + + + + Cancel Ok
@@ -176,203 +120,206 @@ - \ No newline at end of file From 7454b9fbf990eccc223bb336485db2dc52e2e354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Sun, 8 Oct 2023 14:45:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=BC=B9=E7=AA=97=E4=B8=AD=E7=9A=84=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tools/HeaderNotice.vue | 553 +++++++++++++------------- 1 file changed, 284 insertions(+), 269 deletions(-) diff --git a/src/components/tools/HeaderNotice.vue b/src/components/tools/HeaderNotice.vue index 2ac983e..bba217b 100644 --- a/src/components/tools/HeaderNotice.vue +++ b/src/components/tools/HeaderNotice.vue @@ -6,7 +6,8 @@ :arrowPointAtCenter="true" overlayClassName="header-notice-wrapper" @visibleChange="handleHoverChange" - :overlayStyle="{ width: '300px', top: '50px' }"> + :overlayStyle="{ width: '300px', top: '50px' }" + > - + - + \ No newline at end of file From 1777ca2bf51d16f6313145b67098c57da80cbea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=BB=E7=8F=AE=E5=AE=87?= Date: Mon, 9 Oct 2023 13:55:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?web=20=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../radionuclide/particulate/blankphd.vue | 393 +++++++++--------- 1 file changed, 201 insertions(+), 192 deletions(-) diff --git a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue index 7f8d3bb..4da9b50 100644 --- a/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue +++ b/src/views/statistics/imsData/radionuclide/particulate/blankphd.vue @@ -1,6 +1,13 @@