Commit Graph

604 Commits (0249a60fd85482cfaa1644e4d586de65e03b9822)

Author SHA1 Message Date
zhaoyu 6123eb94a9 港股查询港股的部门 2023-12-15 15:55:56 +08:00
zhaoyu e6b0c53c36 重点工程优化 2023-12-15 15:50:40 +08:00
zhaoyu 89cbc27c62 Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求 2023-12-14 18:57:51 +08:00
limingyu 7af697ad76 新动火作业和港务局一公司地图点位页面更新3 2023-12-14 18:32:24 +08:00
liujun 9033707ae1 13025 用工形式显示不正确 2023-12-14 18:09:24 +08:00
liujun 356eab0ded 13132 人员详情页面 修改 参考其他页面 2023-12-14 17:55:55 +08:00
liujun 16636dbae4 13134 主管部门没有显示数据 2023-12-14 17:49:54 +08:00
liujun af4055823b 12618 编辑页面 判空提示语不正确 2023-12-14 16:07:04 +08:00
zhaoyu 58e7ab4540 排版 2023-12-14 15:47:35 +08:00
zhaoyu ee190fc41e Merge remote-tracking branch 'origin/重点工程定位需求' into 重点工程定位需求 2023-12-14 15:46:14 +08:00
zhaoyu 24d4be5b65 排版 2023-12-14 15:46:04 +08:00
liujun b2e4ab0d38 12618 编辑页面 判空提示语不正确 2023-12-14 15:23:45 +08:00
zhaoyu c48430df78 搜索 2023-12-14 14:59:20 +08:00
zhaoyu 5a1ec5df35 bug修复 2023-12-14 14:10:15 +08:00
zhaoyu f575847b82 bug修复 2023-12-14 09:51:11 +08:00
zhaoyu 14abb214e1 开工数量不对问题 2023-12-13 17:05:21 +08:00
zhaoyu f5cdc6232e 文件下载问题 2023-12-13 16:57:13 +08:00
zhaoyu a6ccc5a8a6 经纬度问题 2023-12-13 16:55:59 +08:00
zhaoyu f004534d92 bug处理 2023-12-13 14:44:44 +08:00
zhaoyu 6a032a68f7 Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求
# Conflicts:
#	src/views/map/dialog/index.vue
2023-12-11 18:19:40 +08:00
limingyu 5335c79d33 新动火作业和港务局一公司地图点位页面更新2 2023-12-11 18:15:37 +08:00
zhaoyu 84a0e76a06 Merge remote-tracking branch 'origin/yhkp' into 重点工程定位需求
# Conflicts:
#	src/components/OutSourced/index.vue
2023-12-11 18:15:29 +08:00
limingyu 65f2ec54f7 Merge branch 'dev' into 新动火作业1128 2023-12-11 18:14:27 +08:00
zhaoyu 43c2e70dba 地图 2023-12-11 18:14:03 +08:00
zhaoyu 32376c8a07 Merge remote-tracking branch 'origin/新动火作业1128' into 重点工程定位需求
# Conflicts:
#	src/views/map/dialog/index.vue
2023-12-11 18:12:58 +08:00
zhaoyu 4e6e73c926 Merge branch '重点工程视频bug修复' into 重点工程定位需求 2023-12-11 17:51:42 +08:00
zhaoyu 8e8baa2f6d Merge branch 'liujun-2023-12-05-相关方需求变更' into 重点工程定位需求 2023-12-11 17:51:13 +08:00
zhaoyu af4aeb0738 地图 2023-12-11 17:49:55 +08:00
zhaoyu baac77a56b Merge branch 'dev' into 重点工程定位需求 2023-12-11 10:42:45 +08:00
zhaoyu 33040e1000 Merge remote-tracking branch 'origin/dev' into dev 2023-12-11 10:42:15 +08:00
zhaoyu bf6d999f85 Merge branch 'dev' into 重点工程定位需求 2023-12-11 10:41:31 +08:00
zhaoyu ebc73a0f18 Merge branch 'main' into dev 2023-12-11 10:41:05 +08:00
鲁洪霞 434c5bb39d 添加重点工程 2023-12-11 10:32:51 +08:00
zhaoyu 328e99740e 重点工程定位以及其他需求 2023-12-08 17:24:58 +08:00
liujun 745788de65 历史bug修复 2023-12-07 15:02:00 +08:00
zhaoyu b97ed67483 重点工程视频管理bug修复 2023-12-07 10:29:12 +08:00
liujun 97e824fcf4 相关方培训新增需求 2023-12-06 16:52:48 +08:00
liujun 9e9337d75d 相关方培训新增需求 2023-12-06 15:02:40 +08:00
limingyu f1d7e0d096 Merge remote-tracking branch 'origin/dev' into 新动火作业1128 2023-11-30 14:15:46 +08:00
liujianan 229b261a3f 修复下面图标连续点击不显示bug 2023-11-30 11:51:15 +08:00
limingyu 59d2e7c7cd Merge branch 'dev' into 新动火作业1128
# Conflicts:
#	src/views/map/dialog/index.vue
2023-11-30 08:59:19 +08:00
guoyuepeng a00777acfd Merge remote-tracking branch 'origin/dev' into dev 2023-11-29 17:58:52 +08:00
liujianan c660bdb8e7 曹妃甸人员定位标记点更新之后移动 2023-11-29 17:50:20 +08:00
guoyuepeng a0af117bdc Merge remote-tracking branch 'origin/dev' into dev 2023-11-29 17:13:42 +08:00
dearlin b235e8f6e9 fix:人员信息定位弹窗展示字段 2023-11-29 17:09:04 +08:00
guoyuepeng 314a5e3123 1.无效字符 2023-11-29 16:25:43 +08:00
guoyuepeng 9fd7b1a261 1.新的地图标识
2.边界入侵不能播放修复
2023-11-29 16:07:04 +08:00
guoyuepeng 981ba47e84 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/keyprojects/platformelectronic/index.vue
2023-11-29 15:48:55 +08:00
dearlin 82de06b2d3 fix:平台栅栏视频无法定位得问题 2023-11-29 15:43:31 +08:00
guoyuepeng d08d823145 1.九公司的四色图
2.电子围栏功能
2023-11-29 14:27:50 +08:00