frontdesk/proxy.conf.json
@@ -1,16 +1,16 @@ { "/archive-web": { "target": "http://192.168.1.114:8090/", "target": "http://192.168.1.119:8090/", "secure": false }, "/group1/M00": { "target": "http://192.168.1.114/", "target": "http://192.168.1.166/", "secure": false }, "/file": { "target": "http://192.168.1.114:8012/file/", "target": "http://192.168.1.121:8012/file/", "secure": false }
@@ -431,7 +431,7 @@ <div bsModal #smModal="bs-modal" class="modal fade in" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="false" [config]="{backdrop: 'static',keyboard:false}"> <div class="modal-dialog " style="width: 1000px;white-space:nowrap; "> <div class="modal-dialog " style="width: 1000px;white-space:nowrap;"> <div class="modal-content"> <div class="modal-body"> <div class="row" style="margin-left: 10px;margin-right: 10px;"> frontdesk/src/app/routes/filearchives/upvolume/upvolume.component.html
@@ -135,7 +135,7 @@ </div> <div bsModal #archiveDetailModal="bs-modal" id="archiveDetailModal" class="modal fade in" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="false" [config]="{backdrop: 'static',keyboard:false}"> <div class="modal-dialog " style="width: 1000px;white-space:nowrap; "> <div class="modal-dialog " style="width: 1000px;white-space:nowrap;top: 600px "> <div class="modal-content"> <em class="fa fa-times" style="margin-left:98%" (click)="archiveModalCloseById(archiveDetailModal,'archiveDetailModal')" aria-hidden="true"></em> <div class="modal-body"> frontdesk/src/app/shared/components/arrangementDetails/arrangementDetails.component.html
@@ -10,6 +10,7 @@ <th class="text-center">申请人</th> <th class="text-center">申请人部门</th> <th class="text-center">调整实物</th> <th class="text-center">调整理由</th> </tr> </thead> <tbody style="height:auto; display:inline;"> @@ -18,15 +19,6 @@ <td class="text-center">{{reason.arrangementStaff}}</td> <td class="text-center">{{reason.orgValue}}</td> <td class="text-center"><span *ngIf="reason.materialObjectFlg">是</span><span *ngIf="!reason.materialObjectFlg">否</span></td> </tr> </tbody> <thead class="text-center"> <tr> <th class="text-center">调整理由</th> </tr> </thead> <tbody style="height:auto; display:inline;"> <tr> <td class="text-center">{{reason.reason == '' ? '无' : reason.reason}}</td> </tr> </tbody> @@ -74,24 +66,18 @@ <thead class="text-center"> <tr> <th class="text-center">说明</th> <ng-container *ngFor="let item of colList"> <th class="text-center">{{item.colName}}</th> </ng-container> <th class="text-center">调整前</th> <th class="text-center">调整后</th> </tr> </thead> <tbody style="height:auto; display:inline;"> <tr> <td class="text-center">调整前</td> <ng-container *ngFor="let col of colList"> <td class="text-center">{{volumeDetail.oldVolumeDetail[col.colId]}}</td> </ng-container> </tr> <tr> <td class="text-center">调整后</td> <ng-container *ngFor="let col of colList"> <td class="text-center">{{volumeDetail.newVolumeDetail[col.colId]}}</td> </ng-container> </tr> <ng-container *ngFor="let item of colList"> <tr *ngIf="volumeDetail.oldVolumeDetail[item.colId]!==undefined || volumeDetail.newVolumeDetail[item.colId]!==undefined"> <td class="text-center">{{item.colName}}</td> <td class="text-center">{{volumeDetail.oldVolumeDetail[item.colId]}}</td> <td class="text-center">{{volumeDetail.newVolumeDetail[item.colId]}}</td> </tr> </ng-container> </tbody> </table> </div> frontdesk/src/app/shared/components/arrangementDetails/arrangementDetails.component.ts
@@ -125,10 +125,16 @@ const data = newVolumeDetail.find(newData => newData.metadataId === oldData.metadataId && newData.value !== oldData.value); if (data !== undefined) { this.colList.push({colName: data.chineseName, colId: data.englishName}); var obj = {}; this.colList = this.colList.reduce(function(item, next) { obj[next.colName] ? '' : obj[next.colName] = true && item.push(next) return item }, []); this.volumeDetail.newVolumeDetail[data.englishName] = data.value; this.volumeDetail.oldVolumeDetail[data.englishName] = oldData.value; } }); console.log(this.volumeDetail); } analysisArchiveData(archive, key) { frontdesk/src/app/shared/components/showArchiveParts/showArchiveParts.component.ts
@@ -246,6 +246,7 @@ dataType: dataType, uploadedFileList: list, }); console.log(this.fileAdjustmentList); } // 密集 frontdesk/src/app/shared/components/uploadfile/uploadfile.component.ts
@@ -66,6 +66,7 @@ ) {} ngOnInit() { console.log( this.data.uploadedFileList); this.uploader = new Resumable({ target: this.urlUtil.upFilePsotUrl, testTarget: this.urlUtil.upFileGetUrl, @@ -100,6 +101,7 @@ }); this.data.uploadedFileList = []; this.data.uploadedFileList = tmpElemArray; console.log(tmpElemArray) this.uploader.files.forEach((data) => { if (data.fileName !== file.fileName) { @@ -268,6 +270,7 @@ }); this.data.uploadedFileList = []; this.data.uploadedFileList = tmpElemArray; console.log(tmpElemArray); } removeAdd(item) {
