shaojiahao
/
Sinopec-Anxin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]完善证照预警字段；上传证照时的地址拼接

beijing
邵佳豪 3 years ago
parent
ec9ce7cc41
commit
9ed7232bb3
7 changed files with 91 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      src/app/pages/home-page/home-page.component.ts
  2. 20
      src/app/pages/license/file-category/file-category.component.ts
  3. 39
      src/app/pages/license/update-category/update-category.component.ts
  4. 10
      src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
  5. 2
      src/app/pages/oil-unloading-process/oil-unloading-process.component.html
  6. 32
      src/app/pages/warning-statistics-list/warning-statistics-list.component.html
  7. 2
      src/app/pages/warning-statistics-list/warning-statistics-list.component.ts

40
src/app/pages/home-page/home-page.component.ts
Unescape View File

@ -23,29 +23,29 @@ export class HomePageComponent implements OnInit {
tooltip: {
trigger: 'item'//触发类型
},
legend: {
top: '1%',
// left: '25.5%',
itemGap: 6,
itemWidth: 6,
itemHeight: 6,
formatter: (name) => {
return '{a|' + name + '}';
},
textStyle: {
color: '#fff',
rich: {
a: {
width: 50
}
}
}
},
// legend: {
// top: '1%',
// // left: '25.5%',
// itemGap: 6,
// itemWidth: 6,
// itemHeight: 6,
// formatter: (name) => {
// return '{a|' + name + '}';
// },
// textStyle: {
// color: '#fff',
// rich: {
// a: {
// width: 50
// }
// }
// }
// },
series: [
{
type: 'pie',
radius: ['55%', '65%'],
top: '10%',
radius: ['65%', '75%'],
top: '5%',
// bottom: '-5%',
// right: '77%',
avoidLabelOverlap: false,//防止标签重叠策略

20
src/app/pages/license/file-category/file-category.component.ts
Unescape View File

@ -49,13 +49,13 @@ export class FileCategoryComponent implements OnInit {
}
//获取文件格式
getFileType(name: string):string {
getFileType(name: string): string {
let suffix
if (name.substring(name.length-4).includes('png') || name.substring(name.length-4).includes('jpg') || name.substring(name.length-4).includes('jpeg') || name.substring(name.length-4).includes('webp')) {
if (name.substring(name.length - 4).includes('png') || name.substring(name.length - 4).includes('jpg') || name.substring(name.length - 4).includes('jpeg') || name.substring(name.length - 4).includes('webp')) {
suffix = 'img'
} else if (name.substring(name.length-4).includes('doc') || name.substring(name.length-4).includes('docx')) {
} else if (name.substring(name.length - 4).includes('doc') || name.substring(name.length - 4).includes('docx')) {
suffix = 'word'
} else if (name.substring(name.length-4).includes('pdf')) {
} else if (name.substring(name.length - 4).includes('pdf')) {
suffix = 'pdf'
}
return suffix
@ -90,7 +90,7 @@ export class FileCategoryComponent implements OnInit {
let arr = item.imageUrl.split('.')
arr[arr.length - 1] = 'pdf'
window.open(arr.join('.'))
} else if (this.getFileType(item.imageUrl) == 'pdf') {
} else if (this.getFileType(item.imageUrl) == 'pdf') {
window.open(item.imageUrl)
} else {
this.message.create('warning', '暂不支持查看！');
@ -132,6 +132,10 @@ export class FileCategoryComponent implements OnInit {
return false;
}
instance.data2.validatyType = Number(instance.validatyType)
if (instance.data2.imageUrl.indexOf('http') == -1) {
let newUrl = window.location.protocol + '//' + window.location.host + instance.data2.imageUrl
instance.data2.imageUrl = newUrl
}
if (!instance.isSubmit) {
this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
this.getStationList();
@ -141,13 +145,13 @@ export class FileCategoryComponent implements OnInit {
} else {
await new Promise(resolve => {
this.http.post('/api/services/app/StationFileLicense/Create', instance.data2).subscribe((data: any) => {
this.submitReview(data.result).then(res=>{
this.submitReview(data.result).then(res => {
resolve(data);
return true;
});
})
})
} //else
}
}
});
const instance = modal.getContentComponent();
@ -184,7 +188,7 @@ export class FileCategoryComponent implements OnInit {
this.message.create('warning', '该证照请编辑保存后再提交审核！');
return
}
return new Promise((resolve, reject)=>{
return new Promise((resolve, reject) => {
let params = { id: item.id }
this.http.post('/api/services/app/StationFileLicense/Commit', {}, { params }).subscribe(data => {
this.message.create('success', '提交审核成功！');

39
src/app/pages/license/update-category/update-category.component.ts
Unescape View File

@ -38,7 +38,7 @@ export class UpdateCategoryComponent implements OnInit {
this.tableSpin = true
let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation'));
let params = { orgId: data.organization.id || "" }
this.http.get(`/api/services/app/StationValidityLicense/GetCurStationLicense`,{params}).subscribe((info: any)=>{
this.http.get(`/api/services/app/StationValidityLicense/GetCurStationLicense`, { params }).subscribe((info: any) => {
this.list = info.result
this.tableSpin = false
console.log(info.result)
@ -46,29 +46,29 @@ export class UpdateCategoryComponent implements OnInit {
}
//获取办理类型
getHandleTypes(handleTypes: any[]):string {
getHandleTypes(handleTypes: any[]): string {
if (!handleTypes || !handleTypes.length) {
return
}
let names: string[] = []
let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
let list: handleTypeList[] = new handleType().list;
handleTypeList.forEach(item=>{
list.find(element=>{
item == element.value? names.push(element.name) : null
handleTypeList.forEach(item => {
list.find(element => {
item == element.value ? names.push(element.name) : null
})
})
return names.join(',')
}
//获取文件格式
getFileType(name: string):string {
getFileType(name: string): string {
let suffix
if (name.substring(name.length-4).includes('png') || name.substring(name.length-4).includes('jpg') || name.substring(name.length-4).includes('jpeg') || name.substring(name.length-4).includes('webp')) {
if (name.substring(name.length - 4).includes('png') || name.substring(name.length - 4).includes('jpg') || name.substring(name.length - 4).includes('jpeg') || name.substring(name.length - 4).includes('webp')) {
suffix = 'img'
} else if (name.substring(name.length-4).includes('doc') || name.substring(name.length-4).includes('docx')) {
} else if (name.substring(name.length - 4).includes('doc') || name.substring(name.length - 4).includes('docx')) {
suffix = 'word'
} else if (name.substring(name.length-4).includes('pdf')) {
} else if (name.substring(name.length - 4).includes('pdf')) {
suffix = 'pdf'
}
return suffix
@ -103,7 +103,7 @@ export class UpdateCategoryComponent implements OnInit {
let arr = item.split('.')
arr[arr.length - 1] = 'pdf'
window.open(arr.join('.'))
} else if (this.getFileType(item) == 'pdf') {
} else if (this.getFileType(item) == 'pdf') {
window.open(item)
} else {
this.message.create('warning', '暂不支持查看！');
@ -152,6 +152,12 @@ export class UpdateCategoryComponent implements OnInit {
body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
body.validityEndTime = instance.isNoLongTermTime[1] || new Date()
}
if (body.imageUrl.indexOf('http') == -1) {
let newUrl = window.location.protocol + '//' + window.location.host + body.imageUrl
body.imageUrl = newUrl
}
if (!instance.isSubmit) {
this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data:any) => {
this.getStationList();
@ -167,7 +173,8 @@ export class UpdateCategoryComponent implements OnInit {
});
})
})
} //else
}
// return false;
} else {
this.message.create('warning', '请填写完整！');
return false;
@ -204,14 +211,14 @@ export class UpdateCategoryComponent implements OnInit {
}
//提交审核
submitReview(item){
submitReview(item) {
if (!item.id) {
this.message.create('warning', '该证照请编辑保存后再提交审核！');
return
}
return new Promise((resolve, reject)=>{
return new Promise((resolve, reject) => {
let params = { id: item.id }
this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => {
this.http.post('/api/services/app/StationValidityLicense/Commit', {}, { params }).subscribe(data => {
this.message.create('success', '提交审核成功！');
this.getStationList();
resolve('success');
@ -220,9 +227,9 @@ export class UpdateCategoryComponent implements OnInit {
}
//撤销审核
cancelReview(item){
cancelReview(item) {
let params = { id: item.id }
this.http.post('/api/services/app/StationValidityLicense/Uncommit', {},{params}).subscribe(data => {
this.http.post('/api/services/app/StationValidityLicense/Uncommit', {}, { params }).subscribe(data => {
this.message.create('success', '撤销审核成功！');
this.getStationList();
})

10
src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
Unescape View File

@ -389,7 +389,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
},
legend: {
selectedMode: false, // 是否允许点击
data: ['事前准备', '事中操作'],
data: ['卸油准备', '卸油操作'],
textStyle: {
color: '#fff'
},
@ -530,8 +530,8 @@ export class OilUnloadingProcessListComponent implements OnInit {
this.num = Number(data.proccessBeforeCount + data.proccessingCount)
//饼图
this.oilchartpieOptionPieData2 = [
{ name: '事前准备', value: data.proccessBeforeCount },
{ name: '事中操作', value: data.proccessingCount },
{ name: '卸油准备', value: data.proccessBeforeCount },
{ name: '卸油操作', value: data.proccessingCount },
// { name: '全程检测', value: data.allProccessCount }
]
this.oilchartpieOption2.series[0].data = this.oilchartpieOptionPieData2
@ -549,9 +549,9 @@ export class OilUnloadingProcessListComponent implements OnInit {
// valuedataAll.push(element.allProccessCount)
});
this.oilchartbarOption2.xAxis.data = monthArr
this.oilchartbarOption2.series[0].name = '事前准备'
this.oilchartbarOption2.series[0].name = '卸油准备'
this.oilchartbarOption2.series[0].data = valuedataBefore
this.oilchartbarOption2.series[1].name = '事中操作'
this.oilchartbarOption2.series[1].name = '卸油操作'
this.oilchartbarOption2.series[1].data = valuedataIng
// this.oilchartbarOption2.series[2].name = '全程监测'
// this.oilchartbarOption2.series[2].data = valuedataAll

2
src/app/pages/oil-unloading-process/oil-unloading-process.component.html
Unescape View File

@ -10,7 +10,7 @@
<div class="contentbox">
<div class="topbox">
<div class="title">
卸油前准备
卸油准备
</div>
<div class="content content1">
<div class="imgbox">

32
src/app/pages/warning-statistics-list/warning-statistics-list.component.html
Unescape View File

@ -170,11 +170,37 @@
{{item.gasStation.stationName ? item.gasStation.stationName : '/'}}
</td>
<td nzEllipsis>
{{item.violatedItemSnapshotObj.name ? item.violatedItemSnapshotObj.name : '/'}}
<ng-container *ngIf="item.violation.eventSystemName == '证照预警'; else elseTemplate3">
{{item.violatedItemSnapshotObj.validityLicenseType.licenseName ?
item.violatedItemSnapshotObj.validityLicenseType.licenseName : '/'}}
</ng-container>
<ng-template #elseTemplate3>
{{item.violatedItemSnapshotObj.name ? item.violatedItemSnapshotObj.name : '/'}}
</ng-template>
</td>
<td>
{{item.violatedItemSnapshotObj.endTime ?
(item.violatedItemSnapshotObj.endTime | date:"yyyy-MM-dd") : '/'}}
<ng-container *ngIf="item.violation.eventSystemName == '证照预警'; else elseTemplate">
<ng-container *ngIf="item.desc == '有效期'; else elseTemplate1">
{{item.violatedItemSnapshotObj.validityEndTime ?
(item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}}
</ng-container>
<ng-template #elseTemplate1>
{{item.violatedItemSnapshotObj.YearlyCheckDate ?
(item.violatedItemSnapshotObj.YearlyCheckDate | date:"yyyy-MM-dd") : '/'}}
</ng-template>
</ng-container>
<ng-template #elseTemplate>
<ng-container *ngIf="item.desc == '维保'; else elseTemplate2">
{{item.violatedItemSnapshotObj.maintenanceDate ?
(item.violatedItemSnapshotObj.maintenanceDate | date:"yyyy-MM-dd") : '/'}}
</ng-container>
<ng-template #elseTemplate2>
{{item.violatedItemSnapshotObj.validityEndTime ?
(item.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd") : '/'}}
</ng-template>
</ng-template>
</td>
<td>
<span style="cursor: pointer;color: #36A2FF;" (click)="look(item)">查看</span>

2
src/app/pages/warning-statistics-list/warning-statistics-list.component.ts
Unescape View File

@ -677,7 +677,7 @@ export class WarningStatisticsListComponent implements OnInit {
ViolateTime: (this.validateForm.value.datePicker[0] && this.validateForm.value.datePicker[1]) ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD') + ' 00:00:00', moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD') + ' 23:59:59'] : null
}
};
this.http.get(`/api/services/app/ViolateRecord/ExportExcel`, httpOptions).subscribe((data: any) => {
this.http.get(`/api/services/app/ViolateRecord/LicenseExportExcel`, httpOptions).subscribe((data: any) => {
// console.log('导出成功')
// 文件名中有中文 则对文件名进行转码
const link = document.createElement('a');

Write Preview
Loading…
Cancel
Save