gaobaoming
2018-10-31 05312667d102c9e99d9cbafc022beeb9f1e1afc1
样式
22 files modified
113 ■■■■ changed files
src/app/routes/authority-manager/operation-log/operation-log.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/common/common-board/common-board.component.html 2 ●●● patch | view | raw | blame | history
src/app/routes/data-setting/agent-tree/agent-tree.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/data-setting/data-set-add/data-set-add.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/data-setting/data-set-create/data-set-create.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/platform-setting/add-template/add-template.component.html 4 ●●●● patch | view | raw | blame | history
src/app/routes/platform-setting/change2template/change2template.component.html 4 ●●●● patch | view | raw | blame | history
src/app/routes/platform-setting/hirer-manager/hirer-manager.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/platform-setting/module-setting/edit-information/edit-information.component.html 4 ●●●● patch | view | raw | blame | history
src/app/routes/platform-setting/module-setting/module-setting.component.html 24 ●●●● patch | view | raw | blame | history
src/app/routes/platform-setting/module-setting/module-setting.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/system-setting/operation-log/operation-log.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/create-perspective-table/show-data/show-data.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-a.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-b.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-c.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-d.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-e.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-f.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-g.scss 1 ●●●● patch | view | raw | blame | history
src/app/shared/styles/themes/theme-h.scss 1 ●●●● patch | view | raw | blame | history
src/styles.scss 3 ●●●●● patch | view | raw | blame | history
src/app/routes/authority-manager/operation-log/operation-log.component.ts
@@ -16,10 +16,10 @@
})
export class OperationLogComponent implements OnInit {
  [x: string]: any;
 public firstText: string = '首页';
  public previousText: string =  '上一页';
  public nextText: string =  '下一页';
  public lastText: string =  '尾页';
  public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public mylogData = {
    // 标题
    'title': 'my-log.mytitle',
src/app/routes/common/common-board/common-board.component.html
@@ -65,7 +65,7 @@
    </div>
    <div class="modal-footer">
      <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button>
      <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> -->
    </div>
  </div>
</div>
src/app/routes/data-setting/agent-tree/agent-tree.component.ts
@@ -11,10 +11,10 @@
  outputs: ['outputValueTree1', 'outputValueTree2']
})
export class AgenttreeComponent implements OnInit {
 public firstText: string = '首页';
  public previousText: string =  '上一页';
  public nextText: string =  '下一页';
  public lastText: string =  '尾页';
  public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  ngOnInit() {
  }
  maxSize:number;
src/app/routes/data-setting/data-set-add/data-set-add.component.ts
@@ -31,10 +31,10 @@
    this.isSave = false;
  }
  [x: string]: any;
   public firstText: string = '首页';
  public previousText: string =  '上一页';
  public nextText: string =  '下一页';
  public lastText: string =  '尾页';
  public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public isSave = false;
  public common = true;//普通模式
  public expert = false;//专家模式
src/app/routes/data-setting/data-set-create/data-set-create.component.ts
@@ -50,10 +50,10 @@
  public judge = false;//是否保存
  public datasetId: any;//数据集id
  //ts中文属性S值国际化
  public firstText: string = '首页';
  public previousText: string = '上一页';
  public nextText: string = '下一页';
  public lastText: string = '尾页';
    public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
    public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
    public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
    public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public singleData;
  public swalItem = {
    //数据为空
src/app/routes/platform-setting/add-template/add-template.component.html
@@ -23,8 +23,8 @@
          <!-- end -->
        </div>
        <div class="modal-footer">
          <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
          <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button>
          <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
          <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> -->
        </div>
      </div>
    </div>
src/app/routes/platform-setting/change2template/change2template.component.html
@@ -65,8 +65,8 @@
      <!-- end -->
    </div>
    <div class="modal-footer">
      <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button>
      <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> -->
    </div>
  </div>
</div>
src/app/routes/platform-setting/hirer-manager/hirer-manager.component.ts
@@ -106,10 +106,10 @@
  public ltime1
  public rtime2
  public ltime2
 public firstText: string = '首页';
  public previousText: string =  '上一页';
  public nextText: string =  '下一页';
  public lastText: string =  '尾页';
  public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  constructor(public httpService: HttpService, public routeInfo: ActivatedRoute, public constant: ConstantService, public SwalService: SwalService) {
  }
src/app/routes/platform-setting/module-setting/edit-information/edit-information.component.html
@@ -61,8 +61,8 @@
    </div>
    <div class="modal-footer">
      <!-- {{templateId}}/{{detailId}} -->
      <button type="button" class="btn btn-primary" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button>
      <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <!-- <button type="button" class="btn btn-default" (click)="close()">{{singleButton.concelButton | translate}}</button> -->
    </div>
  </div>
</div>
src/app/routes/platform-setting/module-setting/module-setting.component.html
@@ -24,23 +24,23 @@
                    <em class="fa fa-search text-muted em-top" (click)="search()"></em>
                </div>
                <div class="col-lg-3 add-module-btn">
                    <button class="btn btn-primary btn-sm" type="button" (click)="addTemplate()" title="{{singleButton.addModule | translate}}">{{singleButton.addModule | translate}}</button>
                     <button class="btn btn-primary btn-sm" type="button" (click)="editTemplate()" title="{{singleButton.editModule | translate}}"><em class="fa fa-eyedropper" title="{{singleButton.editModule | translate}}"></em></button>
                      <button class="btn btn-default  btn-sm"type="button" (click)="deletemodule()"title="{{singleButton.deletemodule | translate}}"><em style="color:red;" class="fa fa-trash"></em></button>
                    <button class="but_block but_block_hover" type="button" (click)="addTemplate()" title="{{singleButton.addModule | translate}}">{{singleButton.addModule | translate}}</button>
                     <button class="but_block but_block_hover" type="button" (click)="editTemplate()" title="{{singleButton.editModule | translate}}"><em class="fa fa-eyedropper" title="{{singleButton.editModule | translate}}"></em></button>
                      <button class="but_free but_hover"type="button" (click)="deletemodule()"title="{{singleButton.deletemodule | translate}}"><em style="color:red;" class="fa fa-trash"></em></button>
                </div>
            </div>
            <div class="row">
                <div class="col-lg-9">
                <div class="col-lg-8">
                    <ul class="list-inline m0">
                        <li *ngFor="let item of detailCatalog" (click)="getinfo(item.groupId,item.parentid,item)">
                            <div class="btn btn-default" [class.bgselected]="item.selector"><a [class.colorselected]="item.selector" class="sonBtn">{{item.groupName}}</a></div>
                        </li>
                    </ul>
                </div>
                <div class="col-lg-3">
                    <button class="btn btn-primary btn-sm" type="button" (click)="addDetail()" *ngIf="able" title="{{singleButton.addDetailed | translate}}">{{singleButton.addDetailed | translate}}</button>
                    <button class="btn btn-primary btn-sm" type="button" (click)="change2template()" title="{{singleButton.creatModule | translate}}"><em class="fa fa-crop" title="{{singleButton.creatModule | translate}}"></em></button>
                    <button class="btn btn-primary btn-sm" type="button" (click)="editDetail()" title="{{singleButton.editname | translate}}"><em class="fa fa-eyedropper" title="{{singleButton.editname | translate}}"></em></button>
                <div class="col-lg-4">
                    <button class="but_block but_block_hover" type="button" (click)="addDetail()" *ngIf="able" title="{{singleButton.addDetailed | translate}}">{{singleButton.addDetailed | translate}}</button>
                    <button class="but_block but_block_hover" type="button" (click)="change2template()" title="{{singleButton.creatModule | translate}}"><em class="fa fa-crop" title="{{singleButton.creatModule | translate}}"></em></button>
                    <button class="but_block but_block_hover" type="button" (click)="editDetail()" title="{{singleButton.editname | translate}}"><em class="fa fa-eyedropper" title="{{singleButton.editname | translate}}"></em></button>
                 <button class="btn btn-default  btn-sm"
                    type="button" (click)="deletedetail() "title="{{singleButton.deletedetails | translate}}"><em style="color:red;" class="fa fa-trash"></em></button>
                </div>
@@ -62,12 +62,12 @@
                                    <p>{{text.description | translate}}{{item.remark}}</p>
                                </div>
                            </td>
                            <td class="col-lg-3 vbottom">
                                <button class="btn btn-primary btn-sm" type="button" value="item.widgetId" (click)="editStyle(item.widgetId,item.type,item)">{{tableBtn.editStyle | translate}}</button>
                            <td class="col-lg-4 vbottom">
                                <button class="but_block but_block_hover" type="button" value="item.widgetId" (click)="editStyle(item.widgetId,item.type,item)">{{tableBtn.editStyle | translate}}</button>
                                <button class="btn btn-primary btn-sm" type="button"  (click)="editInformation(item.modelId)">{{tableBtn.editMsg | translate}}</button>
                                <button class="but_block but_block_hover" type="button"  (click)="editInformation(item.modelId)">{{tableBtn.editMsg | translate}}</button>
                                <button class="btn btn-primary btn-sm" type="button" (click)="deletewidgetmodel(item.modelId)">{{tableBtn.delete | translate}}</button>
                                <button class="but_block but_block_hover" type="button" (click)="deletewidgetmodel(item.modelId)">{{tableBtn.delete | translate}}</button>
                            </td>
                        </tr>
                        <tfoot>
src/app/routes/platform-setting/module-setting/module-setting.component.ts
@@ -25,10 +25,10 @@
    public keyword = 'module-setting.KEYWORD';
    // 表内图片
    public ChartImg = 'assets/img/dummy.png';
    public firstText: string = '首页';
    public previousText: string = '上一页';
    public nextText: string = '下一页';
    public lastText: string = '尾页';
    public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
    public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
    public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
    public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
    // 表格外按钮
    public singleButton = {
src/app/routes/system-setting/operation-log/operation-log.component.ts
@@ -16,10 +16,10 @@
})
export class OperationLogComponent implements OnInit {
  [x: string]: any;
 public firstText: string = '首页';
  public previousText: string =  '上一页';
  public nextText: string =  '下一页';
  public lastText: string =  '尾页';
  public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public mylogData = {
    // 标题
    "title": "my-log.mytitle",
src/app/routes/widget-manager/create-perspective-table/show-data/show-data.component.ts
@@ -26,10 +26,10 @@
  public bigCurrentPage: number = 1;
  public maxSize: number = 5;
  public numPages;
   public firstText: string = '首页';
  public previousText: string =  '上一页';
  public nextText: string =  '下一页';
  public lastText: string =  '尾页';
  public firstText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public previousText: string = '<em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-left pagin-style" style="margin-right:10px;"></em>';
  public nextText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em><em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  public lastText: string = '<em _ngcontent-c6="" class="fa fa-angle-right pagin-style" style="margin-right:10px;"></em>';
  //总页数
  public lastPage: number;
  //总条数
src/app/shared/styles/themes/theme-a.scss
@@ -145,6 +145,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-b.scss
@@ -143,6 +143,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-c.scss
@@ -87,6 +87,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-d.scss
@@ -86,6 +86,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-e.scss
@@ -87,6 +87,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-f.scss
@@ -86,6 +86,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-g.scss
@@ -86,6 +86,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/app/shared/styles/themes/theme-h.scss
@@ -86,6 +86,7 @@
  color:$free-button-color;
  transition: 0.2s;
  white-space: nowrap;
  min-width: 40px;
}
.but_hover:hover{
  background: $free-button-color;
src/styles.scss
@@ -352,4 +352,7 @@
}
.fa-size{
    font-size: 18px;
}
.pull-left{
    color: #909FA7;
}