wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity
2,060 Commits 7 Branches 12 Tags 640 MiB
Commit Graph

148 Commits

Author SHA1 Message Date
a0049873 14f660a532 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2023-01-13 11:22:38 +08:00
a0049873 d5b2125f39 评价功能开发 2023-01-10 17:51:20 +08:00
wuhongjian f576ece322 Merge branch 'hi-ucs-dev' into release 2023-01-05 09:24:07 +08:00
wuhongjian 222af51196 修复赋能场景样式问题 2023-01-03 15:45:46 +08:00
wuhongjian 6736a8d434 Merge branch 'hi-ucs-dev' into release 2022-12-29 17:34:40 +08:00
gongjiale 7286ced04e 修改bug 2022-12-29 16:33:03 +08:00
wuhongjian c05b9a91c3 676修复 2022-12-28 09:34:49 +08:00
a0049873 ef987f2d42 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
 2022-12-08 13:43:39 +08:00
wuhongjian 6085e640d7 cookie过期时间更正 2022-12-05 17:38:59 +08:00
wuhongjian 6c3a0ff07f 西海岸问题修复 2022-12-02 17:30:32 +08:00
a0049873 f92ac21530 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
 2022-12-01 12:33:32 +08:00
wuhongjian 953fe9e18f bug修复 2022-11-29 11:57:33 +08:00
a0049873 77dc9be197 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
#	front/public/static/config/location.js
#	front/src/App.vue
#	front/src/views/personalCenter/components/MyPublish.vue
 2022-11-28 17:38:34 +08:00
wuhongjian 8904da5a13 西海岸bug修复 2022-11-28 01:17:08 +08:00
wuhongjian d3d9ac328d Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-11-26 18:40:24 +08:00
wuhongjian 555672eeb8 西海岸bug修复 2022-11-26 18:39:45 +08:00
gongjiale 84abb2fde3 新增 2022-11-26 18:17:55 +08:00
wuhongjian 0fa3708f20 西海岸bug修复 2022-11-24 20:32:15 +08:00
wuhongjian a7998206f2 西海岸bug修复 2022-11-24 16:11:34 +08:00
a0049873 a88baa4eac Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	back/public/config/basicConfig.js
#	front/public/static/config/basicConfig.js
#	front/src/App.vue
 2022-11-24 09:13:40 +08:00
wuhongjian 851eb37c35 西海岸添加关闭所有视频 2022-11-22 15:04:49 +08:00
wuhongjian 089716c2a8 配置文件更新 2022-11-21 20:42:03 +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
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
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
chenchenzai d055a89f09 西海岸视频监控 2022-11-21 11:15:40 +08:00
unknown fc1e1714a9 地图点击视频监控出现弹窗 2022-11-20 17:55:55 +08:00
a0049873 72a900723f Merge branch 'hi-ucs-dev' into release 2022-11-18 15:43:18 +08:00
unknown 2c69d3829b 头部菜单修改 2022-11-16 16:20:41 +08:00
a0049873 1d41742942 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-11-15 10:30:15 +08:00
a0049873 3003da8c03 配置文件修改 2022-11-15 09:40:20 +08:00
wuhongjian adeaa3d2d7 Merge branch 'hi-ucs-dev' into release 2022-11-14 10:00:26 +08:00
wuhongjian 7a14485775 bug修复 2022-11-11 19:40:59 +08:00
wuhongjian c9d710c3bb 配置文件更新 2022-11-09 17:57:55 +08:00
a0049873 4532029b66 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-10-31 18:59:29 +08:00
a0049873 72cd80df26 Merge branch 'hi-ucs-dev' into release 2022-10-31 15:45:17 +08:00
gongjiale 511f4690c1 Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-31 14:50:38 +08:00
guoyue 50c2d6264d renren-admin改为ucs-admin 2022-10-31 14:08:04 +08:00
wuhongjian 04fcdfde08 bug修复 2022-10-28 13:58:53 +08:00
a0049873 e65419c06e Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	back/public/config/basicConfig.js
#	front/public/static/config/basicConfig.js
 2022-10-27 10:52:53 +08:00
a0049873 94a940a1ab 金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页 2022-10-26 14:48:37 +08:00
wuhongjian aaa16a1105 bug修复 2022-10-24 14:26:22 +08:00
a0049873 25763b72e3 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-10-22 11:10:07 +08:00
a0049873 30328e575d 视频会议 2022-10-22 11:08:52 +08:00
wuhongjian 5deb9a3826 Merge branch 'hi-ucs-dev' into release 2022-10-20 16:20:24 +08:00
guoyue cdb47c705b 西海岸：基础设施--获取摄像头增加远雄url 2022-10-18 15:52:07 +08:00