diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts index bf268db..4a0c15c 100644 --- a/src/app/babylon/controller/data-manager.ts +++ b/src/app/babylon/controller/data-manager.ts @@ -481,8 +481,8 @@ export class DataManager { case FacilityType.XF_MHQ_GF_8: case FacilityType.XF_MHQ_GF_25: case FacilityType.XF_MHQ_GF_35: result = new PropertyData_MHQ(key, facilityType); break; - case FacilityType.JY_JYJ: result = new PropertyData_JYJ(key, "", "", "", "", "",); break; - case FacilityType.JY_YG: result = new PropertyData_YG(key, "", "", "", "", "", ""); break; + case FacilityType.JY_JYJ: result = new PropertyData_JYJ(key, "", "", "", "", "", "",); break; + case FacilityType.JY_YG: result = new PropertyData_YG(key, "", "", "", "", "","", ""); break; case FacilityType.JY_SYGX: result = new PropertyData_SYGX(key); break; case FacilityType.JY_YQHSGX: result = new PropertyData_YQHSGX(key); break; diff --git a/src/app/babylon/model/data/institution/building/export-data.ts b/src/app/babylon/model/data/institution/building/export-data.ts index 8f56d9a..bd607bc 100644 --- a/src/app/babylon/model/data/institution/building/export-data.ts +++ b/src/app/babylon/model/data/institution/building/export-data.ts @@ -66,6 +66,7 @@ export class ExportData_JYJ { 品牌: string; 油枪数量: string; 油品品号: string; + 油枪编号: string; 油泵类型: string; 流量: string; 功率: string; @@ -74,6 +75,7 @@ export class ExportData_JYJ { this.品牌 = jyj_property.brand; this.油枪数量 = jyj_property.oilGunNum; this.油品品号 = jyj_property.oilProductNo; + this.油枪编号 = jyj_property.oilGunNo; this.油泵类型 = jyj_property.oilPumpType; this.流量 = jyj_property.flow; this.功率 = jyj_property.power; @@ -88,6 +90,7 @@ export class ExportData_YG { 名称: string; 油品品号: string; + 油枪编号: string; 油罐容积: string; 安全容积: string; 罐区: string; @@ -96,6 +99,7 @@ export class ExportData_YG { constructor(yg_property: PropertyData_YG) { this.名称 = yg_property.name; this.油品品号 = yg_property.oilProductNo; + this.油枪编号 = yg_property.oilGunNo; this.油罐容积 = yg_property.oilTankVolume; this.安全容积 = yg_property.safeVolume; this.罐区 = yg_property.tankFarm; diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts index ea673a0..c380ea3 100644 --- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-jyj.ts @@ -11,24 +11,26 @@ export class PropertyData_JYJ extends PropertyData_Base { superBrand: string = ""; //超大牌 oilGunNum: string = ""; //油枪数量 oilProductNo: string = ""; //油品品号 + oilGunNo: string = ""; //油枪编号 oilPumpType: string = ""; //油泵类型 flow: string = ""; //流量 power: string = ""; //功率 - constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilPumpType: string) { + constructor(key: string, brand: string, superBrand: string, oilGunNum: string, oilProductNo: string, oilGunNo: string, oilPumpType: string) { super(key, FacilityType.JY_JYJ); this.name = "未命名"; this.brand = brand this.superBrand = superBrand this.oilGunNum = oilGunNum this.oilProductNo = oilProductNo + this.oilGunNo = oilGunNo this.oilPumpType = oilPumpType this.flow = "0.5kg/s" this.power = "1kw" } clone(key: string) { - let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilPumpType); + let result = new PropertyData_JYJ(key, this.brand, this.superBrand, this.oilGunNum, this.oilProductNo, this.oilGunNo, this.oilPumpType); result.name = this.name; result.flow = this.flow; result.power = this.power; diff --git a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts index 41892e3..7a7ea82 100644 --- a/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts +++ b/src/app/babylon/model/data/institution/facility/property-data/in/property-data-yg.ts @@ -8,16 +8,18 @@ import { PropertyData_Base } from "../property-data-base"; export class PropertyData_YG extends PropertyData_Base { oilProductNo: string = ""; //油品品号 + oilGunNo: string = ""; //油枪编号 oilTankVolume: string = ""; //油罐容积 safeVolume: string = ""; //安全容积 quantity: string = ""; //数量 tankFarm: string = ""; //罐区 oilTankType: string = ""; //油罐类型 - constructor(key: string,oilProductNo: string,oilTankVolume: string,safeVolume: string,quantity: string,tankFarm: string,oilTankType: string) { + constructor(key: string,oilProductNo: string,oilGunNo: string,oilTankVolume: string,safeVolume: string,quantity: string,tankFarm: string,oilTankType: string) { super(key, FacilityType.JY_YG); this.name = "未命名"; this.oilProductNo = oilProductNo + this.oilGunNo = oilGunNo this.oilTankVolume = oilTankVolume this.safeVolume = safeVolume this.quantity = quantity @@ -26,7 +28,7 @@ export class PropertyData_YG extends PropertyData_Base { } clone(key: string) { - let result = new PropertyData_YG(key,this.oilProductNo,this.oilTankVolume,this.safeVolume,this.quantity,this.tankFarm,this.oilTankType); + let result = new PropertyData_YG(key,this.oilProductNo,this.oilGunNo,this.oilTankVolume,this.safeVolume,this.quantity,this.tankFarm,this.oilTankType); result.name = this.name; return result; } diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html index fe67121..e2bc605 100644 --- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.html +++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.html @@ -71,7 +71,7 @@ - +
@@ -228,6 +228,7 @@ 处置 --> + +
- 事件排名 + 近30天事件排名
-
+
{{'0' + (key + 1)}} @@ -90,7 +91,7 @@ {{key + 1}}
- {{item.key}} + {{item.eventSystemName}}
@@ -111,10 +112,9 @@
- 油站排名 + 近30天油站排名
-
+
@@ -124,7 +124,7 @@ {{key + 1}}
- {{item.name}} {{item.companyName}} + {{item.companyName}} {{item.stationName}}
@@ -168,7 +168,7 @@
- +
@@ -204,11 +204,11 @@
- +
- 预警事件统计 + 近30天预警事件统计
@@ -243,20 +243,30 @@
-
- 卸油正常 - {{HomeAggregatioData.ouViolationType.ouCorrectCount}} +
+
+ 累计卸油总车次 +
+ + {{HomeAggregatioData.ouViolationType.ouTotalCount}}
+
-
- 卸油违规 +
+
+ 累计卸油预警车次 +
+ {{HomeAggregatioData.ouViolationType.ouNotCorrectCount}}
-
-
- 卸油总数 - {{HomeAggregatioData.ouViolationType.ouTotalCount}} -
+
diff --git a/src/app/pages/home-page/home-page.component.scss b/src/app/pages/home-page/home-page.component.scss index fb13c41..3908710 100644 --- a/src/app/pages/home-page/home-page.component.scss +++ b/src/app/pages/home-page/home-page.component.scss @@ -569,29 +569,35 @@ width: 76%; // border: 1px solid red; } - .oilNum{ + + .oilNum { position: absolute; - left: 1%; - bottom: 20px; + left: 4%; + bottom: 22px; display: flex; - flex-wrap: wrap; - .oilNumItem{ - margin-right: 6px; - } - div{ + flex-direction: column; + + .oilNumItem { display: flex; align-items: center; + justify-content: space-between; color: white; - font-size: 12px; - - span{ - margin:0 4px; + font-size: 14px; + + span { + margin: 0 4px; } - .point{ + + .pointbox { + display: flex; + align-items: center; + } + + .point { width: 6px; height: 6px; background-color: #91CCFF; - + } } } @@ -648,7 +654,7 @@ // 适配125% -@media screen and (max-height: 750px) { +@media screen and (max-height: 900px) { .informbox { width: 100%; height: 38px; diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts index 468a454..87bce44 100644 --- a/src/app/pages/home-page/home-page.component.ts +++ b/src/app/pages/home-page/home-page.component.ts @@ -6,6 +6,8 @@ import * as moment from 'moment'; import { NzModalService } from 'ng-zorro-antd/modal'; import { GetOutOfLineDetailsComponent } from '../today-warning/get-out-of-line-details/get-out-of-line-details.component'; import { NzMessageService } from 'ng-zorro-antd/message'; + +declare var tools @Component({ selector: 'app-home-page', templateUrl: './home-page.component.html', @@ -23,7 +25,7 @@ export class HomePageComponent implements OnInit { }, legend: { top: '5%', - left: '20%', + left: '25.5%', itemGap: 8, itemWidth: 6, itemHeight: 6, @@ -128,48 +130,11 @@ export class HomePageComponent implements OnInit { } }, tooltip: { - trigger: 'axis'//触发类型 + // trigger: 'axis'//触发类型 }, - // series: [ - // { - // data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 16, 15, 14, 13, 12, 11, 10, 8, 7, 6, 3, 2, 1], - // type: 'line', - // smooth: true, - // showSymbol: false, - // label: { - // show: true, - // position: 'top' - // }, - // lineStyle: { - // color: '#46DFFF', - // width: 1 - // }, - // areaStyle: { - // opacity: 0.8, - // color: { - // type: 'linear', - // x: 0, - // y: 0, - // x2: 0, - // y2: 1, - // colorStops: [ - // { - // offset: 0, color: '#46DFFF' // 0% 处的颜色 - // }, - // { - // offset: 0.3, color: '#46DFFF' // 0% 处的颜色 - // }, - // { - // offset: 1, color: 'rgba(0, 13, 33, 0)' // 100% 处的颜色 - // }], - // global: false // 缺省为 false - // } - // }, - // } - // ], series: [ { - data: [], + data: [4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000,], type: 'bar', itemStyle: { color: { @@ -189,12 +154,26 @@ export class HomePageComponent implements OnInit { barWidth: '35%' }, { - data: [], + data: [4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000, 4000, 3000, 4000, 4000, 4000,], type: 'line', symbol: 'circle', symbolSize: 5, label: { - show: true + normal: { + show: true, + formatter: function (dataObj) { + const { dataIndex, value } = dataObj; + let labelText = value; + + labelText = ''; + if (dataIndex % 1 === 0) { // 每隔三个x坐标显示一个 + labelText = value; + } + + return `${labelText}` + } + } + }, itemStyle: { color: '#fff', @@ -208,7 +187,7 @@ export class HomePageComponent implements OnInit { } ], grid: { - left: '18px', + left: '40px', right: '30px', bottom: '38px', top: '30px' @@ -222,7 +201,7 @@ export class HomePageComponent implements OnInit { }, legend: { top: '5%', - left: '20%', + left: '25%', itemGap: 8, itemWidth: 6, itemHeight: 6, @@ -242,7 +221,7 @@ export class HomePageComponent implements OnInit { { type: 'pie', radius: ['50%', '60%'], - bottom: '-5%', + bottom: '8%', right: '77%', avoidLabelOverlap: false,//防止标签重叠策略 label: { @@ -261,7 +240,7 @@ export class HomePageComponent implements OnInit { active: { fontSize: document.documentElement.clientHeight < 750 ? 12 : 14, color: '#fff', - fontFamily: 'Microsoft YaHei', + // fontFamily: 'Microsoft YaHei', }, } }, @@ -298,7 +277,7 @@ export class HomePageComponent implements OnInit { axisTick: {//刻度线 show: false }, - inverse: true + // inverse: true }, yAxis: { @@ -323,7 +302,7 @@ export class HomePageComponent implements OnInit { } }, tooltip: { - trigger: 'axis' + // // trigger: 'axis' }, series: [ { @@ -354,7 +333,20 @@ export class HomePageComponent implements OnInit { symbol: 'circle', symbolSize: 8, label: { - show: true + normal: { + show: true, + formatter: function (dataObj) { + const { dataIndex, value } = dataObj; + let labelText = value; + + labelText = ''; + if (dataIndex % 1 === 0) { // 每隔三个x坐标显示一个 + labelText = value; + } + + return `${labelText}` + } + } }, itemStyle: { color: '#fff', @@ -378,7 +370,7 @@ export class HomePageComponent implements OnInit { // itemHeight: 8, // }, grid: { - left: '36px', + left: '40px', right: '30px', bottom: '38px', top: '66px' @@ -424,6 +416,10 @@ export class HomePageComponent implements OnInit { // this.getAggregations() + setTimeout(() => { + this.getHomeAggregation() + }, 10 * 6000); + } //获得所有未读消息 @@ -499,6 +495,8 @@ export class HomePageComponent implements OnInit { } //预警图表 equipmentechartdata + tools1 + tools2 eventEcharts(data) { data.violationType.violationTypeAgg.forEach(element => { // num += element.count @@ -506,9 +504,16 @@ export class HomePageComponent implements OnInit { element.value = element.count }); this.warningechartpieOption.series[0].data = data.violationType.violationTypeAgg; - this.warningechartpieOption.series[0].label.normal.formatter = '{total|' + data.recordCount + '}' + '\n\r' + '{active|总数}' + this.warningechartpieOption.series[0].label.normal.formatter = '{total|' + data.recordCount + '}' + '\n\r' + '{active|预警事件}' this.warningechartpie.setOption(this.warningechartpieOption); + // 可调用clearLoop方法，清除定时器 + this.tools1 && this.tools1.clearLoop(); + this.tools1 = null; + this.tools1 = tools.loopShowTooltip(this.warningechartpie, this.warningechartpieOption, { + interval: 5000, + loopSeries: true + }); let monthArr = [] let valuedata = [] @@ -519,6 +524,23 @@ export class HomePageComponent implements OnInit { this.warningechartbarOption.xAxis.data = monthArr this.warningechartbarOption.series[0].data = valuedata this.warningechartbarOption.series[1].data = valuedata + let xxx = valuedata.find(function (value, index, arr) { + return value > 1000; + }) + if (xxx) { + // console.log('xxxxxxxxxx') + this.warningechartbarOption.series[1].label.normal.formatter = function (dataObj) { + const { dataIndex, value } = dataObj; + let labelText = value; + + labelText = ''; + if (dataIndex % 2 === 0) { // 每隔三个x坐标显示一个 + labelText = value; + } + + return `${labelText}` + } + } this.warningechartbar.setOption(this.warningechartbarOption); @@ -535,10 +557,17 @@ export class HomePageComponent implements OnInit { element.value = element.count }); this.oilchartpieOptionPieData1 = data.ouViolationType.ouViolationTypeAgg - this.oilchartpieOption.series[0].label.normal.formatter = '{total|' + data.ouRecordCount + '}' + '\n\r' + '{active|总数}' + this.oilchartpieOption.series[0].label.normal.formatter = '{total|' + data.ouRecordCount + '}' + '\n\r' + '{active|卸油预警}' this.oilchartpieOption.series[0].data = this.oilchartpieOptionPieData1 this.oilchartpie.setOption(this.oilchartpieOption); + // 可调用clearLoop方法，清除定时器 + this.tools2 && this.tools2.clearLoop(); + this.tools2 = null; + this.tools2 = tools.loopShowTooltip(this.oilchartpie, this.oilchartpieOption, { + interval: 5000, + loopSeries: true + }); //柱状图 let monthArr = [] let valuedata = [] @@ -549,6 +578,23 @@ export class HomePageComponent implements OnInit { this.oilchartbarOption.xAxis.data = monthArr this.oilchartbarOption.series[0].data = valuedata this.oilchartbarOption.series[1].data = valuedata + let xxx = valuedata.find(function (value, index, arr) { + return value > 1000; + }) + if (xxx) { + // console.log('xxxxxxxxxx') + this.warningechartbarOption.series[1].label.normal.formatter = function (dataObj) { + const { dataIndex, value } = dataObj; + let labelText = value; + + labelText = ''; + if (dataIndex % 2 === 0) { // 每隔三个x坐标显示一个 + labelText = value; + } + + return `${labelText}` + } + } this.oilchartbar.setOption(this.oilchartbarOption); } //获取统计信息 @@ -650,7 +696,7 @@ export class HomePageComponent implements OnInit { look(item) { // console.log(item) if (item.notification.data.eventSystemName == '灭火器维护' || item.notification.data.eventSystemName == '证照预警') { - this.message.create('warning', item.notification.data.desc); + this.message.create('warning', item.notification.data.content1); } else { this.isOpenModel = true let data = { diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 28d79ca..fc3d4fb 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -114,7 +114,7 @@ export class HomeComponent implements OnInit { }).subscribe((data: any) => { // console.log(data) if (item.notification.data.properties.EventSystemName == '灭火器维护' || item.notification.data.properties.EventSystemName == '证照预警') { - this.message.create('warning', data.result.desc); + this.message.create('warning', data.result.content1); } else { const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, diff --git a/src/app/pages/init3D.guard.ts b/src/app/pages/init3D.guard.ts index 7aaf270..e325730 100644 --- a/src/app/pages/init3D.guard.ts +++ b/src/app/pages/init3D.guard.ts @@ -25,7 +25,7 @@ export class init3DGuard implements CanActivate { if (userdata.userName == 'superadmin' || res.hasBuildingInfo) { return true } else { - this.message.info("当前站点没有数字油站!"); + this.message.info("当前油站未开通!"); return false } }); diff --git a/src/app/pages/left-domain/left-domain.component.html b/src/app/pages/left-domain/left-domain.component.html index 3751ee0..7887279 100644 --- a/src/app/pages/left-domain/left-domain.component.html +++ b/src/app/pages/left-domain/left-domain.component.html @@ -7,7 +7,7 @@

{{baseInfo.stationName || '暂无数据'}}

{{baseInfo.address || '暂无数据'}}

{{baseInfo.locationName || '暂无数据'}}

-

{{baseInfo.openTime | date:"yyyy/MM/dd HH:mm:ss" || '0:00:00'}} 开业

+

{{baseInfo.openTime | date:"yyyy/MM/dd" || ''}} 开业

{{baseInfo.laneCount || '0'}} 车道

所属公司: {{baseInfo.companyName || '暂无数据'}}

联系人: {{baseInfo.leaderName || '暂无数据'}}

@@ -67,12 +67,14 @@

品牌

油枪数量

油品品号

+

油枪编号

油泵类型

+

@@ -91,6 +93,7 @@

油品品号

+

油枪编号

油罐容积

安全容积

罐区

@@ -98,6 +101,7 @@

+

diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index ca5f930..b503fc1 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -396,8 +396,15 @@ export class LeftDomainComponent implements OnInit { //关闭 编辑信息/导出Excel 弹窗 closeBaseInfoDialog() { - sessionStorage.setItem('userdata', this.originalData) - this.isShowBaseDialog = false + PlanComponent.instance.isShowLoading = true + let params = { organizationUnitId: PlanComponent.instance.companyData.id } + this.http.get('/api/services/app/GasStation/Get', { params: params }).subscribe((data: any) => { + data.result.govUnitDetail ? data.result.govUnitDetail = JSON.parse(data.result.govUnitDetail) : null + this.baseInfo = data.result + sessionStorage.setItem('userdata', this.originalData) + this.isShowBaseDialog = false + PlanComponent.instance.isShowLoading = false + }) } } diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html index 40c7c30..b44e4dd 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.html @@ -83,7 +83,7 @@ --> - +
@@ -113,19 +113,22 @@ 油站名称
- 组织机构 + 公司名称
-
+
+ 区域 +
+
卸油开始时间
-
+
卸油结束时间
操作前准备预警节点数量
- 操作后准备预警节点数量 + 操作中准备预警节点数量
全流程准备预警节点数量 @@ -142,29 +145,32 @@
- 油站名称 + {{item.gasStation.stationName}}
- 组织机构 + {{item.gasStation.companyName}}
-
+
+ {{item.gasStation.locationName}} +
+
{{item.startTime ? (item.startTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
-
+
{{item.endTime ? (item.endTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}
{{item.proccessBeforeCount}}
- {{item.proccessAfterCount}} + {{item.proccessingCount}}
{{item.allProccessCount}}
+ *ngIf="item.proccessBeforeCount == 0 && item.proccessingCount == 0 && item.allProccessCount == 0; else elseTemplate"> 合规 diff --git a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss index 6ee4fb0..83fc3a7 100644 --- a/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss +++ b/src/app/pages/oil-unloading-process-list/oil-unloading-process-list.component.scss @@ -16,7 +16,7 @@ width: 100%; height: 32px; display: flex; - justify-content: space-around; + justify-content: flex-start; .searchParams, .btn { @@ -24,11 +24,15 @@ } .searchParams { - flex: 10; + // flex: 10; + width: 150px; + + } + .searchParams2{ + width: 220px; } - .btn { - flex: 1; + // flex: 1; } nz-select { 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 980529a..cb20acd 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 @@ -193,7 +193,7 @@ export class OilUnloadingProcessListComponent implements OnInit { } }, tooltip: { - trigger: 'axis' + // trigger: 'axis' }, series: [ { @@ -313,7 +313,7 @@ export class OilUnloadingProcessListComponent implements OnInit { //二级柱状图 oilchartbarOption2 = { tooltip: { - trigger: 'axis' + // trigger: 'axis' }, xAxis: { type: 'category', @@ -452,6 +452,12 @@ export class OilUnloadingProcessListComponent implements OnInit { this.refreshEchartsData2(this.echartsData) } }); + this.myChart.on('click', (params) => { + if (params.name == '预警事件') { + this.isgoback = true + this.refreshEchartsData2(this.echartsData) + } + }); //柱状图 let monthArr = [] @@ -585,7 +591,7 @@ export class OilUnloadingProcessListComponent implements OnInit { }).subscribe((data: any) => { this.list = this.list.concat(data.result.items); this.list = [...this.list] - console.log('xxx',this.list) + // console.log('xxx',this.list) this.totalCount = data.result.totalCount console.log('获取卸油流程列表', data.result.items) // this.getAggregations() diff --git a/src/app/pages/plan-admin/plan-admin.component.ts b/src/app/pages/plan-admin/plan-admin.component.ts index 63cc687..6c4445c 100644 --- a/src/app/pages/plan-admin/plan-admin.component.ts +++ b/src/app/pages/plan-admin/plan-admin.component.ts @@ -38,7 +38,8 @@ export class PlanAdminComponent implements OnInit { OrganizationUnitId: String(this.OrganizationUnitId), IsContainsChildren: 'true', SkipCount: this.SkipCount, - MaxResultCount: this.MaxResultCount + MaxResultCount: this.MaxResultCount, + Sorting:' BuildingBasicInfo.Id asc' } await new Promise((resolve, reject) => { this.http.get('/api/services/app/GasStation/GetAll', { @@ -65,7 +66,9 @@ export class PlanAdminComponent implements OnInit { OrganizationUnitId: String(this.OrganizationUnitId), IsContainsChildren: 'true', SkipCount: '0', - MaxResultCount: this.MaxResultCount + MaxResultCount: this.MaxResultCount, + Sorting:' BuildingBasicInfo.Id asc' + } this.http.get('/api/services/app/GasStation/GetAll', { params: params @@ -85,7 +88,8 @@ export class PlanAdminComponent implements OnInit { OrganizationUnitId: String(this.OrganizationUnitId), IsContainsChildren: 'true', SkipCount: '0', - MaxResultCount: this.MaxResultCount + MaxResultCount: this.MaxResultCount, + Sorting:' BuildingBasicInfo.Id asc' } this.http.get('/api/services/app/GasStation/GetAll', { params: params @@ -118,12 +122,16 @@ export class PlanAdminComponent implements OnInit { const element = data.result.items[index]; element.key = element.id element.title = element.displayName + // if(element.parentId == OrganizationUnitId){ + // element.isLeaf = true + // } } - + console.log('组织机构', data.result.items) this.nodes = [...this.toTree.toTree(data.result.items)] + this.nzExpandedKeys = [OrganizationUnitId] this.nzSelectedKeys = [OrganizationUnitId] this.OrganizationUnitId = OrganizationUnitId - this.nzExpandAll = true + // this.nzExpandAll = true this.getGasStation() }) } @@ -171,7 +179,8 @@ export class PlanAdminComponent implements OnInit { OrganizationUnitId: String(this.OrganizationUnitId), IsContainsChildren: 'true', SkipCount: this.SkipCount, - MaxResultCount: this.MaxResultCount + MaxResultCount: this.MaxResultCount, + Sorting:' BuildingBasicInfo.Id asc' } await new Promise((resolve, reject) => { this.http.get('/api/services/app/GasStation/GetAll', { diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.html b/src/app/pages/today-warning-admin/today-warning-admin.component.html index 8124705..062a66c 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.html +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.html @@ -93,16 +93,17 @@
-
+
+
-
+
预警级别
预警类型
-
- 预警信息 +
+ 预警事件
所属公司 @@ -125,12 +126,13 @@
处置状态
-
+
操作
+
-
+
@@ -160,8 +162,8 @@
{{item.violation.violationType}}
-
- {{item.violation.violationName}} +
+ {{item.violation.eventSystemName}}
{{item.gasStation.companyName}} @@ -189,11 +191,11 @@ 已处置
-
- - +
+
+
\ No newline at end of file diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.scss b/src/app/pages/today-warning-admin/today-warning-admin.component.scss index 50e2df7..c508376 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.scss +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.scss @@ -54,7 +54,7 @@ width: 100%; height: 32px; display: flex; - justify-content: space-around; + justify-content: flex-start; .searchParams, .btn { @@ -62,12 +62,12 @@ } .searchParams { - flex: 3; - // max-width: 100px; + // flex: 3; + width: 150px; } .btn { - flex: 1; + // flex: 1; } nz-select { @@ -102,17 +102,14 @@ margin-bottom: 12px; background: linear-gradient(180deg, rgba(3, 0, 0, 0) 0%, rgba(0, 46, 91, 0.68) 100%); box-sizing: border-box; - padding-left: 20px; - padding-right: 60px; - + white-space: nowrap; div { font-size: 15px; text-align: left; + white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - display: flex; - align-items: center; button { font-size: 15px; @@ -121,7 +118,15 @@ color: #91CCFF; } } - + .imgbox{ + span{ + img{ + width: 30%; + height: 30%; + margin-left: 15px; + } + } + } .propsm { display: inline-block; width: 38px; @@ -208,7 +213,6 @@ overflow-y: auto; box-sizing: border-box; padding: 16px 35px 16px 36px; - .listitem { height: 40px; line-height: 40px; diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts index e4d9c77..ce72c52 100644 --- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts +++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts @@ -25,7 +25,7 @@ export class TodayWarningAdminComponent implements OnInit { validateForm!: FormGroup; constructor(private http: HttpClient, private fb: FormBuilder, private router: Router, private toTree: TreeService, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private navChangeService: NavChangeService, private message: NzMessageService) { } - + isSpin:boolean = false ngOnInit(): void { this.validateForm = this.fb.group({ level: [null], @@ -112,6 +112,7 @@ export class TodayWarningAdminComponent implements OnInit { disposalState = null } console.log(this.validateForm.value) + this.isSpin = true let params = { Level: this.validateForm.value.level, ViolationIds: ViolationIds, @@ -130,7 +131,7 @@ export class TodayWarningAdminComponent implements OnInit { this.list = data.result.items this.totalCount = data.result.totalCount console.log('预警列表', this.list) - + this.isSpin = false let obj = { name: '改变数量', num: this.totalCount @@ -171,6 +172,7 @@ export class TodayWarningAdminComponent implements OnInit { isVisible = false look(item) { + console.log(item) const modal = this.modal.create({ nzContent: GetOutOfLineDetailsComponent, nzWrapClassName: "vertical-center-modal", @@ -188,7 +190,7 @@ export class TodayWarningAdminComponent implements OnInit { }, nzFooter: null, nzOnOk: async () => { - + console.log(99999,instance.content) } }); const instance = modal.getContentComponent(); diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html index 878aa06..fe01efd 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.html @@ -5,34 +5,41 @@ 预警截图
-
+
预警视频
+
+ 预警详情：{{details}} +
-
- {{details}} -
-
- -
+
-
-
- 处置内容 - 提交 - 已处置 -
-
- -
+
+
+
+ 处置内容 + 提交 + 已处置 +
+
+ + {{content}} +
+
+ + 处置人：{{data.handleUsername}} + + + 处置时间：{{data.handleTime|date:"yyyy-MM-dd HH:mm:ss"}} +
-
\ No newline at end of file diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss index 8d6c8ee..9aa63d7 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.scss @@ -1,7 +1,7 @@ .box { width: 100%; height: 715px; - overflow-y: auto; + // overflow-y: auto; color: #fff; display: flex; flex-direction: column; @@ -54,106 +54,87 @@ } } -.ant-modal-close { - color: #fff; +.details { + width: 100%; + height: 45px; + line-height: 45px; + box-sizing: border-box; + padding: 0 12px; } .content { flex: 1; - box-sizing: border-box; - padding: 12px; overflow: hidden; - display: flex; - flex-direction: column; - overflow-y: auto; - .details { - margin-bottom: 12px; - } - .disposebox { + .imgbox { + width: 100%; + height: 100%; display: flex; - flex-direction: column; - height: 72px; - margin-bottom: 25px; - .title { - display: flex; - justify-content: space-between; - margin-bottom: 12px; + align-items: center; + justify-content: center; + img { + max-width: 100%; + max-height: 100%; } + } - .textarea { - height: 60px; - - textarea { - color: #C4E2FC; - border: 1px solid #91CCFF; - background-color: #172c45; - } + .vediobox { + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + video { + max-width: 100%; + max-height: 100%; } } +} - .imgbox { - flex: 1; - display: flex; - width: 100%; - - .imglist { - display: flex; - flex-direction: column; - width: 196px; - height: 100%; - overflow-y: auto; - box-sizing: border-box; - padding-right: 12px; - border-right: 1px solid rgba(145, 204, 255, 0.3); - - .imglisttitle { - font-size: 16px; - font-family: sybold; - margin-bottom: 16px; - } +.disposebox { + width: 100%; + height: 95px; + box-sizing: border-box; + padding: 5px 12px; + display: flex; + flex-direction: column; - .img { - width: 178px; - height: 108px; - margin-bottom: 8px; + .title { + display: flex; + justify-content: space-between; + } - img { - width: 100%; - height: 100%; - cursor: pointer; - } - } + .disposeContent { + display: flex; + align-items: center; + textarea { + width: 100%; + height: 40px; + color: #C4E2FC; + border: 1px solid #91CCFF; + background-color: #172c45; } - - .bigimg { - // min-width: 1149px; - flex: 1; - box-sizing: border-box; - padding-left: 13px; - display: flex; - justify-content: center; - max-height: 500px; - - img { - max-width: 100%; - max-height: 100%; - } + span{ + display: inline-block; + width: 100%; + height: 40px; + line-height: 40px; } } - .vediobox { - flex: 1; - width: 100%; - video{ - max-height: 500px; - } - } + .disposeTime {} + +} + +.ant-modal-close { + color: #fff; } + + // 适配125% @media screen and (max-height: 750px) { .box { @@ -234,4 +215,4 @@ ::-webkit-scrollbar-track { background-color: #061d3c; -} \ No newline at end of file +} diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts index fb97bce..ef7348c 100644 --- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts +++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts @@ -19,7 +19,7 @@ export class GetOutOfLineDetailsComponent implements OnInit { details ngOnInit(): void { console.log(this.data) - this.details = this.data.desc + this.details = this.data.content1 this.imgUrl = this.data.violateImage this.vedioUrl = this.data.violateVideo this.content = this.data.handleRecord @@ -38,6 +38,7 @@ export class GetOutOfLineDetailsComponent implements OnInit { this.http.post('/api/services/app/ViolateRecord/HandleViolateRecord', body).subscribe(data => { this.message.create('success', '处置成功！'); this.data.handleTime = new Date() + this.data.handleRecord = this.content }) } } diff --git a/src/app/pages/today-warning/today-warning.component.html b/src/app/pages/today-warning/today-warning.component.html index befdc06..244f83e 100644 --- a/src/app/pages/today-warning/today-warning.component.html +++ b/src/app/pages/today-warning/today-warning.component.html @@ -75,10 +75,9 @@
- -
+
-
+
@@ -109,7 +108,7 @@ 预警类型: {{item.violation.violationType}}
- 预警信息: {{item.violation.violationName}} + 预警信息: {{item.violation.eventSystemName}}
区域: {{item.violateArea}} @@ -117,7 +116,7 @@
摄像头: {{item.cameraNo}}
-
+
{{item.violateTime | date:"yyyy-MM-dd HH:mm:ss"}}
@@ -128,11 +127,12 @@ 已处置
-
+
- - 已处置 +
+
\ No newline at end of file diff --git a/src/app/pages/today-warning/today-warning.component.scss b/src/app/pages/today-warning/today-warning.component.scss index ad0c680..0977630 100644 --- a/src/app/pages/today-warning/today-warning.component.scss +++ b/src/app/pages/today-warning/today-warning.component.scss @@ -54,7 +54,7 @@ width: 100%; height: 32px; display: flex; - justify-content: space-around; + justify-content: flex-start; .searchParams, .btn { @@ -62,11 +62,12 @@ } .searchParams { - flex: 2.9; + // flex: 2.9; + width: 150px; } .btn { - flex: 1; + // flex: 1; } nz-select { @@ -113,6 +114,14 @@ color: #91CCFF; } } + .imgbox{ + span{ + img{ + width: 30%; + height: 80%; + } + } + } } .dispositioned { diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts index 7e68090..5f4e570 100644 --- a/src/app/pages/today-warning/today-warning.component.ts +++ b/src/app/pages/today-warning/today-warning.component.ts @@ -54,6 +54,7 @@ export class TodayWarningComponent implements OnInit { list: any = [ ] totalCount: string //预警总数 + isSpin:boolean = false getEarlyWarningList() { let ViolationIds = [] if (this.validateForm.value.type) { @@ -81,13 +82,14 @@ export class TodayWarningComponent implements OnInit { SkipCount: '0', MaxResultCount: '9999' } + this.isSpin = true this.http.get('/api/services/app/ViolateRecord/GetAll', { params: params }).subscribe((data: any) => { this.list = data.result.items this.totalCount = data.result.totalCount console.log('预警列表', this.list) - + this.isSpin = false let obj = { name: '改变数量', num: this.totalCount diff --git a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts index 9f2ba23..3738f00 100644 --- a/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts +++ b/src/app/system-management/analysis-of-the-host/analysis-of-the-host.component.ts @@ -72,7 +72,9 @@ export class AnalysisOfTheHostComponent implements OnInit { getHost() { this.http.get('/api/services/app/EdgeDevice/GetAll', { params: { - organizationUnitId: this.selectedOilStation.id + organizationUnitId: this.selectedOilStation.id, + SkipCount: '0', + MaxResultCount: '100', } }).subscribe((data: any) => { console.log('主机列表', data.result.items) @@ -86,10 +88,12 @@ export class AnalysisOfTheHostComponent implements OnInit { getCamera() { this.http.get('/api/services/app/Camera/GetAll', { params: { - organizationUnitId: this.selectedOilStation.id + organizationUnitId: this.selectedOilStation.id, + SkipCount: '0', + MaxResultCount: '100', } }).subscribe((data: any) => { - console.log('摄像头列表', data) + // console.log('摄像头列表', data) this.listOfDataCamera = data.result.items }) } diff --git a/src/app/system-management/organization/organization.component.ts b/src/app/system-management/organization/organization.component.ts index 6f1c6bb..318ff82 100644 --- a/src/app/system-management/organization/organization.component.ts +++ b/src/app/system-management/organization/organization.component.ts @@ -155,28 +155,33 @@ export class OrganizationComponent implements OnInit { } deleteOr(item) { console.log(item) - this.modal.confirm({ - nzTitle: `确定要删除${item.title}这个机构吗?`, - nzOkText: '确定', - nzOkType: 'danger', - nzOnOk: () => { - this.http.delete('/api/services/app/Organization/Delete', { - params: { - Id: item.origin.id - } - }).subscribe(data => { - this.nzTreeComponent.getExpandedNodeList().forEach((item) => { - this.defaultExpandedKeys.push(item.key) + if (item.origin.children && item.origin.children.length != 0) { + this.message.create('warning', '请先删除所有子节点'); + } else { + this.modal.confirm({ + nzTitle: `确定要删除${item.title}这个机构吗?`, + nzOkText: '确定', + nzOkType: 'danger', + nzOnOk: () => { + this.http.delete('/api/services/app/Organization/Delete', { + params: { + Id: item.origin.id + } + }).subscribe(data => { + this.nzTreeComponent.getExpandedNodeList().forEach((item) => { + this.defaultExpandedKeys.push(item.key) + }) + this.getAllOrganization() + this.message.create('success', '删除成功！'); }) - this.getAllOrganization() - this.message.create('success', '删除成功！'); - }) - }, - nzCancelText: '取消', - nzOnCancel: () => { + }, + nzCancelText: '取消', + nzOnCancel: () => { + + } + }); + } - } - }); } diff --git a/src/app/system-management/user/user.component.html b/src/app/system-management/user/user.component.html index ff7193e..15d33b8 100644 --- a/src/app/system-management/user/user.component.html +++ b/src/app/system-management/user/user.component.html @@ -37,7 +37,7 @@ {{ data.userName }} {{ data.name }} - {{item}} + {{item}}