seimin 1 year ago
parent
commit
018296977f

+ 2 - 2
proxy.conf.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "/service": {
2
   "/service": {
3
-    "target": "http://192.168.3.108",
3
+    "target": "http://weixintest16.ngser.dashitech.com",
4
     "logLevel": "debug",
4
     "logLevel": "debug",
5
     "changeOrigin": true,
5
     "changeOrigin": true,
6
     "pathRewrite": {
6
     "pathRewrite": {
@@ -8,7 +8,7 @@
8
     }
8
     }
9
   },
9
   },
10
   "/file": {
10
   "/file": {
11
-    "target": "http://192.168.3.108",
11
+    "target": "http://weixintest16.ngser.dashitech.com",
12
     "logLevel": "debug",
12
     "logLevel": "debug",
13
     "changeOrigin": true,
13
     "changeOrigin": true,
14
     "pathRewrite": {
14
     "pathRewrite": {

+ 3 - 3
src/app/views/washing-batch-view/washing-batch-view.component.html

@@ -39,15 +39,15 @@
39
         [nzLoading]="loading" [nzScroll]="{ x: '100%', y: scrollY + 'px' }">
39
         [nzLoading]="loading" [nzScroll]="{ x: '100%', y: scrollY + 'px' }">
40
         <thead>
40
         <thead>
41
           <tr class="thead">
41
           <tr class="thead">
42
-            <th nzLeft="0px" nzAlign="center" nzWidth="50px" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
42
+            <th nzLeft="0px" nzAlign="center" nzWidth="40px" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
43
               (nzCheckedChange)="checkAll($event)"></th>
43
               (nzCheckedChange)="checkAll($event)"></th>
44
-            <th [nzLeft]="first ? '50px' : null" [nzRight]="last ? '0px' : null" nzAlign="center" [nzWidth]="(first || last) ? '150px' : '70px'" *ngFor="let row of rows;let first = first;let last = last;">{{ row }}</th>
44
+            <th [nzLeft]="first ? '40px' : null" [nzRight]="last ? '0px' : (index == rows.length - 2 ? '100px' : null)" nzAlign="center" [nzWidth]="first ? '140px' : (last ? '100px' : '65px')" *ngFor="let row of rows;let first = first;let last = last;let index = index;">{{ row }}</th>
45
           </tr>
45
           </tr>
46
         </thead>
46
         </thead>
47
         <tbody>
47
         <tbody>
48
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
48
           <tr *ngFor="let data of listOfData;let index=index;" (click)="selectedListData(data)">
49
             <td nzLeft="0px" nzAlign="center" nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
49
             <td nzLeft="0px" nzAlign="center" nzShowCheckbox [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
50
-            <td [nzLeft]="first ? '50px' : null" [nzRight]="last ? '0px' : null" nzAlign="center" *ngFor="let row of data;let first = first;let last = last;">{{ row }}</td>
50
+            <td [nzLeft]="first ? '40px' : null" [nzRight]="last ? '0px' : (index == rows.length - 2 ? '100px' : null)" nzAlign="center" *ngFor="let row of data;let first = first;let last = last;let index = index;">{{ row }}</td>
51
           </tr>
51
           </tr>
52
         </tbody>
52
         </tbody>
53
       </nz-table>
53
       </nz-table>

+ 3 - 0
src/app/views/washing-batch-view/washing-batch-view.component.less

@@ -11,6 +11,7 @@
11
     // 头部
11
     // 头部
12
     .head{
12
     .head{
13
       height: 130px;
13
       height: 130px;
14
+      flex-shrink: 0;
14
       background-color: #fff;
15
       background-color: #fff;
15
       display: flex;
16
       display: flex;
16
       align-items: center;
17
       align-items: center;
@@ -47,6 +48,7 @@
47
 
48
 
48
       .search{
49
       .search{
49
         height: 75px;
50
         height: 75px;
51
+        flex-shrink: 0;
50
         &.top {
52
         &.top {
51
           height: 74px;
53
           height: 74px;
52
           padding: 0 16px;
54
           padding: 0 16px;
@@ -99,6 +101,7 @@
99
       }
101
       }
100
       .bottom{
102
       .bottom{
101
         height: 90px;
103
         height: 90px;
104
+        flex-shrink: 0;
102
         padding-top: 20px;
105
         padding-top: 20px;
103
         display: flex;
106
         display: flex;
104
         justify-content: flex-end;
107
         justify-content: flex-end;

+ 1 - 2
src/app/views/washing-batch-view/washing-batch-view.component.ts

@@ -1,6 +1,5 @@
1
 import { Component, OnInit, AfterViewInit, HostListener } from "@angular/core";
1
 import { Component, OnInit, AfterViewInit, HostListener } from "@angular/core";
2
 import { ToolService } from 'src/app/services/tool.service';
2
 import { ToolService } from 'src/app/services/tool.service';
3
-import { fromEvent } from 'rxjs';
4
 import { MainService } from 'src/app/services/main.service';
3
 import { MainService } from 'src/app/services/main.service';
5
 
4
 
6
 @Component({
5
 @Component({
@@ -28,7 +27,7 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
28
   resizeInit(){
27
   resizeInit(){
29
     clearTimeout(this._timer);
28
     clearTimeout(this._timer);
30
     this._timer = setTimeout(() => {
29
     this._timer = setTimeout(() => {
31
-      this.scrollY = window.innerHeight - 383;
30
+      this.scrollY = window.innerHeight - 206 - document.querySelector('.head').clientHeight - document.querySelector('th').clientHeight;
32
     }, 500)
31
     }, 500)
33
   }
32
   }
34
 
33