gaobaoming
2018-10-26 9f45c621288c915bf844434913874ca55c6f0fd5
高宝明
13 files modified
115 ■■■■■ changed files
src/app/routes/data-setting/choice-datasetset/choice-datasetset.component.html 6 ●●●● patch | view | raw | blame | history
src/app/routes/data-setting/data-set/data-set.component.ts 1 ●●●● patch | view | raw | blame | history
src/app/routes/data-setting/data-source/data-source.component.html 12 ●●●●● patch | view | raw | blame | history
src/app/routes/data-setting/data-source/data-source.component.scss 10 ●●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/my-widget/add-node/add-node.component.html 4 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/my-widget/change-group/change-group.component.html 12 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/my-widget/change-group/change-group.component.scss 6 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/my-widget/my-widget.component.html 10 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/my-widget/my-widget.component.ts 8 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/my-widget/select-dataset/select-dataset.component.html 6 ●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/template-reference/template-reference.component.html 19 ●●●●● patch | view | raw | blame | history
src/app/routes/widget-manager/template-reference/template-reference.component.ts 8 ●●●● patch | view | raw | blame | history
src/styles.scss 13 ●●●●● patch | view | raw | blame | history
src/app/routes/data-setting/choice-datasetset/choice-datasetset.component.html
@@ -34,9 +34,9 @@
        </div>
      </div>
    </div>
    <div>
      <button type="button" class="btn btn-primary btn-lg dis" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <button type="button" class="btn btn-default btn-lg dist" (click)="close()">{{singleButton.concelButton | translate}}</button>
    <div class="modal-footer">
      <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <!-- <button type="button" class="btn btn-default btn-lg dist" (click)="close()">{{singleButton.concelButton | translate}}</button> -->
    </div>
  </div>
</div>
src/app/routes/data-setting/data-set/data-set.component.ts
@@ -512,7 +512,6 @@
  }
  ngOnInit() {
    console.log('asdasd');
    this.title = this.routeInfo.snapshot.data[0]["title"];
    this.getDataList();
    // this.nameFilter.valueChanges
src/app/routes/data-setting/data-source/data-source.component.html
@@ -1,13 +1,11 @@
<app-title [title]="title" style="color:  #333;"></app-title>
<div class="row position">
  <!-- 遮罩start -->
  <div class="overlay" *ngIf="spinning">
    <div class="spin">
      <span>
        <i class="fa fa-spinner fa-spin"></i>
      </span>
    </div>
  </div>
<div class="load" *ngIf="spinning">
  <span>
      <i class="fa fa-spinner fa-spin"></i>
  </span>
</div>
  <!-- 遮罩end -->
  <div class="col-md-12">
    <div class="box box_left" style="padding-right: 0;">
src/app/routes/data-setting/data-source/data-source.component.scss
@@ -61,4 +61,14 @@
}
.freeStyle{
    margin-right: 5px;
}
.load{
    position: fixed;
    top: 50%;
    left: 50%;
    span{
        font-size: 66px;
        color: #2faed4;
    }
}
src/app/routes/widget-manager/my-widget/add-node/add-node.component.html
@@ -23,7 +23,7 @@
      </table>
    </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>
src/app/routes/widget-manager/my-widget/change-group/change-group.component.html
@@ -7,11 +7,6 @@
       </div>
       <div class="modal-body">
          <div class="position">
              <div class="load" [hidden]="!treeLoading">
                  <span>
                      <i class="fa fa-spinner fa-spin"></i>
                  </span>
              </div>
        <tree-root [hidden]="treeLoading" #tree [nodes]="nodes" [focused]="true" [options]="customTemplateStringOptions">
          <ng-template #treeNodeTemplate let-node>
            <div (click)="getMessage(node.data,node.parent)">
@@ -28,4 +23,9 @@
         <!-- <button type="button" class="btn btn-default" (click)="close()" >{{singleButton.concelButton | translate}}</button> -->
       </div>
     </div>
  </div>
  </div>
  <div class="load" [hidden]="!treeLoading">
    <span>
        <i class="fa fa-spinner fa-spin"></i>
    </span>
</div>
src/app/routes/widget-manager/my-widget/change-group/change-group.component.scss
@@ -1,9 +1,9 @@
.position{
    position: relative;
    .load{
        position: absolute;
        top: 60%;
        left: 50%;
        position: fixed;
        top: 50%;
        left: 45%;
        span{
            font-size: 66px;
            color: #2faed4;
src/app/routes/widget-manager/my-widget/my-widget.component.html
@@ -28,9 +28,9 @@
            <em class="fa fa-search text-muted em-right" (click)="search()"></em>
          </div>
           <div class="form-group pull-right col-lg-6" style="text-align: right;">
            <a class="" (click)="creatReportForm()"><em class="fa fa-bookmark" ></em>{{singleButton.creatReportForm | translate}}</a>
            <a class="left-line" (click)="creatChart()"><em class="fa fa-pie-chart" ></em>{{singleButton.creatChart | translate}}</a>
            <a class="left-line" (click)="creatPerspectiveDrawing()"><em class="fa fa-cube" ></em>{{singleButton.creatPerspectiveDrawing | translate}}</a>
            <a class="green_color" (click)="creatReportForm()"><em class="fa fa-bookmark" ></em>{{singleButton.creatReportForm | translate}}</a>
            <a class="left-line green_color" (click)="creatChart()"><em class="fa fa-pie-chart" ></em>{{singleButton.creatChart | translate}}</a>
            <a class="left-line green_color" (click)="creatPerspectiveDrawing()"><em class="fa fa-cube" ></em>{{singleButton.creatPerspectiveDrawing | translate}}</a>
          </div>
          <!-- <div class="form-group col-lg-4 pull-right">
            <button class="btn btn-primary btn-sm" type="button" (click)="creatReportForm()">{{singleButton.creatReportForm | translate}}</button>
@@ -107,8 +107,8 @@
      <div class="well wd-wide tree">
        <div style="display: flex;border-bottom: 1px solid #999;">
        <div class="newNode" style="border: none;display: flex;justify-content: space-around;">
          <a class="" (click)="addSameNode(tree)"><em class="fa fa-plus-circle" ></em>平级节点</a>
          <a class="" (click)="addNode(tree)"><em class="fa fa-plus-circle" ></em>子节点</a>
          <a class="green_color" (click)="addSameNode(tree)"><em class="fa fa-plus-circle" ></em>平级节点</a>
          <a class="green_color" (click)="addNode(tree)"><em class="fa fa-plus-circle" ></em>子节点</a>
          
        </div>
        <ul style="width:270px;"  class="mybtnul" *ngIf="!isNew" >
src/app/routes/widget-manager/my-widget/my-widget.component.ts
@@ -42,10 +42,10 @@
    onEvent(msg) {
        // 
    }
    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>';
    //左侧tree操作按钮
    public treeBtn = {
        //  新增子节点
src/app/routes/widget-manager/my-widget/select-dataset/select-dataset.component.html
@@ -28,9 +28,9 @@
        </div>
      </div>
    </div>
    <div>
      <button type="button" class="btn btn-primary btn-lg dis" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <button type="button" class="btn btn-default btn-lg dist" (click)="close()">{{singleButton.concelButton | translate}}</button>
    <div class="modal-footer">
      <button type="button" class="mol_but but_hover" (click)="confirm()">{{singleButton.confirmButton | translate}}</button>
      <!-- <button type="button" class="btn btn-default btn-lg dist" (click)="close()">{{singleButton.concelButton | translate}}</button> -->
    </div>
  </div>
</div>
src/app/routes/widget-manager/template-reference/template-reference.component.html
@@ -1,14 +1,11 @@
<div class="content-heading" style="color: #333;">{{title | translate}}</div>
<!-- 遮罩start -->
<div class="load" *ngIf="spinning">
    <span>
        <i class="fa fa-spinner fa-spin"></i>
    </span>
  </div>
<div class="module-setting-contact">
      <!-- 遮罩start -->
  <div class="overlay" *ngIf="spinning">
        <div class="spin">
          <span>
            <i class="fa fa-spinner fa-spin"></i>
          </span>
        </div>
      </div>
      <!-- 遮罩end -->
    <div class="panel panel-default">
        <div class="panel-body">
            <div class="row under-line">
@@ -59,8 +56,8 @@
                                </div>
                            </td>
                            <td class="col-lg-3 vbottom">
                                <button class="btn btn-primary btn-sm" type="button" (click)="preview(item.widgetId,item.type,item.modelId)">{{singleButton.preview | translate}}</button>
                                <button class="btn btn-primary btn-sm" type="button" (click)="refer(item.widgetId,item.type,item.modelId)">{{singleButton.refer | translate}}</button>
                                <button class="but_free but_hover" type="button" (click)="preview(item.widgetId,item.type,item.modelId)">{{singleButton.preview | translate}}</button>
                                <button class="but_free but_hover" type="button" (click)="refer(item.widgetId,item.type,item.modelId)">{{singleButton.refer | translate}}</button>
                            </td>
                        </tr>        
                        <tfoot>
src/app/routes/widget-manager/template-reference/template-reference.component.ts
@@ -20,10 +20,10 @@
  public 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/styles.scss
@@ -380,6 +380,7 @@
    line-height: 38px;
    color:#178a8b;
    transition: 0.2s;
    white-space: nowrap;
}
.but_block{
    background: #178a8b;
@@ -391,6 +392,7 @@
    line-height: 35px;
    color:#ffffff;
    transition: 0.2s;
    white-space: nowrap;
}
.but_strip_hover:hover{
    background: #ffffff;
@@ -410,6 +412,7 @@
    line-height: 35px;
    color:#178a8b;
    transition: 0.2s;
    white-space: nowrap;
}
.mol_but_sm{
    background: white;
@@ -487,4 +490,14 @@
.green_color:hover{
    color: #178a8b !important;
    font-weight: 500;
}
.load{
    position: fixed;
    top: 50%;
    left: 50%;
    z-index: 999;
    span{
        font-size: 66px;
        color: #2faed4;
    }
}