Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日

2024年1月19日V01.00.51
责任状人数问题
2024-01-19 17:47:05 +08:00 · 2024-01-19 17:46:54 +08:00 · 2024-01-19 08:59:59 +08:00 · 2024-01-18 20:50:05 +08:00 · 2024-01-18 19:36:32 +08:00 · 2024-01-18 14:49:53 +08:00
761 changed files with 38830 additions and 969 deletions
--- a/config/index.js
+++ b/config/index.js
@ -11,7 +11,7 @@ module.exports = {
    assetsPublicPath: '/',
    proxyTable: {
      '/api': {
-        target: 'http://192.168.0.79:8091/',
+        target: 'http://192.168.151.43:8091/',
        changeOrigin: true,
        pathRewrite: {
          '^/api': ''
--- a/index.html
+++ b/index.html
@ -9,6 +9,11 @@
    <link rel="stylesheet" href="https://g.alicdn.com/de/prismplayer/2.16.0/skins/default/aliplayer-min.css" />
    <script type="text/javascript" charset="utf-8" src="https://g.alicdn.com/de/prismplayer/2.16.0/aliplayer-min.js"></script>
    <script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
+
+    <script type="text/javascript" charset="utf-8" src="https://api.tianditu.gov.cn/api?v=4.0&tk=e8a16137fd226a62a23cc7ba5c9c78ce"></script>
+    <script type="text/javascript" src="./static/map/cesium91/CesiumUnminified/Cesium.js"></script>
+    <script type="text/javascript" src="./static/map/cesium91/CustomCesiumSDK.js"></script>
+    <link href="./static/map/cesium91/CesiumUnminified/Widgets/widgets.css" rel="stylesheet"/>
  </head>
  <body>
    <div id="app"></div>
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -5,7 +5,7 @@
  "author": "",
  "private": true,
  "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.0.45",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js  --host 192.168.151.43",
    "start": "npm run dev",
    "unit": "jest --config test/unit/jest.conf.js --coverage",
    "e2e": "node test/e2e/runner.js",
@ -25,7 +25,9 @@
    "js-cookie": "^2.2.1",
    "jspdf": "^2.5.1",
    "moment": "^2.29.3",
+    "motion": "^10.16.4",
    "throttle-debounce": "^5.0.0",
+    "mqtt": "4.2.1",
    "normalize.css": "^8.0.1",
    "nprogress": "^0.2.0",
    "relation-graph": "^1.1.0",
--- a/src/assets/map/anquan/bg1.png
+++ b/src/assets/map/anquan/bg1.png
--- a/src/assets/map/anquan/bg2.png
+++ b/src/assets/map/anquan/bg2.png
--- a/src/assets/map/anquan/bg3.png
+++ b/src/assets/map/anquan/bg3.png
--- a/src/assets/map/anquan/bg4.png
+++ b/src/assets/map/anquan/bg4.png
--- a/src/assets/map/anquan/ico1.png
+++ b/src/assets/map/anquan/ico1.png
--- a/src/assets/map/anquan/ico2.png
+++ b/src/assets/map/anquan/ico2.png
--- a/src/assets/map/anquan/ico3.png
+++ b/src/assets/map/anquan/ico3.png
--- a/src/assets/map/anquan/icobg.png
+++ b/src/assets/map/anquan/icobg.png
--- a/src/assets/map/anquan/label.png
+++ b/src/assets/map/anquan/label.png
--- a/src/assets/map/bianjie/img1.png
+++ b/src/assets/map/bianjie/img1.png
--- a/src/assets/map/bianjie/img2.png
+++ b/src/assets/map/bianjie/img2.png
--- a/src/assets/map/bianjie/videoimg1.png
+++ b/src/assets/map/bianjie/videoimg1.png
--- a/src/assets/map/gangkou_index/back.png
+++ b/src/assets/map/gangkou_index/back.png
--- a/src/assets/map/gangkou_index/bg1.png
+++ b/src/assets/map/gangkou_index/bg1.png
--- a/src/assets/map/gangkou_index/buttom/ico1.png
+++ b/src/assets/map/gangkou_index/buttom/ico1.png
--- a/src/assets/map/gangkou_index/buttom/ico10.png
+++ b/src/assets/map/gangkou_index/buttom/ico10.png
--- a/src/assets/map/gangkou_index/buttom/ico10_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico10_on.png
--- a/src/assets/map/gangkou_index/buttom/ico11.png
+++ b/src/assets/map/gangkou_index/buttom/ico11.png
--- a/src/assets/map/gangkou_index/buttom/ico11_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico11_on.png
--- a/src/assets/map/gangkou_index/buttom/ico12.png
+++ b/src/assets/map/gangkou_index/buttom/ico12.png
--- a/src/assets/map/gangkou_index/buttom/ico12_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico12_on.png
--- a/src/assets/map/gangkou_index/buttom/ico13.png
+++ b/src/assets/map/gangkou_index/buttom/ico13.png
--- a/src/assets/map/gangkou_index/buttom/ico13_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico13_on.png
--- a/src/assets/map/gangkou_index/buttom/ico14.png
+++ b/src/assets/map/gangkou_index/buttom/ico14.png
--- a/src/assets/map/gangkou_index/buttom/ico14_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico14_on.png
--- a/src/assets/map/gangkou_index/buttom/ico15.png
+++ b/src/assets/map/gangkou_index/buttom/ico15.png
--- a/src/assets/map/gangkou_index/buttom/ico15_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico15_on.png
--- a/src/assets/map/gangkou_index/buttom/ico16.png
+++ b/src/assets/map/gangkou_index/buttom/ico16.png
--- a/src/assets/map/gangkou_index/buttom/ico16_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico16_on.png
--- a/src/assets/map/gangkou_index/buttom/ico17.png
+++ b/src/assets/map/gangkou_index/buttom/ico17.png
--- a/src/assets/map/gangkou_index/buttom/ico17_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico17_on.png
--- a/src/assets/map/gangkou_index/buttom/ico18.png
+++ b/src/assets/map/gangkou_index/buttom/ico18.png
--- a/src/assets/map/gangkou_index/buttom/ico18_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico18_on.png
--- a/src/assets/map/gangkou_index/buttom/ico19.png
+++ b/src/assets/map/gangkou_index/buttom/ico19.png
--- a/src/assets/map/gangkou_index/buttom/ico19_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico19_on.png
--- a/src/assets/map/gangkou_index/buttom/ico1_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico1_on.png
--- a/src/assets/map/gangkou_index/buttom/ico2.png
+++ b/src/assets/map/gangkou_index/buttom/ico2.png
--- a/src/assets/map/gangkou_index/buttom/ico20.png
+++ b/src/assets/map/gangkou_index/buttom/ico20.png
--- a/src/assets/map/gangkou_index/buttom/ico20_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico20_on.png
--- a/src/assets/map/gangkou_index/buttom/ico21.png
+++ b/src/assets/map/gangkou_index/buttom/ico21.png
--- a/src/assets/map/gangkou_index/buttom/ico21_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico21_on.png
--- a/src/assets/map/gangkou_index/buttom/ico22.png
+++ b/src/assets/map/gangkou_index/buttom/ico22.png
--- a/src/assets/map/gangkou_index/buttom/ico22_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico22_on.png
--- a/src/assets/map/gangkou_index/buttom/ico23.png
+++ b/src/assets/map/gangkou_index/buttom/ico23.png
--- a/src/assets/map/gangkou_index/buttom/ico23_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico23_on.png
--- a/src/assets/map/gangkou_index/buttom/ico24.png
+++ b/src/assets/map/gangkou_index/buttom/ico24.png
--- a/src/assets/map/gangkou_index/buttom/ico24_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico24_on.png
--- a/src/assets/map/gangkou_index/buttom/ico25.png
+++ b/src/assets/map/gangkou_index/buttom/ico25.png
--- a/src/assets/map/gangkou_index/buttom/ico25_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico25_on.png
--- a/src/assets/map/gangkou_index/buttom/ico26.png
+++ b/src/assets/map/gangkou_index/buttom/ico26.png
--- a/src/assets/map/gangkou_index/buttom/ico26_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico26_on.png
--- a/src/assets/map/gangkou_index/buttom/ico27.png
+++ b/src/assets/map/gangkou_index/buttom/ico27.png
--- a/src/assets/map/gangkou_index/buttom/ico27_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico27_on.png
--- a/src/assets/map/gangkou_index/buttom/ico2_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico2_on.png
--- a/src/assets/map/gangkou_index/buttom/ico3.png
+++ b/src/assets/map/gangkou_index/buttom/ico3.png
--- a/src/assets/map/gangkou_index/buttom/ico3_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico3_on.png
--- a/src/assets/map/gangkou_index/buttom/ico4.png
+++ b/src/assets/map/gangkou_index/buttom/ico4.png
--- a/src/assets/map/gangkou_index/buttom/ico4_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico4_on.png
--- a/src/assets/map/gangkou_index/buttom/ico5.png
+++ b/src/assets/map/gangkou_index/buttom/ico5.png
--- a/src/assets/map/gangkou_index/buttom/ico5_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico5_on.png
--- a/src/assets/map/gangkou_index/buttom/ico6.png
+++ b/src/assets/map/gangkou_index/buttom/ico6.png
--- a/src/assets/map/gangkou_index/buttom/ico6_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico6_on.png
--- a/src/assets/map/gangkou_index/buttom/ico7.png
+++ b/src/assets/map/gangkou_index/buttom/ico7.png
--- a/src/assets/map/gangkou_index/buttom/ico7_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico7_on.png
--- a/src/assets/map/gangkou_index/buttom/ico8.png
+++ b/src/assets/map/gangkou_index/buttom/ico8.png
--- a/src/assets/map/gangkou_index/buttom/ico8_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico8_on.png
--- a/src/assets/map/gangkou_index/buttom/ico9.png
+++ b/src/assets/map/gangkou_index/buttom/ico9.png
--- a/src/assets/map/gangkou_index/buttom/ico9_on.png
+++ b/src/assets/map/gangkou_index/buttom/ico9_on.png
--- a/src/assets/map/gangkou_index/ico1.png
+++ b/src/assets/map/gangkou_index/ico1.png
--- a/src/assets/map/gangkou_index/ico2.png
+++ b/src/assets/map/gangkou_index/ico2.png
--- a/src/assets/map/gangkou_index/ico3.png
+++ b/src/assets/map/gangkou_index/ico3.png
--- a/src/assets/map/gangkou_index/img1.png
+++ b/src/assets/map/gangkou_index/img1.png
--- a/src/assets/map/gangkou_index/img10.png
+++ b/src/assets/map/gangkou_index/img10.png
--- a/src/assets/map/gangkou_index/img10_on.png
+++ b/src/assets/map/gangkou_index/img10_on.png
--- a/src/assets/map/gangkou_index/img11.png
+++ b/src/assets/map/gangkou_index/img11.png
--- a/src/assets/map/gangkou_index/img11_on.png
+++ b/src/assets/map/gangkou_index/img11_on.png
--- a/src/assets/map/gangkou_index/img12.png
+++ b/src/assets/map/gangkou_index/img12.png
--- a/src/assets/map/gangkou_index/img12_on.png
+++ b/src/assets/map/gangkou_index/img12_on.png
--- a/src/assets/map/gangkou_index/img1_on.png
+++ b/src/assets/map/gangkou_index/img1_on.png
--- a/src/assets/map/gangkou_index/img2_1.png
+++ b/src/assets/map/gangkou_index/img2_1.png
--- a/src/assets/map/gangkou_index/img2_2.png
+++ b/src/assets/map/gangkou_index/img2_2.png
--- a/src/assets/map/gangkou_index/img2_on.png
+++ b/src/assets/map/gangkou_index/img2_on.png
--- a/src/assets/map/gangkou_index/img2ico1.png
+++ b/src/assets/map/gangkou_index/img2ico1.png
--- a/src/assets/map/gangkou_index/img2ico2.png
+++ b/src/assets/map/gangkou_index/img2ico2.png
--- a/src/assets/map/gangkou_index/img2ico3.png
+++ b/src/assets/map/gangkou_index/img2ico3.png
--- a/src/assets/map/gangkou_index/img2ico4.png
+++ b/src/assets/map/gangkou_index/img2ico4.png
--- a/src/assets/map/gangkou_index/img3_on.png
+++ b/src/assets/map/gangkou_index/img3_on.png
--- a/src/assets/map/gangkou_index/img4.png
+++ b/src/assets/map/gangkou_index/img4.png
--- a/src/assets/map/gangkou_index/img4_on.png
+++ b/src/assets/map/gangkou_index/img4_on.png
--- a/src/assets/map/gangkou_index/img5.png
+++ b/src/assets/map/gangkou_index/img5.png
--- a/src/assets/map/gangkou_index/img5_on.png
+++ b/src/assets/map/gangkou_index/img5_on.png
--- a/src/assets/map/gangkou_index/img6.png
+++ b/src/assets/map/gangkou_index/img6.png
--- a/src/assets/map/gangkou_index/img6_on.png
+++ b/src/assets/map/gangkou_index/img6_on.png
--- a/src/assets/map/gangkou_index/img7.png
+++ b/src/assets/map/gangkou_index/img7.png
--- a/src/assets/map/gangkou_index/img7_on.png
+++ b/src/assets/map/gangkou_index/img7_on.png
--- a/src/assets/map/gangkou_index/img8.png
+++ b/src/assets/map/gangkou_index/img8.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
guoyuepeng	186b35792b	Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日	2024-01-19 17:47:05 +08:00
guoyuepeng	eb8383008e	2024年1月19日V01.00.51	2024-01-19 17:46:54 +08:00
zhaoyu	719da7d2a1	责任状人数问题	2024-01-19 08:59:59 +08:00
liujun	8914ef8874	去除debugger	2024-01-18 20:50:05 +08:00
liujun	6655fa0372	垃圾文件删除	2024-01-18 19:36:32 +08:00
liujun	9f5ef78d18	13709 编号右对齐参考其他作业详情下面的菜单也都要改+	2024-01-18 14:49:53 +08:00
zhaoyu	ed0584275f	文档bug处理	2024-01-12 14:33:53 +08:00
zhaoyu	5af701d670	重点工程需求完成	2024-01-11 18:02:28 +08:00
zhaoyu	193a1d1d17	搜索	2024-01-11 17:36:26 +08:00
zhaoyu	81b15934d8	禅道 13618	2024-01-11 15:35:27 +08:00
liujun	6166e45b7e	Merge branch 'dev-2024年1月8日' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj-vue into dev-2024年1月8日	2024-01-11 14:38:09 +08:00
liujun	174f6796b9	企业端地图迁移，功能前端组件更新	2024-01-11 14:37:49 +08:00
limingyu	5beb6dc5ad	受限空间受限空间所属单位2	2024-01-11 09:30:50 +08:00
limingyu	e3dd1716e8	Merge remote-tracking branch 'origin/dev-2024年1月8日' into dev-2024年1月8日	2024-01-11 09:30:20 +08:00
limingyu	49ad7c53e4	Merge branch '1212-八项作业迁移' into dev-2024年1月8日	2024-01-11 09:28:36 +08:00
zhaoyu	fc766f9e08	Merge branch 'zy-2024-01-04-bug修复' into dev-2024年1月8日	2024-01-10 18:03:52 +08:00
liujun	47152bb821	Merge branch 'liujun-2023-12-28-bug修复' into dev-2024年1月8日	2024-01-10 17:54:39 +08:00
liujun	9f45352069	Merge remote-tracking branch 'origin/liujun-2023-12-28-监管端地图同步到企业端' into dev	2024-01-09 11:31:54 +08:00
limingyu	7aef14617c	Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移	2024-01-08 13:51:41 +08:00
limingyu	f8b2085dd8	受限空间受限空间所属单位	2024-01-08 13:44:09 +08:00
liujun	07b12c3c05	13025 用工形式显示不正确	2024-01-05 09:29:48 +08:00
zhaoyu	b5e41c1628	具体位置	2024-01-04 16:51:20 +08:00
liujun	c6bacc5cff	13075 未做限制，应该里边的数据删除后才可以删除外边的。	2024-01-04 10:56:23 +08:00
zhaoyu	f0777dccbd	Merge remote-tracking branch 'origin/dev' into dev	2024-01-03 10:37:38 +08:00
zhaoyu	7b82480f14	Merge branch '地图展示有限空间作业' into dev	2024-01-03 10:37:00 +08:00
zhaoyu	7f775e1286	展示有限空间信息	2024-01-03 10:31:49 +08:00
liujun	993e215991	相关方端bug	2024-01-02 14:12:39 +08:00
liujun	ba894bd4f3	bug修复	2023-12-28 14:46:32 +08:00
liujun	61beb0ec93	Merge remote-tracking branch 'origin/1212-八项作业迁移' into dev	2023-12-28 14:10:37 +08:00
guoyuepeng	1764e2668f	添加更新.md	2023-12-28 10:44:13 +08:00
liujun	883be5690d	Merge remote-tracking branch 'origin/1212-八项作业迁移' into 1212-八项作业迁移	2023-12-27 15:14:26 +08:00
liujun	ab1cd79df5	相关方端bug	2023-12-27 15:13:47 +08:00
zhaoyu	cb7be7a874	bug处理	2023-12-21 18:01:51 +08:00