Skip to content

Commit 87f195b

Browse files
author
彭甘雨
committed
修改样式和添加必录
1 parent 7b4cc0a commit 87f195b

File tree

9 files changed

+146
-86
lines changed

9 files changed

+146
-86
lines changed

‎README.md

+5
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,8 @@ Specify what it takes to deploy your app.
5252
* [ember inspector for chrome](https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi)
5353
* [ember inspector for firefox](https://addons.mozilla.org/en-US/firefox/addon/ember-inspector/)
5454

55+
56+
## 版权
57+
58+
Copyright 2019 Cloud J Tech, Inc and other contributors
59+
Licensed under the GPLv3

‎app/dashboard/device/list/controller.js

+29
Original file line numberDiff line numberDiff line change
@@ -627,8 +627,23 @@ export default Ember.Controller.extend({
627627
},
628628
toggleModalScript: function () {
629629
let scriptModal = this.get('model.scriptModal')
630+
let rowList = this.get('rowList')
631+
632+
if (rowList.length == 0) {
633+
Ember.$.notify({
634+
title: '<strong>操作失败:</strong>',
635+
message: '请选择需要执行的主机'
636+
}, {
637+
animate: {
638+
enter: 'animated fadeInRight',
639+
exit: 'animated fadeOutRight'
640+
},
641+
type: 'danger'
642+
})
643+
}
630644
if (scriptModal != true) {
631645
let selectedDevices = []
646+
632647
this.get('rowList').forEach(item => {
633648
if (item.checked) {
634649
selectedDevices.push(item)
@@ -654,6 +669,20 @@ export default Ember.Controller.extend({
654669
},
655670
toggleModalFile: function () {
656671
let fileModal = this.get('model.fileModal')
672+
let rowList = this.get('rowList')
673+
674+
if (rowList.length == 0) {
675+
Ember.$.notify({
676+
title: '<strong>操作失败:</strong>',
677+
message: '请选择需要执行的主机'
678+
}, {
679+
animate: {
680+
enter: 'animated fadeInRight',
681+
exit: 'animated fadeOutRight'
682+
},
683+
type: 'danger'
684+
})
685+
}
657686
if (fileModal != true) {
658687
let selectedDevices = []
659688
this.get('rowList').forEach(item => {

‎app/dashboard/device/list/template.hbs

+78-72
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
{{input type="checkbox" checked=autoRefresh}}自动刷新
2525
{{#if (eq false isShowMultiSearchBlock)}}
2626
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
27-
<a {{action "showMultiSearchBlockAction"}} href="javascript::void(0);">展开更多条件</a>
27+
<a {{action "showMultiSearchBlockAction"}}
28+
href="javascript::void(0);">展开更多条件</a>
2829
{{/if}}
2930
</div>
3031
</div>
@@ -201,8 +202,9 @@
201202
<td>
202203
{{#link-to "dashboard.log.detail" item.ID "install"}}
203204
<div class="progress progress-striped active" title="{{item.InstallLog}}" style="height: 17px;">
204-
<div title="{{item.InstallLog}}" class="progress-bar progress-bar-success" role="progressbar" aria-valuemin="0"
205-
aria-valuemax="100" style="width: {{percentage item.InstallProgress}};">
205+
<div title="{{item.InstallLog}}" class="progress-bar progress-bar-success"
206+
role="progressbar" aria-valuemin="0" aria-valuemax="100"
207+
style="width: {{percentage item.InstallProgress}};">
206208
<span class="sr-only">{{item.InstallLog}}</span>
207209
</div>
208210
</div>
@@ -228,35 +230,38 @@
228230
</table>
229231
<div class="row padding0">
230232
<div class="col-sm-9">
231-
<button {{action "batchDeleteAction"}} type="button" class="btn btn-danger btn-sm">删除</button> &nbsp;&nbsp;
232-
<button {{action "reInstallAction"}} type="button" class="btn btn-default btn-sm">重新安装</button> &nbsp;&nbsp;
233-
<button {{action "cancelInstallAction"}} type="button" class="btn btn-default btn-sm">取消安装</button> &nbsp;&nbsp;
233+
<button {{action "batchDeleteAction"}} type="button" class="btn btn-danger btn-sm">删除</button>
234+
&nbsp;&nbsp;
235+
<button {{action "reInstallAction"}} type="button" class="btn btn-default btn-sm">重新安装</button>
236+
&nbsp;&nbsp;
237+
<button {{action "cancelInstallAction"}} type="button" class="btn btn-default btn-sm">取消安装</button>
238+
&nbsp;&nbsp;
234239

235-
<button {{action "toggleModalIpmi" "batchPowerOnAction"}} disabled={{model.isButtonLock}} title="{{model.buttonLockNoticeInfo}}"
236-
type="button" class="btn btn-default btn-sm">
240+
<button {{action "toggleModalIpmi" "batchPowerOnAction"}} disabled={{model.isButtonLock}}
241+
title="{{model.buttonLockNoticeInfo}}" type="button" class="btn btn-default btn-sm">
237242
开机
238243
</button> &nbsp;&nbsp;
239244

240-
<button {{action "toggleModalIpmi" "batchStartFromPxeAction"}} disabled={{model.isButtonLock}} title="{{model.buttonLockNoticeInfo}}"
241-
type="button" class="btn btn-default btn-sm">
245+
<button {{action "toggleModalIpmi" "batchStartFromPxeAction"}} disabled={{model.isButtonLock}}
246+
title="{{model.buttonLockNoticeInfo}}" type="button" class="btn btn-default btn-sm">
242247
从PXE启动
243248
</button> &nbsp;&nbsp;
244249

245-
<button {{action "toggleModalIpmi" "batchPowerOffAction"}} disabled={{model.isButtonLock}} title="{{model.buttonLockNoticeInfo}}"
246-
type="button" class="btn btn-default btn-sm">
250+
<button {{action "toggleModalIpmi" "batchPowerOffAction"}} disabled={{model.isButtonLock}}
251+
title="{{model.buttonLockNoticeInfo}}" type="button" class="btn btn-default btn-sm">
247252
关机
248253
</button> &nbsp;&nbsp;
249254

250-
<button {{action "toggleModalIpmi" "batchReStartAction"}} disabled={{model.isButtonLock}} title="{{model.buttonLockNoticeInfo}}"
251-
type="button" class="btn btn-default btn-sm">
255+
<button {{action "toggleModalIpmi" "batchReStartAction"}} disabled={{model.isButtonLock}}
256+
title="{{model.buttonLockNoticeInfo}}" type="button" class="btn btn-default btn-sm">
252257
重启
253258
</button> &nbsp;&nbsp;
254-
<button {{action "toggleModalScript"}} disabled={{model.isButtonLock}} title="{{model.buttonLockNoticeInfo}}" type="button"
255-
class="btn btn-default btn-sm">
259+
<button {{action "toggleModalScript"}} disabled={{model.isButtonLock}}
260+
title="{{model.buttonLockNoticeInfo}}" type="button" class="btn btn-default btn-sm">
256261
脚本执行
257262
</button> &nbsp;&nbsp;
258-
<button {{action "toggleModalFile"}} disabled={{model.isButtonLock}} title="{{model.buttonLockNoticeInfo}}" type="button"
259-
class="btn btn-default btn-sm">
263+
<button {{action "toggleModalFile"}} disabled={{model.isButtonLock}}
264+
title="{{model.buttonLockNoticeInfo}}" type="button" class="btn btn-default btn-sm">
260265
文件下发
261266
</button> &nbsp;&nbsp;
262267
</div>
@@ -398,7 +403,6 @@
398403
{{/common/io-form-validator}}
399404
{{/common/io-modal}}
400405

401-
402406
{{#common/io-modal show=model.scriptModal close="toggleModalScript"}}
403407
{{#common/io-form-validator submitForm="scriptTaskAction"}}
404408
<form class="form-horizontal">
@@ -413,47 +417,47 @@
413417
</div>
414418
<div class="modal-body" style="max-height:70rem">
415419
<div class="row">
416-
<div class="col-sm-2"></div>
420+
<div class="col-sm-1"></div>
417421
<div class="col-sm-2" style="padding:0;">
418-
<div class="pull-right">作业名称：</div>
422+
<div class="pull-right"><label class="required">作业名称：</label></div>
419423
</div>
420-
<div class="col-sm-4">
421-
{{input required=true value=model.task.TaskName type="text" class="form-control input-md"}}
424+
<div class="col-sm-6">
425+
{{input required=true value=model.task.TaskName type="text" required=true class="form-control input-md"}}
422426
</div>
423427
</div>
424428
<div class="row" style="padding-top: 20px;">
425-
<div class="col-sm-2"></div>
429+
<div class="col-sm-1"></div>
426430
<div class="col-sm-2" style="padding:0;">
427-
<div class="pull-right">执行通道：</div>
431+
<div class="pull-right"><label class="required">执行通道：</label></div>
428432
</div>
429-
<div class="col-sm-4">
433+
<div class="col-sm-6">
430434
{{common/io-select class="form-control" prompt="请选择执行通道"
431-
content= model.dictTaskChannel
435+
content= model.dictTaskChannel required=true
432436
value=model.task.TaskChannel optionValuePath="content.id"
433437
optionLabelPath="content.name" }}
434438
</div>
435439
</div>
436440
<div class="row" style="padding-top: 20px;">
437-
<div class="col-sm-2"></div>
441+
<div class="col-sm-1"></div>
438442
<div class="col-sm-2" style="padding:0;">
439-
<div class="pull-right">执行用户：</div>
443+
<div class="pull-right"><label class="required">执行用户：</label></div>
440444
</div>
441-
<div class="col-sm-4">
445+
<div class="col-sm-6">
442446
{{input required=true value=model.task.Runas type="text" class="form-control input-md"}}
443447
</div>
444448
</div>
445449

446450
<div class="row" style="padding-top: 20px;">
447-
<div class="col-sm-2"></div>
451+
<div class="col-sm-1"></div>
448452
<div class="col-sm-2" style="padding:0;">
449-
<div class="pull-right">超时时间：</div>
453+
<div class="pull-right"><label class="required">超时时间：</label></div>
450454
</div>
451-
<div class="col-sm-4">
455+
<div class="col-sm-6">
452456
{{input required=true value=model.task.Timeout type="number" class="form-control input-md"}}
453457
</div>
454458
</div>
455459
<div class="row" style="padding-top: 30px;">
456-
<div class="col-sm-2"></div>
460+
<div class="col-sm-1"></div>
457461
<div class="col-sm-2" style="padding:0;">
458462
<div class="pull-right">设备列表：</div>
459463
</div>
@@ -485,48 +489,49 @@
485489
</div>
486490
</div>
487491
<div class="row" style="padding-top: 20px;">
488-
<div class="col-sm-2"></div>
492+
<div class="col-sm-1"></div>
489493
<div class="col-sm-2" style="padding:0;">
490-
<div class="pull-right">密码：</div>
494+
<div class="pull-right"><label class="required">密码：</label></div>
491495
</div>
492-
<div class="col-sm-4">
496+
<div class="col-sm-6">
493497
{{input required=true value=model.task.Password type="password" class="form-control input-md"}}
494498
</div>
495499
</div>
496500
{{!-- <div class="row" style="padding-top: 20px;">
497-
<div class="col-sm-2"></div>
501+
<div class="col-sm-1"></div>
498502
<div class="col-sm-2" style="padding:0;">
499503
<div class="pull-right">脚本类型：</div>
500504
</div>
501-
<div class="col-sm-4">
505+
<div class="col-sm-6">
502506
{{common/io-radio required=true name=(str-concat index index2) value=model.task.ScriptType
503507
checked=item2.default}}
504508
</div>
505509
</div> --}}
506510
<div class="row" style="padding-top: 20px;">
507-
<div class="col-sm-2"></div>
511+
<div class="col-sm-1"></div>
508512
<div class="col-sm-2" style="padding:0;">
509-
<div class="pull-right">脚本内容：</div>
513+
<div class="pull-right"><label class="required">脚本内容：</label></div>
510514
</div>
511515
<div class="col-sm-4 col-upload">
512516
{{#common/io-file-upload upload="uploadScript" autoUpload=true showUploadButton=false
513517
multiple=false}}{{/common/io-file-upload}}
514-
{{textarea value=model.task.Script required=true class="form-control input-md"}}
518+
{{textarea value=model.task.Script required=true class="form-control input-md" rows="10"}}
515519
</div>
516520
</div>
517521
<div class="row" style="padding-top: 20px;">
518-
<div class="col-sm-2"></div>
522+
<div class="col-sm-1"></div>
519523
<div class="col-sm-2" style="padding:0;">
520524
<div class="pull-right">脚本参数：</div>
521525
</div>
522-
<div class="col-sm-4">
523-
{{textarea value=model.task.ScriptParam class="form-control input-md"}}
526+
<div class="col-sm-4 col-upload">
527+
{{textarea value=model.task.ScriptParam class="form-control input-md" }}
524528
</div>
525529
</div>
526530
</div>
527531
<div class="modal-footer">
528-
<button type="submit" class="btn btn-primary">保存</button>
529-
<button type="button" class="btn btn-default" data-dismiss="modal" {{action "toggleModalScript"}}>取消</button>
532+
<button type="submit" class="btn btn-primary">执行</button>
533+
<button type="button" class="btn btn-default" data-dismiss="modal"
534+
{{action "toggleModalScript"}}>取消</button>
530535
</div>
531536
</div>
532537
</div>
@@ -551,47 +556,47 @@
551556
</div>
552557
<div class="modal-body" style="max-height:70rem">
553558
<div class="row">
554-
<div class="col-sm-2"></div>
559+
<div class="col-sm-1"></div>
555560
<div class="col-sm-2" style="padding:0;">
556-
<div class="pull-right">作业名称：</div>
561+
<div class="pull-right"><label class="required">作业名称：</label></div>
557562
</div>
558-
<div class="col-sm-4">
559-
{{input required=true value=model.task.TaskName type="text" class="form-control input-md"}}
563+
<div class="col-sm-6">
564+
{{input required=true value=model.task.TaskName required=true type="text" class="form-control input-md"}}
560565
</div>
561566
</div>
562567
<div class="row" style="padding-top: 20px;">
563-
<div class="col-sm-2"></div>
568+
<div class="col-sm-1"></div>
564569
<div class="col-sm-2" style="padding:0;">
565-
<div class="pull-right">执行通道：</div>
570+
<div class="pull-right"><label class="required">执行通道：</label></div>
566571
</div>
567-
<div class="col-sm-4">
572+
<div class="col-sm-6">
568573
{{common/io-select class="form-control" prompt="请选择执行通道"
569-
content= model.dictTaskChannel
570-
value=model.task.TaskChannel optionValuePath="content.id"
571-
optionLabelPath="content.name" }}
574+
content= model.dictTaskChannel required=true
575+
value=model.task.TaskChannel optionValuePath="content.id"
576+
optionLabelPath="content.name" }}
572577
</div>
573578
</div>
574579
<div class="row" style="padding-top: 20px;">
575-
<div class="col-sm-2"></div>
580+
<div class="col-sm-1"></div>
576581
<div class="col-sm-2" style="padding:0;">
577-
<div class="pull-right">执行用户：</div>
582+
<div class="pull-right"><label class="required">执行用户：</label></div>
578583
</div>
579-
<div class="col-sm-4">
584+
<div class="col-sm-6">
580585
{{input required=true value=model.task.Runas type="text" class="form-control input-md"}}
581586
</div>
582587
</div>
583588

584589
<div class="row" style="padding-top: 20px;">
585-
<div class="col-sm-2"></div>
590+
<div class="col-sm-1"></div>
586591
<div class="col-sm-2" style="padding:0;">
587-
<div class="pull-right">超时时间：</div>
592+
<div class="pull-right"><label class="required">超时时间：</label></div>
588593
</div>
589-
<div class="col-sm-4">
594+
<div class="col-sm-6">
590595
{{input required=true value=model.task.Timeout type="number" class="form-control input-md"}}
591596
</div>
592597
</div>
593598
<div class="row" style="padding-top: 30px;">
594-
<div class="col-sm-2"></div>
599+
<div class="col-sm-1"></div>
595600
<div class="col-sm-2" style="padding:0;">
596601
<div class="pull-right">设备列表：</div>
597602
</div>
@@ -623,25 +628,25 @@
623628
</div>
624629
</div>
625630
<div class="row" style="padding-top: 20px;">
626-
<div class="col-sm-2"></div>
631+
<div class="col-sm-1"></div>
627632
<div class="col-sm-2" style="padding:0;">
628-
<div class="pull-right">密码：</div>
633+
<div class="pull-right"><label class="required">密码：</label></div>
629634
</div>
630-
<div class="col-sm-4">
635+
<div class="col-sm-6">
631636
{{input required=true value=model.task.Password type="password" class="form-control input-md"}}
632637
</div>
633638
</div>
634639
<div class="row" style="padding-top: 20px;">
635-
<div class="col-sm-2"></div>
640+
<div class="col-sm-1"></div>
636641
<div class="col-sm-2" style="padding:0;">
637642
<div class="pull-right">目标路径：</div>
638643
</div>
639-
<div class="col-sm-4">
644+
<div class="col-sm-6">
640645
{{input type="text" value=model.task.DestFile required=true class="form-control input-md"}}
641646
</div>
642647
</div>
643648
<div class="row" style="padding-top: 20px;">
644-
<div class="col-sm-2"></div>
649+
<div class="col-sm-1"></div>
645650
<div class="col-sm-2" style="padding:0;">
646651
<div class="pull-right">源文件：</div>
647652
</div>
@@ -653,8 +658,9 @@
653658
</div>
654659
</div>
655660
<div class="modal-footer">
656-
<button type="submit" class="btn btn-primary">保存</button>
657-
<button type="button" class="btn btn-default" data-dismiss="modal" {{action "toggleModalFile"}}>取消</button>
661+
<button type="submit" class="btn btn-primary">下发</button>
662+
<button type="button" class="btn btn-default" data-dismiss="modal"
663+
{{action "toggleModalFile"}}>取消</button>
658664
</div>
659665
</div>
660666
</div>

‎app/dashboard/guide/controller.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default Ember.Controller.extend({
5656
self.get("dhcpSubnetSrv").save(form).then(function(data) {
5757
self.set("model.dhcpMessage",null);
5858
if(data.Status === "success"){
59-
self.send("skipStep1Action");
59+
// self.send("skipStep1Action");
6060
} else {
6161
Ember.$.notify({
6262
title: "<strong>操作失败:</strong>",

0 commit comments

Comments
 (0)