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

111 Commits

Author SHA1 Message Date
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
wuhongjian 502068705b Merge branch 'hi-ucs-dev' into release 2022-10-14 11:24:10 +08:00
wuhongjian 79cdaa1146 bug修复 2022-10-13 21:40:56 +08:00
wuhongjian b79797b09a bug修复 2022-10-13 19:11:45 +08:00
wuhongjian 2c4752c97b bug修复 2022-10-13 18:13:19 +08:00
wuhongjian 0c83991e6c bug修复 2022-10-13 18:08:14 +08:00
wuhongjian 7877cd2474 bug修复 2022-10-13 15:45:21 +08:00
wuhongjian 54aa64de64 客户需求更新 2022-10-13 14:47:53 +08:00
wuhongjian 720b26a902 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 17:56:45 +08:00
wuhongjian 8f1658f2eb 客户需求 2022-10-12 17:56:41 +08:00
guoyue 5f8659f7f4 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-12 16:00:45 +08:00
guoyue f198ad5f5a 西海岸: 获取摄像头列表的api更改为配置文件形式 2022-10-12 16:00:41 +08:00
wuhongjian 70bb06cba6 更改token问题 2022-10-12 09:50:17 +08:00
guoyue 5db6afcb6c 西海岸：特殊用户增加可查看所有权限 2022-10-09 16:42:57 +08:00
guoyue af1c03d3ed 西海岸相关功能 合并代码 2022-10-09 14:29:51 +08:00
guoyue 7d513edafc 配置环境 2022-10-08 16:00:37 +08:00
851673013@qq.com a906b433f2 区市站点隐藏掉 2022-09-30 10:40:05 +08:00
851673013@qq.com a3c6162592 修改文件 2022-09-30 10:27:57 +08:00
a0049873 55da389003 隐藏趋势站点，能力云图 2022-09-27 16:49:10 +08:00
guoyue ae5978f408 add: 西海岸 测试环境 2022-09-26 17:26:06 +08:00
guoyue f26afc84c7 西海岸：顶部导航去掉技术文档 2022-09-23 10:37:21 +08:00
guoyue f6b6c4713d 西海岸-去掉融合服务和CIM 2022-09-21 18:48:35 +08:00
guoyue bff2aa9f97 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-19 19:24:02 +08:00
guoyue b2abd5f16e 新增研发展厅环境 2022-09-19 19:19:13 +08:00
guoyue 253b9f511a 能力集市-组件服务：智能算法支持类型选择 2022-09-19 19:18:49 +08:00
a0049873 e97fc9afa9 Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-09-19 11:08:15 +08:00
a0049873 6ef87c3c79 广场新增删选条件 2022-09-19 10:19:31 +08:00
a0049873 a653d9607f Merge branch 'hi-ucs-dev' into release 
# Conflicts:
#	front/public/static/config/basicConfig.js
 2022-09-14 10:50:43 +08:00
guoyue dfba732000 展厅dev环境 2022-09-13 18:04:46 +08:00
guoyue 59abe1614c 融合服务 CIM 技术文档 包头市局西海岸都支持 2022-09-08 15:46:08 +08:00
guoyue 7f3c5c0921 研发开发环境 2022-09-07 14:30:00 +08:00
guoyue 84e3f220dd 开发环境 2022-09-07 14:29:06 +08:00
wuhongjian 0c78639afa 配置文件更新 2022-08-29 09:58:43 +08:00
wuhongjian 48097bdd54 合并版本v0.8.7.2 2022-08-29 09:58:12 +08:00
wuhongjian 13226c8976 版本号更新 2022-08-27 14:26:03 +08:00
wuhongjian 66db5faf1b 详情页模糊化处理 2022-08-27 14:25:03 +08:00
wuhongjian 916ea5ecd2 bug修复 2022-08-25 19:06:53 +08:00
wuhongjian 9b77589c6e 配置文件更新 2022-08-25 15:20:06 +08:00