Commit Graph

1697 Commits

Author SHA1 Message Date
gongjiale 0328893a11 西海岸能力集市左侧联调地图 2022-11-22 14:37:20 +08:00
gongjiale e818e901ac Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-22 11:23:35 +08:00
gongjiale c3c3fe9199 UI样式调整 2022-11-22 11:22:00 +08:00
a0049873 21e602bb9e 西海岸需求开发 2022-11-22 10:58:19 +08:00
a0049873 8ad683813c 西海岸需求开发 2022-11-22 10:57:30 +08:00
gongjiale 730eb1e634 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-22 10:05:49 +08:00
gongjiale beb51f9b51 提交西海岸左側 2022-11-22 10:00:29 +08:00
a0049873 962f1ad766 点位查全部 2022-11-22 09:49:43 +08:00
a0049873 56e11a088e 西海岸需求开发 2022-11-22 09:47:10 +08:00
wuhongjian 089716c2a8 配置文件更新 2022-11-21 20:42:03 +08:00
chenchenzai 4259e48c70 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-21 20:32:54 +08:00
chenchenzai c619d24cf9 h5player播放接口添加 2022-11-21 20:32:28 +08:00
wuhongjian 1e3aa7db5a Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-21 19:21:47 +08:00
gongjiale 91d034c35d bus事件 2022-11-21 19:17:16 +08:00
gongjiale d70ca58781 bus事件 2022-11-21 19:16:13 +08:00
wuhongjian df8aa20b3f Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-21 19:12:16 +08:00
chenchenzai ffbf434cd7 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-21 19:12:05 +08:00
wuhongjian 3076ab83c2 配置文件更新 2022-11-21 19:11:44 +08:00
chenchenzai 2ee35c6814 西海岸视频地图修改1121 2022-11-21 19:10:39 +08:00
a0049873 bd88609e0b 西海岸需求开发 2022-11-21 18:49:01 +08:00
a0049873 828a011669 西海岸版本开发 2022-11-21 18:46:38 +08:00
gongjiale 879b43cea5 添加按鈕取消事件;修改UI 2022-11-21 18:22:58 +08:00
gongjiale f795484416 西海岸左侧样式修改 2022-11-21 14:19:16 +08:00
gongjiale 88d86a6749 Revert "西海岸左侧样式修改"
This reverts commit f39257bdb0.
2022-11-21 14:16:21 +08:00
gongjiale f39257bdb0 西海岸左侧样式修改 2022-11-21 14:14:45 +08:00
a0049873 3b4a6278cb Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/videoSurveillance/index.vue
2022-11-21 13:52:50 +08:00
a0049873 1d02b59509 查询修改 2022-11-21 13:48:57 +08:00
gongjiale e1905140f4 暂存 staged 2022-11-21 12:26:18 +08:00
gongjiale 3e225ddce2 标签视频添加 2022-11-21 12:21:21 +08:00
chenchenzai cde4f5d82e Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-21 11:16:51 +08:00
chenchenzai d055a89f09 西海岸视频监控 2022-11-21 11:15:40 +08:00
a0049873 dce08fa047 政务云找回 2022-11-21 10:54:48 +08:00
a0049873 de09c71c8b 被覆盖 2022-11-21 10:51:54 +08:00
gongjiale 558663fbfa 查询按钮丢失 2022-11-21 10:47:54 +08:00
a0049873 d4f8a4c334 冲突解决 2022-11-21 09:32:05 +08:00
unknown fc1e1714a9 地图点击视频监控出现弹窗 2022-11-20 17:55:55 +08:00
unknown c6798ff28e 西海岸基础设施视频监控页面地图修改1 2022-11-20 14:08:35 +08:00
a0049873 5767fa4c49 西海岸 待申请列表相关开发 2022-11-19 17:16:19 +08:00
a0049873 9fe01b9d10 政务云资源模糊查 2022-11-19 16:05:31 +08:00
a0049873 778122d249 西海岸 基础设施开发 2022-11-18 18:33:04 +08:00
a0049873 97ddab81b8 BUG修改 2022-11-18 17:05:26 +08:00
a0049873 a5f3b4b023 组件服务 应用资源添加完全删除功能 2022-11-18 16:55:55 +08:00
gongjiale 281143503a 添加 2022-11-18 16:40:34 +08:00
gongjiale 1ae34481d7 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-18 16:38:51 +08:00
gongjiale e48f8cc6ce 能力上架修改 2022-11-18 16:38:42 +08:00
a0049873 bc73b269a6 政务云修改 2022-11-18 15:54:43 +08:00
a0049873 84ea475d64 西海岸版本 基础设施开发 2022-11-18 15:38:56 +08:00
a0049873 8a02cc43b4 政务云资源对接 2022-11-18 15:37:00 +08:00
unknown 938ad4cd9b Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-18 11:19:23 +08:00
unknown 74925cc9e0 西海岸基础设施修改 2022-11-18 11:18:56 +08:00