Compare commits

...

61 Commits

Author SHA1 Message Date
张帅
1e5a6dab7f Update .gitlab-ci.yml 2021-10-25 07:19:30 +00:00
张帅
aa0d0a3921 Update .gitlab-ci.yml 2021-10-25 07:11:56 +00:00
张帅
f7ea7f1a6c Update .gitlab-ci.yml 2021-10-25 07:04:20 +00:00
张帅
1b3fe6cbd4 Update Dockerfile 2021-10-25 06:07:00 +00:00
张帅
36f5904766 Update Dockerfile 2021-10-25 05:58:16 +00:00
张帅
81a429b171 Update Dockerfile 2021-10-25 03:45:46 +00:00
张帅
d9a2821195 Update Dockerfile 2021-10-25 03:17:01 +00:00
zhangshuai
730e94f252 feat :还原Tiles文件 2021-10-23 21:34:13 +08:00
zhangshuai
c2d53e9209 feat :删除Tiles文件 2021-10-23 21:07:09 +08:00
张帅
b1673491c6 Update .gitlab-ci.yml 2021-10-22 09:53:40 +00:00
张帅
ebd19390ed Update .gitlab-ci.yml 2021-10-22 09:44:32 +00:00
方顺健
315e127083 Update package.json 2021-10-22 07:20:06 +00:00
方顺健
c80cf743be Update .gitlab-ci.yml file 2021-10-20 02:43:53 +00:00
方顺健
60ec39b5c9 Update .gitlab-ci.yml file 2021-10-20 02:35:16 +00:00
方顺健
a413eb6aed Update .gitlab-ci.yml file 2021-10-20 02:12:17 +00:00
方顺健
56e30dfe47 Update .gitlab-ci.yml 2021-10-20 02:08:03 +00:00
chenjinsong
49b8c0959c CN-204 feat: ip详情定位 2021-10-19 19:06:16 +08:00
chenjinsong
a9ebac4eb1 CN-205 feat: 地图下钻 2021-10-16 15:50:12 +08:00
hyx
7c45b758ef CN-154 chart列表页面开发
CN-155 chart编辑页面开发
2021-10-15 16:42:15 +08:00
chenjinsong
3c492fdad9 CN-191 fix: table刷新动画修复、单图表刷新时使用最新时间 2021-10-13 20:01:29 +08:00
chenjinsong
cc92e5366a CN-203 feat: ip实体详情接口调整 2021-10-13 19:06:24 +08:00
chenjinsong
05cfaa0f57 fix: 更正国际化码 2021-10-12 18:17:53 +08:00
chenjinsong
25a2da8d4b perf: 调整entity详情的边距 2021-10-12 16:21:30 +08:00
chenjinsong
14a8365e20 CN-197 perf: 调整地图的tooltip 2021-10-11 19:12:52 +08:00
chenjinsong
747a7ecd7c CN-196 perf: 调整地图底色 2021-10-09 19:03:50 +08:00
chenjinsong
392cb144ee fix: 修复app详情列表曲线图缺失、统计数据错位问题 2021-10-09 16:14:50 +08:00
chenjinsong
254fa3d5b6 CN-141 feat: 桑基图 2021-10-08 21:09:51 +08:00
chenjinsong
2b745ac31f CN-140 feat: 时区问题 2021-09-30 18:27:04 +08:00
chenjinsong
a98cfce449 CN-193 feat: 修复trafficSummary三个图报错的问题 2021-09-30 15:30:38 +08:00
chenjinsong
7cc59a7f2f CN-139 feat: entity列表改版 2021-09-30 00:50:11 +08:00
hyx
b1cd2b662a CN-139 entity列表改版 2021-09-28 20:13:42 +08:00
chenjinsong
393bf0df57 feat: icon图标更新 2021-09-28 19:43:15 +08:00
chenjinsong
be53a6897b fix: 修复有时控制台报undefined的问题 2021-09-28 19:02:29 +08:00
chenjinsong
934b9b8e1f CN-184 fix: 修复带折线图的单值图显示错误的问题 2021-09-28 17:36:46 +08:00
chenjinsong
238e303dc5 CN-182 fix: 修复IP详情页活跃APP列表无数据的问题 2021-09-28 14:34:06 +08:00
chenjinsong
050e663c81 CN-167 fix: 修复APP活跃列表无数据的问题 2021-09-26 15:47:02 +08:00
chenjinsong
5e7eab6a3d CN-153 fix: 修复二级下拉列表加载过程中显示no data字样的问题 2021-09-26 14:01:16 +08:00
chenjinsong
77ec21b5d0 CN-172 fix: 修复初始加载有些图表不显示数据的问题 2021-09-24 19:24:42 +08:00
chenjinsong
4d239cd2b3 CN-172 fix: 修复初始加载有些图表不显示数据的问题 2021-09-24 19:24:25 +08:00
chenjinsong
56d32ce8ca CN-148 feat: app详情开发 2021-09-22 23:05:18 +08:00
chenjinsong
c55747fefc CN-146 feat: ip基本信息开发 2021-09-22 09:08:21 +08:00
chenjinsong
3255674788 CN-146 feat: ip基本信息开发 2021-09-18 17:48:52 +08:00
chenjinsong
047fc4a1a7 CN-141 feat: group类型图表开发(未实现折叠) 2021-09-16 21:19:48 +08:00
chenjinsong
6548df58db CN-140 feat: 实体详情改为弹框形式 2021-09-15 20:11:07 +08:00
chenjinsong
d16f095987 perf: entity详情头部样式调整 2021-09-15 16:56:33 +08:00
chenjinsong
8093f4bf93 feat: entity详情(未完成)、修复一些问题 2021-09-15 12:19:13 +08:00
chenjinsong
b4a03aa7ce CN-134 fix: 增加ip类型的面包屑标识 2021-09-10 17:09:51 +08:00
chenjinsong
63f2f27d98 CN-138 feat: galaxy增加清除缓存按钮 2021-09-09 17:18:07 +08:00
chenjinsong
e27ad46609 fix: 修复echarts图表尺寸异常的问题 2021-09-08 21:44:29 +08:00
chenjinsong
95f3602248 fix: 修复echarts图表尺寸异常的问题 2021-09-08 21:29:12 +08:00
chenjinsong
36a1f08963 CN-128 perf: 优化图表加载动画 2021-09-07 15:24:57 +08:00
chenjinsong
3c47b8d613 CN-128 perf: 优化图表加载动画 2021-09-07 11:38:06 +08:00
chenjinsong
49d7fdb1d1 perf: 更换语法高亮插件 2021-09-06 18:04:27 +08:00
shizhendong
6d32418690 fix: 修复44.54编译问题 2021-09-03 16:43:26 +08:00
陈劲松
be03307994 Update .gitlab-ci.yml file 2021-09-03 08:14:51 +00:00
陈劲松
d51d808bd9 Update .gitlab-ci.yml file 2021-09-03 08:04:41 +00:00
chenjinsong
bdd093e5fd CN-129 fix: 尝试修复地图尺寸不对的问题 2021-09-03 14:30:35 +08:00
chenjinsong
cbcf111ccf CN-119 feat: 完成interface页面 2021-09-02 17:12:27 +08:00
chenjinsong
5973ca1b6e Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev 2021-09-01 14:56:37 +08:00
chenjinsong
7dab5e0686 Merge branch 'dev' of https://git.mesalab.cn/cyber-narrator/cn-ui into dev 2021-08-31 10:15:41 +08:00
chenjinsong
44f4f5e61b fix: 修复44.54编译问题 2021-08-30 18:55:56 +08:00
31880 changed files with 3882 additions and 671 deletions

View File

@@ -10,11 +10,14 @@ cache:
- package.json
paths:
- node_modules
- dist/
before_script:
- export CNUI_TAG=$(date +%Y%m%d%H%M%S)
generate_git-log:
variables:
CI_DEBUG_TRACE: "true"
stage: gen_git-log
script:
- if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then sed -i '/<body>/ a <a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./git-log.html">更新记录</a>' ./public/index.html; echo "添加更新记录链接"; fi;
@@ -23,32 +26,30 @@ generate_git-log:
- "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
- echo "</pre></body></html>" >> ./public/git-log.html
- echo "处理 git-log.html 结束"
artifacts:
paths:
- public
only:
- dev
- dev-ci-debug
tags:
- GN-XXG-Server
build_project:
stage: build_project
variables:
CI_DEBUG_TRACE: "true"
script:
- echo "npm install ..."
- npm install --save-dev cross-env --unsafe-perm
- npm install --save-dev --unsafe-perm
- echo "npm run build"
- npm run build
artifacts:
paths:
- dist
only:
- dev
- dev-ci-debug
- tags
tags:
- GN-XXG-Server
build_image:
stage: build_image
variables:
CI_DEBUG_TRACE: "true"
script:
- echo "docker build"
- sudo docker build -t dev_cn-ui:$CNUI_TAG .
@@ -58,13 +59,15 @@ build_image:
- sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
when: on_success
only:
- dev
- dev-ci-debug
tags:
- GN-XXG-Server
build_release_image:
stage: build_image
variables:
CI_DEBUG_TRACE: "true"
script:
- echo 'tag名称是'
- echo $CI_COMMIT_TAG

View File

@@ -2,8 +2,9 @@ FROM nginx:latest
MAINTAINER shizhendong shizhendong@zdjizhi.com
# 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
COPY dist/ /usr/share/nginx/html/
ADD dist/ /usr/share/nginx/html/
# nginx 配置 制作镜像时不做处理 容器可自己挂载配置文件
#COPY nginx.conf /etc/nginx/nginx.conf

View File

@@ -16,7 +16,8 @@
"core-js": "^3.6.5",
"dayjs": "^1.10.5",
"echarts": "^5.1.1",
"element-plus": "^1.0.2-beta.44",
"element-plus": "1.0.2-beta.44",
"leaflet": "^1.7.1",
"lib-flexible": "^0.3.2",
"lodash": "^4.17.21",
"moment-timezone": "^0.5.33",
@@ -39,6 +40,7 @@
"@babel/preset-typescript": "^7.10.4",
"@commitlint/cli": "^9.1.2",
"@commitlint/config-conventional": "^9.1.2",
"@highlightjs/vue-plugin": "^2.0.1",
"@rollup/plugin-commonjs": "^15.1.0",
"@rollup/plugin-node-resolve": "^9.0.0",
"@rollup/plugin-typescript": "^6.0.0",
@@ -54,13 +56,15 @@
"@vue/component-compiler-utils": "^3.2.0",
"babel-eslint": "^10.1.0",
"compression-webpack-plugin": "^8.0.1",
"cross-env": "^7.0.3",
"eslint": "^7.22.0",
"eslint-config-standard": "^16.0.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^4.3.1",
"eslint-plugin-vue": "^7.7.0",
"uglifyjs-webpack-plugin": "^2.2.0"
"uglifyjs-webpack-plugin": "^2.2.0",
"vue3-ace-editor": "^2.0.2"
},
"browserslist": [
"> 1%",

BIN
public/Tiles/1/0/0.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
public/Tiles/1/0/1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
public/Tiles/1/1/0.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

BIN
public/Tiles/1/1/1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
public/Tiles/10/602/318.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
public/Tiles/10/602/319.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public/Tiles/10/602/320.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
public/Tiles/10/602/321.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
public/Tiles/10/602/322.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
public/Tiles/10/602/323.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
public/Tiles/10/602/324.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
public/Tiles/10/602/325.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
public/Tiles/10/602/326.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
public/Tiles/10/602/327.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
public/Tiles/10/602/328.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
public/Tiles/10/602/329.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
public/Tiles/10/602/330.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

BIN
public/Tiles/10/602/331.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
public/Tiles/10/602/332.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
public/Tiles/10/602/333.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public/Tiles/10/602/334.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/Tiles/10/602/335.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
public/Tiles/10/602/336.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

BIN
public/Tiles/10/602/337.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

BIN
public/Tiles/10/602/338.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public/Tiles/10/602/339.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
public/Tiles/10/602/340.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
public/Tiles/10/602/341.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
public/Tiles/10/602/342.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
public/Tiles/10/602/343.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
public/Tiles/10/602/344.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
public/Tiles/10/602/345.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
public/Tiles/10/602/346.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
public/Tiles/10/602/347.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
public/Tiles/10/602/348.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

BIN
public/Tiles/10/602/349.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/Tiles/10/602/350.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

BIN
public/Tiles/10/602/351.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

BIN
public/Tiles/10/602/352.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/Tiles/10/602/353.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
public/Tiles/10/602/354.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public/Tiles/10/602/355.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
public/Tiles/10/602/356.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

BIN
public/Tiles/10/602/357.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

BIN
public/Tiles/10/602/358.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

BIN
public/Tiles/10/602/359.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

BIN
public/Tiles/10/602/360.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
public/Tiles/10/602/361.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
public/Tiles/10/602/362.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

BIN
public/Tiles/10/602/363.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
public/Tiles/10/602/364.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
public/Tiles/10/602/365.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
public/Tiles/10/602/366.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
public/Tiles/10/602/367.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/368.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/369.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/370.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/371.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/372.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/373.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/374.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
public/Tiles/10/602/375.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/Tiles/10/602/376.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
public/Tiles/10/602/377.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/378.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/Tiles/10/602/379.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/602/380.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
public/Tiles/10/602/381.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
public/Tiles/10/602/382.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
public/Tiles/10/602/383.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

BIN
public/Tiles/10/602/384.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

BIN
public/Tiles/10/602/385.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

BIN
public/Tiles/10/602/386.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/Tiles/10/602/387.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

BIN
public/Tiles/10/602/388.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

BIN
public/Tiles/10/602/389.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
public/Tiles/10/602/390.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
public/Tiles/10/602/391.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

BIN
public/Tiles/10/602/392.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
public/Tiles/10/602/393.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
public/Tiles/10/602/394.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/Tiles/10/602/395.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

BIN
public/Tiles/10/602/396.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/Tiles/10/602/397.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/Tiles/10/602/398.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/Tiles/10/602/399.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
public/Tiles/10/602/400.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
public/Tiles/10/602/401.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
public/Tiles/10/602/402.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 873 B

BIN
public/Tiles/10/603/318.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

BIN
public/Tiles/10/603/319.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

BIN
public/Tiles/10/603/320.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

BIN
public/Tiles/10/603/321.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

BIN
public/Tiles/10/603/322.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

BIN
public/Tiles/10/603/323.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
public/Tiles/10/603/324.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

BIN
public/Tiles/10/603/325.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Some files were not shown because too many files have changed in this diff Show More