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

1445 Commits

Author SHA1 Message Date
guoyue cf7d85060c 西海岸：基础设施-申请增加过期时间 2022-09-27 11:53:10 +08:00
a0049873 18f911bd16 基础设施修改 2022-09-27 10:37:08 +08:00
guoyue f071abfcf7 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 09:49:35 +08:00
guoyue 0b401f5741 我的申请增加水印 2022-09-27 09:49:30 +08:00
a0049873 ccbb53093f Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-27 09:43:44 +08:00
a0049873 8782498104 管理端bug修改 门户修改右侧图标 2022-09-27 09:42:13 +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 cecba03c6e 西海岸：视频播放 离线(status不是1)提示当前视频离线 2022-09-26 16:41:09 +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
guoyue 4e3fa20984 西海岸：登录默认 跳转到能力集市-基础设施 2022-09-26 15:55:31 +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 5e31517f1d fix：控制台--地图报错 2022-09-23 13:33:41 +08:00
guoyue 5e2b32f62a 西海岸：应用资源-部署与安全，去掉服务地址 2022-09-23 11:36:02 +08:00
guoyue 4dc1525520 fix：基础设施-地图搜索 改回最初 2022-09-23 11:15:14 +08:00
guoyue 1d61355bc6 西海岸：能力云图-基础设施-单兵设备，无人机前端写死 2022-09-23 10:36:52 +08:00
guoyue 4a28789464 西海岸：我的申请，增加设备申请 2022-09-22 19:07:54 +08:00
guoyue 10fdc587a2 西海岸：单兵无人机 申请按钮，更改为未申请状态才可申请 2022-09-22 16:04:24 +08:00
guoyue fe3eb0aa68 西海岸--基础设施：去掉视频标签 2022-09-22 15:08:02 +08:00
guoyue 05d2ad1a45 西海岸：我的申请增加设备申请 2022-09-22 14:28:29 +08:00
guoyue 7594c9cb51 西海岸：能力集市基础设施-左侧列表拼接status=1 2022-09-22 14:14:13 +08:00
guoyue b1f17ca5bb 优化我的申请js，删除多余注释代码 2022-09-22 13:31:36 +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 6f6ec109e4 fix-首页：获取单兵设备无人机报错 2022-09-22 09:24:17 +08:00
guoyue c55eedc5b4 单兵和无人机：列表增加详情 2022-09-21 23:31:56 +08:00
guoyue e906d9adc5 fix：修复能力下架不选文件报错bug 2022-09-21 22:46:48 +08:00
guoyue e077a04c08 西海岸：应用详情：增加 审批通过可以查看马赛克内容 逻辑 2022-09-21 22:33:35 +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 495ed477f8 门户首页-能力汇聚：基础设施，保留视频资源，单兵，无人机 2022-09-21 22:26:56 +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 cc330f2b60 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-21 18:48:57 +08:00
lizhicheng2 83eb319d28 西海岸-能力详情模糊 2022-09-21 17:56:11 +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 560e6af900 西海岸：服务地址改成申请才能看（跟市局一样） 2022-09-21 15:54:15 +08:00
guoyue e7a5a21430 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-09-21 15:44:08 +08:00
guoyue 11f4c3fe25 西海岸--单兵设备和无人机：列表/申请接口联调 2022-09-21 15:43:55 +08:00
yuhan_jiang 6827b2ebe5 fix：解决单点无法登出 2022-09-21 11:09:25 +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 8b9e11b0a0 我的申请-已申请：新增基础设施-视频预览 2022-09-20 19:07:59 +08:00
guoyue 8cb2f83fb5 西海岸-响应拦截器-去掉reload 2022-09-20 17:39:28 +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 576790ad9d bug fix:视频流url拼写错误 2022-09-19 18:28:44 +08:00
lizhicheng2 f3973fe28d bug fix:单点登录登出问题 2022-09-19 13:04:27 +08:00
a0049873 6ef87c3c79 广场新增删选条件 2022-09-19 10:19:31 +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 0661a53d79 强制使用谷歌或者火狐浏览器 2022-09-13 18:04:33 +08:00
guoyue fb0a5e1f38 退出登录，移除本地查询条件 2022-09-13 18:04:12 +08:00
guoyue 31a809f9d9 赋能场景存储查询条件 2022-09-13 18:03:55 +08:00
guoyue 90a3aa8e37 能力云图增加返回按钮 2022-09-13 14:59:44 +08:00
guoyue 1cba78f8e1 融合服务，能力集市详情返回 2022-09-13 09:38:26 +08:00
guoyue 7996d8a701 强制使用谷歌浏览器 2022-09-13 09:38:00 +08:00
guoyue 1e06abbf11 融合服务更新api 2022-09-08 15:46:21 +08:00
guoyue 59cc6d93fc 部门联系人和电话改为手动填写 2022-09-08 14:37:15 +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
guoyue 5eefd4d306 消息列表：已读消息更改 2022-09-08 09:44:12 +08:00
guoyue 2e17b5cf80 技术文档：使用手册下载 2022-09-07 14:28:52 +08:00
zhangzhuliang 205cb756be 会议室审核加下载附件按钮和输入框报错 2022-09-02 11:06:11 +08:00
gaoyuanwei c3bc043228 提示语 2022-09-01 17:56:20 +08:00
a0049873 3b09661496 v3 流程 2022-09-01 16:12:44 +08:00
gaoyuanwei 2ff89ea6e4 前后台-- -- 上传附件 2022-09-01 13:50:42 +08:00
zhangzhuliang 7ff222761c 会议室增加自定义状态码 2022-09-01 09:05:28 +08:00
zhangzhuliang c1643e3cb0 会议室bug提交 2022-08-31 18:26:06 +08:00
wuhongjian 0f7fd813f2 CIM+算法改为CIM+组件 2022-08-29 09:45:48 +08:00
wuhongjian 66db5faf1b 详情页模糊化处理 2022-08-27 14:25:03 +08:00
wuhongjian 0e224958ce 配置修改 2022-08-26 19:24:17 +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 7212fd3e7c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-25 19:06:55 +08:00
wuhongjian 916ea5ecd2 bug修复 2022-08-25 19:06:53 +08:00
gaoyuanwei caef0e672a bug 2022-08-25 17:56:33 +08:00
gaoyuanwei e0ea4a6a2d bug修改 2022-08-25 17:45:34 +08:00
wuhongjian b923e7ac2d 配置文件更新 2022-08-25 15:07:19 +08:00
gaoyuanwei bae47ea208 使用方式--归属部门与服务商 2022-08-24 18:30:12 +08:00
gaoyuanwei 89d782fa9b 只留已申请标签 2022-08-24 17:42:31 +08:00
wuhongjian 0a55ac7b68 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-24 13:53:48 +08:00
wuhongjian 894db08c4e 市局基础设施只要图片预览 2022-08-24 13:53:45 +08:00
gaoyuanwei f28d12ac88 使用方式-- --申请后查看 2022-08-24 12:54:40 +08:00
wuhongjian d1a50bc25a 修复变形问题 2022-08-24 09:19:32 +08:00
gaoyuanwei 1c0be1ca6e 赋能案例标题忘改了 2022-08-23 19:29:45 +08:00
gaoyuanwei 17bc4877f2 bug修改 2022-08-23 18:02:00 +08:00
gaoyuanwei 0c4015cb5c 亿点点修改 2022-08-23 17:47:24 +08:00
a0049873 07198b8ebc 样式修改 2022-08-23 17:11:50 +08:00
a0049873 d1e6b9acd7 修改首页 选择数据类型样式 ， 修改 全局搜索逻辑 2022-08-23 16:51:41 +08:00
a0049873 ded027bb64 新 申请流程 2022-08-23 13:59:43 +08:00
a0049873 273a7c98c8 BUG 修改 2022-08-22 17:34:15 +08:00
a0049873 21e1bb5898 算法 平台地址 添加申请前后 的显示和隐藏 2022-08-22 16:52:42 +08:00
a0049873 c824e53a50 消息中心位置 2022-08-22 11:50:51 +08:00
gaoyuanwei 906ffdec57 NAME---name 2022-08-19 17:14:38 +08:00
a0049873 ac2d520db9 BUG修改 2022-08-19 17:08:12 +08:00
a0049873 17dd883672 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-19 16:53:57 +08:00
a0049873 73591c0ed2 CIM专区 图层 算法开发 2022-08-19 16:53:42 +08:00
gaoyuanwei d2b9f38f06 背景 2022-08-19 16:09:10 +08:00
gaoyuanwei 2938de6392 样式 2022-08-19 15:42:18 +08:00
gaoyuanwei 9d075bda9c cim前两个 2022-08-19 14:50:41 +08:00
gaoyuanwei b2effa3c14 前两个 2022-08-19 14:24:34 +08:00
gaoyuanwei a4b7510e1a cim的js文件 2022-08-19 12:51:03 +08:00
gaoyuanwei d6e49c16f1 cim图片 2022-08-19 10:15:48 +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 080682f6b7 能力下架功能开发 2022-08-17 16:42:46 +08:00
a0049873 3f235f3d81 修改能力申请文案 2022-08-17 11:16:25 +08:00
a0049873 82249450c4 首页添加版本判断 2022-08-16 09:16:36 +08:00
gaoyuanwei 36b161da4c Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-15 18:09:18 +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
a0049873 331924e14e 能力广场排序 2022-08-15 18:08:12 +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 55693b880f Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-15 14:50:24 +08:00
a0049873 5f3c8d3556 全局搜索 2022-08-15 14:48:53 +08:00
gaoyuanwei 3befb49a12 首页文字---特效 2022-08-15 14:07:06 +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
a0049873 dc1b55de29 BUG修改 2022-08-10 15:47:29 +08:00
a0049873 b99ec35e90 能力广场 2022-08-10 14:55:56 +08:00
851673013@qq.com 6e2d146ca8 算法广场 2022-08-10 14:54:45 +08:00
wuhongjian 2fe6aed0df Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-10 11:54:14 +08:00
wuhongjian 94cc9163cf gis广场bug修复 2022-08-10 11:53:19 +08:00
851673013@qq.com f6bd2ba3ad 广场 2022-08-10 10:34:04 +08:00
851673013@qq.com 12bee09773 广场 2022-08-10 10:32:50 +08:00
851673013@qq.com 469c6afd61 智能算法广场 2022-08-10 09:34:50 +08:00
gaoyuanwei e1d18f8b27 入口在能力集市 2022-08-09 20:01:21 +08:00
851673013@qq.com 8bfae0915d 能力广场 2022-08-09 18:33:31 +08:00
a0049873 1775286039 BUG修改 2022-08-09 18:25:18 +08:00
851673013@qq.com f21d694200 能力广场 2022-08-09 18:19:18 +08:00
a0049873 3160a0710f BUG修改 2022-08-09 18:19:03 +08:00
851673013@qq.com c4155bb364 能力广场 2022-08-09 18:15:16 +08:00
a0049873 cdc3b9c215 应用广场 滚动 2022-08-09 18:08:33 +08:00
wuhongjian e026c97a73 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-09 17:10:48 +08:00
wuhongjian 5a32f96150 bug修复 2022-08-09 17:09:58 +08:00
851673013@qq.com 31fd3b2511 同层广场和算法广场 2022-08-09 17:09:20 +08:00
a0049873 b91625bae2 应用广场点击跳转 2022-08-09 16:54:02 +08:00
a0049873 33243a5e00 能力广场 2022-08-09 16:50:18 +08:00
gaoyuanwei 60d8b97335 标题改变、返回集市 2022-08-09 16:41:07 +08:00
a0049873 4c4de0abea 应用广场开发 2022-08-09 16:36:47 +08:00
851673013@qq.com b4268c9961 广场 2022-08-09 16:27:04 +08:00
a0049873 cbbcc43549 图片 2022-08-09 15:57:49 +08:00
a0049873 56b781cdfc Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/capacitySquare/index.vue
 2022-08-09 15:27:22 +08:00
a0049873 27573355d2 广场 2022-08-09 15:25:45 +08:00
851673013@qq.com 064b71c6fc 应用广场 2022-08-09 15:23:38 +08:00
851673013@qq.com c449977b34 阿里巴巴普惠体 2022-08-09 11:49:53 +08:00
851673013@qq.com 5cfffccfe8 阿里巴巴普惠体 2022-08-09 11:47:06 +08:00
851673013@qq.com 7e61899d24 应用广场-只能算法 2022-08-09 11:37:23 +08:00
gaoyuanwei d2d18fc0a6 能力广场弹窗 2022-08-09 11:31:14 +08:00
a0049873 ca4c907d8a 能力广场 2022-08-09 09:40:12 +08:00
851673013@qq.com b1c6383f31 能力需求bug 2022-08-08 17:54: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
851673013@qq.com 06e9ade25d bug826-应用详情-功能介绍 2022-08-08 09:44:26 +08:00
wuhongjian cf53e51913 西海岸需求更新 2022-08-06 16:36:20 +08:00
gaoyuanwei b3695b04cd 技术文档左侧超出文本框 2022-08-06 11:01:32 +08:00
a0049873 f54169dfa3 后台挂载BUG修改 前台视频资源上限改为1000 2022-08-05 17:02:55 +08:00
a0049873 a24b273809 赋能案例 改为100条 2022-08-05 12:01:23 +08:00
851673013@qq.com 027a3a072d 能力集市左侧树，区级加上数 2022-08-05 11:13:16 +08:00
851673013@qq.com 9040f4fa5b bug819： 图层上架：上架时，先提示接口异常，再提示上架成功，在我的申请界面，申请单号为空 2022-08-05 10:47:21 +08:00
wuhongjian 012d562013 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-05 10:01:52 +08:00
wuhongjian dca5dc511e bug修复，配置更新 2022-08-05 10:01:49 +08:00
851673013@qq.com fbd25a0c5d bug824：上架业务组件：共享条件选择后，提示信息不消失 2022-08-05 09:51:59 +08:00
851673013@qq.com 8c5dc5f7e4 bug822：能力集市：组件服务-图层详情，使用方式的地址建议可以点击打开链接 2022-08-05 09:32:03 +08:00
gaoyuanwei a4e51ff48c 817bug 2022-08-04 18:58:24 +08:00
851673013@qq.com eafd6aea19 能力云图-总调用次数 2022-08-04 16:52:08 +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 9f9edd23eb 能力统计bug 2022-08-04 13:58:14 +08:00
851673013@qq.com c7b15fbe5b bug804 2022-08-03 16:42:40 +08:00
851673013@qq.com 79c315bf17 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-03 15:26:19 +08:00
851673013@qq.com cb25668fb4 bug792 2022-08-03 15:26:06 +08:00
gaoyuanwei 8bce63cb0e 新手指引提示bug修改 2022-08-03 15:20:27 +08:00
851673013@qq.com 3817737f04 bug796 2022-08-03 14:47:02 +08:00
851673013@qq.com a07d621206 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-03 14:28:16 +08:00
851673013@qq.com fb2e57e756 bug746组件服务智能算法-算法优势 2022-08-03 14:27:57 +08:00
guoyue 403018f234 赋能场景详情标签字体演示更改 2022-08-03 14:23:23 +08:00
guoyue 8ada557003 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-03 14:18:08 +08:00
guoyue ce0ce3f2f1 技术文档更改 2022-08-03 14:17:51 +08:00
guoyue c33729bbb8 合并 2022-08-03 14:09:11 +08:00
gaoyuanwei e271d2fe94 789、790bug 2022-08-03 14:05:42 +08:00
gaoyuanwei e8be9f904e Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	back/src/views/modules/activiti/demo/comments.vue
 2022-08-03 13:39:21 +08:00
guoyue bba86294df 技术文档更改 2022-08-03 13:36:43 +08:00
guoyue dee93f83b9 技术文档 优化 2022-08-03 12:58:51 +08:00
gaoyuanwei 9c991756eb 784bug 2022-08-03 12:10:56 +08:00
851673013@qq.com ce6163621d bug786能力需求申请 2022-08-03 09:46:46 +08:00
gaoyuanwei 341119dcd2 782Bug 2022-08-03 09:20:25 +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
gaoyuanwei 8630b7af86 技术文档-定位、联系我们 2022-08-02 17:28:58 +08:00
a0049873 c889fe069f 申请方 新增终止功能 审批方能力申请 改为驳回 2022-08-02 17:23:07 +08:00
wuhongjian 4a4a4b3d35 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-02 15:40:41 +08:00
wuhongjian a34e079708 修复市局空白页 2022-08-02 15:40:37 +08:00
gaoyuanwei bfa739691a 技术文档-能力申请图片数字bug修改 2022-08-02 14:07:46 +08:00
gaoyuanwei 4d94b59a55 技术文档-四个跳转 2022-08-02 13:46:12 +08:00
gaoyuanwei 466e9b510d Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/src/views/instructionManual/components/menuBook.vue
 2022-08-02 12:13:01 +08:00
gaoyuanwei 77c5cba599 技术文档-联系我们、使用手册、提供服务 2022-08-02 12:00:40 +08:00
a0049873 e081c560a7 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 
# Conflicts:
#	front/public/index.html
 2022-08-02 11:59:59 +08:00
a0049873 ee9ec45450 前台上架 驳回功能 2022-08-02 11:59:01 +08:00
851673013@qq.com 651c58404f 前台-技术文档-总体流程 2022-08-02 11:58:02 +08:00
guoyue 1959ac68f9 样式调整 新手指引 2022-08-01 19:04:35 +08:00
guoyue de2930eda4 指导手册 样式调整 2022-08-01 18:48:08 +08:00
guoyue d6f8ad6f31 样式调整 新手指导 2022-08-01 18:46:32 +08:00
guoyue 3f0f51ad13 新手指引 样式调整 2022-08-01 18:40:13 +08:00
guoyue 2649c45a66 新手指引： 宽度调整 2022-08-01 18:36:02 +08:00
guoyue f59460da3a Merge branch 'hi-ucs-dev' of http://124.222.94.39:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-01 18:24:55 +08:00
guoyue 9a8be5272e 开发文档 2022-08-01 18:24:42 +08:00
a0049873 b5a94cd6a7 Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-08-01 17:53:05 +08:00
a0049873 9bb633e1e6 BUG修改 2022-08-01 17:52:38 +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
gaoyuanwei 636318536b 765bug，上架关联组件时搜索功能 2022-08-01 15:57:09 +08:00
gaoyuanwei 52c1850cfb 归属部门，必填字段 2022-08-01 14:53:03 +08:00
851673013@qq.com 1cd5db6444 判断当前用户是否拥有归属部门 2022-08-01 14:34:02 +08:00
a0049873 80e9ddf3fc BUG修改 2022-08-01 11:07:58 +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
gaoyuanwei c8a8a58705 747\739\748 Bug 2022-07-29 15:27:24 +08:00
851673013@qq.com 35d8487a5f 来源部门共享门户颜色修改 2022-07-29 14:54:31 +08:00
851673013@qq.com 3609c2ba20 bug751 2022-07-29 14:49:44 +08:00
lizhicheng2 4d31d111ac 赋能场景详情补充 2022-07-29 14:20:40 +08:00
851673013@qq.com d8cbe92fb6 工作台部门能力风险和能力云图 2022-07-29 14:14:30 +08:00
gaoyuanwei 16a624b136 应用场景、功能介绍tab展示不全 2022-07-29 11:43:24 +08:00
gaoyuanwei cfa9de0b32 747、749 2022-07-29 11:02:16 +08:00
851673013@qq.com 8376fb23d5 后台能力运行监控 2022-07-28 20:40:48 +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 e47d7cf470 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-28 14:43:04 +08:00
wuhongjian b766bcf8fa bug修复 2022-07-28 14:42:44 +08:00
a0049873 bd839fd335 隐藏高级搜索 2022-07-28 14:21:20 +08:00
a0049873 5d3388465f BUG修改 视频展示多个/ 2022-07-28 14:13:49 +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
gaoyuanwei 531aa7aafb 前台上架-预览bug修复 2022-07-27 16:19:34 +08:00
851673013@qq.com ef980d77c3 基础设施视频接口调换 2022-07-27 14:19:51 +08:00
lizhicheng2 291b65d03f 前台融合服务页面修改 2022-07-27 13:53:59 +08:00
851673013@qq.com bb9856e5c1 前台富文本样式修改 2022-07-27 11:07:34 +08:00
851673013@qq.com 42020cd1be 富文本前台样式修改 2022-07-27 11:02:32 +08:00
wuhongjian 806a45ccf7 后台开发文档 2022-07-27 10:54:34 +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
a0049873 5dbaa26848 引入富文本编辑 2022-07-26 16:32:07 +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
a0049873 c09aa9c1b9 BUG修改 2022-07-26 14:42:17 +08:00
a0049873 5f8d005935 添加预览 时默认保存 常见问题功能 2022-07-26 14:38:09 +08:00
a0049873 486c3e8d46 websocket 钩子 2022-07-26 14:05:58 +08:00
gaoyuanwei 20e75d78cc 填写时红字提示消失 2022-07-26 11:36:15 +08:00
a0049873 fe5b5e1102 BUG修改 标题过长导致右边样式不统一 2022-07-26 10:54:19 +08:00
a0049873 15a3236516 BUG修改 下架的能力 不允许申请 2022-07-26 10:43:28 +08:00
gaoyuanwei 8be597f9cf Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 10:18:49 +08:00
gaoyuanwei 14d684bdfd 前台必填字段 2022-07-26 10:18:34 +08:00
a0049873 73ef6f5bdc BUG 修改 我的发布无法跳转 申购车 过滤已经下架的能力 2022-07-26 10:17:47 +08:00
gaoyuanwei 837641ba79 Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-26 10:09:16 +08:00
gaoyuanwei 73ed69f315 前台必填项设置 2022-07-26 10:07:39 +08:00
a0049873 b8e4c36223 BUG修改 首页知识库跳转 、 能力统计 添加tooltip 2022-07-26 09:51:47 +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 3675a618bf 视频审核成功 拼接地址 2022-07-25 15:07:44 +08:00
851673013@qq.com 03bfdd1d14 富文本引用 2022-07-25 11:34:30 +08:00
gaoyuanwei 979458071d 开发组件轮播 2022-07-25 11:24:41 +08:00
851673013@qq.com ef9a2dd15c bug703 2022-07-25 11:09:59 +08:00
gaoyuanwei aa1af8b4cd 应用场景-样式修改 2022-07-25 10:49:20 +08:00
a0049873 dc4b16d04d Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-25 10:17:20 +08:00
a0049873 011cd3708a 基础设施申请添加提示 2022-07-25 10:17:08 +08:00
851673013@qq.com 859005e1c0 bug708 2022-07-25 10:13:01 +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 b3b9b48ed4 BUG修改 2022-07-22 18:44:07 +08:00
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
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 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
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
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
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
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 b7b0a14b86 文本类算法试用+单点登录bug修复 2022-07-11 19:12:53 +08:00
851673013@qq.com dcf90b081e 详情页bug以及后台日志 2022-07-11 17:50:01 +08:00
guoyue c4a99bf8de 合并冲突 2022-07-11 10:29:34 +08:00
a0049873 23324f50ad BUG修改 后台上架开发 2022-07-09 15:22:20 +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
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 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 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