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

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

@@ -4,7 +4,7 @@
     <!-- 基本信息 -->
     <div class="publicBox baseInfo" *ngIf="beforeFence === 0 && baseInfo">
       <div class="interval">
-        <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="title">{{baseInfo.stationName || '暂无数据'}}<button class="titleBotton"><label *ngIf="baseInfo.stationType == 0">自营</label><label *ngIf="baseInfo.stationType == 1">加盟</label><label *ngIf="baseInfo.stationType != 0 && baseInfo.stationType != 1">其他</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" || ''}}   开业</p>

src/styles.scss

@@ -136,6 +136,7 @@ h1 {
   .ant-modal-body,.ant-modal-content { height: 100%; }
   canvas{ width: 100%; height: 100%; border: none; outline: none; }
 }
+#embed-host{ input{color: #000;} } //bbl 内置color
 #threeDimensional {
   //可展开面板
   #disposalPlan{