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

221 Commits

Author SHA1 Message Date
wuhongjian 11362c536d 开发环境配置更新 2022-08-02 10:15:32 +08:00
guoyue c5d7351809 合并 2022-08-01 16:22:24 +08:00
a0049873 dafc2ac1be 后台挂载 部门校验 2022-08-01 14:34:44 +08:00
a0049873 80e9ddf3fc BUG修改 2022-08-01 11:07:58 +08:00
a0049873 328ab1102e 西海岸演示版本 2022-08-01 09:21:57 +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 fd3a7ef353 基础设施输入框 去除X 2022-07-28 09:40:05 +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 b3b9b48ed4 BUG修改 2022-07-22 18:44:07 +08:00
a0049873 4a1d7340b9 Merge branch 'release' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-uce-release 
# Conflicts:
#	front/public/index.html
#	front/src/main.js
 2022-07-22 16:04:05 +08:00
a0049873 795d3e0b56 BUG修改 2022-07-22 15:46:13 +08:00
a0049873 2ac76dc174 添加websocket配置 2022-07-22 10:55:44 +08:00
wuhongjian b1543e323a 合并版本v0.8.2.6 2022-07-21 18:17:37 +08:00
a0049873 681dceaa47 BUG修改 2022-07-21 15:36:01 +08:00
wuhongjian 0e351e915b 合并版本v0.8.2.3 2022-07-18 18:49:43 +08:00
a0049873 259ee9379a 能力申请修改 2022-07-18 17:55:18 +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
wuhongjian 71a8a3ef59 添加西海岸图标切图 2022-07-18 13:35:11 +08:00
wuhongjian c817f9eefc 合并版本v0.8.2.3 2022-07-16 16:44:00 +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
wuhongjian 6b0bb85212 bug修复 2022-07-16 15:04:25 +08:00
wuhongjian 09518566c7 合并版本 2022-07-15 14:10:46 +08:00
a0049873 f2aa5c5e3c BUg修改 2022-07-15 10:35:05 +08:00
wuhongjian 63711c54bd 合并版本 2022-07-15 09:17:43 +08:00
a0049873 9cb2e9e81f 我的申请模块开发 2022-07-14 16:50:51 +08:00
wuhongjian 2ed32e97db 用户名显示真实姓名 2022-07-14 14:17:20 +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
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
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
guoyue 8acde6c897 Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev 2022-07-13 09:20:23 +08:00
guoyue 68efdf228b add: 指导手册(暂存) 2022-07-13 09:19:03 +08:00
wuhongjian 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
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
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 d95a2eeb9f bug修复 2022-07-07 20:37:34 +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
a0049873 c271f3d988 BUG修改 2022-07-07 17:54:41 +08:00
guoyue 4aef24c734 门户：融合服务列表+详情+我的收藏 2022-07-07 13:34:29 +08:00
wuhongjian 6cb8142534 favio替换，与后台同步更新版本 2022-07-06 22:17:22 +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
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 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
wuhongjian d71dc876f5 西海岸bug修复 2022-07-05 17:35:48 +08:00
wuhongjian 8a5b0a6370 bug修复 2022-07-05 12:52:32 +08:00
wuhongjian 2d5be4eb52 bug修复 2022-07-04 17:34:14 +08:00
a0049873 c35d5789fc BUG修改 2022-07-04 17:02:00 +08:00
wuhongjian f8588795c4 合并版本 2022-07-04 11:57:44 +08:00
wuhongjian d87bf2ded9 bug修复 2022-07-04 11:27:21 +08:00
a0049873 2fdfa22266 BUG修改 2022-07-01 18:23:43 +08:00
wuhongjian c8e1881fae bug修复 2022-07-01 11:10:23 +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
a0049873 9bf47e3223 BUG修改 2022-06-30 18:48:59 +08:00
a0049873 ecd5c76998 BUG修改 2022-06-30 18:18:10 +08:00
a0049873 0f6b37e52e 摄像头申请流程 2022-06-30 15:27:16 +08:00
wuhongjian 976e588372 购物车 2022-06-30 09:34:16 +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 ccbcab8dfa 新能力申请 2022-06-29 17:28:49 +08:00
wuhongjian 4c77a55ae7 基础设施联调 2022-06-28 22:24:05 +08:00
a0049873 3738985ade 后台能力申请页面开发 前台申购车 重构 新增市局数据资源跳转 2022-06-27 14:27:50 +08:00
wuhongjian d99b983961 测试分支 2022-06-27 11:20:58 +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
wuhongjian 068c5dfb1e bug修复 2022-06-24 19:38:27 +08:00
wuhongjian c97201645b 修改死数据配置，token失效问题 2022-06-23 17:56:40 +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
wuhongjian c6cb53c3b9 bug修复 2022-06-22 19:11:34 +08:00
wuhongjian faade9c621 市局版本合并bug修复 2022-06-22 17:04:48 +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 ddb93e3cd7 location配置-底部数据及问答小人 2022-06-22 15:53:06 +08:00
gaoyuanwei f1b5f9ee57 三方配置 2022-06-21 18:26:40 +08:00
wuhongjian 449ed38a29 配置更新 2022-06-21 17:21:40 +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
a0049873 25eed3e27b 青岛配置 2022-06-21 17:01:19 +08:00
gaoyuanwei fc84f8ed92 数据资源部分更改、导航栏修改、云图数据修改 2022-06-21 16:49:45 +08:00
gaoyuanwei 9d36a8b5d6 dev-location 2022-06-21 15:10:21 +08:00
a0049873 aab6b091e0 预览BUG修改 2022-06-20 18:38:51 +08:00
wuhongjian e3bbd281c5 配置文件 2022-06-20 18:04:17 +08:00
wuhongjian 9ca37f388c 配置项更新 2022-06-20 16:37:10 +08:00
wuhongjian 66bec11398 更改 2022-06-19 18:37:46 +08:00
851673013@qq.com b61e7cf803 页面底部更换配置 2022-06-17 18:04:49 +08:00
wuhongjian c852f77bee bug修复 2022-06-16 13:59:02 +08:00
wuhongjian 94f5ab6acd bug修复 2022-06-15 20:49:47 +08:00
a0049873 f0fdad3db0 echarts 演示地图开发 2022-06-15 15:00:28 +08:00
wuhongjian 272c38a78f 配置文件更新 2022-06-15 12:26:21 +08:00
wuhongjian afbf59cc50 初始化 2022-06-14 09:32:49 +08:00