a0049873
|
ad6a1c14de
|
BUg修改
|
2022-10-31 20:23:26 +08:00 |
|
a0049873
|
493151d9f0
|
BUG修改
|
2022-10-31 19:45:21 +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 |
 gongjiale
|
d130bcf1aa
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-31 17:47:56 +08:00 |
|
gongjiale
|
2156e70433
|
左侧树修改
|
2022-10-31 17:47:38 +08:00 |
|
unknown
|
1ad52d954c
|
bug修改，我的申请
|
2022-10-31 16:29:19 +08:00 |
|
a0049873
|
15426bccdc
|
能力申请 应用系统对接
|
2022-10-31 16:03:12 +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 |
|
guoyue
|
5f155dc69a
|
更改图片字段
|
2022-10-31 14:07:39 +08:00 |
|
guoyue
|
2774650d96
|
新手指南--资源下架跳转到我的发布
|
2022-10-28 17:04:37 +08:00 |
|
gongjiale
|
90237e4f6d
|
Merge branch 'hi-ucs-pre' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-28 16:40:35 +08:00 |
|
gongjiale
|
6967b3f1da
|
1.完成能力集市：基础设施-会客厅，字数太多时，展示不美观的问题；
2.完成融合服务：打包模式，点击发布时间，只能按照正序排，不能按照倒序排列的问题；
3完成.融合服务：打包模式，点击收藏量，只能按照正序排，不能按照倒序排列的问题
|
2022-10-28 16:37:48 +08:00 |
 wuhongjian
|
ed6a7e85b2
|
bug修复
|
2022-10-28 13:59:44 +08:00 |
|
wuhongjian
|
04fcdfde08
|
bug修复
|
2022-10-28 13:58:53 +08:00 |
|
guoyue
|
2f34e4acbc
|
合并
|
2022-10-27 19:39:34 +08:00 |
|
guoyue
|
cc00873328
|
我的申请：查看详情按钮位置调整
|
2022-10-27 19:33:42 +08:00 |
|
a0049873
|
fbcd40f2a6
|
BUG修改
|
2022-10-27 18:05:28 +08:00 |
|
wuhongjian
|
9a2c2c07d1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-27 15:48:26 +08:00 |
|
wuhongjian
|
09d56091fa
|
测试问题修复
|
2022-10-27 15:48:24 +08:00 |
|
guoyue
|
c1da555ceb
|
西海岸：摄像头提示文字预览视频更改为观看视频
|
2022-10-27 15:04:49 +08:00 |
|
guoyue
|
3e310fb7ea
|
合并
|
2022-10-27 14:40:35 +08:00 |
|
guoyue
|
e29e0f0526
|
算法广场和能力广场容错处理pic为空
|
2022-10-27 13:50:29 +08:00 |
|
guoyue
|
3e1b6b8a22
|
修复 需求中心：需求申请时，应用领域无法进行选择
|
2022-10-27 13:47:19 +08:00 |
|
a0049873
|
f36e2bbffc
|
BUG修改
|
2022-10-27 11:44:25 +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
|
4930027d67
|
能力上架 新增转办功能
|
2022-10-27 10:50:09 +08:00 |
|
guoyue
|
46ad5e747d
|
算法广场和gis广场 传参参数更改
|
2022-10-26 20:28:58 +08:00 |
|
guoyue
|
5132d3ec60
|
算法广场兼容
|
2022-10-26 20:10:06 +08:00 |
|
guoyue
|
b61722857d
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-26 19:40:10 +08:00 |
|
guoyue
|
355ee77e79
|
fix：算法广场和GIS广场图片bug
|
2022-10-26 17:10:15 +08:00 |
|
guoyue
|
fef67d9cc4
|
门户：新手指引：能力下架，跳转页面不对，应该跳转到我的申请-上架能力页面
|
2022-10-26 16:25:44 +08:00 |
|
a0049873
|
1e3b315d35
|
BUg修改
|
2022-10-26 15:04:55 +08:00 |
|
guoyue
|
82718e3d02
|
合并
|
2022-10-26 15:03:29 +08:00 |
|
guoyue
|
d28628f35a
|
fix：消息跳转获取列表bug
|
2022-10-26 15:01:54 +08:00 |
|
a0049873
|
3ef7da2d6c
|
金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页
|
2022-10-26 14:49:00 +08:00 |
|
a0049873
|
94a940a1ab
|
金宏网-能力统计：资源申请量，点击跳转时，应该跳转到后台管理的能力统计-能力使用sheet页
|
2022-10-26 14:48:37 +08:00 |
|
a0049873
|
330f8de5e4
|
全局搜索 搜索逻辑修改
|
2022-10-26 10:39:32 +08:00 |
|
a0049873
|
d8a08c6470
|
基础设施 去表格
|
2022-10-26 09:56:05 +08:00 |
|
wuhongjian
|
00e4e9671b
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-26 09:38:13 +08:00 |
|
wuhongjian
|
c634d85688
|
去掉视频资源列表
|
2022-10-26 09:38:11 +08:00 |
|
a0049873
|
1f727a6cbd
|
修改会议室默认图片
|
2022-10-26 09:37:47 +08:00 |
|
a0049873
|
b600caa357
|
添加admin权限
|
2022-10-26 09:19:01 +08:00 |
|
guoyue
|
5fea910701
|
合并
|
2022-10-25 18:00:40 +08:00 |
|
guoyue
|
05899ab616
|
能力分类进入能力集市，应用领域有选中时，展开
|
2022-10-25 17:53:17 +08:00 |
|
guoyue
|
b561eff3ea
|
查看详情按钮样式更改
|
2022-10-25 17:52:39 +08:00 |
|
guoyue
|
24dc1d09cd
|
更改气泡提示框按钮样式居中显示（全局更改）
|
2022-10-25 17:52:04 +08:00 |
|
guoyue
|
7ff2d13afe
|
算法广场，GIS广场接口里联调
|
2022-10-25 17:51:39 +08:00 |
|
a0049873
|
983b2c0534
|
更改头部样式
|
2022-10-25 15:11:47 +08:00 |
|
wuhongjian
|
8f33c9f375
|
bug修复
|
2022-10-25 11:30:05 +08:00 |
|
a0049873
|
5cbeba19b8
|
会议室列表
|
2022-10-25 10:58:25 +08:00 |
|
a0049873
|
b30a72555f
|
判断用户后台权限
|
2022-10-25 09:48:40 +08:00 |
|
wuhongjian
|
11b42afde3
|
一键组会内容添加
|
2022-10-25 09:21:38 +08:00 |
|
guoyue
|
79ee811854
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 17:44:26 +08:00 |
|
guoyue
|
1a40a09286
|
算法广场和GIS广场增加区域筛选，api待联调
|
2022-10-24 17:44:10 +08:00 |
|
a0049873
|
0726f4a927
|
添加角色控制
|
2022-10-24 15:20:58 +08:00 |
|
a0049873
|
8a31a4e285
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 14:54:14 +08:00 |
|
a0049873
|
314b68b3a3
|
静态数据
|
2022-10-24 14:54:03 +08:00 |
|
wuhongjian
|
84f1b03c42
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 14:26:25 +08:00 |
|
wuhongjian
|
aaa16a1105
|
bug修复
|
2022-10-24 14:26:22 +08:00 |
|
a0049873
|
e1a805d4bd
|
客户端下载
|
2022-10-24 14:12:35 +08:00 |
|
a0049873
|
98a420f0c3
|
接口文件
|
2022-10-24 13:50:23 +08:00 |
|
a0049873
|
52be0acd83
|
一键组会
|
2022-10-24 11:28:37 +08:00 |
|
wuhongjian
|
a8aba6b4f1
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-24 09:51:40 +08:00 |
|
wuhongjian
|
e0481ba5a5
|
配置更新
|
2022-10-24 09:51:37 +08:00 |
|
gongjiale
|
70a015cb01
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-22 15:29:52 +08:00 |
|
gongjiale
|
1427424073
|
pageWithAttrs
|
2022-10-22 15:29:21 +08:00 |
|
guoyue
|
6b1fc28b4b
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-22 14:29:55 +08:00 |
|
guoyue
|
b226e777f7
|
西海岸：增加我的发布侧边栏
|
2022-10-22 14:29:18 +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 |
|
a0049873
|
a296f5a0d6
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-21 17:32:59 +08:00 |
|
a0049873
|
7e9108e7d6
|
BUG修改
|
2022-10-21 17:32:45 +08:00 |
|
guoyue
|
0461d44c85
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-21 17:00:22 +08:00 |
|
guoyue
|
f4a53c91b1
|
修复首页点击能力集市，搜索，基础设施进入能力集市，页面不显示bug
|
2022-10-21 17:00:09 +08:00 |
|
wuhongjian
|
6da86d7340
|
Merge branch 'hi-ucs-dev' into release
|
2022-10-21 16:46:36 +08:00 |
|
wuhongjian
|
67574732c7
|
bug修复
|
2022-10-21 16:45:53 +08:00 |
|
unknown
|
44da94a71e
|
所属部门自动搜索
|
2022-10-21 16:35:26 +08:00 |
|
guoyue
|
b5f9531943
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-21 11:47:38 +08:00 |
|
guoyue
|
549dda54b3
|
消息通知：跳转逻辑更改
|
2022-10-21 11:47:28 +08:00 |
|
a0049873
|
672e6164ba
|
平均分改评分
|
2022-10-21 10:09:59 +08:00 |
|
wuhongjian
|
5deb9a3826
|
Merge branch 'hi-ucs-dev' into release
|
2022-10-20 16:20:24 +08:00 |
|
wuhongjian
|
1a96e4e6a2
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-20 16:16:44 +08:00 |
|
wuhongjian
|
1f3116f402
|
开启gzip
|
2022-10-20 16:15:59 +08:00 |
|
guoyue
|
ba5526d7d8
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-20 16:08:12 +08:00 |
|
guoyue
|
33ba30d97f
|
西海岸：云图视频资源数量 ，前端去掉+4
|
2022-10-20 16:07:56 +08:00 |
|
gongjiale
|
56c4393f2e
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-20 11:24:31 +08:00 |
|
gongjiale
|
f541f61409
|
添加一网通览
|
2022-10-20 11:24:17 +08:00 |
|
a0049873
|
6b1c3f30a4
|
排行榜功能开发
|
2022-10-20 10:09:41 +08:00 |
|
unknown
|
a12d0aa6ff
|
西海岸视频选中bug修改
|
2022-10-19 17:32:01 +08:00 |
|
unknown
|
02d70b4b8d
|
西海岸视频地图图标点击切换方式修改
|
2022-10-19 17:10:48 +08:00 |
|
guoyue
|
4e271b6aa7
|
合并冲突
|
2022-10-19 13:55:49 +08:00 |
|
unknown
|
1a23d64064
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-19 11:50:11 +08:00 |
|
unknown
|
04471a122e
|
ie浏览器提示信息
|
2022-10-19 11:48:31 +08:00 |
|
gongjiale
|
b24e925c5a
|
西海岸问题修改
|
2022-10-19 11:46:29 +08:00 |
|
gongjiale
|
7a0d2ba101
|
Merge branch 'hi-ucs-dev' of http://192.168.124.50:80/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-19 10:45:54 +08:00 |
|
gongjiale
|
55398620f0
|
首页跳转问题修改
|
2022-10-19 10:45:15 +08:00 |
|
guoyue
|
2af92a6f8f
|
西海岸-基础设施：在线视频预览，弹出视频窗口，改成鼠标放上后给出tips“请申请后再预览”，弹框标题增加提示信息
|
2022-10-19 10:20:09 +08:00 |
|
guoyue
|
3f22be0d8d
|
Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev
|
2022-10-18 15:52:16 +08:00 |