Browse Source

页面优化

seimin 1 year ago
parent
commit
9085f494c1

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "/service": {
2
   "/service": {
3
-    "target": "http://192.168.4.241",
3
+    "target": "http://192.168.3.108",
4
     "logLevel": "debug",
4
     "logLevel": "debug",
5
     "changeOrigin": true,
5
     "changeOrigin": true,
6
     "pathRewrite": {
6
     "pathRewrite": {

+ 1 - 1
src/app/share/allocation-worker/allocation-worker.component.html

@@ -34,7 +34,7 @@
34
               </td>
34
               </td>
35
               <td nzAlign="center">{{ data.name }}</td>
35
               <td nzAlign="center">{{ data.name }}</td>
36
               <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.totalCount }}</td>
36
               <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.totalCount }}</td>
37
-              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.freetime }}</td>
37
+              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'" [ngClass]="{red: !data.freetime, green: data.freetime}">{{ data.freetime || '忙碌中' }}</td>
38
             </tr>
38
             </tr>
39
           </tbody>
39
           </tbody>
40
         </nz-table>
40
         </nz-table>

+ 1 - 1
src/app/share/dialog-delete/dialog-delete.component.ts

@@ -34,7 +34,7 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
34
     if(changes.delModal && changes.delModal.currentValue){
34
     if(changes.delModal && changes.delModal.currentValue){
35
       this.isRemandClean = true;
35
       this.isRemandClean = true;
36
       this.isLoading = false;
36
       this.isLoading = false;
37
-      this.recoveryRoom = null;
37
+      // this.recoveryRoom = null;
38
     }
38
     }
39
     if(changes.isSelected && changes.isSelectedArr){
39
     if(changes.isSelected && changes.isSelectedArr){
40
       if(changes.isSelectedArr.currentValue.length === 1){
40
       if(changes.isSelectedArr.currentValue.length === 1){