Compare commits

...

77 Commits

Author SHA1 Message Date
limingyu b371d51094 企业端安全环保检查确认时退出验证已关闭、其他页面二次退出验证也已经关闭 2024-02-05 16:09:28 +08:00
zhaoyu d12840b2f7 有限空间缺少展示内容问题修复 2024-01-31 15:12:19 +08:00
liujun 56e85f71ee Merge remote-tracking branch 'origin/2024年1月24日测试' into 2024年1月24日测试 2024-01-31 14:37:32 +08:00
liujun 6bddd1e261 删除无用代码 2024-01-31 14:37:01 +08:00
zhaoyu dc4a031f4e Merge remote-tracking branch 'origin/2024年1月24日测试' into 2024年1月24日测试 2024-01-31 14:23:50 +08:00
zhaoyu 1f3a8e9f32 编辑成功后不返回问题 2024-01-31 14:23:42 +08:00
liujun 1aefaa8e00 企业端、企业端便跟企业信息时未清空以选信息 2024-01-31 14:08:31 +08:00
zhaoyu 33c50697d6 Merge remote-tracking branch 'origin/2024年1月24日测试' into 2024年1月24日测试 2024-01-31 13:48:31 +08:00
zhaoyu 30474ca1f0 处理删除 2024-01-31 13:48:21 +08:00
limingyu 8354ae5f18 12614bug企业信息修改页面返回弹窗问题修改 2024-01-31 10:40:00 +08:00
limingyu 89915ce805 修改bug12702、13770、13714、13580、12922、12994、13119、13407 2024-01-31 10:30:56 +08:00
zhaoyu d343fab8cc Merge remote-tracking branch 'origin/2024年1月24日测试' into 2024年1月24日测试 2024-01-30 17:43:37 +08:00
zhaoyu d890052fa7 企业端八项作业bug修复 2024-01-30 17:43:22 +08:00
liujun bd29264f7c 1、审批第二节点没有存审批意见bug修复
2、修别字修改
3、流程页面样式修改
2024-01-30 15:21:00 +08:00
liujun 4e58cf0745 错别字更改 2024-01-30 14:14:55 +08:00
liujun 53f0fc4a3e 企业端、股份端,相关方人员详情信息代码同步 2024-01-30 13:49:13 +08:00
liujun 5b046f1fe2 相关方流程记录功能开发 2024-01-30 12:03:00 +08:00
liujun 1ff1cea9eb 1、错别字更改
2、监管端查询sql报错修改
3、表单提交后未清空。
2024-01-29 17:20:47 +08:00
liujun 509f226d31 审批过程中审批意见丢失bug修改 2024-01-29 14:51:43 +08:00
liujun 8af77c02ea 1、流程数据保存错误bug修改
2、打回后无法审批bug修复
2024-01-29 13:20:27 +08:00
liujun fb36e78a30 13817 批量推送和单独推送 单位搜索框加关键字搜索 2024-01-27 16:13:10 +08:00
liujun af941d2e5f 13854 选择框的高度长度不一 2024-01-27 16:09:29 +08:00
liujun f2ec94182e 13856 审核完一个人之后,审核下一个人,输入框内信息没有重置清空 2024-01-27 16:03:30 +08:00
liujun 8c73a7f990 13862 选择第二个审批 报错 2024-01-27 15:57:50 +08:00
liujun 760adc19f5 13818 批量推送和单独推送 文字修改 监管部门不合适 2024-01-25 20:03:38 +08:00
liujun 8159bc677c Merge remote-tracking branch 'origin/liujun-2024-01-09-消防功能新需求' into 2024年1月24日测试
# Conflicts:
#	package.json
2024-01-25 19:16:20 +08:00
guoyuepeng 51a306a2fa Merge pull request 'liujun-2024-01-17-相关方新需求' (#10) from liujun-2024-01-17-相关方新需求 into 2024年1月24日测试
Reviewed-on: #10
2024-01-24 16:02:11 +08:00
guoyuepeng 4807b87f72 Merge pull request '2024-01-16-zy-门口门禁需求' (#8) from 2024-01-16-zy-门口门禁需求 into 2024年1月24日测试
Reviewed-on: #8
2024-01-24 15:56:37 +08:00
zhaoyu 374c0bed6c 相邻区域问题修复完成 2024-01-24 15:43:48 +08:00
liujun 9d863aca1a 消防器材功能迁移至企业端 2024-01-24 11:43:42 +08:00
zhaoyu bd6bd0a8a4 门口门禁增加摄像头 2024-01-23 18:57:28 +08:00
zhaoyu 54ab694f2f 企业端门口门禁开发完成并且用户信息增加门口门禁卡号字段 2024-01-23 14:24:59 +08:00
liujun 6de4acfd96 若干bug修改 2024-01-22 18:47:24 +08:00
liujun 3f20c93293 若干bug修改 2024-01-22 18:11:54 +08:00
liujun b8331f9ad7 若干bug修改 2024-01-22 15:23:02 +08:00
liujun bc89c09958 若干bug修改 2024-01-22 14:39:38 +08:00
liujun cdf082b956 去除debugger 2024-01-19 20:44:32 +08:00
liujun 89c6d0ff09 若干bug修复 2024-01-19 18:35:26 +08:00
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
liujun 77dd807b97 功能重构 2024-01-19 16:45:44 +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
zhaoyu f60cbeb34a 责任状人数问题 2024-01-18 18:08:29 +08:00
liujun 9f5ef78d18 13709 编号右对齐 参考其他作业详情 下面的菜单也都要改+ 2024-01-18 14:49:53 +08:00
liujun 7ae3809342 相关方流程变更 2024-01-18 13:56:14 +08:00
liujun a01d60b192 相关方流程变更 2024-01-17 18:43:02 +08:00
zhaoyu 69c66c667a 门口门禁开发 2024-01-17 16:51:54 +08:00
liujun e8cbeaf287 消防资源统计功能模块 2024-01-17 09:10:54 +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
807 changed files with 46655 additions and 1037 deletions

View File

@ -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': ''

View File

@ -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>

994
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -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",

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

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