- 近30天卸油作业总数走势
+ 近30天卸油作业走势
diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
index 0d3f4e4..83bfacf 100644
--- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
+++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.ts
@@ -235,7 +235,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
barWidth: '25%'
},
{
- name: '卸油事件',
+ name: '卸油预警',
data: [],
type: 'line',
symbol: 'circle',
@@ -254,17 +254,17 @@ export class OilUnloadingProcessListComponent implements OnInit {
}
}
],
- // legend: {
- // selectedMode: false, // 是否允许点击
- // data: ['卸油事件'],
- // textStyle: {
- // color: '#fff'
- // },
- // right: 28,
- // top: 18,
- // itemWidth: 8,
- // itemHeight: 8,
- // },
+ legend: {
+ selectedMode: false, // 是否允许点击
+ data: ['卸油事件','卸油预警'],
+ textStyle: {
+ color: '#fff'
+ },
+ right: 28,
+ top: 18,
+ itemWidth: 8,
+ itemHeight: 8,
+ },
grid: {
left: '42px',
right: '30px',
@@ -495,13 +495,17 @@ export class OilUnloadingProcessListComponent implements OnInit {
//柱状图
let monthArr = []
let valuedata = []
+ let valuedata2 = []
data.list.forEach(element => {
monthArr.push(moment(element.key).format('MM.DD'))
valuedata.push(element.totalCount)
+ let item = Number(element.proccessBeforeCount + element.proccessingCount)
+ valuedata2.push(item)
});
+ // console.log('卸油预警',valuedata2)
this.oilchartbarOption.xAxis.data = monthArr
this.oilchartbarOption.series[0].data = valuedata
- this.oilchartbarOption.series[1].data = valuedata
+ this.oilchartbarOption.series[1].data = valuedata2
this.mybarChart.setOption(this.oilchartbarOption);
}
refreshEchartsData2(data) {
diff --git a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html
index 576c104..e81d414 100644
--- a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html
+++ b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html
@@ -24,24 +24,28 @@
+
- 是否年检
-
-
+ 办理类型
+
+
+
+
+
+
- 是否需要上传附件
-
-
+ 是否上传副本
+
+
+
- 办理类型
-
-
-
+ 是否年检
+
+
diff --git a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts
index 083c833..4b5af42 100644
--- a/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts
+++ b/src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts
@@ -20,9 +20,9 @@ export class AddUpdateOfLicenseComponent implements OnInit {
name: [null, [Validators.required]],
handleRemindDays: [90, [Validators.required]],
closingRemindDays: [30, [Validators.required]],
- isYearlyCheck: [true, [Validators.required]],
- hasAttachment: [false, [Validators.required]],
- handleTypes: [[], [Validators.required]]
+ handleType: [[], [Validators.required]],
+ isEctype: [false, [Validators.required]],
+ isYearlyCheck: [true, [Validators.required]]
});
}
destroyModal(): void {
diff --git a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html
index 576c104..fc20e8d 100644
--- a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html
+++ b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html
@@ -24,6 +24,22 @@
+
+ 办理类型
+
+
+
+
+
+
+
+
+
+ 是否上传副本
+
+
+
+
是否年检
diff --git a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts
index e48067f..0fc8089 100644
--- a/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts
+++ b/src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts
@@ -20,9 +20,9 @@ export class EditUpdateOfLicenseComponent implements OnInit {
name: [this.data.licenseName, [Validators.required]],
handleRemindDays: [this.data.handleRemindDays, [Validators.required]],
closingRemindDays: [this.data.closingRemindDays, [Validators.required]],
- isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]],
- hasAttachment: [this.data.hasAttachment, [Validators.required]],
- handleTypes: [this.data.handleTypes, [Validators.required]]
+ handleType: [this.data.handleTypes, [Validators.required]],
+ isEctype: [this.data.hasAttachment, [Validators.required]],
+ isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]]
});
}
destroyModal(): void {
diff --git a/src/app/system-management/update-of-license/update-of-license.component.html b/src/app/system-management/update-of-license/update-of-license.component.html
index 49b64d4..63f540c 100644
--- a/src/app/system-management/update-of-license/update-of-license.component.html
+++ b/src/app/system-management/update-of-license/update-of-license.component.html
@@ -16,6 +16,8 @@
更新类证件
办理提醒时间
临期提醒时间
+ 办理类型
+ 是否上传副本
是否年检
操作
@@ -25,6 +27,8 @@
{{data.licenseName}}
{{data.handleRemindDays}}天
{{data.closingRemindDays}}天
+ {{getHandleTypes(data.handleTypes)}}
+ {{data.hasAttachment ? '是' : '否'}}
{{data.isYearlyCheck ? '是' : '否'}}
编辑
diff --git a/src/app/system-management/update-of-license/update-of-license.component.ts b/src/app/system-management/update-of-license/update-of-license.component.ts
index 6514fb5..9883a42 100644
--- a/src/app/system-management/update-of-license/update-of-license.component.ts
+++ b/src/app/system-management/update-of-license/update-of-license.component.ts
@@ -15,6 +15,9 @@ export class UpdateOfLicenseComponent implements OnInit {
constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService, private http: HttpClient) { }
+
+
+
ngOnInit(): void {
this.getLicense()
}
@@ -52,9 +55,9 @@ export class UpdateOfLicenseComponent implements OnInit {
licenseName: instance.validateForm.value.name,
handleRemindDays: instance.validateForm.value.handleRemindDays,
closingRemindDays: instance.validateForm.value.closingRemindDays,
- isYearlyCheck: instance.validateForm.value.isYearlyCheck,
- hasAttachment: instance.validateForm.value.hasAttachment,
- handleTypes: instance.validateForm.value.handleTypes,
+ hasAttachment: instance.validateForm.value.isEctype,
+ handleTypes: instance.validateForm.value.handleType,
+ isYearlyCheck: instance.validateForm.value.isYearlyCheck
}
this.http.post('/api/services/app/ValidityLicenseType/Create', body).subscribe(data => {
resolve(data)
@@ -94,9 +97,9 @@ export class UpdateOfLicenseComponent implements OnInit {
licenseName: instance.validateForm.value.name,
handleRemindDays: instance.validateForm.value.handleRemindDays,
closingRemindDays: instance.validateForm.value.closingRemindDays,
- isYearlyCheck: instance.validateForm.value.isYearlyCheck,
- hasAttachment: instance.validateForm.value.hasAttachment,
- handleTypes: instance.validateForm.value.handleTypes,
+ hasAttachment: instance.validateForm.value.isEctype,
+ handleTypes: instance.validateForm.value.handleType,
+ isYearlyCheck: instance.validateForm.value.isYearlyCheck
}
this.http.put('/api/services/app/ValidityLicenseType/Update', body).subscribe(data => {
resolve(data)
@@ -139,6 +142,31 @@ export class UpdateOfLicenseComponent implements OnInit {
}
});
}
-
-
+ handleTypeList = [
+ { value: 0, name: "无" },
+ { value: 1, name: "年度公示" },
+ { value: 2, name: "年检" },
+ { value: 3, name: "到期换证" },
+ { value: 4, name: "年度执行报告" },
+ { value: 5, name: "到期检测" },
+ { value: 6, name: "年度复训" },
+ { value: 7, name: "年度检测" },
+ { value: 8, name: "到期备案" },
+ { value: 9, name: "到期评价" },
+ ]
+ //获取办理类型
+ getHandleTypes(handleTypes: any[]): string {
+ if (!handleTypes || !handleTypes.length) {
+ return
+ }
+ let names: string[] = []
+ let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
+ let list = this.handleTypeList;
+ handleTypeList.forEach(item => {
+ list.find(element => {
+ item == element.value ? names.push(element.name) : null
+ })
+ })
+ return names.join(',')
+ }
}