Commits · 72f8079e234b37cd7197e054025c89c0a97d4c6a · liuna / cmszMonitorAnalysis

08 Dec, 2017 1 commit

authored Dec 08, 2017

1点击 '修改'按钮 样式失调bug
2 增加 '参数值'比填控制

72f8079e

07 Dec, 2017 3 commits
- 修改 '新增参数后页面不展示'bug 调整界面 '参数'部分的UI · 6f6f5639
  莫林毅 authored Dec 07, 2017
  
  6f6f5639
- 修改弹出框样式 · e7853639
  莫林毅 authored Dec 07, 2017
  
  e7853639
- 预分析与建模->数据模型管理 ->模型维护功能增加 ‘数据编码’字段[! 后台代码代码不完全改动] · baacc4b1
  莫林毅 authored Dec 07, 2017
  
  baacc4b1
06 Dec, 2017 3 commits
- Merge remote-tracking branch 'origin/moly' · 66b8c680
  胡斌 authored Dec 06, 2017
  
  66b8c680
- 智能分析平台备份 · 618b4b67
  胡斌 authored Dec 06, 2017
  
  618b4b67
- 修改bug . · e3191b72
  莫林毅 authored Dec 06, 2017
  
  e3191b72
05 Dec, 2017 6 commits
- Merge remote-tracking branch 'origin/liuna' · 2e3a0ecd
  胡斌 authored Dec 05, 2017
```
# Conflicts:
#	.idea/workspace.xml
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
```
  2e3a0ecd
- Merge remote-tracking branch 'origin/moly' · a00e2703
  胡斌 authored Dec 05, 2017
  
  a00e2703
- 2017年12月4日智能分析平台提交内容 · 98f37997
  liuna authored Dec 05, 2017
```
      --数据质量核查下质量规则报告页面
```
  98f37997
- 修改了页面 · c7cfe40d
  莫林毅 authored Dec 05, 2017
  
  c7cfe40d
- Merge remote-tracking branch 'origin/liuna' · c18b9c9e
  胡斌 authored Dec 05, 2017
```
# Conflicts:
#	.idea/workspace.xml
```
  c18b9c9e
- 2017年12月4日智能分析平台提交内容 · 3f1e7665
  liuna authored Dec 05, 2017
```
      --数据质量核查下质量规则新增页面弹出窗口
```
  3f1e7665
04 Dec, 2017 10 commits
- 过滤规则维护 · 7b778386
  胡斌 authored Dec 04, 2017
  
  7b778386
- Merge remote-tracking branch 'origin/liuna' · 220b8b10
  胡斌 authored Dec 04, 2017
```
# Conflicts:
#	.idea/workspace.xml
```
  220b8b10
- 2017年12月4日智能分析平台提交内容 · 1ba4a8ac
  liuna authored Dec 04, 2017
```
      --数据质量核查下质量规则修改页面完成
```
  1ba4a8ac
- Merge remote-tracking branch 'origin/liuna' · 9286ac9c
  胡斌 authored Dec 04, 2017
```
# Conflicts:
#	.idea/workspace.xml
```
  9286ac9c
- 2017年12月4日智能分析平台提交内容 · 8c943857
  liuna authored Dec 04, 2017
```
      --数据质量核查下质量规则运营页面完成
```
  8c943857
- Merge remote-tracking branch 'origin/moly' · 109d4a64
  胡斌 authored Dec 04, 2017
  
  109d4a64
- 过滤规则维护 · 57d67ef9
  胡斌 authored Dec 04, 2017
  
  57d67ef9
- 过滤规则维护页面编写 · 7bdffc50
  莫林毅 authored Dec 04, 2017
  
  7bdffc50
- 合并刘娜代码 · 0f1934ea
  胡斌 authored Dec 04, 2017
  
  0f1934ea
- Merge remote-tracking branch 'origin/master' into moly · 38de5b19
  莫林毅 authored Dec 04, 2017
```
# Conflicts:
#	src/main/java/com/hp/cmsz/entity/DimKpi.java
#	src/main/java/com/hp/cmsz/repository/BusinessDao.java
```
  38de5b19
03 Dec, 2017 5 commits
- Merge remote-tracking branch 'origin/liuna' · bbae9c30
  胡斌 authored Dec 03, 2017
```
# Conflicts:
#	.idea/workspace.xml
```
  bbae9c30
- 过滤规则维护页面编写 · bbb45284
  胡斌 authored Dec 03, 2017
  
  bbb45284
- 过滤规则维护页面编写 · 9fe6b58d
  胡斌 authored Dec 03, 2017
  
  9fe6b58d
- 2017年12月03 关联配置 · bb205033
  莫林毅 authored Dec 03, 2017
  
  bb205033
- 2017年12月3日智能分析平台提交内容 · c30ebd21
  liuna authored Dec 03, 2017
```
      --数据质量核查下质量规则新增页面完成
```
  c30ebd21
02 Dec, 2017 5 commits
- Merge remote-tracking branch 'origin/liuna' · c8358d99
  胡斌 authored Dec 02, 2017
```
# Conflicts:
#	.idea/workspace.xml
#	src/main/java/com/hp/cmsz/web/analysissupport/FilterRuleMaintainController.java
```
  c8358d99
- 智能分析平台打包备份 · 08503c0e
  胡斌 authored Dec 02, 2017
  
  08503c0e
- 2017年12月2日智能分析平台提交内容 · 29444a6f
  liuna authored Dec 02, 2017
```
      --数据质量核查下过滤规则页面联动
```
  29444a6f
- Merge remote-tracking branch 'origin/liuna' · 92210c7a
  胡斌 authored Dec 02, 2017
```
# Conflicts:
#	.idea/workspace.xml
```
  92210c7a
- 把servlet-api包放到默认lib下 · eb6fc743
  胡斌 authored Dec 02, 2017
  
  eb6fc743
01 Dec, 2017 3 commits
- 2017年12月1日智能分析平台提交内容 · ea1d1e22
  liuna authored Dec 01, 2017
```
      --数据质量核查
```
  ea1d1e22
- 2017年12月1日智能分析平台提交内容 · a061e9dd
  liuna authored Dec 01, 2017
```
      --数据质量核查
```
  a061e9dd
- 智能分析平台提交备份 · fcf75446
  afe authored Dec 01, 2017
  
  fcf75446
28 Nov, 2017 4 commits

Merge remote-tracking branch 'monitorAnalysis/liuna' · a52e5e9e

authored Nov 28, 2017

# Conflicts:
#	.idea/workspace.xml
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/BusinessDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/ChannelDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/repository/KpiDao.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/BusinessService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWarningInfoViewService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/service/monitoroperation/XcdWorkingOrderInfoService.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/PageURLController.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$1.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$2.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$3.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/KeyLinkProcessAnalysisController$4.class
#	src/main/webapp/WEB-INF/classes/com/hp/cmsz/web/monitoroperation/WorkingOrderCreateController.class

a52e5e9e

Merge remote-tracking branch 'monitorAnalysis/liuna' · 20ee8f77
afe authored Nov 28, 2017
```
# Conflicts:
#	.idea/workspace.xml
```
20ee8f77
2017年11月28 智能分析平台提交内容 · c86ed933
liuna authored Nov 28, 2017
```
      --质量规则维护
```
c86ed933
2017年11月28 智能分析平台提交内容 · 292c0962
liuna authored Nov 28, 2017
```
      --质量规则维护
```
292c0962