diff --git a/package.json b/package.json index bbea7cf..b1b053f 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "vue-area-linkage": "^5.1.0", "vue-cropper": "^0.5.4", "vue-i18n": "^8.7.0", + "vue-infinite-scroll": "^2.0.2", "vue-loader": "^15.7.0", "vue-ls": "^3.2.0", "vue-photo-preview": "^1.1.3", diff --git a/src/assets/images/abnormalAlarm/alarm.png b/src/assets/images/abnormalAlarm/alarm.png new file mode 100644 index 0000000..6b7c929 Binary files /dev/null and b/src/assets/images/abnormalAlarm/alarm.png differ diff --git a/src/assets/images/abnormalAlarm/cpu.png b/src/assets/images/abnormalAlarm/cpu.png new file mode 100644 index 0000000..e21eb78 Binary files /dev/null and b/src/assets/images/abnormalAlarm/cpu.png differ diff --git a/src/assets/images/abnormalAlarm/email.png b/src/assets/images/abnormalAlarm/email.png new file mode 100644 index 0000000..3c40f8e Binary files /dev/null and b/src/assets/images/abnormalAlarm/email.png differ diff --git a/src/assets/images/abnormalAlarm/icon-r.png b/src/assets/images/abnormalAlarm/icon-r.png new file mode 100644 index 0000000..fb64be2 Binary files /dev/null and b/src/assets/images/abnormalAlarm/icon-r.png differ diff --git a/src/assets/images/abnormalAlarm/icon-y.png b/src/assets/images/abnormalAlarm/icon-y.png new file mode 100644 index 0000000..16e6883 Binary files /dev/null and b/src/assets/images/abnormalAlarm/icon-y.png differ diff --git a/src/assets/images/abnormalAlarm/partition.png b/src/assets/images/abnormalAlarm/partition.png new file mode 100644 index 0000000..a2418d8 Binary files /dev/null and b/src/assets/images/abnormalAlarm/partition.png differ diff --git a/src/assets/images/abnormalAlarm/ram.png b/src/assets/images/abnormalAlarm/ram.png new file mode 100644 index 0000000..dfc754f Binary files /dev/null and b/src/assets/images/abnormalAlarm/ram.png differ diff --git a/src/assets/images/abnormalAlarm/running.png b/src/assets/images/abnormalAlarm/running.png new file mode 100644 index 0000000..b19f792 Binary files /dev/null and b/src/assets/images/abnormalAlarm/running.png differ diff --git a/src/assets/images/abnormalAlarm/times.png b/src/assets/images/abnormalAlarm/times.png new file mode 100644 index 0000000..3144cb4 Binary files /dev/null and b/src/assets/images/abnormalAlarm/times.png differ diff --git a/src/assets/images/abnormalAlarm/warning.png b/src/assets/images/abnormalAlarm/warning.png new file mode 100644 index 0000000..ef0982e Binary files /dev/null and b/src/assets/images/abnormalAlarm/warning.png differ diff --git a/src/assets/less/TabMenu.less b/src/assets/less/TabMenu.less new file mode 100644 index 0000000..2d14e70 --- /dev/null +++ b/src/assets/less/TabMenu.less @@ -0,0 +1,80 @@ +::v-deep { + .ant-tabs{ + height: 100%; + .ant-tabs-top-content{ + height: calc(100% - 50px); + .ant-tabs-tabpane{ + height: 100%; + overflow: auto; + overflow: hidden; + } + } + } + .ant-tabs-bar{ + width: 100%; + height: 40px; + margin: 0 0 10px 0; + background-color: rgba(12, 235, 201, 0.05); + border-top: 1px solid rgba(12, 235, 201, 0.3); + border-bottom: 1px solid rgba(12, 235, 201, 0.3); + } + .ant-tabs-nav .ant-tabs-tab{ + height: 30px; + line-height: 30px; + background-color: rgba(58, 236, 240, 0.22); + font-family: BookmanOldStyle; + font-size: 16px; + font-weight: bold; + font-stretch: normal; + letter-spacing: 2px; + color: #c9f6f6; + margin: 0 0 0 10px; + padding: 0 23px; + position: relative; + &::before{ + content: ""; + position: absolute; + top: 0; + left: 0; + width: 7px; + height: 29px; + color: rgba(58, 236, 240, 0.22); + border: 1px solid #569e9e; + border-right: none; + border-radius: 0; + } + &::after{ + content: ""; + position: absolute; + top: 0; + right: 0; + width: 7px; + height: 29px; + color: rgba(58, 236, 240, 0.22); + border: 1px solid #569e9e; + border-left: none; + } + &-active{ + &::before, + &::after { + border-color: #0cecca !important; + } + } + } + .ant-tabs-ink-bar{ + display: none !important + } + .ant-tabs-nav .ant-tabs-tab-active{ + color: #2affdf; + } + .ant-row{ + height: 36px; + line-height: 36px; + } + .ant-tabs-tab-prev, .ant-tabs-tab-next{ + color: #c9f6f6; + } + .ant-tabs-tab-prev:hover, .ant-tabs-tab-next:hover{ + color: #2affdf; + } +} \ No newline at end of file diff --git a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue index 31d31f6..7571454 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmHistory/index.vue @@ -442,90 +442,11 @@ export default { \ No newline at end of file diff --git a/src/views/abnormalAlarm/serverMonitor/instances/index.vue b/src/views/abnormalAlarm/serverMonitor/instances/index.vue index c628d7c..a378ca7 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/index.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/index.vue @@ -1,15 +1,45 @@ - \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 523b949..9995050 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11622,6 +11622,11 @@ vue-i18n@^8.7.0: resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.18.2.tgz#cd7c12f2e178e6faa23b0e3cfd2f7bac9305f8fc" integrity sha512-0X5nBTCZAVjlwcrPaYJwNs3iipBBTv0AUHwQUOa8yP3XbQGWKbRHqBb3OhCYtum/IHDD21d/df5Xd2VgyxbxfA== +vue-infinite-scroll@^2.0.2: + version "2.0.2" + resolved "https://registry.npmmirror.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711" + integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A== + vue-loader@^13.0.5: version "13.7.3" resolved "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.3.tgz#e07440f78230a639d00ada4da7b96d0e9d62037f"