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

proxy.config.json

@@ -1,13 +1,13 @@
 {
-    "/api": {
+  "/api": {
-      "target": "http://39.106.78.171:8906",
+    "target": "http://39.106.78.171:8906",
-      "secure": false,
+    "secure": false,
-      "changeOrigin": true
+    "changeOrigin": true
-    },
+  },
-    "/signalr": {
+  "/signalr": {
-      "target": "http://39.106.78.171:8906",
+    "target": "http://39.106.78.171:8906",
-      "secure": false,
+    "secure": false,
-      "ws": true,
+    "ws": true,
-      "logLevel": "debug"
+    "logLevel": "debug"
   }
-}
+}

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

@@ -74,7 +74,7 @@
             <p [title]="item.getPropertyData().brand"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().brand" (click)="stopBubbling($event)"></p>
             <p [title]="item.getPropertyData().oilGunNum"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNum" (click)="stopBubbling($event)"></p>
             <p [title]="item.getPropertyData().oilProductNo"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
-            <p [title]="item.getPropertyData().oilGunNo" class="overflowP"><textarea [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)"></textarea></p>
+            <p [title]="item.getPropertyData().oilGunNo" class="overflowP"><textarea [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)" [ngStyle]="{'line-height': isLineFeed(item.getPropertyData().oilGunNo)? '48px' : '24px'}"></textarea></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>
@@ -101,7 +101,7 @@
           </div>
           <div class="tableContent">
             <p [title]="item.getPropertyData().oilProductNo"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilProductNo" (click)="stopBubbling($event)"></p>
-            <p [title]="item.getPropertyData().oilGunNo" class="overflowP"><textarea [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)"></textarea></p>
+            <p [title]="item.getPropertyData().oilGunNo" class="overflowP"><textarea [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilGunNo" (click)="stopBubbling($event)" [ngStyle]="{'line-height': isLineFeed(item.getPropertyData().oilGunNo)? '48px' : '24px'}"></textarea></p>
             <p [title]="item.getPropertyData().oilTankVolume"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().oilTankVolume" (click)="stopBubbling($event)"></p>
             <p [title]="item.getPropertyData().safeVolume"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().safeVolume" (click)="stopBubbling($event)"></p>
             <p [title]="item.getPropertyData().tankFarm"><input type="text" class="tableInput" [disabled]="!editMode" [(ngModel)]="item.getPropertyData().tankFarm" (click)="stopBubbling($event)"></p>

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

@@ -207,6 +207,26 @@ export class LeftDomainComponent implements OnInit {
     //编辑模式
   }
 
+  //是否换行
+  isLineFeed(str: string):boolean {
+    if (str) {
+      let strlen = 0;
+      for (var i = 0;i < str.length; i++) {
+        if(str.charCodeAt(i) > 255) //如果是汉字，则字符串长度加2
+        strlen += 2;
+        else
+        strlen++;
+      }
+      if (strlen >= 16) {
+        return false
+      } else {
+        return true
+      }
+    } else {
+      return true
+    }
+  }
+
   //获取设备 数量
   getFacilityNum(type: string): string {
     let num = 0

src/app/pages/login/login.component.html

@@ -1,7 +1,7 @@
 <div class="login" id="login">
   <div class="card">
     <h1 class="cardheader">欢迎登录</h1>
-    <h1 class="cardheader">中化石油智能安全管理系统</h1>
+    <h1 class="cardheader">加油站智能安全管理系统</h1>
   
     <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
       <nz-form-item>
@@ -37,7 +37,7 @@
       <button [nzLoading]="isLoading" nz-button class="login-form-button login-form-margin"
         [nzType]="'primary'">登录</button>
     </form>
-    <p class="company">中化石油销售有限公司 版权所有</p>
+    <p class="company">中化石油销售有限公司 北京安信科创软件有限公司 版权所有</p>
   </div>
 
 

src/app/pages/login/login.component.scss

@@ -13,10 +13,10 @@
   transform: translate(-50%,-50%);
   background-color: rgba(0, 13, 33, 0.24);
   border-radius: 16px;
-  width: 456px;
+  width: 468px;
   height: 548px;
   box-sizing: border-box;
-  padding: 79px 48px 42px 48px;
+  padding: 79px 45px 42px 45px;
   color: rgba(255, 255, 255, 1);
 }
 

src/app/pages/oil-station-info/oil-station-info.component.html

@@ -146,12 +146,12 @@
                   </nz-form-control>
                 </nz-form-item>
               </td>
-              <td class="head">油罐容积</td>
+              <td class="head">油罐容积(m³)</td>
               <td class="text">
                 <nz-form-item>
                   <nz-form-control>
                     <nz-input-group>
-                      <input [(ngModel)]="httpBody.tankVolume" nz-input type="text" formControlName="tankVolume" />
+                      <input [(ngModel)]="httpBody.tankVolume" nz-input type="number" formControlName="tankVolume" />
                     </nz-input-group>
                   </nz-form-control>
                 </nz-form-item>
@@ -318,7 +318,7 @@
                         nzTheme="outline"></i>重新上传</button>
                   </div>
                   <div class="timeDiv">
-                    <nz-form-item style="width: 35%;border: 1px solid #91CCFF;margin-right: 12px;">
+                    <nz-form-item style="width: 40%;border: 1px solid #91CCFF;margin-right: 12px;">
                       <nz-form-control>
                         <nz-range-picker [(ngModel)]="businessLicensevalidityTime"
                           formControlName="businessLicensevalidityTime">
@@ -326,7 +326,7 @@
                       </nz-form-control>
                     </nz-form-item>
                     <span><span style="color: red;">*</span>提前预警时间天数：</span>
-                    <nz-form-item style="width: 5%;border: 1px solid #91CCFF;margin-right: 12px;">
+                    <nz-form-item style="width: 50px;border: 1px solid #91CCFF;margin-right: 12px;">
                       <nz-form-control>
                         <nz-input-group>
                           <input style="padding: 0;text-align: center;" [(ngModel)]="httpBody.validityTermDays" nz-input
@@ -359,7 +359,7 @@
                         nzTheme="outline"></i>重新上传</button>
                   </div>
                   <div class="timeDiv">
-                    <nz-form-item style="width: 35%;border: 1px solid #91CCFF;margin-right: 12px;">
+                    <nz-form-item style="width: 40%;border: 1px solid #91CCFF;margin-right: 12px;">
                       <nz-form-control>
                         <nz-range-picker [(ngModel)]="hazardousLicensevalidityTime"
                           formControlName="hazardousLicensevalidityTime">
@@ -367,7 +367,7 @@
                       </nz-form-control>
                     </nz-form-item>
                     <span><span style="color: red;">*</span>提前预警时间天数：</span>
-                    <nz-form-item style="width: 5%;border: 1px solid #91CCFF;margin-right: 12px;">
+                    <nz-form-item style="width: 50px;border: 1px solid #91CCFF;margin-right: 12px;">
                       <nz-form-control>
                         <nz-input-group>
                           <input style="padding: 0;text-align: center;" [(ngModel)]="httpBody.dangerousTermDays" nz-input
@@ -400,14 +400,14 @@
                         nzTheme="outline"></i>重新上传</button>
                   </div>
                   <div class="timeDiv">
-                    <nz-form-item style="width: 35%;border: 1px solid #91CCFF;margin-right: 12px;">
+                    <nz-form-item style="width: 40%;border: 1px solid #91CCFF;margin-right: 12px;">
                       <nz-form-control>
                         <nz-range-picker [(ngModel)]="oilLicensevalidityTime" formControlName="oilLicensevalidityTime">
                         </nz-range-picker>
                       </nz-form-control>
                     </nz-form-item>
                     <span><span style="color: red;">*</span>提前预警时间天数：</span>
-                    <nz-form-item style="width: 5%;border: 1px solid #91CCFF;margin-right: 12px;">
+                    <nz-form-item style="width: 50px;border: 1px solid #91CCFF;margin-right: 12px;">
                       <nz-form-control>
                         <nz-input-group>
                           <input style="padding: 0;text-align: center;" [(ngModel)]="httpBody.sellLicenseTermDays" nz-input

src/app/pages/plan-admin/plan-admin.component.html

@@ -69,7 +69,7 @@
             <th>经营品类</th>
             <th [nzWidth]="'6%'">油机数量</th>
             <th [nzWidth]="'6%'">车道数量</th>
-            <th [nzWidth]="'6%'">油罐容积</th>
+            <th [nzWidth]="'8%'">油罐容积</th>
             <th [nzWidth]="'5%'">操作</th>
           </tr>
         </thead>
@@ -89,7 +89,7 @@
             <th nzEllipsis [title]="item.sellVariety">{{item.sellVariety}}</th>
             <th>{{item.gasStationCount}}</th>
             <th>{{item.laneCount}}</th>
-            <th>{{item.tankVolume}}</th>
+            <th>{{item.tankVolume}}{{item.tankVolume ? 'm³' : null}}</th>
             <th>
               <span class="look" (click)="look(item)" style="cursor:pointer;color: #36A2FF">查看</span>
             </th>

src/app/system-management/navigation/navigation.component.html

@@ -23,7 +23,7 @@
   </nz-sider>
   <nz-layout>
     <nz-header>
-      <span>Hey，欢迎登录加油站可视化智能安全管理系统</span>
+      <span>Hey，欢迎登录加油站智能安全管理系统</span>
       <a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
         <i nz-icon nzType="setting"></i>
       </a>

src/index.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN">
 <head>
   <meta charset="utf-8">
-  <title>中化石油智能安全管理系统</title>
+  <title>加油站智能安全管理系统</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">