Commit Graph

1207 Commits

Author SHA1 Message Date
a0049873 12288fe713 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-22 18:20:31 +08:00
851673013@qq.com 7f7f5d4602 bug 2022-07-22 18:07:25 +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
851673013@qq.com b8afda6f0a 我的浏览bug修改 2022-07-22 16:58:19 +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
851673013@qq.com 5876a3488e 常见问题bug 2022-07-22 16:02:49 +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
a0049873 2ac76dc174 添加websocket配置 2022-07-22 10:55:44 +08:00
851673013@qq.com 4e0d54efb1 归属部门bug 2022-07-22 10:50:39 +08:00
wuhongjian 4da090585a 登出问题解决 2022-07-21 18:39:19 +08:00
wuhongjian f952931b92 【单点登录】解决登出问题 2022-07-21 18:38:20 +08:00
wuhongjian b1543e323a 合并版本v0.8.2.6 2022-07-21 18:17:37 +08:00
a0049873 1bdd5c6a1c BUG修改 2022-07-21 17:58:13 +08:00
gaoyuanwei 0562c702fe 627bug 2022-07-21 17:20:43 +08:00
a0049873 2cc2cc4e00 BUG修改 以及消息中心自动刷新 2022-07-21 17:10:13 +08:00
a0049873 f3499c31b0 BUG修改 2022-07-21 16:20:09 +08:00
gaoyuanwei 2c95fa65af tota 2022-07-21 16:06:45 +08:00
gaoyuanwei 3968d6a7de bug 2022-07-21 15:57:08 +08:00
a0049873 681dceaa47 BUG修改 2022-07-21 15:36:01 +08:00
a0049873 10f3323676 消息中心添加 websocket 2022-07-21 14:34:09 +08:00
851673013@qq.com c0831d1eea 应用资源归属部门 2022-07-21 11:39:09 +08:00
851673013@qq.com 722f0b970a 能力下架申请 2022-07-21 11:29:15 +08:00
gaoyuanwei dbe688f3aa Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-21 11:26:59 +08:00
gaoyuanwei 2be53d5e28 applicationSystem[]变'' 2022-07-21 11:26:47 +08:00
a0049873 f62af22a5e 样式修改 2022-07-21 10:56:54 +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
851673013@qq.com 30afa74344 前台上架下一页 2022-07-21 09:15:05 +08:00
wuhongjian 38c77a3e96 西海岸直接回单点 2022-07-20 17:22:23 +08:00
gaoyuanwei 66a5d33609 眼花了,没有png 2022-07-20 16:21:28 +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
wuhongjian 9cdbc6ef61 大屏变黑适配 2022-07-20 15:01:14 +08:00
gaoyuanwei f3e32e9698 前台-申购车-搜索功能 2022-07-20 10:53:02 +08:00
851673013@qq.com 70fb082506 应用详情-应用详情tab-bug修改 2022-07-20 09:18:34 +08:00
a0049873 a833330be1 上架完善 资源图谱转rem 2022-07-19 20:06:01 +08:00
851673013@qq.com 227eb72670 能力云图bug 2022-07-19 19:44:48 +08:00
gaoyuanwei 2905416d07 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 19:34:50 +08:00
gaoyuanwei 2548beb7c1 650、657bug 2022-07-19 19:34:43 +08:00
a0049873 0a2ebce897 完善 挂载 2022-07-19 19:30:42 +08:00
a0049873 f820d49f58 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-19 18:52:02 +08:00
a0049873 7bcb6b2062 修改多条添加逻辑 2022-07-19 18:51:21 +08:00
gaoyuanwei b6ce94a078 修改来源应用为下拉框 2022-07-19 17:44:39 +08:00
gaoyuanwei 166f6f91be Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 17:17:30 +08:00
gaoyuanwei a5ef8d2046 bug==select 2022-07-19 17:17:19 +08:00
gaoyuanwei e4d79e03b8 bug==select 2022-07-19 17:14:42 +08:00
851673013@qq.com 0ca63565e3 样式修改 2022-07-19 16:43:49 +08:00
851673013@qq.com 5afe117bc6 bug619 2022-07-19 16:20:45 +08:00
851673013@qq.com 0976ca98ac Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 15:54:26 +08:00
851673013@qq.com 768645a94a 归属部门bug619 2022-07-19 15:54:23 +08:00
a0049873 8ec4b585b6 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 15:06:32 +08:00
a0049873 d1692a1f51 上架功能修改 2022-07-19 15:06:26 +08:00
a0049873 e770028fba 详情页收藏功能BUG修改 2022-07-19 15:05:37 +08:00
gaoyuanwei bf56ce5eaa bug修改 2022-07-19 14:45:35 +08:00
wuhongjian da68d9117c 合并版本v0.8.2.4 2022-07-19 14:11:58 +08:00
gaoyuanwei 00af09c4f0 bug! 2022-07-19 14:05:47 +08:00
gaoyuanwei b75e6a4fb0 还原 2022-07-19 13:59:26 +08:00
wuhongjian 578b63fdd0 bug修复 2022-07-19 13:40:11 +08:00
gaoyuanwei 9a681317f0 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 11:26:29 +08:00
gaoyuanwei 4d01131e74 来源应用穿梭框左侧实现单选 2022-07-19 11:26:18 +08:00
851673013@qq.com 4b33b089f1 我的浏览模糊查询 2022-07-19 11:14:46 +08:00
a0049873 a52966d68a BUG修改 2022-07-19 11:13:15 +08:00
a0049873 dbe0edfcd7 BUG修改 2022-07-19 11:08:32 +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
851673013@qq.com 7c63022fc5 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-19 10:25:16 +08:00
851673013@qq.com b15efd9206 bug629 2022-07-19 10:25:10 +08:00
a0049873 ed5ed8c828 能力申请 应用资源特殊处理 2022-07-19 10:22:16 +08:00
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
wuhongjian becacd1599 合并版本,测试环境配置 2022-07-12 15:11:23 +08:00
wuhongjian b7b0a14b86 文本类算法试用+单点登录bug修复 2022-07-11 19:12:53 +08:00
851673013@qq.com dcf90b081e 详情页bug以及后台日志 2022-07-11 17:50:01 +08:00
wuhongjian 46558e465e 西海岸bug修复 2022-07-11 11:38:54 +08:00
guoyue c4a99bf8de 合并冲突 2022-07-11 10:29:34 +08:00
a0049873 23324f50ad BUG修改 后台上架开发 2022-07-09 15:22:20 +08:00
wuhongjian ab21f7de11 合并版本v0.8.1.6 2022-07-09 10:37:17 +08:00
wuhongjian a839c90a1e 单点登录bug修复 2022-07-08 19:02:20 +08:00
851673013@qq.com 678367a6bf 编目bug 2022-07-08 18:33:17 +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
851673013@qq.com dd6e249190 bug487 2022-07-08 16:39:09 +08:00
a0049873 e8485a86f9 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/static/config/location.js
2022-07-08 08:53:52 +08:00
a0049873 2aa05ee719 解决冲突 2022-07-08 08:53:19 +08:00
wuhongjian 32e5253c9f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 20:38:01 +08:00
wuhongjian d95a2eeb9f bug修复 2022-07-07 20:37:34 +08:00
851673013@qq.com 4958384c9a 应用资源详情页跳转 2022-07-07 20:35:13 +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
851673013@qq.com 74187e4623 基础设施 2022-07-07 19:07:56 +08:00
wuhongjian 6f7d059eca Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-07 18:23:20 +08:00
wuhongjian dfa6c6a67b 单点登录bug修复 2022-07-07 18:22:54 +08:00
gaoyuanwei 420a31531f 按钮 2022-07-07 18:17:31 +08:00
a0049873 c271f3d988 BUG修改 2022-07-07 17:54:41 +08:00
a0049873 44479b25e9 BUG修改 2022-07-07 17:38:13 +08:00
gaoyuanwei 73b9108c08 469,顺序排序 2022-07-07 16:46:48 +08:00
guoyue 5d2c39fb44 融合服务:一键申请的存储数组更改 2022-07-07 14:31:52 +08:00
guoyue 4aef24c734 门户:融合服务列表+详情+我的收藏 2022-07-07 13:34:29 +08:00
851673013@qq.com 617373eb8e 详情页技术文档添加暂无上传提示 2022-07-07 11:37:05 +08:00
a0049873 4774431110 BUG修改 2022-07-07 11:25:56 +08:00
a0049873 0ad5646167 BUG修改 2022-07-07 10:49:37 +08:00
851673013@qq.com b48c2972ce 能力云图bug 2022-07-07 10:42:14 +08:00
a0049873 e6528b4b3b 滚动条BUG修改 2022-07-07 09:23:12 +08:00
wuhongjian 6cb8142534 favio替换,与后台同步更新版本 2022-07-06 22:17:22 +08:00
wuhongjian 888711b94d Merge branch 'hi-ucs-dev' into release 2022-07-06 18:52:04 +08:00
wuhongjian 25b6d1196b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-06 18:51:43 +08:00
wuhongjian 695aa6867d Merge branch 'hi-ucs-dev' into release 2022-07-06 18:45:20 +08:00
wuhongjian 9cc8accbde 不显示问题修复 2022-07-06 18:42:23 +08:00
gaoyuanwei 71eae6deeb 318摄像头列表弹窗bug修改 2022-07-06 18:15:58 +08:00
851673013@qq.com 544ba02828 调用趋势 2022-07-06 17:01:44 +08:00
gaoyuanwei eb08f86f21 462无法滚动问题 2022-07-06 16:34:17 +08:00
gaoyuanwei 7b6dfa8b93 387浏览记录bug 2022-07-06 16:02:30 +08:00
gaoyuanwei 89a73222e6 bug修复 2022-07-06 13:35:02 +08:00
gaoyuanwei 2bbfac3363 bug 2022-07-06 13:16:13 +08:00
gaoyuanwei 5035cc074a 应用资源 2022-07-06 13:07:12 +08:00
851673013@qq.com 8a686cfca6 应用资源关联组件 2022-07-06 12:48:00 +08:00
gaoyuanwei d93cfa543c 业务组件bug 2022-07-06 12:05:05 +08:00
851673013@qq.com 86580758f4 详情页bug自测 2022-07-06 11:58:13 +08:00
wuhongjian d96a0c440b bug修复 2022-07-06 10:36:41 +08:00
gaoyuanwei c2bb7f5eb8 bug修改 2022-07-06 10:09:53 +08:00
851673013@qq.com 0cab45f228 详情页tab 2022-07-06 09:52:38 +08:00
a0049873 adfc44cc7f Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/assignCase/components/queryPage.vue
2022-07-05 20:52:02 +08:00
a0049873 35653daae4 BUg 2022-07-05 20:51:11 +08:00
wuhongjian 48aa9dffa1 bug修复 2022-07-05 20:46:50 +08:00
wuhongjian d72d47970c 冲突合并 2022-07-05 20:07:44 +08:00
wuhongjian cedb88a2b6 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-05 20:07:29 +08:00
a0049873 e65a8765fb 数字能力超市 2022-07-05 20:05:53 +08:00
a0049873 d5d85a194c 云图跳转首页 2022-07-05 19:47:38 +08:00
a0049873 48971f001a 图片判断 默认智能算法 2022-07-05 18:37:28 +08:00
wuhongjian b6942754cd Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-05 17:36:56 +08:00
wuhongjian d71dc876f5 西海岸bug修复 2022-07-05 17:35:48 +08:00
851673013@qq.com 6539637031 详情页 2022-07-05 17:33:32 +08:00
a0049873 a8780ed884 BUG修改 2022-07-05 17:12:53 +08:00
a0049873 3cc6bce2f8 BUG修改 2022-07-05 17:02:25 +08:00
gaoyuanwei a438bd6ed5 应用资源上架样式修改 2022-07-05 16:45:44 +08:00
a0049873 2b211dae96 BUG修改 添加全局路由 2022-07-05 16:20:11 +08:00
gaoyuanwei e1b7fb4dd8 后台-组件服务bug 2022-07-05 15:00:38 +08:00
a0049873 c30b02c3e5 BUG修改 2022-07-05 14:57:59 +08:00
a0049873 3ec46bdd0a BUG修改 2022-07-05 14:37:22 +08:00
gaoyuanwei 20b968beba demandSubject 2022-07-05 13:51:21 +08:00
wuhongjian dc0a44dab7 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-05 12:52:35 +08:00
wuhongjian 8a5b0a6370 bug修复 2022-07-05 12:52:32 +08:00
a0049873 5e91ab13a9 BUG修改 2022-07-05 11:51:31 +08:00
a0049873 ae188ef656 赋能案例 滚动条联动 2022-07-05 11:28:30 +08:00
a0049873 a6488d0c92 修改数据资源判断 2022-07-05 10:39:59 +08:00
gaoyuanwei 4c85700094 关联组件 2022-07-05 10:11:50 +08:00
a0049873 92ae5c3088 能力统计 移到首页 2022-07-04 17:53:54 +08:00
851673013@qq.com 79fecefa96 no message 2022-07-04 17:41:11 +08:00
851673013@qq.com 559b2bc407 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-04 17:37:27 +08:00
851673013@qq.com f69da5becb 门户标题一级背景 2022-07-04 17:37:14 +08:00
wuhongjian 2d5be4eb52 bug修复 2022-07-04 17:34:14 +08:00
851673013@qq.com 5f17f8d0d1 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-04 17:31:20 +08:00
gaoyuanwei 0db6fb95fe 来源应用2.0 2022-07-04 17:21:43 +08:00
gaoyuanwei 60bd1daf9b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-04 17:18:23 +08:00
gaoyuanwei 0ce6113ffa 来源应用 2022-07-04 17:15:45 +08:00
851673013@qq.com 68ddce3130 详情页关联组件样式修改 2022-07-04 17:15:06 +08:00
a0049873 c35d5789fc BUG修改 2022-07-04 17:02:00 +08:00
wuhongjian f8588795c4 合并版本 2022-07-04 11:57:44 +08:00
a0049873 a2a4a5d92c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-04 11:56:52 +08:00
a0049873 5ffeb562da BUG修改 2022-07-04 11:56:45 +08:00
wuhongjian 7303904f68 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-04 11:27:24 +08:00
wuhongjian d87bf2ded9 bug修复 2022-07-04 11:27:21 +08:00
851673013@qq.com d4ecfc74a4 关联组件问题 2022-07-04 11:24:29 +08:00
851673013@qq.com e849f37f1e 应用资源详情bug 2022-07-04 10:38:50 +08:00
a0049873 1846356272 判断修改 2022-07-04 09:27:52 +08:00
a0049873 82b72fd5f6 BUG修改 2022-07-01 20:22:51 +08:00
gaoyuanwei d13fe453ce Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 20:14:38 +08:00
gaoyuanwei f2431d18e5 bug 2022-07-01 20:14:28 +08:00
a0049873 b7939e4636 BUG修改 2022-07-01 20:13:39 +08:00
gaoyuanwei 0cf0c4b4b8 算法详情页 2022-07-01 19:48:49 +08:00
gaoyuanwei c4a2acd8a7 bug修改 2022-07-01 19:32:48 +08:00
a0049873 3f77db2ff8 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 19:02:56 +08:00
a0049873 d50b0a0dca BUG修改 2022-07-01 19:02:49 +08:00
851673013@qq.com 40804a7b9d 西海岸版本不调用能力云图中的组件服务的调用趋势和总调用次数接口 2022-07-01 18:59:46 +08:00
a0049873 6550188e13 BUG修改 2022-07-01 18:54:03 +08:00
gaoyuanwei 076ea19f88 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 18:33:26 +08:00
gaoyuanwei d75d7e1eab BUG修改 2022-07-01 18:33:11 +08:00
a0049873 ae80f57dcc 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-01 18:24:43 +08:00
a0049873 2fdfa22266 BUG修改 2022-07-01 18:23:43 +08:00
851673013@qq.com 0d110a5af6 基础设施-bug414 2022-07-01 18:20:43 +08:00
gaoyuanwei 46e5c6dbb6 能力上架详情页修改 2022-07-01 17:58:25 +08:00
851673013@qq.com 17fc21cf1e 智能算法bug-修改 2022-07-01 17:57:08 +08:00
851673013@qq.com 935c80ee87 智能算法回退版本 2022-07-01 17:36:41 +08:00
851673013@qq.com 8789176e4a 详情页关联组件 2022-07-01 17:27:01 +08:00
851673013@qq.com fe1c1931f0 图层服务-开发组件-业务组件bug406更改 2022-07-01 17:22:37 +08:00
851673013@qq.com d0bbe8d909 能力云图 2022-07-01 17:05:15 +08:00
wuhongjian 418b5f1de7 bug修复 2022-07-01 17:03:15 +08:00
gaoyuanwei 5d8416a0a4 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 15:59:12 +08:00
gaoyuanwei e5ea56b29f bug 元--单位 2022-07-01 15:58:59 +08:00
851673013@qq.com d347e274c5 开发组件bug 2022-07-01 15:53:16 +08:00
851673013@qq.com 75a56eec3a 能力云图bug 2022-07-01 14:40:38 +08:00
a0049873 9e609538f1 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/MyApply.vue
2022-07-01 14:32:40 +08:00
a0049873 4f11e078b8 新增能力集市 和详情页申请功能 摄像头申请功能完善 2022-07-01 14:31:46 +08:00
851673013@qq.com b9ed594f1c 能力汇聚查看更多 2022-07-01 14:24:41 +08:00
851673013@qq.com 2e3db9a60d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 13:47:54 +08:00
851673013@qq.com 96502e05c6 能力云图 2022-07-01 13:47:32 +08:00
gaoyuanwei f30d67b7d4 bug 接口请求方式 2022-07-01 13:46:49 +08:00
gaoyuanwei 11a2eb5602 bug 2022-07-01 11:24:19 +08:00
a0049873 91c7e6c904 添加删除校验 2022-07-01 11:10:58 +08:00
wuhongjian e9031d0a45 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-01 11:10:25 +08:00
wuhongjian c8e1881fae bug修复 2022-07-01 11:10:23 +08:00
a0049873 97a24aa4c1 BUG修改 2022-07-01 10:50:29 +08:00
851673013@qq.com cf0bb02b43 赋能案例 2022-07-01 10:33:34 +08:00
a0049873 aff2ebda88 BUG修改 2022-07-01 10:33:11 +08:00
gaoyuanwei ecdc04930d 免批申请、免费试用按钮取消 && 详情页标签折行问题 && 基础设施感知为空 &&新建工作流程提示错误 2022-06-30 21:19:57 +08:00
gaoyuanwei d898bbec7e 详情页、审批bug修改 2022-06-30 19:44:50 +08:00
wuhongjian 2663665321 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-30 19:06:55 +08:00
wuhongjian 8fcdff051b bug修复 2022-06-30 19:04:35 +08:00
gaoyuanwei 0f67147f8c .ant-message 2022-06-30 18:52:54 +08:00
a0049873 9bf47e3223 BUG修改 2022-06-30 18:48:59 +08:00
a0049873 cb19d42c9e BUG修改 2022-06-30 18:26:39 +08:00
a0049873 ecd5c76998 BUG修改 2022-06-30 18:18:10 +08:00
gaoyuanwei e6001c4db1 图层服务 2022-06-30 16:19:57 +08:00
a0049873 ea4736c0b7 BUG修改 2022-06-30 15:53:45 +08:00
a0049873 9f9ab46f28 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-30 15:40:09 +08:00
a0049873 120f753db2 摄像头最多选10个 2022-06-30 15:40:03 +08:00
gaoyuanwei c6c820c827 331-开发组件 2022-06-30 15:35:49 +08:00
a0049873 0f6b37e52e 摄像头申请流程 2022-06-30 15:27:16 +08:00
gaoyuanwei 1aa48bd4e6 318-详情页标题tip(5个) 2022-06-30 11:42:01 +08:00
a0049873 3468a95a7c Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-30 10:42:20 +08:00
a0049873 bf0b25eace BUG修改 2022-06-30 10:42:09 +08:00
gaoyuanwei 802a940dc0 303-知识库浏览量 2022-06-30 10:30:53 +08:00
a0049873 a4c46b8edf BUG修改 2022-06-30 10:28:02 +08:00
a0049873 f2921a0227 算法PK隐藏全选 2022-06-30 10:12:28 +08:00
851673013@qq.com 08b971c411 bug修改 2022-06-30 10:09:05 +08:00
wuhongjian 976e588372 购物车 2022-06-30 09:34:16 +08:00
851673013@qq.com ff1aea83f7 组件服务详情 2022-06-29 19:12:12 +08:00
851673013@qq.com 80f61d0698 组件详情 2022-06-29 18:53:53 +08:00
wuhongjian ab7e377dea Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-29 18:37:29 +08:00
wuhongjian ffaabe340a 视频资源 2022-06-29 18:36:50 +08:00
a0049873 50d0576a70 能力申请 2022-06-29 18:23:08 +08:00
a0049873 ca69c86577 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/apply.vue
2022-06-29 17:30:59 +08:00
a0049873 ccbcab8dfa 新能力申请 2022-06-29 17:28:49 +08:00
851673013@qq.com 2a6ba26594 关联能力 2022-06-29 16:56:51 +08:00
gaoyuanwei 8287422d9a 333-输入框上面的黑框提示取消 2022-06-29 15:54:22 +08:00
gaoyuanwei 592c506c23 341个人办公-工作动态-预览格式问题 2022-06-29 14:34:42 +08:00
851673013@qq.com cf1f75fd83 能力集市分页bug 2022-06-29 11:37:47 +08:00
gaoyuanwei 3fb7474426 图层服务bug 2022-06-29 11:31:25 +08:00
851673013@qq.com d4a8ebf34f 能力集市添加pagenum 2022-06-29 10:47:03 +08:00
gaoyuanwei eb02d71771 317能力集市日期折行 2022-06-29 10:24:12 +08:00
gaoyuanwei dc57556a6c 319图层服务详情页 2022-06-29 10:18:26 +08:00
851673013@qq.com 111aa16692 bug269 2022-06-29 10:06:00 +08:00
a0049873 7cfebcfef8 能力申请页面 console注释 2022-06-29 09:56:01 +08:00
851673013@qq.com 4540430fa6 bug268 2022-06-29 09:50:28 +08:00
851673013@qq.com cc36886687 bug271 2022-06-29 09:46:02 +08:00
851673013@qq.com 17749b6df6 bug334 2022-06-29 09:32:51 +08:00
wuhongjian 4c77a55ae7 基础设施联调 2022-06-28 22:24:05 +08:00
a0049873 c53e96d0c3 新申购车 2022-06-28 21:49:50 +08:00
851673013@qq.com 107be0c3f4 bug329 2022-06-28 20:04:46 +08:00
guoyue 3672d8fbf8 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-28 10:32:58 +08:00
guoyue dff7bc51e7 fix: 算法对比-锚点 2022-06-28 10:32:28 +08:00
wuhongjian 5cf50fe7f7 bug修复 2022-06-28 10:31:46 +08:00
wuhongjian 019da30ff5 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-27 18:54:20 +08:00
wuhongjian 9d9a3a2278 地图添加 2022-06-27 18:53:51 +08:00
gaoyuanwei c160e5e08e 基础建设--选项卡修改 2022-06-27 18:13:13 +08:00
851673013@qq.com aea65eb40c 选中样式修改 2022-06-27 17:08:49 +08:00
851673013@qq.com 5ebcd9630b 基础设施左侧列表 2022-06-27 17:03:19 +08:00
gaoyuanwei 93071ea26c 热门能力bug修改 2022-06-27 16:49:14 +08:00
851673013@qq.com 8d28f41b20 bug 294 2022-06-27 15:03:59 +08:00
guoyue d2423b751d Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-27 14:47:49 +08:00
guoyue 5005bf2f06 算法对比:左册导航跟右侧滚动联动 2022-06-27 14:47:23 +08:00
a0049873 3738985ade 后台能力申请页面开发 前台申购车 重构 新增市局数据资源跳转 2022-06-27 14:27:50 +08:00
851673013@qq.com 8737b2e89b bug288 2022-06-27 14:16:21 +08:00
851673013@qq.com 0adb286827 详情页bug279 2022-06-27 14:09:55 +08:00
guoyue 1410884d61 算法对比,暂存 2022-06-27 13:52:16 +08:00
851673013@qq.com e0ed9d7f60 详情页bug 2022-06-27 11:49:47 +08:00
wuhongjian d99b983961 测试分支 2022-06-27 11:20:58 +08:00
a0049873 01f05b1963 eslint 2022-06-27 09:43:37 +08:00
gaoyuanwei 03c4325919 基础设施-选中数量绑定 2022-06-25 15:26:42 +08:00
851673013@qq.com e309dbbb90 基础设施 2022-06-25 15:08:19 +08:00
guoyue ff14614874 去掉footer 2022-06-25 14:46:04 +08:00
guoyue c6c9d06b85 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-25 14:01:30 +08:00
guoyue b379c87cd4 优化对比算法 2022-06-25 14:00:45 +08:00
gaoyuanwei 598f60ca17 基础设施外部引用 2022-06-25 13:45:26 +08:00
gaoyuanwei d4d9f068c3 基础设施-初始页面 2022-06-25 13:34:24 +08:00
guoyue 8f8387c80d add: 算法对比--路由跳转 2022-06-25 11:12:54 +08:00
guoyue 7339d16220 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/src/views/home/components/searchResultList.vue
2022-06-25 10:40:03 +08:00
a0049873 4d11d0a84a BUG修改 2022-06-24 20:20:17 +08:00
a0049873 df7c0019f8 BUG修改 2022-06-24 20:08:54 +08:00
a0049873 5cab30d2cc 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-06-24 19:50:41 +08:00
a0049873 2bb502921f BUG修改 2022-06-24 19:47:00 +08:00
wuhongjian 068c5dfb1e bug修复 2022-06-24 19:38:27 +08:00
a0049873 6e0b7d3e88 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-24 17:59:14 +08:00
a0049873 a21a0490e1 BUG修改 以及新增 密码加密 2022-06-24 17:58:43 +08:00
gaoyuanwei 4fba819602 基础设施-左侧 2022-06-24 17:15:55 +08:00
gaoyuanwei f2671b729d 基础设施 2022-06-24 17:04:47 +08:00
a0049873 4f36fdbc0c 更改云图接口 2022-06-24 10:50:59 +08:00
a0049873 608094dc5a 修改BUG 2022-06-24 10:04:30 +08:00
wuhongjian cdaef52145 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-23 21:16:15 +08:00
wuhongjian f21946644d 评论功能开发 2022-06-23 21:16:11 +08:00
guoyue b335bee61c 算法对比(暂存) 2022-06-23 19:58:44 +08:00
851673013@qq.com 360efeb2f4 能力申请 2022-06-23 19:19:48 +08:00
851673013@qq.com 980cdb9e33 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-23 19:19:32 +08:00
wuhongjian c97201645b 修改死数据配置,token失效问题 2022-06-23 17:56:40 +08:00
wuhongjian 5430330eaf BUG 修改 2022-06-23 15:02:11 +08:00
wuhongjian f7e1556ed7 修改token失效问题 2022-06-23 14:52:50 +08:00
a0049873 cd42aa29af Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/static/config/location.js
2022-06-23 14:19:26 +08:00
a0049873 fe0d925329 BUG修改 2022-06-23 14:17:04 +08:00
guoyue 3ceb5b59de 算法对比 2022-06-23 13:19:52 +08:00
guoyue 96f2b8b1f3 add: 算法对比 2022-06-23 12:43:02 +08:00
851673013@qq.com c66bf1de0d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-23 11:12:02 +08:00
gaoyuanwei f3100ec6ab 图层服务详情页完善 2022-06-23 09:44:16 +08:00
wuhongjian 8371fb4eab bug修复 2022-06-22 20:01:26 +08:00
wuhongjian c6cb53c3b9 bug修复 2022-06-22 19:11:34 +08:00
851673013@qq.com 9c7d3db786 赋能案例 2022-06-22 18:10:37 +08:00
a0049873 109b82b95d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-22 17:30:32 +08:00
a0049873 1cf533434b 图层服务上架开发 2022-06-22 17:30:23 +08:00
851673013@qq.com 0b0b9af1f1 赋能案例 2022-06-22 17:08:44 +08:00
wuhongjian faade9c621 市局版本合并bug修复 2022-06-22 17:04:48 +08:00
gaoyuanwei f082474aba 首页-知识库-数据展示 2022-06-22 16:36:04 +08:00
a0049873 2b79dd385d BUG修改 2022-06-22 16:30:07 +08:00
a0049873 3b6d6a38c7 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev
# Conflicts:
#	front/public/static/config/location.js
2022-06-22 16:19:19 +08:00
a0049873 d9350d938c 合并代码 2022-06-22 16:18:12 +08:00
gaoyuanwei d2a9efabce 业务组件详情页-bug修改 2022-06-22 15:57:32 +08:00
gaoyuanwei e1bfbf55ec 图层服务-初始详情页 2022-06-22 15:56:33 +08:00
gaoyuanwei ddb93e3cd7 location配置-底部数据及问答小人 2022-06-22 15:53:06 +08:00
a0049873 96993e040f no message 2022-06-22 14:17:29 +08:00
a0049873 b0c667eb00 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-22 14:15:33 +08:00
a0049873 f323016e40 消息中心 2022-06-22 14:15:28 +08:00
gaoyuanwei f1b5f9ee57 三方配置 2022-06-21 18:26:40 +08:00
wuhongjian 449ed38a29 配置更新 2022-06-21 17:21:40 +08:00
wuhongjian f4f955b99e 能力云图西海岸对接 2022-06-21 17:14:59 +08:00
851673013@qq.com 5a021de654 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-21 17:08:06 +08:00
851673013@qq.com 967f6389c1 拉取 2022-06-21 17:08:02 +08:00
wuhongjian 511d3dc3d9 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-21 17:06:08 +08:00
wuhongjian 7b8cdbd0e7 3840*1080切换适配 2022-06-21 17:06:05 +08:00
a0049873 c9855a55c3 滚动条bug修改 2022-06-21 17:04:20 +08:00
a0049873 25eed3e27b 青岛配置 2022-06-21 17:01:19 +08:00
a0049873 15b0d7c5ae 头部加阴影 2022-06-21 17:01:04 +08:00
851673013@qq.com bec8226d8a bug 2022-06-21 16:59:31 +08:00
a0049873 d5c79225da Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-21 16:56:03 +08:00
a0049873 db187766cc 我的消息模块开发 2022-06-21 16:55:59 +08:00
gaoyuanwei fc84f8ed92 数据资源部分更改、导航栏修改、云图数据修改 2022-06-21 16:49:45 +08:00
HISENSE\liuyuxin6 5a9761b741 '修改工作动态列表页样式问题' 2022-06-21 15:27:21 +08:00
gaoyuanwei 9d36a8b5d6 dev-location 2022-06-21 15:10:21 +08:00
gaoyuanwei 8bc5bff98d 业务组件功能完善 2022-06-21 11:42:06 +08:00
851673013@qq.com 7bc3912bb7 详情页bug修改 2022-06-21 11:33:12 +08:00
HISENSE\liuyuxin6 01dc4a8c43 '修改工作动态列表及详情页样式问题' 2022-06-21 10:48:39 +08:00
a0049873 94fae9752f BUG修改 2022-06-21 10:38:33 +08:00
a0049873 cad2aa570c 增加 服务接口 和请求方式字段 2022-06-21 10:36:45 +08:00
HISENSE\liuyuxin6 5977d85597 '工作动态列表及详情页' 2022-06-21 09:48:23 +08:00
a0049873 6edf4d50f9 BUG修改 2022-06-20 18:59:43 +08:00
gaoyuanwei 09f421580b Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-20 18:39:10 +08:00
gaoyuanwei d7a5fa90a6 业务组件 2022-06-20 18:38:56 +08:00
a0049873 aab6b091e0 预览BUG修改 2022-06-20 18:38:51 +08:00
851673013@qq.com 369ed41fd9 开发组件-详情页 2022-06-20 18:34:31 +08:00
wuhongjian e3bbd281c5 配置文件 2022-06-20 18:04:17 +08:00
a0049873 2b5676d31c BUG修改 2022-06-20 16:58:24 +08:00
a0049873 b9d159d99a infolist修改 2022-06-20 16:51:23 +08:00
a0049873 f41eee2997 业务组件和开发组件 上架开发 2022-06-20 16:46:33 +08:00
wuhongjian 9ca37f388c 配置项更新 2022-06-20 16:37:10 +08:00
a0049873 17721d0c42 能力上架整合 2022-06-20 11:43:46 +08:00
a0049873 98a17a8dd3 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-20 11:35:16 +08:00
a0049873 78f0ee1b92 新增资源导入 2022-06-20 11:35:00 +08:00
gaoyuanwei 0425b0e9f3 知识库bug修改 2022-06-20 09:56:28 +08:00
gaoyuanwei 40aae994a4 知识库bug修改 2022-06-20 09:54:47 +08:00
wuhongjian 319c25ed4f getVideoList 2022-06-19 18:59:14 +08:00
851673013@qq.com cbff48e994 bug 2022-06-19 18:42:32 +08:00
wuhongjian 66bec11398 更改 2022-06-19 18:37:46 +08:00
851673013@qq.com 3eeb2702d3 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-19 18:34:58 +08:00
851673013@qq.com 33134d3151 合并冲突之后的文件 2022-06-19 18:33:53 +08:00
wuhongjian 5a36b3eabd 初始数据更改 2022-06-19 18:32:05 +08:00
851673013@qq.com e38c8234a4 组件服务和基础设施 2022-06-19 18:30:37 +08:00
gaoyuanwei 91e9d2649e 百分比 2022-06-19 18:28:59 +08:00
wuhongjian 15ce5fe9fc Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-19 18:18:33 +08:00
wuhongjian b7772d9a77 样式 2022-06-19 18:18:29 +08:00
a0049873 15f77487ae 样式修改 2022-06-19 18:11:19 +08:00
gaoyuanwei 462f39826c 数据赋值更改 2022-06-19 18:07:27 +08:00
gaoyuanwei c6649d5fee 数据资源样式及接口ip修改 2022-06-19 17:56:21 +08:00
a0049873 f958db6940 eslint 2022-06-19 17:33:12 +08:00
a0049873 cf9d8c9ee3 细节调整 2022-06-19 17:26:53 +08:00
851673013@qq.com 134d54d5ef bug 2022-06-19 17:14:38 +08:00
851673013@qq.com 754eef207d 组件服务 2022-06-19 17:12:30 +08:00
gaoyuanwei 4093653331 数据资源、知识库 2022-06-19 17:08:06 +08:00
a0049873 5fe38ceaa4 云图 2022-06-19 17:05:28 +08:00
gaoyuanwei 94fd21ab27 能力云图api接口 2022-06-19 14:40:14 +08:00
851673013@qq.com 95677b7031 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-19 12:26:07 +08:00
a0049873 39ba614c1f no message 2022-06-19 11:42:14 +08:00
851673013@qq.com 9ab323b2b7 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-19 11:41:37 +08:00
a0049873 ec1ed6e78e 居中 2022-06-19 11:40:44 +08:00
851673013@qq.com 42a427a791 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-19 11:20:40 +08:00
a0049873 47f8dfe0a0 阴影 2022-06-19 11:20:25 +08:00
851673013@qq.com 4e08d4ea19 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-19 11:03:59 +08:00
a0049873 a0c1367cd6 BUG 2022-06-19 11:03:02 +08:00
a0049873 462ed15ead 布局 2022-06-19 10:46:31 +08:00
a0049873 06659b9342 bug 2022-06-19 10:29:28 +08:00
a0049873 891e7df1cd 字体 2022-06-19 10:28:38 +08:00
a0049873 6bd14950a4 能力云图 2022-06-19 10:22:39 +08:00
851673013@qq.com b61e7cf803 页面底部更换配置 2022-06-17 18:04:49 +08:00
a0049873 9900583333 文件上传组件BUG修改 2022-06-17 11:16:10 +08:00
a0049873 eed0b62c5a 能力集气泡图 BUG修改 2022-06-17 10:40:09 +08:00
wuhongjian ff134c7b0a 上传配置地址修改 2022-06-16 16:58:49 +08:00
wuhongjian c852f77bee bug修复 2022-06-16 13:59:02 +08:00
851673013@qq.com 13c10ce1ae 区市站点 2022-06-16 12:27:15 +08:00
gaoyuanwei 1cd13ca346 能力集市左侧最大高度修改 2022-06-16 12:11:58 +08:00
851673013@qq.com 466c70e5d6 区市站点-样式修改 2022-06-16 12:06:11 +08:00
gaoyuanwei b7896bcfe3 头部、首页、赋能样式修改 2022-06-16 10:52:07 +08:00
851673013@qq.com 71f6ff0790 计费标准修改 2022-06-16 10:29:32 +08:00
wuhongjian 94f5ab6acd bug修复 2022-06-15 20:49:47 +08:00
a0049873 f02ed50650 BUG 2022-06-15 20:45:29 +08:00
a0049873 4087d54c40 BUG修改 2022-06-15 20:45:10 +08:00
851673013@qq.com 2218e034bd 赋能案例bug修改 2022-06-15 20:36:01 +08:00
a0049873 96ef90a216 eslint格式 2022-06-15 20:14:27 +08:00
851673013@qq.com 35770f4956 上架详情页标题修改 2022-06-15 19:19:32 +08:00
a0049873 86458f70fd 功能新增 BUG修改 2022-06-15 18:33:28 +08:00
gaoyuanwei 4ca50ddd7c 查询页修改 2022-06-15 18:24:10 +08:00
851673013@qq.com fb6107d461 应用资源详情样式修改 2022-06-15 18:11:20 +08:00
a0049873 7fc167b7df 动态获取接口请求方式 2022-06-15 17:13:19 +08:00
a0049873 99cdec5f8e 更改字段 2022-06-15 16:54:52 +08:00
a0049873 65f08c1ba5 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-15 16:29:14 +08:00
a0049873 011a68190d 新加点击功能 2022-06-15 16:28:55 +08:00
851673013@qq.com ec2dfaa755 赋能案例-详情页路由 2022-06-15 16:19:42 +08:00
a0049873 4a0516fe11 去除 西海岸和崂山区以外的 箭头动画 2022-06-15 15:53:37 +08:00
gaoyuanwei cdf9298f58 跳转 2022-06-15 15:31:56 +08:00
851673013@qq.com 34c38d80db 赋能案例路由 2022-06-15 15:28:19 +08:00
a0049873 e84e336d3a 西海岸镜像 添加头部路由 线头双向 2022-06-15 15:26:39 +08:00
851673013@qq.com 5f69279437 赋能案例详情 2022-06-15 15:22:26 +08:00
gaoyuanwei dace70ec6b 赋能案例查询页 2022-06-15 15:20:10 +08:00
a0049873 904332259f 尺寸更改 2022-06-15 15:02:03 +08:00
a0049873 f0fdad3db0 echarts 演示地图开发 2022-06-15 15:00:28 +08:00
wuhongjian 272c38a78f 配置文件更新 2022-06-15 12:26:21 +08:00
851673013@qq.com 2402c128a7 赋能案例图片 2022-06-15 10:00:54 +08:00
gaoyuanwei ce79e3c7de 赋能案例初始 2022-06-15 09:34:16 +08:00
851673013@qq.com 9706fd18b3 详情页面切换 2022-06-14 19:35:48 +08:00
851673013@qq.com ea9f61ede8 首页-能力上架弹窗bug修改 2022-06-14 17:27:08 +08:00
851673013@qq.com 3d6df3e3f4 能力上架样式修改 2022-06-14 16:36:17 +08:00
wuhongjian 4399b2ddc8 ui 2022-06-14 16:31:34 +08:00
851673013@qq.com 8b092e05e5 详情样式修改 2022-06-14 16:29:56 +08:00
851673013@qq.com a3d77f3557 应用资源详情bug修改 2022-06-14 16:25:15 +08:00
851673013@qq.com ddd1d13333 应用资源详情bug 2022-06-14 16:11:52 +08:00
851673013@qq.com 0bc59716ad 应用资源bug修改 2022-06-14 15:54:57 +08:00
851673013@qq.com 3bd8e574bb 应用资源详情bug修改 2022-06-14 15:39:04 +08:00
a0049873 904aecc6da 详情页BUG修改,应用资源详情页开发 2022-06-14 14:49:38 +08:00
851673013@qq.com 161eaddef3 应用资源详情 2022-06-14 14:33:30 +08:00
wuhongjian d61593f666 bug 2022-06-14 14:03:46 +08:00
wuhongjian 8058b17c08 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-14 13:59:37 +08:00
wuhongjian 85d714d7eb 格式处理 2022-06-14 13:57:04 +08:00
a0049873 efad411cf9 修改我的收藏显示BUG 2022-06-14 12:03:39 +08:00
a0049873 27e9aa34b5 修改申购车筛选显示BUG 2022-06-14 12:02:01 +08:00
a0049873 e74c6ded3e 代码格式修改 2022-06-14 11:57:19 +08:00
a0049873 8b48a62f9c 格式 2022-06-14 11:52:16 +08:00
a0049873 3b3459206d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-06-14 11:50:33 +08:00
a0049873 0f1a9d56e0 新增跳转逻辑判断 2022-06-14 11:49:37 +08:00
wuhongjian b5e820c639 分辨率适配 2022-06-14 11:47:57 +08:00
a0049873 f64f44172e 跳转挂载前 新增分支选择 2022-06-14 11:32:25 +08:00
a0049873 1deb802d87 应用展示显示BUG修改 2022-06-14 11:14:06 +08:00
a0049873 680d8d63ba 成功后退出 2022-06-14 11:11:24 +08:00
a0049873 c5bd98c8fc 挂载添加deptid 2022-06-14 11:06:32 +08:00
a0049873 cfded4f558 应用详情开发 2022-06-14 10:45:59 +08:00
a0049873 1275b4b992 应用详情 2022-06-14 10:21:06 +08:00
a0049873 ea9fffad7f 应用详情页 2022-06-14 10:10:51 +08:00
wuhongjian afbf59cc50 初始化 2022-06-14 09:32:49 +08:00