From e2b7c06eb44a43397bf303442d39d26d2ed5276c Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Thu, 7 Jul 2022 15:26:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E6=A3=80=E6=B5=8B=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=BA=8B=E4=BB=B6=E5=88=97=E8=A1=A8=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=20=E7=9B=B8=E5=85=B3=E6=A3=80=E6=B5=8B=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit aa1cddb746836829077500ea82a35a1ae27733e3) --- .../detections/overview/DetectionSecurityEventOverview.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/detections/overview/DetectionSecurityEventOverview.vue b/src/views/detections/overview/DetectionSecurityEventOverview.vue index 2a4be1ec..c05b86d0 100644 --- a/src/views/detections/overview/DetectionSecurityEventOverview.vue +++ b/src/views/detections/overview/DetectionSecurityEventOverview.vue @@ -216,7 +216,7 @@
-
+
Date: Thu, 7 Jul 2022 08:05:20 +0000 Subject: [PATCH 2/5] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b80be37d..d0962fd3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,24 +15,6 @@ cache: before_script: - export CNUI_TAG=$(date +%Y%m%d%H%M%S) -generate_git-log: - stage: gen_git-log - script: - - if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then sed -i 's++更新记录\n+g' ./public/index.html; echo "添加更新记录链接"; fi; - - echo "最近的100个提交记录" - - echo "
" > ./public/git-log.html
-    - "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
-    - echo "
" >> ./public/git-log.html - - echo "处理 git-log.html 结束" - artifacts: - paths: - - public/index.html - - public/git-log.html - only: - - dev - tags: - - GN-XXG-Server - build_project: stage: build_project script: @@ -41,7 +23,7 @@ build_project: - echo "npm run build" - npm run build only: - - dev + - dev_copy - tags tags: - GN-XXG-Server @@ -57,7 +39,7 @@ build_image: - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui:$CNUI_TAG when: on_success only: - - dev + - dev_copy tags: - GN-XXG-Server From 58b6f6b6a26b54e2c4d509ad9d344edcb223764d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=B5=A9?= Date: Thu, 7 Jul 2022 08:05:28 +0000 Subject: [PATCH 3/5] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d0962fd3..cdc080aa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ # 自定义生命周期 stages: - - gen_git-log - build_project - build_image From 3109b9979b37f44ca5040d65c0b74c9e8c8698ca Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 8 Jul 2022 10:49:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20config.js=E6=96=87=E4=BB=B6baseUrl?= =?UTF-8?q?=20ip=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8A=A5=E5=91=8A=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/config.js | 2 +- src/components/table/report/reportTestTable.vue | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/config.js b/public/config.js index 3d59b49f..e672dcd8 100644 --- a/public/config.js +++ b/public/config.js @@ -1,4 +1,4 @@ var BASE_CONFIG = { - baseUrl: 'http://192.168.44.54:8090/', + baseUrl: 'http://192.168.44.53:8090/', version: '2.0.2021.05.11.19.43' } diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue index d0834c5f..5de1a130 100644 --- a/src/components/table/report/reportTestTable.vue +++ b/src/components/table/report/reportTestTable.vue @@ -238,17 +238,17 @@ export default { prop: 'id', show: true, width: 50 - }, { - label: this.$t('report.categoryType'), - prop: 'categoryId', - show: true, - minWidth: 180 }, { label: this.$t('config.user.name'), prop: 'name', show: true, minWidth: 200, sortable: 'custom' + }, { + label: this.$t('report.categoryType'), + prop: 'categoryId', + show: true, + minWidth: 180 }, { label: this.$t('report.timeLimit'), prop: 'timeLimit', From 0ea57484e6d912296a5adcd7af8f0e6066c91b68 Mon Sep 17 00:00:00 2001 From: "@changcode" Date: Fri, 8 Jul 2022 16:14:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?style:=20=E5=AE=9E=E4=BD=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=20=E7=BD=91=E7=BB=9C=E8=B4=A8=E9=87=8F=E6=8A=98?= =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/views/entityExplorer/entity-detail.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/assets/css/components/views/entityExplorer/entity-detail.scss b/src/assets/css/components/views/entityExplorer/entity-detail.scss index b86633a3..973d314c 100644 --- a/src/assets/css/components/views/entityExplorer/entity-detail.scss +++ b/src/assets/css/components/views/entityExplorer/entity-detail.scss @@ -45,6 +45,9 @@ .chart-header { border: none; } + .chart-drawing { + width: 530px; + } } } }