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

634 Commits

Author SHA1 Message Date
851673013@qq.com b407c3e610 bug626 2022-07-19 09:57:38 +08:00
gaoyuanwei 52ece255f3 冲突 2022-07-19 09:45:36 +08:00
gaoyuanwei a99f4fcbf3 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 09:43:58 +08:00
gaoyuanwei f1de4b860e 前台加word-break: break-all; 2022-07-19 09:42:41 +08:00
851673013@qq.com caf80caeff bug630 2022-07-19 09:42:37 +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
gaoyuanwei b19361005f 把部门联系人和电话给我带出来！！！ 2022-07-18 18:24:17 +08:00
851673013@qq.com 46aef1c4df bug577 2022-07-18 18:17:48 +08:00
851673013@qq.com 6080e7933a bug498 2022-07-18 18:00:07 +08:00
851673013@qq.com e10cb78ab9 bug625 2022-07-18 17:56:36 +08:00
a0049873 259ee9379a 能力申请修改 2022-07-18 17:55:18 +08:00
851673013@qq.com fe86d84699 应用详情-状态判断bug 2022-07-18 17:40:35 +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
gaoyuanwei a35a885b2f 业务组件视频、图片分离 2022-07-18 16:39:11 +08:00
851673013@qq.com f535e26c84 归属部门bug 2022-07-18 16:29:49 +08:00
gaoyuanwei 3d3e2729ed 623bug 2022-07-18 16:03:06 +08:00
gaoyuanwei 0c9d41c4ce 621bug 2022-07-18 15:45:40 +08:00
851673013@qq.com 0d66553d28 应用详情暂无样式修改 2022-07-18 15:40:45 +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
gaoyuanwei fd2fa09fd9 bug修复及后台挂接计费标准只能选一次 2022-07-18 15:22:12 +08:00
851673013@qq.com 07d387b5a2 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 15:20:02 +08:00
851673013@qq.com 6b9de7f3b7 应用资源详情页-应用详情判断是否是青岛 2022-07-18 15:19:15 +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
gaoyuanwei 31d20f4f15 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:02:48 +08:00
gaoyuanwei 569d2340ee Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 14:02:33 +08:00
851673013@qq.com 5507c8ed9c 应用详情-详情页tab显示问题bug 2022-07-18 14:00:49 +08:00
gaoyuanwei a168e10105 bug+bug+bug 2022-07-18 13:56:27 +08:00
wuhongjian 8f0fbc0551 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-18 13:56:06 +08:00
wuhongjian 61e61fbb87 修复tab页会左偏 2022-07-18 13:56:02 +08:00
851673013@qq.com 1dce78dc92 应用资源详情页-应用详情 2022-07-18 13:53:01 +08:00
wuhongjian 71a8a3ef59 添加西海岸图标切图 2022-07-18 13:35:11 +08:00
wuhongjian 5a9f4ee620 来源应用只能选择一个 2022-07-18 11:24:57 +08:00
851673013@qq.com 351518f849 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
 2022-07-18 11:00:07 +08:00
851673013@qq.com 4a52c2cf78 审批和前台应用详情 2022-07-18 10:47:49 +08:00
gaoyuanwei aa84a66a0b bug 2022-07-18 10:44:34 +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 ddf4ff421b 合并版本 2022-07-16 17:03:32 +08:00
a0049873 9001b5a5e1 BUG修改 2022-07-16 16:58:33 +08:00
wuhongjian c817f9eefc 合并版本v0.8.2.3 2022-07-16 16:44:00 +08:00
yuhan_jiang c156b52d84 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
* 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs:
  端口修改
  BUG修改  应用资源新增 能力集市图标  和详情页切换
  bug修改
  bug修复
  BUG修改
  BUG修改

# Conflicts:
#	front/src/utils/request.js
#	front/src/vab/plugins/permissions.js
 2022-07-16 16:22:28 +08:00
yuhan_jiang 15eb5dbd13 【单点登录】修复云图需要点击两次才能单点成功问题 2022-07-16 16:16:38 +08:00
a0049873 c7f2e1f70a 端口修改 2022-07-16 16:01:57 +08:00
a0049873 d38c0ae217 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-16 16:01:34 +08:00
a0049873 6062af489e BUG修改 应用资源新增 能力集市图标 和详情页切换 2022-07-16 16:01:28 +08:00
gaoyuanwei 123b64bc70 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-16 15:27:49 +08:00
gaoyuanwei c9cda03deb bug修改 2022-07-16 15:25:49 +08:00
wuhongjian 835e9d0cc4 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-16 15:05:34 +08:00
wuhongjian 6b0bb85212 bug修复 2022-07-16 15:04:25 +08:00
a0049873 bb6d58f568 BUG修改 2022-07-16 14:40:49 +08:00
a0049873 2354d8da3b BUG修改 2022-07-16 14:27:58 +08:00
a0049873 1740d6c06a Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/personalCenter/components/MyBrowse.vue
 2022-07-16 10:03:25 +08:00
a0049873 86ece3cb09 BUG修改 2022-07-16 10:00:27 +08:00
wuhongjian 6c10a4bb29 eslint问题修复 2022-07-15 21:35:22 +08:00
gaoyuanwei 4568d28b6a 关联bug 2022-07-15 19:23:37 +08:00
851673013@qq.com 61baa7441b bug498 2022-07-15 18:56:00 +08:00
851673013@qq.com 97e078e596 bug507 2022-07-15 18:40:54 +08:00
a0049873 ed5576a604 BUG修改 2022-07-15 17:52:31 +08:00
a0049873 bb99765381 上架添加取消按钮 2022-07-15 17:40:32 +08:00
a0049873 3b10007619 详情页收藏按钮 2022-07-15 17:32:47 +08:00
gaoyuanwei 60e26e151c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 17:26:38 +08:00
gaoyuanwei 5978bc1859 前台-上架联动 2022-07-15 17:22:48 +08:00
851673013@qq.com 46285025f8 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 17:01:45 +08:00
851673013@qq.com bc1d36dae9 等保备案bug 2022-07-15 17:01:41 +08:00
a0049873 8213a9761d 前端上架 新增 归属部门 下拉 2022-07-15 16:57:51 +08:00
851673013@qq.com d36a5fc3a0 bug564 2022-07-15 16:55:13 +08:00
851673013@qq.com 425b8de7c6 是否等保备案bug修改 2022-07-15 16:47:06 +08:00
851673013@qq.com dcbc08d000 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 16:31:19 +08:00
851673013@qq.com 6dc52aff1d bug535 2022-07-15 16:31:05 +08:00
a0049873 02f1de8486 BUG修改 2022-07-15 16:30:13 +08:00
851673013@qq.com 90d9e7ae30 bug535 2022-07-15 16:25:33 +08:00
a0049873 906533e574 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-15 16:16:56 +08:00
a0049873 e8b741077e BUG修改 2022-07-15 16:16:50 +08:00
851673013@qq.com e7bfc7db36 bug566 2022-07-15 16:06:36 +08:00
851673013@qq.com d6e7324b80 前台-详情页-算法优势bug 2022-07-15 15:30:15 +08:00
851673013@qq.com 8fda94f942 基础设施bug 2022-07-15 14:56:17 +08:00
851673013@qq.com acd4bdae9f bug523 2022-07-15 14:36:13 +08:00
851673013@qq.com 0bf0722e53 bug577 2022-07-15 14:12:04 +08:00
wuhongjian 09518566c7 合并版本 2022-07-15 14:10:46 +08:00
wuhongjian 16e4146471 依赖更新 2022-07-15 14:10:10 +08:00
a0049873 2e2287f1cf BUg修改 2022-07-15 11:51:40 +08:00
a0049873 e2209f7694 BUG修改 2022-07-15 11:49:14 +08:00
a0049873 e1e676e70a BUG修改 2022-07-15 11:34:23 +08:00
a0049873 a0526237f1 BUG修改 2022-07-15 11:14:48 +08:00
a0049873 622f2f645b BUG修改 2022-07-15 11:07:08 +08:00
851673013@qq.com cf296916e1 bug251 2022-07-15 11:03:21 +08:00
a0049873 f2aa5c5e3c BUg修改 2022-07-15 10:35:05 +08:00
851673013@qq.com ca7df48001 bug557 2022-07-15 10:15:03 +08:00
wuhongjian 63711c54bd 合并版本 2022-07-15 09:17:43 +08:00
851673013@qq.com 293d6794c8 前台上架滚动条问题 2022-07-14 18:43:32 +08:00
851673013@qq.com b9dc8c15b4 摄像头接口更改 2022-07-14 18:31:19 +08:00
guoyue c951b7f858 文档url拼接 2022-07-14 17:45:20 +08:00
guoyue e5d772ab21 合并 2022-07-14 17:41:09 +08:00
guoyue efe4c42995 技术文档url拼接 2022-07-14 17:34:13 +08:00
a0049873 85dbc018b0 添加徽章 2022-07-14 17:33:01 +08:00
a0049873 bf6676dd06 我的申请页面 筛选功能 2022-07-14 17:20:40 +08:00
gaoyuanwei 38ebe981fa 全部评论提示bug修改 2022-07-14 17:04:17 +08:00
wuhongjian 65cd3bf086 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 17:02:45 +08:00
wuhongjian 29b20ce55b 添加地图分区摄像头数量 2022-07-14 17:02:42 +08:00
a0049873 9cb2e9e81f 我的申请模块开发 2022-07-14 16:50:51 +08:00
gaoyuanwei 0929b51faf 562bug 2022-07-14 15:37:27 +08:00
851673013@qq.com 9f5186f12b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 15:13:46 +08:00
gaoyuanwei 1ed9909e47 570bug 2022-07-14 15:12:47 +08:00
851673013@qq.com ea665df41e bug568 2022-07-14 15:12:40 +08:00
851673013@qq.com deb886a254 技术文档 2022-07-14 14:55:49 +08:00
wuhongjian 169d66e608 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-14 14:17:38 +08:00
wuhongjian 2ed32e97db 用户名显示真实姓名 2022-07-14 14:17:20 +08:00
guoyue 310a5f837d 指导手册：左侧树更改 2022-07-14 14:16:49 +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 eefa5354ec 指导手册增加图标 2022-07-14 10:56:37 +08:00
guoyue e4280e3874 fix: 融合服务详情-申请使用， 常见问题 2022-07-14 10:56:04 +08:00
a0049873 2532a6cc79 BUG修改 2022-07-14 09:45:52 +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 7f2f5e541b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/public/index.html
 2022-07-13 18:15:37 +08:00
a0049873 876676819b BUG修改 2022-07-13 18:15:13 +08:00
wuhongjian a1eb29974c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 18:01:41 +08:00
wuhongjian 2019c1583f 11个算法试用配置内容 2022-07-13 18:00:26 +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
guoyue 7bd990fe25 add: 指导手册 2022-07-13 17:46:57 +08:00
a0049873 d551b833d3 我的申请 能力申请 开发 2022-07-13 16:30:37 +08:00
guoyue 84ecc46c69 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 15:04:20 +08:00
guoyue dfbdbb5a46 fix：指导手册 2022-07-13 15:04:12 +08:00
wuhongjian da20700414 更换默认图片 2022-07-13 11:44:10 +08:00
wuhongjian cbe9efa5ea 更换ico 2022-07-13 11:43:28 +08:00
wuhongjian 38bc627486 merge change修改 2022-07-13 11:18:02 +08:00
851673013@qq.com 962ab8841d 后台能力资源上架 2022-07-13 10:11:01 +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
a0049873 8bccb9bd94 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 09:09:41 +08:00
a0049873 19e8f11f1d 个人中心接口 2022-07-13 09:09:35 +08:00
wuhongjian 0814ccea07 合并版本 2022-07-12 17:43:06 +08:00
851673013@qq.com 570a582818 技术文档样式修改 2022-07-12 17:13:03 +08:00
851673013@qq.com 57df5fe220 技术文档bug 2022-07-12 17:08:58 +08:00
851673013@qq.com f593a97854 技术文档 2022-07-12 16:54:35 +08:00
851673013@qq.com 616d806c2d 上架技术文档 2022-07-12 15:58:57 +08:00
wuhongjian 432f8fef23 测试环境配置 2022-07-12 15:11:38 +08:00