Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

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;
 

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;

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;

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;
   }

src/app/pages/left-domain/left-domain.component.html

@@ -7,7 +7,7 @@
         <p class="title">{{baseInfo.stationName || '暂无数据'}}<button class="titleBotton"><label *ngIf="baseInfo.stationType == 0">自营</label><label *ngIf="baseInfo.stationType == 1">加盟</label><label *ngIf="baseInfo.stationType == 2">其他</label></button></p>
         <p class="text"><img src="../../../assets/images/baseInfo/position.png" class="textIcon">{{baseInfo.address || '暂无数据'}}</p>
         <p class="text"><img src="../../../assets/images/baseInfo/building.png" class="textIcon">{{baseInfo.locationName || '暂无数据'}}</p>
-        <p class="text"><img src="../../../assets/images/baseInfo/date.png" class="textIcon">{{baseInfo.openTime | date:"yyyy/MM/dd HH:mm:ss" || '0:00:00'}}   开业</p>
+        <p class="text"><img src="../../../assets/images/baseInfo/date.png" class="textIcon">{{baseInfo.openTime | date:"yyyy/MM/dd" || ''}}   开业</p>
         <p class="text"><img src="../../../assets/images/baseInfo/road.png" class="textIcon">{{baseInfo.laneCount || '0'}}   车道</p>
         <p class="text">所属公司:     {{baseInfo.companyName || '暂无数据'}}</p>
         <p class="text">联系人:     {{baseInfo.leaderName || '暂无数据'}}</p>
@@ -67,12 +67,14 @@
             <p>品牌</p>
             <p>油枪数量</p>
             <p>油品品号</p>
+            <p>油枪编号</p>
             <p>油泵类型</p>
           </div>
           <div class="tableContent">
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().brand" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNum" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)"></p>
             <p style="padding-left: 8px;" (click)="stopBubbling($event)">
               <nz-select class="tableSelect" [nzBorderless]="true" [nzDisabled]="!editMode" [(ngModel)]="item.getPropertyData().oilPumpType">
                 <nz-option nzValue="zxb" nzLabel="自吸泵"></nz-option>
@@ -91,6 +93,7 @@
         <div class="table">
           <div class="tableHeader">
             <p>油品品号</p>
+            <p>油枪编号</p>
             <p>油罐容积</p>
             <p>安全容积</p>
             <p>罐区</p>
@@ -98,6 +101,7 @@
           </div>
           <div class="tableContent">
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
+            <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilTankVolume" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().safeVolume" (click)="stopBubbling($event)"></p>
             <p><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().tankFarm" (click)="stopBubbling($event)"></p>