Commit Graph

58 Commits

Author SHA1 Message Date
wu ming 25d67ad44e 功能调整和完善--9.20 2016-09-20 19:00:26 +08:00
wu ming e76717783e 合并-9.19 2016-09-19 11:21:43 +08:00
wu ming d059c714ca 合并-9.19 2016-09-19 11:21:06 +08:00
wu ming c832fb16f3 完善GFS配置页面 2016-09-19 11:16:28 +08:00
Linda 218a5c6bea GFS配置页面 2016-09-19 10:40:50 +08:00
wu ming 267f87a09e 增加检索功能 2016-09-18 18:51:04 +08:00
Linda 50163a76ac 合并 2016-09-18 14:52:10 +08:00
Linda e415846f46 新建集群弹框内样式及图片 2016-09-18 14:44:01 +08:00
wu ming 32ac1beeda Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-09-14 16:37:55 +08:00
wu ming d81753abf4 nothing-9-14 2016-09-14 16:37:16 +08:00
wu ming 11d9143db2 修改连接oracle服务 2016-09-14 16:32:02 +08:00
Linda f2399dc67f 任务中进度条显示 2016-09-13 15:42:12 +08:00
wu ming f1ec0cc895 merge-20160913 2016-09-13 15:25:28 +08:00
Linda c6cf79cb61 数据管理配置页面前端编写 2016-09-13 14:22:00 +08:00
Linda 838bbe4570 merge--ad 2016-09-13 10:55:48 +08:00
Linda 00a1fee4fc merge 2016-09-13 10:54:54 +08:00
wu ming 3ac5b5516e 任务页面 2016-09-13 10:22:05 +08:00
wu ming 85a9d2dfae 添加任务页面 2016-09-13 08:50:28 +08:00
Linda d048c64a82 nothing 2016-09-13 08:34:28 +08:00
wu ming 0df0f24a8d for merge 2016-09-13 08:27:57 +08:00
wu ming 648fdc307d nothing 2016-09-12 17:01:04 +08:00
wu ming 981debdcb7 合并-9月12号 2016-09-12 16:50:20 +08:00
wu ming 86256d2a0d 完善数据管理功能 2016-09-12 16:30:19 +08:00
Linda fa0c482bcd 当前位置样式修改
服务管理弹框界面修改
配置界面优化
2016-09-12 13:34:22 +08:00
Linda b04b63c6d9 nothing 2016-09-12 09:15:31 +08:00
wu ming 566cd7c3ad 完善服务集群管理页面 2016-09-11 17:37:39 +08:00
wu ming bcf440c67a Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope
Conflicts:
	dist/hawtio-kubernetes.js
2016-09-10 21:09:35 +08:00
wu ming ce4b567081 添加gfs配置页面 2016-09-10 21:07:20 +08:00
Linda 85a4849064 配置界面修改 2016-09-09 16:55:40 +08:00
wu ming c79a979d86 合并 2016-09-09 16:10:19 +08:00
Linda 757066182c Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope
Conflicts:
	defs.d.ts
	dist/hawtio-kubernetes.js
2016-09-09 16:08:37 +08:00
wu ming 583ac9e74e bbb 2016-09-09 16:06:04 +08:00
Linda 9af6a1b5b5 服务集群界面修改 2016-09-09 15:19:59 +08:00
wu ming 7698e63eb0 增加服务集群配置功能 2016-09-09 15:17:51 +08:00
wu ming 18e2092d22 aaa 2016-09-09 15:14:22 +08:00
wu ming a2e57ef9ba Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-09-09 08:33:01 +08:00
wu ming 99d7cf5ea7 修改配置表单,单未使用 2016-09-09 08:32:46 +08:00
Linda 6141ec9723 Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-09-09 08:21:16 +08:00
Linda d52f123cba 树形文件夹图片 2016-09-09 08:20:39 +08:00
wu ming c0c6e85564 何并分支 2016-09-08 23:02:12 +08:00
wu ming 3aec8f7361 添加服务集群配置界面 2016-09-08 22:56:46 +08:00
Linda 4ffba40f1f 数据迁移弹框界面修改 2016-09-08 16:04:38 +08:00
wu ming 2570630a36 添加设置按钮 2016-09-08 08:37:22 +08:00
wu ming 6fbcb50d37 修改java后台ip 2016-09-07 16:14:37 +08:00
Linda 32311b2c73 数据管理页面导航文字居中、批次样式修改、表格样式修改、增加位置显示栏 2016-09-07 14:58:12 +08:00
wu ming d70816ba29 解决冲突问题 2016-09-06 22:34:52 +08:00
wu ming 562b55eb79 增加获取集群文件列表界面 2016-09-06 21:55:12 +08:00
wu ming 3a86521e19 增加获取服务文件列表功能 2016-09-06 19:03:46 +08:00
Linda 980e070e09 修改数据管理页面样式 2016-09-06 17:47:19 +08:00
Linda 29637f20e8 数据管理页面的样式修改 2016-09-06 17:41:58 +08:00