p01469285
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

信息系统界面的侧边栏变宽的bug+进度条显示的修改

This commit is contained in:
chenlw 2017-01-04 15:35:09 +08:00
parent 890275d93d
commit cc251fba16
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@ -248,8 +248,8 @@ gulp.task('connect', ['watch'], function() {
targetPath: '/hawtio/git' targetPath: '/hawtio/git'
}, { }, {
proto: "http", proto: "http",
port: "8088", port: "8080",
hostname: "192.168.0.110", hostname: "192.168.0.181",
path: '/java/console/api', path: '/java/console/api',
targetPath: "/" targetPath: "/"
}]; }];

2
plugins/developer/ts/dataManagerHelper.ts
View File

@ -47,7 +47,7 @@ module Developer{
}, },
{ {
href: UrlHelpers.join(context,"Overview/","task"), href: UrlHelpers.join(context,"Overview/","task"),
label: "任务", label: "查看任务",
title: "任务查看" title: "任务查看"
}, },
]); ]);

18
plugins/kubernetes/html/layoutKubernetes.html
View File

@ -235,13 +235,21 @@
</script> </script>
<!-- 迁移进度条 --> <!-- 迁移进度条 -->
<script type="text/ng-template" id="taskProcess.html"> <script type="text/ng-template" id="taskProcess.html">
<div class="ngCellText progress" ng-init="entity=row.entity"> <!-- <div style="height:80%;" class="ngCellText progress" ng-init="entity=row.entity"> -->
<div ng-show="entity.status!==3" class="progress-bar progress-bar-success active sj_progress_bar " role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%"> <div ng-init="entity=row.entity">
<span class="sj_progress_font">{{entity.process}}%</span> <div style="position:relative;text-align:right;width:100%;height:25px">
<span></span>
</div> </div>
<div ng-show="entity.status ===3" class="progress-bar progress-bar-danger active sj_progress_bar" role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%" title="{{entity.process}}%"> <div ng-show="entity.status!==3" class="progress-bar progress-bar-success active sj_progress_bar " role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="text-align:left;height:15px;width: {{entity.process}}%">
<span class="sj_progress_font">{{entity.process}}%</span> <!-- <span class="sj_progress_font">{{entity.process}}%</span> -->
</div> </div>
<div style="position:relative;text-align:right;width:100%;height:15px;line-height:90%">
<span>{{entity.process}}%</span>
</div>
<!-- <div ng-show="entity.status ===3" class="progress-bar progress-bar-danger active sj_progress_bar" role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="30" aria-valuemax="100" style="width: 100%" title="{{entity.process}}%">
<span class="sj_progress_font">{{entity.process}}%</span>
</div> -->
</div> </div>
</script> </script>
<!--迁移状态显示 --> <!--迁移状态显示 -->

2
plugins/navigation/ts/navigationPlugin.ts
View File

@ -207,7 +207,7 @@ module Navigation {
</ul> </ul>
</div> </div>
<div ng-hide="subTab.items.length" class="title sj_menu_nav" > <div ng-hide="subTab.items.length" class="title sj_menu_nav" >
<i class=" sj_menu_02" ></i><a href="{{subTab.href}}">{{subTab.label}}&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;&#12288;</a> <i class=" sj_menu_02" ></i><a href="{{subTab.href}}">{{subTab.label}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a>
</div> </div>
</li> </li>
</ul> </ul>