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

590 Commits

Author SHA1 Message Date
guoyue 61592ceaea 删除冗余代码 2022-10-12 11:52:50 +08:00
guoyue 140ff7f92c 西海岸--基础设施-摄像头获取：增加loading 2022-10-12 11:51:22 +08:00
a0049873 66df6d8c76 没有后台权限账号 屏蔽跳转功能 2022-10-12 10:04:11 +08:00
guoyue e4ad24ba8c 西海岸：修复视频预览提示错误问题 2022-10-11 15:07:55 +08:00
guoyue b5ad10130f 更改基础设施--左侧树选中状态以及取消选中（没区分西海岸和市局） 2022-10-10 17:10:43 +08:00
guoyue 05c93f9dd9 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-10 15:45:50 +08:00
guoyue 37347b3de2 市局：增加消息通知会议室跳转 2022-10-10 15:45:33 +08:00
a0049873 9c3a8495c0 申请按钮 只能点一次 2022-10-10 15:29:38 +08:00
guoyue 8940dc4e24 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-10 13:54:31 +08:00
guoyue c5ae492e70 融合服务：赋能场景图片大小更改 2022-10-10 13:53:35 +08:00
unknown 0ba3526904 修改bug 2022-10-10 10:15:39 +08:00
unknown 4c4fe02f74 融合服务我的申请修改 2022-10-10 10:11:16 +08:00
guoyue 5db6afcb6c 西海岸：特殊用户增加可查看所有权限 2022-10-09 16:42:57 +08:00
guoyue af1c03d3ed 西海岸相关功能 合并代码 2022-10-09 14:29:51 +08:00
guoyue c4ae6d603a 西海岸购物车等功能 2022-10-09 13:52:28 +08:00
guoyue d6c971ab23 西海岸顶部导航提示正在建设中 2022-10-08 19:20:18 +08:00
guoyue c71784567c 西海岸-购物车收藏功能 2022-10-08 16:00:26 +08:00
guoyue f727efbdcd 顶部导航除基础设施外，禁止切换且提示正在建设中 2022-10-08 14:58:01 +08:00
guoyue 608b6d10ff fix：控制台报错 2022-10-04 15:59:35 +08:00
guoyue 251c3d33d6 市局：城市云脑会客厅--去掉电话必填 2022-10-03 17:23:12 +08:00
guoyue 58e045e862 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-10-03 16:26:28 +08:00
guoyue 12d3cc221c 市局：申请页面---应用系统选项下方加提示：如选项没有系统请新增 2022-10-03 15:44:54 +08:00
gongjiale aa6022f599 修改部分usc问题 2022-10-02 16:42:34 +08:00
guoyue c183ee883d 代码找回 (详情按钮，西海岸智能算法支持，融合服务详情，西海岸登录默认基础设施) 【2022-09-30：修改文件 】 2022-09-30 16:07:15 +08:00
851673013@qq.com 1bff4a6f85 代码修改 2022-09-30 11:07:15 +08:00
851673013@qq.com cce81f9ece bug申请能力应用系统选项下方加提示：如选项没有系统请新增 2022-09-30 10:51:03 +08:00
851673013@qq.com cba2a5c089 bug修改 2022-09-30 10:31:14 +08:00
851673013@qq.com a3c6162592 修改文件 2022-09-30 10:27:57 +08:00
guoyue 166e5e119e 西海岸：能力集市点击非基础设施提示正在建设中 2022-09-29 18:35:14 +08:00
于秀圆 3dcb9b8778 接口传参方式修改 2022-09-29 18:27:32 +08:00
于秀圆 bcbafaf9f0 不规则框选 2022-09-29 18:19:24 +08:00
guoyue 98f0c360d4 西海岸：基础设施--一键申请增加数量限制 2022-09-29 17:26:08 +08:00
guoyue bafe53bc67 西海岸：能力集市--默认选中基础设施 2022-09-29 17:21:54 +08:00
guoyue 48bfe71c6f 西海岸：基础设施--一键申请增加最大数量限制 2022-09-29 17:21:02 +08:00
guoyue a7d7431c75 fix：基础设施-申请报错 2022-09-29 09:24:02 +08:00
guoyue a7da8b013e Merge branches 'hi-ucs-dev' and 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-28 17:33:59 +08:00
guoyue f86d40feda 西海岸：基础设施-视频预览，增加在线离线状态显示，点击预览，提示离线 2022-09-28 17:31:57 +08:00
于秀圆 a4259cf2d9 视频资源表格和地图选中联动 2022-09-28 16:42:35 +08:00
guoyue f79b43d261 西海岸：基础设施--默认选中视频资源 2022-09-28 14:05:12 +08:00
guoyue 787ceeef3f 西海岸：基础设施--批量申请--增加参数 2022-09-27 18:04:07 +08:00
guoyue fc8f43b94c Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 14:07:25 +08:00
guoyue cf7d85060c 西海岸：基础设施-申请增加过期时间 2022-09-27 11:53:10 +08:00
a0049873 18f911bd16 基础设施修改 2022-09-27 10:37:08 +08:00
guoyue 0b401f5741 我的申请增加水印 2022-09-27 09:49:30 +08:00
guoyue 2f752de364 西海岸：基础设施--视频预览增加水印 2022-09-27 09:28:03 +08:00
guoyue 479c2791f3 合并 2022-09-26 17:25:30 +08:00
guoyue 653559e727 格式化代码 2022-09-26 16:55:51 +08:00
guoyue 5c6d90d912 西海岸：我的申请中-视频预览 增加离线提示 2022-09-26 16:40:54 +08:00
guoyue 076d84bd0a 西海岸：视频播放 离线(status不是1)提示当前视频离线 2022-09-26 16:29:32 +08:00
guoyue eab0eb374a 西海岸：去掉拼接的status=1 2022-09-26 16:28:50 +08:00
a0049873 432ba890f6 基础设施初始化BUG修改 2022-09-26 11:32:14 +08:00
unknown 186184c14f new button 2022-09-26 09:41:43 +08:00
guoyue 4dc1525520 fix：基础设施-地图搜索 改回最初 2022-09-23 11:15:14 +08:00
guoyue 10fdc587a2 西海岸：单兵无人机 申请按钮，更改为未申请状态才可申请 2022-09-22 16:04:24 +08:00
guoyue fe3eb0aa68 西海岸--基础设施：去掉视频标签 2022-09-22 15:08:02 +08:00
guoyue 4296677fcd 西海岸：批量预览视频增加提示，去申请才能查看 2022-09-22 13:30:53 +08:00
guoyue 2d32d735a5 西海岸：获取摄像头，拼接status=1 2022-09-22 13:29:47 +08:00
guoyue c55eedc5b4 单兵和无人机：列表增加详情 2022-09-21 23:31:56 +08:00
guoyue a5df439fd0 pk 算法对比，修复弹框没有确定按钮bug 2022-09-21 22:31:56 +08:00
guoyue cce7cb3be9 去掉城市云脑会客厅 2022-09-21 22:27:49 +08:00
guoyue 14978ef490 算法对比，弹框增加确定取消按钮 2022-09-21 21:12:29 +08:00
guoyue 44525afeb8 无人机申请，去掉用户id 2022-09-21 21:12:00 +08:00
guoyue f1de06b5ad 无人机申请增加用户id 2022-09-21 19:59:02 +08:00
guoyue bcef134cf9 无人机申请，增加参数 2022-09-21 17:23:51 +08:00
guoyue 7ea1bc972b 无人机、单兵申请更改参数名 2022-09-21 16:18:02 +08:00
guoyue b17f4a3056 无人机单兵设备申请，参数更改 2022-09-21 15:55:43 +08:00
guoyue 11f4c3fe25 西海岸--单兵设备和无人机：列表/申请接口联调 2022-09-21 15:43:55 +08:00
guoyue b3b35d21b3 删除多余console 2022-09-20 19:28:24 +08:00
guoyue 21adcb62c8 fix：一键申请--融合服务特殊处理 2022-09-20 19:28:13 +08:00
guoyue 5387d6a7a3 西海岸：获取摄像头拼接status为1 2022-09-20 19:08:21 +08:00
guoyue 3e6f875728 西海岸-视频预览--禁止点击播放，给出提示 2022-09-20 16:37:59 +08:00
guoyue 856cf3e41f 西海岸-智能算法：容错处理 2022-09-20 15:15:17 +08:00
guoyue 7f884528e9 西海岸-支持组件服务-算法分类 2022-09-20 13:31:56 +08:00
guoyue 07fff52e43 去掉基础设施--云资源 2022-09-20 10:32:03 +08:00
guoyue c35398209b 视频播放-关闭自动播放功能 2022-09-20 10:24:12 +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 1455e2e0d7 一键申请：融合服务特殊处理 2022-09-19 19:23:41 +08:00
guoyue 253b9f511a 能力集市-组件服务：智能算法支持类型选择 2022-09-19 19:18:49 +08:00
lizhicheng2 f3973fe28d bug fix:单点登录登出问题 2022-09-19 13:04:27 +08:00
guoyue de605dd446 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-16 16:45:53 +08:00
guoyue 1b26210e01 去掉能力集市-浏览量排序 2022-09-16 16:44:26 +08:00
851673013@qq.com f2e68d0105 能力申请单位 2022-09-16 15:15:03 +08:00
guoyue fb0a5e1f38 退出登录，移除本地查询条件 2022-09-13 18:04:12 +08:00
guoyue 31a809f9d9 赋能场景存储查询条件 2022-09-13 18:03:55 +08:00
guoyue 1cba78f8e1 融合服务，能力集市详情返回 2022-09-13 09:38:26 +08:00
guoyue 9df17910ee fix基础设施控制台报错 2022-09-08 14:22:07 +08:00
guoyue 715792aa7d 应用资源和组件服务调换位置 2022-09-08 14:21:42 +08:00
guoyue 510e72f35e 能力集市列表 隐藏浏览量 2022-09-08 13:15:51 +08:00
guoyue 43aec16d92 融合服务支持收藏量 2022-09-08 13:12:40 +08:00
zhangzhuliang 205cb756be 会议室审核加下载附件按钮和输入框报错 2022-09-02 11:06:11 +08:00
zhangzhuliang c1643e3cb0 会议室bug提交 2022-08-31 18:26:06 +08:00
gaoyuanwei cd067cfcc1 赋能场景-典型赋能场景；图片 2022-08-26 10:49:29 +08:00
wuhongjian 64ef4c95a1 bug修复 2022-08-26 09:27:34 +08:00
gaoyuanwei d7d2c56ec7 赋能场景 2022-08-25 20:47:41 +08:00
a0049873 748b3b72ea 隐藏按钮 2022-08-25 20:24:17 +08:00
a0049873 faa639200e 赋能场景 2022-08-25 20:22:33 +08:00
a0049873 9b448c0fcc 赋能场景修改 2022-08-25 19:56:48 +08:00
wuhongjian 916ea5ecd2 bug修复 2022-08-25 19:06:53 +08:00
gaoyuanwei 89d782fa9b 只留已申请标签 2022-08-24 17:42:31 +08:00
wuhongjian 894db08c4e 市局基础设施只要图片预览 2022-08-24 13:53:45 +08:00
wuhongjian d1a50bc25a 修复变形问题 2022-08-24 09:19:32 +08:00
gaoyuanwei 0c4015cb5c 亿点点修改 2022-08-23 17:47:24 +08:00
a0049873 d1e6b9acd7 修改首页 选择数据类型样式 ， 修改 全局搜索逻辑 2022-08-23 16:51:41 +08:00
a0049873 c824e53a50 消息中心位置 2022-08-22 11:50:51 +08:00
a0049873 73591c0ed2 CIM专区 图层 算法开发 2022-08-19 16:53:42 +08:00
a0049873 88e063fa04 CIM专区 初始化 2022-08-19 10:03:43 +08:00
gaoyuanwei 7014db07b3 前台进入后台图标修改 2022-08-18 11:01:27 +08:00
zhangzhuliang 9eaa4ca9bb bug提交 2022-08-17 17:33:57 +08:00
a0049873 3f235f3d81 修改能力申请文案 2022-08-17 11:16:25 +08:00
gaoyuanwei de04c8ce33 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-15 18:08:33 +08:00
gaoyuanwei f45974d654 申请--- --- 应用系统 2022-08-15 18:06:34 +08:00
a0049873 e50dc1ad1f 新排序 2022-08-15 16:47:33 +08:00
a0049873 0b972d7bb9 更改首页逻辑 2022-08-15 15:08:50 +08:00
a0049873 5f3c8d3556 全局搜索 2022-08-15 14:48:53 +08:00
gaoyuanwei c4597f6cbd 最少50字 2022-08-12 18:06:56 +08:00
wuhongjian a2267a59bb Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-12 17:17:06 +08:00
wuhongjian ce3f7ec183 配置更新 2022-08-12 17:17:03 +08:00
a0049873 1e7aca42fd 点图标返回首页 2022-08-12 16:34:13 +08:00
a0049873 f78f2f1292 能力集市 新增点击任意地方跳转详情 2022-08-12 14:19:53 +08:00
zhangzhuliang b1aae6175b 会议室代码提交 2022-08-11 14:22:54 +08:00
guoyue 810e183611 ifx: 门户详情 --资源key更改 2022-08-11 09:33:21 +08:00
guoyue 0b718307d8 fix 融合服务bug 2022-08-10 17:52:49 +08:00
gaoyuanwei e1d18f8b27 入口在能力集市 2022-08-09 20:01:21 +08:00
wuhongjian 5a32f96150 bug修复 2022-08-09 17:09:58 +08:00
851673013@qq.com 2ee3a34b94 bug794增加审核中标签 2022-08-08 14:43:07 +08:00
851673013@qq.com 01f36b7586 能力集市树区市样式修改 2022-08-08 11:38:50 +08:00
wuhongjian cf53e51913 西海岸需求更新 2022-08-06 16:36:20 +08:00
a0049873 f54169dfa3 后台挂载BUG修改 前台视频资源上限改为1000 2022-08-05 17:02:55 +08:00
851673013@qq.com 027a3a072d 能力集市左侧树，区级加上数 2022-08-05 11:13:16 +08:00
wuhongjian dca5dc511e bug修复，配置更新 2022-08-05 10:01:49 +08:00
a0049873 f2b714a915 改成100个 2022-08-04 15:14:55 +08:00
a0049873 6d79448ebe 能力申请驳回开发 视频调整成100个 2022-08-04 15:07:58 +08:00
851673013@qq.com c7b15fbe5b bug804 2022-08-03 16:42:40 +08:00
guoyue 403018f234 赋能场景详情标签字体演示更改 2022-08-03 14:23:23 +08:00
gaoyuanwei e271d2fe94 789、790bug 2022-08-03 14:05:42 +08:00
a0049873 3bb705ec3f 区市站点 添加 鼠标移动效果 2022-08-02 18:37:51 +08:00
a0049873 b1c04e5f31 趋势站点 新增 崂山区 李沧区 2022-08-02 17:59:47 +08:00
851673013@qq.com 5a14127977 bug算法pk 2022-08-02 17:30:39 +08:00
a0049873 c889fe069f 申请方 新增终止功能 审批方能力申请 改为驳回 2022-08-02 17:23:07 +08:00
lizhicheng2 ae2e323769 融合服务列表bug修复 2022-08-01 17:05:40 +08:00
lizhicheng2 035a600a3c 赋能场景详情完善 2022-08-01 16:43:44 +08:00
guoyue c5d7351809 合并 2022-08-01 16:22:24 +08:00
guoyue 1ccd81cd66 融合服务，一键申请--基础设施更改 2022-08-01 16:16:16 +08:00
a0049873 ce5d587c35 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	back/public/index.html
 2022-08-01 09:23:58 +08:00
a0049873 328ab1102e 西海岸演示版本 2022-08-01 09:21:57 +08:00
851673013@qq.com 53f0b38c5a bug774搜索框遮挡问题 2022-07-30 17:55:40 +08:00
851673013@qq.com b79f0674bf bug764闲情也行距和bug759头部图标小手和自测bug 2022-07-30 17:13:56 +08:00
guoyue 44d1aad7dd 打包模式详情 2022-07-29 18:09:06 +08:00
guoyue 7b04a81d62 赋能场景详情增加头部 2022-07-29 15:58:27 +08:00
guoyue 6b07f48dd1 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-29 15:36:32 +08:00
guoyue 32ad0904c2 打包模式-详情 2022-07-29 15:36:21 +08:00
lizhicheng2 4d31d111ac 赋能场景详情补充 2022-07-29 14:20:40 +08:00
a0049873 fabd0da877 更改 西海岸字段 2022-07-28 19:35:42 +08:00
guoyue 488dbfbe5f Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-28 17:54:49 +08:00
guoyue 816d07495c 打包模式详情页添加 2022-07-28 17:52:31 +08:00
lizhicheng2 d9139ae621 赋能场景详情-初步完成 2022-07-28 17:36:23 +08:00
wuhongjian b766bcf8fa bug修复 2022-07-28 14:42:44 +08:00
guoyue 20de75e0dd 合并 2022-07-28 10:19:01 +08:00
a0049873 fd3a7ef353 基础设施输入框 去除X 2022-07-28 09:40:05 +08:00
a0049873 a11d9eb221 能力申请 摄像头修改 2022-07-27 16:58:31 +08:00
851673013@qq.com ef980d77c3 基础设施视频接口调换 2022-07-27 14:19:51 +08:00
lizhicheng2 291b65d03f 前台融合服务页面修改 2022-07-27 13:53:59 +08:00
wuhongjian be75d352b2 JSESSIONID删除 2022-07-26 18:55:33 +08:00
wuhongjian c2b323b14c bug修复 2022-07-26 18:08:24 +08:00
wuhongjian efa51429f9 bug修复 2022-07-26 16:33:10 +08:00
wuhongjian 09f65b44ed Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 15:16:53 +08:00
wuhongjian b4e6f56c47 添加西海岸地图 2022-07-26 15:16:28 +08:00
a0049873 7ed6be40d7 改名 技术文档 2022-07-26 14:48:02 +08:00
851673013@qq.com 32997c5f73 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/home/DetailsPageconetent.vue
 2022-07-25 19:33:44 +08:00
851673013@qq.com 44e2d6a9b9 基础设施 2022-07-25 19:21:41 +08:00
guoyue a5e5c35da8 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-25 19:15:08 +08:00
guoyue f161ca967a add:赋能场景基础设施弹框 2022-07-25 19:07:07 +08:00
a0049873 975a51e4b4 放开 免批 2022-07-25 17:32:24 +08:00
a0049873 011cd3708a 基础设施申请添加提示 2022-07-25 10:17:08 +08:00
gaoyuanwei 4ee80c7529 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-25 09:52:41 +08:00
gaoyuanwei df43efef31 701bug 通知小铃铛的位置 2022-07-25 09:52:23 +08:00
a0049873 90b6866c65 Merge branch 'hi-ucs-dev' into release 2022-07-22 17:29:21 +08:00
a0049873 f372ae6b73 BUG 修改 2022-07-22 17:24:17 +08:00
gaoyuanwei 133553b6a1 上传文件限一个 2022-07-22 16:51:00 +08:00
851673013@qq.com d92cf6925f bug448 2022-07-22 16:46:03 +08:00
a0049873 4a1d7340b9 Merge branch 'release' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-uce-release 
# Conflicts:
#	front/public/index.html
#	front/src/main.js
 2022-07-22 16:04:05 +08:00
a0049873 cf0c32979f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-22 15:46:26 +08:00
a0049873 795d3e0b56 BUG修改 2022-07-22 15:46:13 +08:00
gaoyuanwei 78a9f22ffb bug--需求提交/搜索校验/样式 2022-07-22 15:39:31 +08:00
wuhongjian b1543e323a 合并版本v0.8.2.6 2022-07-21 18:17:37 +08:00
a0049873 681dceaa47 BUG修改 2022-07-21 15:36:01 +08:00
a0049873 10f3323676 消息中心添加 websocket 2022-07-21 14:34:09 +08:00
gaoyuanwei 2be53d5e28 applicationSystem[]变'' 2022-07-21 11:26:47 +08:00
gaoyuanwei a044ead9b0 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-21 10:00:38 +08:00
gaoyuanwei eadcfdceaf 购物车返回第一页bug 2022-07-21 09:59:17 +08:00
wuhongjian 38c77a3e96 西海岸直接回单点 2022-07-20 17:22:23 +08:00
gaoyuanwei b2d51e12eb 技术文档提示---高级搜索条件编辑---基础设施dec不要 2022-07-20 16:18:18 +08:00
wuhongjian 6fcc79b738 合并版本v0.8.2.5 2022-07-20 15:02:17 +08:00
gaoyuanwei 2548beb7c1 650、657bug 2022-07-19 19:34:43 +08:00
wuhongjian d757b3c8cd 冲突修复 2022-07-19 10:47:45 +08:00
wuhongjian 418ba1300e 合并版本v0.8.2.4 2022-07-19 10:40:08 +08:00
a0049873 ed5ed8c828 能力申请 应用资源特殊处理 2022-07-19 10:22:16 +08:00
gaoyuanwei f1de4b860e 前台加word-break: break-all; 2022-07-19 09:42:41 +08:00
wuhongjian a89511eee3 合并版本v0.8.2.4 2022-07-19 09:19:29 +08:00
a0049873 4827fc5784 BUG修改 2022-07-19 09:16:29 +08:00
wuhongjian 0e351e915b 合并版本v0.8.2.3 2022-07-18 18:49:43 +08:00
wuhongjian 665484d30c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 17:29:30 +08:00
wuhongjian 027409b123 西海岸bug修复 2022-07-18 17:29:28 +08:00
a0049873 a740904660 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 17:26:26 +08:00
a0049873 5af7b5f7e8 全部应用资源申请 2022-07-18 17:26:18 +08:00
wuhongjian e1005536bb Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 15:39:25 +08:00
wuhongjian 2c526aeb52 数据中台跳转id添加 2022-07-18 15:39:16 +08:00
a0049873 57758bbfa4 应用资源能力申请BUG修改 2022-07-18 15:18:26 +08:00
a0049873 8f8a1ed3ad Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/capacityOnTheShelf/components/PutOnTheShelf.vue
 2022-07-18 14:43:58 +08:00
a0049873 4819e5ad17 应用资源 能力申请 BUG修改 2022-07-18 14:43:24 +08:00
gaoyuanwei e4e7ed161b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:33:48 +08:00
gaoyuanwei 5f4a67ca55 恢复bug 2022-07-18 14:28:50 +08:00
851673013@qq.com 24f5eeee55 bug597 2022-07-18 14:27:11 +08:00
gaoyuanwei 15b16757a4 能力集市详情bug 2022-07-18 14:20:20 +08:00
wuhongjian 71a8a3ef59 添加西海岸图标切图 2022-07-18 13:35:11 +08:00
wuhongjian e2e0dd8f6c 合并版本v0.8.2.2.release 2022-07-18 10:21:49 +08:00
851673013@qq.com 3ad0e3e77c 基础设施 2022-07-18 09:13:39 +08:00
wuhongjian c817f9eefc 合并版本v0.8.2.3 2022-07-16 16:44:00 +08:00
a0049873 6062af489e BUG修改 应用资源新增 能力集市图标 和详情页切换 2022-07-16 16:01:28 +08:00
a0049873 2354d8da3b BUG修改 2022-07-16 14:27:58 +08:00
a0049873 86ece3cb09 BUG修改 2022-07-16 10:00:27 +08:00
wuhongjian 6c10a4bb29 eslint问题修复 2022-07-15 21:35:22 +08:00
a0049873 ed5576a604 BUG修改 2022-07-15 17:52:31 +08:00
a0049873 3b10007619 详情页收藏按钮 2022-07-15 17:32:47 +08:00
851673013@qq.com 6dc52aff1d bug535 2022-07-15 16:31:05 +08:00
851673013@qq.com 90d9e7ae30 bug535 2022-07-15 16:25:33 +08:00
851673013@qq.com 8fda94f942 基础设施bug 2022-07-15 14:56:17 +08:00
a0049873 f2aa5c5e3c BUg修改 2022-07-15 10:35:05 +08:00
851673013@qq.com b9dc8c15b4 摄像头接口更改 2022-07-14 18:31:19 +08:00
a0049873 9cb2e9e81f 我的申请模块开发 2022-07-14 16:50:51 +08:00
wuhongjian 2ed32e97db 用户名显示真实姓名 2022-07-14 14:17:20 +08:00
guoyue ecf536e13c Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 10:56:55 +08:00
guoyue e4280e3874 fix: 融合服务详情-申请使用， 常见问题 2022-07-14 10:56:04 +08:00
wuhongjian 21a5d058ef Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 18:16:12 +08:00
wuhongjian 39a93eefc6 bug修复 2022-07-13 18:16:10 +08:00
a0049873 876676819b BUG修改 2022-07-13 18:15:13 +08:00
guoyue 3d223aaaf3 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 17:47:44 +08:00
guoyue ad7f05fcba fix: 融合服务列表报错 2022-07-13 17:47:14 +08:00
a0049873 d551b833d3 我的申请 能力申请 开发 2022-07-13 16:30:37 +08:00
guoyue 8acde6c897 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 09:20:23 +08:00
guoyue 68efdf228b add: 指导手册(暂存) 2022-07-13 09:19:03 +08:00
wuhongjian b7b0a14b86 文本类算法试用+单点登录bug修复 2022-07-11 19:12:53 +08:00
guoyue c4a99bf8de 合并冲突 2022-07-11 10:29:34 +08:00
a0049873 23324f50ad BUG修改 后台上架开发 2022-07-09 15:22:20 +08:00
851673013@qq.com c018a11271 bug492 2022-07-08 17:25:37 +08:00
guoyue 324aa70b51 融合服务列表增加收藏量 2022-07-08 16:58:46 +08:00
gaoyuanwei 3b7f8b745a Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 20:03:24 +08:00
gaoyuanwei e40efaf30e 基础设施bug 2022-07-07 20:00:03 +08:00
851673013@qq.com 251231ebb8 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/home/infrastructurePage.vue
 2022-07-07 19:56:25 +08:00
a0049873 2ffb67b235 no message 2022-07-07 19:15:27 +08:00