diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.ts b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
index f980ed2..3ddba8e 100644
--- a/src/app/pages/equipment-info/editequipment/editequipment.component.ts
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
@@ -14,6 +14,8 @@ export class EditequipmentComponent implements OnInit {
validateForm!: FormGroup;
constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient) { }
+
+ data2
ngOnInit(): void {
this.validateForm = this.fb.group({
name: [null, [Validators.required]],
@@ -22,6 +24,7 @@ export class EditequipmentComponent implements OnInit {
prodtime: [null, [Validators.required]],
validitytime: [null, [Validators.required]]
});
+ this.data2 = JSON.parse(JSON.stringify(this.data))
}
destroyModal(){
diff --git a/src/app/pages/equipment-info/equipment-info.component.html b/src/app/pages/equipment-info/equipment-info.component.html
index 4ae0464..7261383 100644
--- a/src/app/pages/equipment-info/equipment-info.component.html
+++ b/src/app/pages/equipment-info/equipment-info.component.html
@@ -45,21 +45,21 @@
-
+
- 干粉灭火器
+ {{item.name}}
- 普通
+ {{item.specification}}
- 2021.01.05
+ {{item.purchaseDate | date:"yyyy-MM-dd"}}
- 2021.01.05
+ {{item.productionDate | date:"yyyy-MM-dd"}}
- 2021.01.05
+ {{item.validityEndTime | date:"yyyy-MM-dd"}}
diff --git a/src/app/pages/equipment-info/equipment-info.component.scss b/src/app/pages/equipment-info/equipment-info.component.scss
index 251eb3c..7d58fc2 100644
--- a/src/app/pages/equipment-info/equipment-info.component.scss
+++ b/src/app/pages/equipment-info/equipment-info.component.scss
@@ -73,7 +73,7 @@
color: #23D9FF;
background: rgba(35, 153, 255, 0.2);
border: 1px solid rgba(35, 217, 255, 0.4);
- // box-shadow: 0 0 3px 1px rgba(35, 217, 255, 0.4);
+ box-shadow: 0 0 3px 0px #23D9FF inset;
}
.tbody {
diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts
index 690c819..238dcd3 100644
--- a/src/app/pages/equipment-info/equipment-info.component.ts
+++ b/src/app/pages/equipment-info/equipment-info.component.ts
@@ -19,7 +19,7 @@ export class EquipmentInfoComponent implements OnInit {
search: [null]
});
this.getEquipment()
- console.log(JSON.parse(sessionStorage.getItem('userdata')))
+ // console.log(JSON.parse(sessionStorage.getItem('userdata')))
}
//获取装备列表
@@ -28,10 +28,13 @@ export class EquipmentInfoComponent implements OnInit {
getEquipment() {
this.http.get('/api/services/app/FireEquipment/GetAll', {
params: {
- OrganizationId: JSON.parse(sessionStorage.getItem('userdata')).organizationIds[0]
+ Name:this.validateForm.value.search ? this.validateForm.value.search : '',
+ OrganizationId: JSON.parse(JSON.parse(sessionStorage.getItem('userdata'))).organization.id,
+ SkipCount: String(this.SkipCount),
+ MaxResultCount: String(this.MaxResultCount)
}
}).subscribe((data: any) => {
- // console.log(data)
+ console.log('装备列表', data)
this.equipmentList = data.result.items
this.equipmentNum = data.result.totalCount
})
@@ -46,11 +49,10 @@ export class EquipmentInfoComponent implements OnInit {
submitForm() {
-
+ this.getEquipment()
}
add() {
const modal = this.modal.create({
- // nzTitle: '新增角色',
nzContent: AddequipmentComponent,
nzViewContainerRef: this.viewContainerRef,
nzWidth: 380,
@@ -73,11 +75,10 @@ export class EquipmentInfoComponent implements OnInit {
productionDate: instance.validateForm.value.prodtime,
purchaseDate: instance.validateForm.value.buytime,
validityEndTime: instance.validateForm.value.validitytime,
- organizationId: JSON.parse(sessionStorage.getItem('userdata')).organizationIds[0]
+ organizationId: JSON.parse(sessionStorage.getItem('userdata')).organization.id
}
this.http.post('/api/services/app/FireEquipment/Create', body).subscribe(data => {
resolve(data)
- this.getEquipment()
this.message.create('success', '创建成功！');
return true
})
@@ -86,13 +87,13 @@ export class EquipmentInfoComponent implements OnInit {
this.message.create('warning', '请填写完整！');
return false
}
- console.log(instance.validateForm.value)
- return false
- }
+ },
});
+ modal.afterClose.subscribe(result => this.getEquipment());
const instance = modal.getContentComponent();
}
edit(item) {
+ console.log(item)
const modal = this.modal.create({
// nzTitle: '新增角色',
nzContent: EditequipmentComponent,
@@ -114,18 +115,18 @@ export class EquipmentInfoComponent implements OnInit {
if (instance.validateForm.valid) {
await new Promise(resolve => {
let body = {
+ id: item.id,
name: instance.validateForm.value.name,
specification: instance.validateForm.value.specification,
productionDate: instance.validateForm.value.prodtime,
purchaseDate: instance.validateForm.value.buytime,
validityEndTime: instance.validateForm.value.validitytime,
- organizationId: JSON.parse(sessionStorage.getItem('userdata')).organizationIds[0]
+ organizationId: item.organizationId
}
- this.http.post('/api/services/app/FireEquipment/Create', body).subscribe(data => {
+ this.http.put('/api/services/app/FireEquipment/Update', body).subscribe(data => {
resolve(data)
- this.message.create('success', '创建成功！');
- // return true
- this.modal.closeAll()
+ this.message.create('success', '修改成功！');
+ return true
})
})
} else {
@@ -143,13 +144,13 @@ export class EquipmentInfoComponent implements OnInit {
nzOkText: '确定',
nzOkType: 'danger',
nzOnOk: () => {
- this.http.delete('', {
+ this.http.delete('/api/services/app/FireEquipment/Delete', {
params: {
Id: item.id
}
}).subscribe(data => {
this.message.create('success', '删除成功！');
-
+ this.getEquipment()
})
},
nzCancelText: '取消',
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
index b0437db..39f76ab 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.html
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -4,85 +4,279 @@
-
-
-
- | 所属组织机构 |
- |
- 开业时间 |
- |
-
-
- | 油站类型 |
- |
- 车道数量 |
- |
-
-
- | 地址 |
- |
-
-
-
-
- | 辖区派出所 |
- |
- 地址 |
- |
-
-
- | 距离 |
- |
- 联系方式 |
- |
-
-
-
-
- | 辖区医院 |
- |
- 地址 |
- |
-
-
- | 距离 |
- |
- 联系方式 |
- |
-
-
-
-
- | 辖区消防队 |
- |
- 地址 |
- |
-
-
- | 距离 |
- |
- 联系方式 |
- |
-
-
-
-
- | 营业执照 |
- |
-
-
- 危险化学品
经营许可证 |
- |
-
-
- 成品油零售
经营许可证 |
- |
-
-
-
-
-
+
\ No newline at end of file
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.scss b/src/app/pages/oil-station-info/oil-station-info.component.scss
index 5be00df..0964eb4 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.scss
+++ b/src/app/pages/oil-station-info/oil-station-info.component.scss
@@ -51,7 +51,15 @@
text-overflow: ellipsis;
color: #C4E2FC;
box-sizing: border-box;
- padding: 0 16px;
+
+ input {
+ color: #fff;
+ height: 100%;
+ background: none;
+ text-align: left;
+ border: 0px;
+ }
+
}
.head {
@@ -59,11 +67,18 @@
background: #0b3863;
color: #23D9FF;
text-align: right;
+ padding: 0 16px;
}
.text {
width: 33%;
}
+
+ .organizations {
+ text-align: left;
+ color: #fff;
+ padding: 0 11px;
+ }
}
}
@@ -73,6 +88,74 @@
td {
height: 98px;
}
+
+ .imgbox {
+ .uploadDivbox {
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 0 16px;
+ display: flex;
+ align-items: center;
+ }
+
+ .uploadDiv {
+ margin-left: 16px;
+ width: 120px;
+ height: 80px;
+ // border: 1px solid red;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+
+ .fileinput {
+ width: 114px;
+ height: 32px;
+ position: absolute;
+ z-index: 100;
+ opacity: 0;
+ top: 23px;
+ cursor: pointer;
+ }
+
+ button {
+ z-index: 99;
+ width: 114px;
+ height: 32px;
+ background: rgba(0, 129, 255, 0.3);
+ border: 1px solid #36A2FF;
+ opacity: 1;
+ border-radius: 0px;
+ color: #91CCFF;
+ }
+ }
+ }
+ }
+ }
+
+ .btnbox {
+ height: 40px;
+ width: 100%;
+ margin-bottom: 24px;
+ display: flex;
+ justify-content: flex-end;
+
+ button {
+ height: 40px;
+ background: rgba(0, 129, 255, 0.3);
+ border: 1px solid #36A2FF;
+ opacity: 1;
+ border-radius: 0px;
+ color: #91CCFF;
+ }
+ button:nth-child(1) {
+ width: 100px;
+ margin-left: 16px;
+ }
+ button:nth-child(2) {
+ width: 130px;
+ margin-left: 16px;
}
}
}
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
index 30e2d0e..25c6d36 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.ts
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -1,15 +1,242 @@
+import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
-
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
+import { NzMessageService } from 'ng-zorro-antd/message';
+import * as moment from 'moment';
@Component({
selector: 'app-oil-station-info',
templateUrl: './oil-station-info.component.html',
styleUrls: ['./oil-station-info.component.scss']
})
export class OilStationInfoComponent implements OnInit {
+ validateForm!: FormGroup;
+ constructor(private fb: FormBuilder, private objectsSrv: ObjectsSimpleService, private http: HttpClient, private message: NzMessageService) { }
- constructor() { }
+ userdata: any
+ dateFormat = 'yyyy-MM-dd';
ngOnInit(): void {
+ this.userdata = JSON.parse(sessionStorage.getItem('userdata'))
+ this.validateForm = this.fb.group({
+ oilStation: this.fb.group({
+ organization: [this.userdata.organization.displayName],
+ startBusinessTime: [null, [Validators.required]],
+ oilStationType: [null],
+ laneNumber: [null],
+ address: [null],
+ validityTime: [null, [Validators.required]]//营业执照有效期
+ }),
+ policeStation: this.fb.group({
+ name: [null],
+ address: [null],
+ distance: [null],
+ contactInformation: [null]
+ }),
+ hospital: this.fb.group({
+ name: [null],
+ address: [null],
+ distance: [null],
+ contactInformation: [null]
+ }),
+ fireBrigade: this.fb.group({
+ name: [null],
+ address: [null],
+ distance: [null],
+ contactInformation: [null]
+ })
+ });
+
+ this.getInfo()
+
+ }
+
+
+ validityTime: any = []//营业执照有效期
+
+ //获取油站信息
+ getInfo() {
+ this.http.get('/api/services/app/GasStation/Get', {
+ params: {
+ organizationId: this.userdata.organization.id
+ }
+ }).subscribe((data: any) => {
+ console.log('油站信息', data)
+ this.httpBody = data.result
+ this.httpBody.govUnitDetail = JSON.parse(data.result.govUnitDetail)
+ this.policeStation = data.result.govUnitDetail.policeStation
+ this.hospital = data.result.govUnitDetail.hospital
+ this.fireBrigade = data.result.govUnitDetail.fireBrigade
+ this.httpBody.stationType = String(this.httpBody.stationType)
+ this.validityTime[0] = data.result.validityStartTime
+ this.validityTime[1] = data.result.validityEndTime
+ this.validityTime = [...this.validityTime]
+ console.log(this.validityTime)
+ }, err => {
+ console.log('油站错误信息', err.error.error.message)
+ })
+ }
+
+
+
+ policeStation = {
+ name: '',
+ address: '',
+ distance: '',
+ contactInformation: ''
+ }
+ hospital = {
+ name: '',
+ address: '',
+ distance: '',
+ contactInformation: ''
+ }
+ fireBrigade = {
+ name: '',
+ address: '',
+ distance: '',
+ contactInformation: ''
+ }
+ httpBody = {
+ id: null,
+ stationName: JSON.parse(sessionStorage.getItem('userdata')).organization.displayName,
+ organizationId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ validityStartTime: '',
+ validityEndTime: '',
+ openTime: '',
+ stationType: '',
+ laneCount: '',
+ address: '',
+ govUnitDetail: {
+ policeStation: {},
+ hospital: {},
+ fireBrigade: {}
+ },
+ businessLicenseImage: '',
+ dangerousChemicalLicenseImage: '',
+ gasSellLicenseImage: ''
}
+
+ submitForm() {
+
+ console.log(this.validateForm)
+ console.log(this.httpBody)
+ if (this.validateForm.valid) {
+ this.isLoadingSave = true
+ this.httpBody.openTime = moment(this.httpBody.openTime).format('YYYY-MM-MM')//开业时间格式化
+ this.httpBody.validityStartTime = moment(this.validityTime[0]).format('YYYY-MM-MM')//开业时间格式化
+ this.httpBody.validityEndTime = moment(this.validityTime[1]).format('YYYY-MM-MM')//开业时间格式化
+ this.httpBody.govUnitDetail.policeStation = this.validateForm.value.policeStation
+ this.httpBody.govUnitDetail.hospital = this.validateForm.value.hospital
+ this.httpBody.govUnitDetail.fireBrigade = this.validateForm.value.fireBrigade
+
+ let body = JSON.parse(JSON.stringify(this.httpBody))
+ body.stationType
+ body.govUnitDetail = JSON.stringify(this.httpBody.govUnitDetail)
+
+ if (this.httpBody.id) {
+ this.http.put('/api/services/app/GasStation/Update', body).subscribe((data: any) => {
+ this.isLoadingSave = false
+ this.message.create('success', '保存成功！');
+ }, err => {
+ this.isLoadingSave = false
+ this.message.create('error', '保存失败！');
+ })
+ } else {
+ this.http.post('/api/services/app/GasStation/Create', body).subscribe((data: any) => {
+ this.httpBody.id = data.result.id
+ this.isLoadingSave = false
+ this.message.create('success', '保存成功！');
+ }, err => {
+ this.isLoadingSave = false
+ this.message.create('error', '保存失败！');
+ })
+ }
+ } else {
+ this.message.create('warning', '请填写完整！');
+ return false
+ }
+
+ }
+
+ isLoadingOne: boolean = false
+ isLoadingTwo: boolean = false
+ isLoadingThree: boolean = false
+ isLoadingSave: boolean = false
+ uploadType: string
+ filechange(e, type) {
+ let file = e.target.files[0] || null //获取上传的文件
+ this.uploadType = type
+ if (this.uploadType == 'businessLicense') {//营业执照
+ this.isLoadingOne = true
+ }
+ if (this.uploadType == 'dangerousChemical') {//危化品销售
+ this.isLoadingTwo = true
+ }
+ if (this.uploadType == 'retailOfRefinedOil') {//成品油零售
+ this.isLoadingThree = true
+ }
+ this.openFileSelect(file, `stationPhotos/${this.userdata.organization.id}/`)
+ }
+ //设置文件路径并上传
+ postFilePath
+ openFileSelect(file: File, extensionPath: string) {
+ this.postFilePath = extensionPath;
+ let fileSize = file.size || null //上传文件的总大小
+ let shardSize = 5 * 1024 * 1024 //5MB 超过5MB要分块上传
+ if (fileSize >= shardSize) // 超过5MB要分块上传
+ {
+ this.postFileByMul(file);
+ }
+ else //普通上传
+ {
+ this.postFile(file);
+ }
+ }
+ //上传文件
+ async postFile(file: File) {
+ await new Promise((resolve, reject) => {
+ this.objectsSrv.postFile(this.postFilePath, file).subscribe(data => {
+ let dataObj = data as any;
+ let filePath: string = ObjectsSimpleService.baseUrl + dataObj.objectName;
+ if (this.uploadType == 'businessLicense') {//营业执照
+ this.httpBody.businessLicenseImage = filePath
+ this.isLoadingOne = false
+ }
+ if (this.uploadType == 'dangerousChemical') {//危化品
+ this.httpBody.dangerousChemicalLicenseImage = filePath
+ this.isLoadingTwo = false
+ }
+ if (this.uploadType == 'retailOfRefinedOil') {//成品油
+ this.httpBody.gasSellLicenseImage = filePath
+ this.isLoadingThree = false
+ }
+ resolve('success')
+ });
+ })
+ }
+
+ /**
+ * 分块上传
+ * @param file
+ */
+ postFileByMul(file: File) {
+ this.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => {
+ let dataObj = value as any;
+ if (this.uploadType == 'businessLicense') {//营业执照
+ this.httpBody.businessLicenseImage = dataObj.filePath
+ this.isLoadingOne = false
+ }
+ if (this.uploadType == 'dangerousChemical') {//危化品
+ this.httpBody.dangerousChemicalLicenseImage = dataObj.filePath
+ this.isLoadingTwo = false
+ }
+ if (this.uploadType == 'retailOfRefinedOil') {//成品油
+ this.httpBody.gasSellLicenseImage = dataObj.filePath
+ this.isLoadingThree = false
+ }
+ });
+
+ }
}
diff --git a/src/app/service/objectsSimple.service.ts b/src/app/service/objectsSimple.service.ts
new file mode 100644
index 0000000..25a5fcf
--- /dev/null
+++ b/src/app/service/objectsSimple.service.ts
@@ -0,0 +1,85 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class ObjectsSimpleService {
+
+ static readonly c_apiRoot = "/api/";//普通上传的API根路径
+ static readonly c_apiRoot_Multipart = "/api/";//分块上传的API根路径
+
+ // static testPath = "f1/f2";//测试路径
+
+ constructor(private http: HttpClient) { }
+
+
+
+ //普通上传，单个文件上限5M
+ static baseUrl = ObjectsSimpleService.c_apiRoot + 'Objects/sinochemweb/';
+ postFile(extensionPath: string, file: File): Observable
违规趋势
+