Commit Graph

142 Commits

Author SHA1 Message Date
李立 456dee0be2 整理代码 2018-01-11 10:05:33 +08:00
ladventure c276f69de4 Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope
# Conflicts:
#	gulpfile.js
2017-12-20 15:17:19 +08:00
ladventure 3c3532b4c5 修改配置 2017-12-20 15:13:44 +08:00
pengfei b075866072 增加Excel导出弹框 2017-12-19 11:37:04 +08:00
pengfei 807644904b ll 2017-11-17 10:27:49 +08:00
wu ming 054c94ce47 ---update 2017-02-21 09:30:51 +08:00
wu ming 423aa1ece0 ---校验条件修改 2017-02-16 08:57:26 +08:00
wu ming b2e2df347b ---迁移任务分类 2017-02-13 15:50:55 +08:00
chenlw fdb373e0a9 还原 2017-01-10 08:39:38 +08:00
chenlw 835d676323 oracle配置界面的各项的默认值修改 2017-01-09 14:29:07 +08:00
chenlw 511e1302de 修复汇总库配置时取消再添加,上次编辑的信息未清空 2017-01-09 11:26:47 +08:00
chenlw 6107e8d36e 修复 端口号要求为1-65535,实际输入为0时,未出现错误提示bug 2017-01-09 09:35:38 +08:00
chenlw fbed6fba0a 配置汇总库的警告提示的样式 2017-01-05 11:29:04 +08:00
chenlw cc251fba16 信息系统界面的侧边栏变宽的bug+进度条显示的修改 2017-01-04 15:35:09 +08:00
chenlw 890275d93d 左侧导航栏建议增大可点击区域<任务> 2016-12-27 15:26:50 +08:00
chenlw ad6d3531a7 迁移进度99%为校验! 2016-12-21 10:24:30 +08:00
Linda 5ad5569942 删除取消按钮边框去除 2016-12-20 12:43:12 +08:00
Linda dc61518fe8 抽取等弹框样式修改 2016-12-20 09:20:53 +08:00
wu ming e2c49ca6c0 ----样式合并并修复gfs配置bug 2016-12-19 17:16:00 +08:00
wu ming df11e7d5d0 --- 2016-12-19 16:43:37 +08:00
wu ming 1a52ad647b ----nothing 2016-12-19 16:32:44 +08:00
Linda 34d7a2fe57 ----yangshi 2016-12-19 15:19:52 +08:00
Linda 759537988f Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-12-19 15:19:27 +08:00
Linda 189bf672e1 横向滚动条、停止删除提醒界面、配置添加界面、EXCEL导入界面样式修改 2016-12-19 15:13:14 +08:00
chenlw 3aed632382 去掉brick大小显示 2016-12-19 10:51:20 +08:00
Linda db6799ce4f Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-12-19 09:56:32 +08:00
Linda b67dcade99 提交 2016-12-19 09:56:17 +08:00
wu ming 8d8588dfdd ---修复数据管理分页Bug 2016-12-16 17:23:01 +08:00
wu ming efa64653d0 ----功能完善 2016-12-16 16:41:43 +08:00
wu ming baa518014e ---x新增功能 2016-12-15 17:04:44 +08:00
wu ming 37e8e8fb29 ---数据管理修改 2016-12-15 08:45:57 +08:00
wu ming 6e799ae0de ---功能完善 2016-12-14 14:08:41 +08:00
wu ming 64f0a0e949 ---V1.5版本 2016-12-13 15:00:22 +08:00
wu ming 1ea7fae6f3 --修复Bug 2016-12-09 17:24:13 +08:00
wu ming 0698be5104 --修复bug 2016-12-02 15:09:56 +08:00
wu ming 58469239ca Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-11-25 10:23:58 +08:00
wu ming c8ae9e8c59 ---脚本审核增加保留你能 2016-11-25 10:21:17 +08:00
chenlw ba9b1616c7 修复:任务模块中批次的标签内容显示有重复 2016-11-22 14:27:20 +08:00
chenlw afd1712fda volume的brick空间改为可用,系统清单的系统类型sqlserver -> sql Server 2016-11-22 10:39:59 +08:00
wu ming c1bda9fbc1 --解决分页Bug 2016-11-21 16:35:46 +08:00
wu ming f078c01e01 --解决分页问题 2016-11-21 10:39:23 +08:00
wu ming df66493679 --增加标准表抽取功能 2016-11-18 17:15:34 +08:00
wu ming 9768e31db1 --抽取功能 2016-11-18 10:38:59 +08:00
wu ming aff4037514 nong 2016-11-17 08:52:32 +08:00
wu ming adcd11eb9b ---样式修改合并 2016-11-17 08:51:46 +08:00
wu ming 87e135ec62 --修改校验功能 2016-11-15 14:51:41 +08:00
Linda 9c9b14f1b7 --样式修改 2016-11-15 14:49:41 +08:00
Linda b5f6f9c8d3 Merge branch 'Web_Manager_Develope' of https://git.trustie.net/fhx569287825/aggregation-platform into Web_Manager_Develope 2016-11-14 11:32:47 +08:00
Linda 124e72cd0d nothing 2016-11-14 11:32:15 +08:00
wu ming 673bd343e0 --添加依赖包 2016-11-14 11:19:09 +08:00