fix: 修复时间选择器无法展开的问题

2021-09-15 17:01:50 +08:00
31864 changed files with 509 additions and 3271 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,14 +10,11 @@ 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;
@@ -26,30 +23,32 @@ 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-ci-debug
+    - dev
  tags:
    - GN-XXG-Server

 build_project:
  stage: build_project
-  variables:
-    CI_DEBUG_TRACE: "true"
  script:
    - echo "npm install ..."
    - npm install --save-dev --unsafe-perm
    - echo "npm run build"
    - npm run build
+  artifacts:
+    paths:
+      - dist
  only:
-    - dev-ci-debug
+    - dev
    - 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 .
@@ -59,15 +58,13 @@ build_image:
    - sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
  when: on_success
  only:
-    - dev-ci-debug
+    - dev
  tags:
    - GN-XXG-Server


 build_release_image:
  stage: build_image
-  variables:
-    CI_DEBUG_TRACE: "true"
  script:
    - echo 'tag名称是'
    - echo $CI_COMMIT_TAG
--- a/3
+++ b/3
@@ -2,9 +2,8 @@ FROM nginx:latest

 MAINTAINER shizhendong shizhendong@zdjizhi.com

-
 # 将dist文件中的内容复制到 /usr/share/nginx/html/ 这个目录下面
-ADD dist/  /usr/share/nginx/html/
+COPY dist/  /usr/share/nginx/html/

 # nginx 配置 ， 制作镜像时不做处理 ， 容器可自己挂载配置文件
 #COPY nginx.conf /etc/nginx/nginx.conf
--- a/package.json
+++ b/package.json
@@ -16,8 +16,7 @@
    "core-js": "^3.6.5",
    "dayjs": "^1.10.5",
    "echarts": "^5.1.1",
-    "element-plus": "1.0.2-beta.44",
-    "leaflet": "^1.7.1",
+    "element-plus": "^1.0.2-beta.44",
    "lib-flexible": "^0.3.2",
    "lodash": "^4.17.21",
    "moment-timezone": "^0.5.33",
--- a/public/Tiles/1/0/0.png
+++ b/public/Tiles/1/0/0.png
--- a/public/Tiles/1/0/1.png
+++ b/public/Tiles/1/0/1.png
--- a/public/Tiles/1/1/0.png
+++ b/public/Tiles/1/1/0.png
--- a/public/Tiles/1/1/1.png
+++ b/public/Tiles/1/1/1.png
--- a/public/Tiles/10/602/318.png
+++ b/public/Tiles/10/602/318.png
--- a/public/Tiles/10/602/319.png
+++ b/public/Tiles/10/602/319.png
--- a/public/Tiles/10/602/320.png
+++ b/public/Tiles/10/602/320.png
--- a/public/Tiles/10/602/321.png
+++ b/public/Tiles/10/602/321.png
--- a/public/Tiles/10/602/322.png
+++ b/public/Tiles/10/602/322.png
--- a/public/Tiles/10/602/323.png
+++ b/public/Tiles/10/602/323.png
--- a/public/Tiles/10/602/324.png
+++ b/public/Tiles/10/602/324.png
--- a/public/Tiles/10/602/325.png
+++ b/public/Tiles/10/602/325.png
--- a/public/Tiles/10/602/326.png
+++ b/public/Tiles/10/602/326.png
--- a/public/Tiles/10/602/327.png
+++ b/public/Tiles/10/602/327.png
--- a/public/Tiles/10/602/328.png
+++ b/public/Tiles/10/602/328.png
--- a/public/Tiles/10/602/329.png
+++ b/public/Tiles/10/602/329.png
--- a/public/Tiles/10/602/330.png
+++ b/public/Tiles/10/602/330.png
--- a/public/Tiles/10/602/331.png
+++ b/public/Tiles/10/602/331.png
--- a/public/Tiles/10/602/332.png
+++ b/public/Tiles/10/602/332.png
--- a/public/Tiles/10/602/333.png
+++ b/public/Tiles/10/602/333.png
--- a/public/Tiles/10/602/334.png
+++ b/public/Tiles/10/602/334.png
--- a/public/Tiles/10/602/335.png
+++ b/public/Tiles/10/602/335.png
--- a/public/Tiles/10/602/336.png
+++ b/public/Tiles/10/602/336.png
--- a/public/Tiles/10/602/337.png
+++ b/public/Tiles/10/602/337.png
--- a/public/Tiles/10/602/338.png
+++ b/public/Tiles/10/602/338.png
--- a/public/Tiles/10/602/339.png
+++ b/public/Tiles/10/602/339.png
--- a/public/Tiles/10/602/340.png
+++ b/public/Tiles/10/602/340.png
--- a/public/Tiles/10/602/341.png
+++ b/public/Tiles/10/602/341.png
--- a/public/Tiles/10/602/342.png
+++ b/public/Tiles/10/602/342.png
--- a/public/Tiles/10/602/343.png
+++ b/public/Tiles/10/602/343.png
--- a/public/Tiles/10/602/344.png
+++ b/public/Tiles/10/602/344.png
--- a/public/Tiles/10/602/345.png
+++ b/public/Tiles/10/602/345.png
--- a/public/Tiles/10/602/346.png
+++ b/public/Tiles/10/602/346.png
--- a/public/Tiles/10/602/347.png
+++ b/public/Tiles/10/602/347.png
--- a/public/Tiles/10/602/348.png
+++ b/public/Tiles/10/602/348.png
--- a/public/Tiles/10/602/349.png
+++ b/public/Tiles/10/602/349.png
--- a/public/Tiles/10/602/350.png
+++ b/public/Tiles/10/602/350.png
--- a/public/Tiles/10/602/351.png
+++ b/public/Tiles/10/602/351.png
--- a/public/Tiles/10/602/352.png
+++ b/public/Tiles/10/602/352.png
--- a/public/Tiles/10/602/353.png
+++ b/public/Tiles/10/602/353.png
--- a/public/Tiles/10/602/354.png
+++ b/public/Tiles/10/602/354.png
--- a/public/Tiles/10/602/355.png
+++ b/public/Tiles/10/602/355.png
--- a/public/Tiles/10/602/356.png
+++ b/public/Tiles/10/602/356.png
--- a/public/Tiles/10/602/357.png
+++ b/public/Tiles/10/602/357.png
--- a/public/Tiles/10/602/358.png
+++ b/public/Tiles/10/602/358.png
--- a/public/Tiles/10/602/359.png
+++ b/public/Tiles/10/602/359.png
--- a/public/Tiles/10/602/360.png
+++ b/public/Tiles/10/602/360.png
--- a/public/Tiles/10/602/361.png
+++ b/public/Tiles/10/602/361.png
--- a/public/Tiles/10/602/362.png
+++ b/public/Tiles/10/602/362.png
--- a/public/Tiles/10/602/363.png
+++ b/public/Tiles/10/602/363.png
--- a/public/Tiles/10/602/364.png
+++ b/public/Tiles/10/602/364.png
--- a/public/Tiles/10/602/365.png
+++ b/public/Tiles/10/602/365.png
--- a/public/Tiles/10/602/366.png
+++ b/public/Tiles/10/602/366.png
--- a/public/Tiles/10/602/367.png
+++ b/public/Tiles/10/602/367.png
--- a/public/Tiles/10/602/368.png
+++ b/public/Tiles/10/602/368.png
--- a/public/Tiles/10/602/369.png
+++ b/public/Tiles/10/602/369.png
--- a/public/Tiles/10/602/370.png
+++ b/public/Tiles/10/602/370.png
--- a/public/Tiles/10/602/371.png
+++ b/public/Tiles/10/602/371.png
--- a/public/Tiles/10/602/372.png
+++ b/public/Tiles/10/602/372.png
--- a/public/Tiles/10/602/373.png
+++ b/public/Tiles/10/602/373.png
--- a/public/Tiles/10/602/374.png
+++ b/public/Tiles/10/602/374.png
--- a/public/Tiles/10/602/375.png
+++ b/public/Tiles/10/602/375.png
--- a/public/Tiles/10/602/376.png
+++ b/public/Tiles/10/602/376.png
--- a/public/Tiles/10/602/377.png
+++ b/public/Tiles/10/602/377.png
--- a/public/Tiles/10/602/378.png
+++ b/public/Tiles/10/602/378.png
--- a/public/Tiles/10/602/379.png
+++ b/public/Tiles/10/602/379.png
--- a/public/Tiles/10/602/380.png
+++ b/public/Tiles/10/602/380.png
--- a/public/Tiles/10/602/381.png
+++ b/public/Tiles/10/602/381.png
--- a/public/Tiles/10/602/382.png
+++ b/public/Tiles/10/602/382.png
--- a/public/Tiles/10/602/383.png
+++ b/public/Tiles/10/602/383.png
--- a/public/Tiles/10/602/384.png
+++ b/public/Tiles/10/602/384.png
--- a/public/Tiles/10/602/385.png
+++ b/public/Tiles/10/602/385.png
--- a/public/Tiles/10/602/386.png
+++ b/public/Tiles/10/602/386.png
--- a/public/Tiles/10/602/387.png
+++ b/public/Tiles/10/602/387.png
--- a/public/Tiles/10/602/388.png
+++ b/public/Tiles/10/602/388.png
--- a/public/Tiles/10/602/389.png
+++ b/public/Tiles/10/602/389.png
--- a/public/Tiles/10/602/390.png
+++ b/public/Tiles/10/602/390.png
--- a/public/Tiles/10/602/391.png
+++ b/public/Tiles/10/602/391.png
--- a/public/Tiles/10/602/392.png
+++ b/public/Tiles/10/602/392.png
--- a/public/Tiles/10/602/393.png
+++ b/public/Tiles/10/602/393.png
--- a/public/Tiles/10/602/394.png
+++ b/public/Tiles/10/602/394.png
--- a/public/Tiles/10/602/395.png
+++ b/public/Tiles/10/602/395.png
--- a/public/Tiles/10/602/396.png
+++ b/public/Tiles/10/602/396.png
--- a/public/Tiles/10/602/397.png
+++ b/public/Tiles/10/602/397.png
--- a/public/Tiles/10/602/398.png
+++ b/public/Tiles/10/602/398.png
--- a/public/Tiles/10/602/399.png
+++ b/public/Tiles/10/602/399.png
--- a/public/Tiles/10/602/400.png
+++ b/public/Tiles/10/602/400.png
--- a/public/Tiles/10/602/401.png
+++ b/public/Tiles/10/602/401.png
--- a/public/Tiles/10/602/402.png
+++ b/public/Tiles/10/602/402.png
--- a/public/Tiles/10/603/318.png
+++ b/public/Tiles/10/603/318.png
--- a/public/Tiles/10/603/319.png
+++ b/public/Tiles/10/603/319.png
--- a/public/Tiles/10/603/320.png
+++ b/public/Tiles/10/603/320.png
--- a/public/Tiles/10/603/321.png
+++ b/public/Tiles/10/603/321.png
--- a/public/Tiles/10/603/322.png
+++ b/public/Tiles/10/603/322.png
--- a/public/Tiles/10/603/323.png
+++ b/public/Tiles/10/603/323.png
--- a/public/Tiles/10/603/324.png
+++ b/public/Tiles/10/603/324.png
--- a/public/Tiles/10/603/325.png
+++ b/public/Tiles/10/603/325.png
--- a/Show More
+++ b/Show More