Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,27 +4,29 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-20 15:12:57
+ * @LastEditTime: 2021-03-24 14:35:51
 -->
 <div class="box">
     <div class="boxleft">
         <div class="lefthead">
           <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
             <div class="headdiv" style="margin-top: 30px;">
-              <span>操作类型：</span>
+              <span>操作类型:</span>
               <input type="radio" name="level" value="" [(ngModel)]="level"><span>全部</span> 
-              <input type="radio" name="level" style="margin-left: 50px;" value="1" [(ngModel)]="level"><span>更新</span>
-              <input type="radio" name="level" style="margin-left: 50px;" value="0" [(ngModel)]="level"><span>新增</span>
-              <input type="radio" name="level" style="margin-left: 50px;" value="2" [(ngModel)]="level"><span>删除</span>
-                <span style="margin-left: 100px;">共计：{{count}}条</span>
+              <input type="radio" name="level"  value="1" [(ngModel)]="level"><span>更新</span>
+              <input type="radio" name="level"  value="0" [(ngModel)]="level"><span>新增</span>
+              <input type="radio" name="level"  value="2" [(ngModel)]="level"><span>删除</span>
+              <div class="count">
+                <span >共计：{{count}}条</span>
+              </div>
             </div>
-            <div class="headdiv">
-                <span>审核状态：</span>
+            <div class="headdivtwo">
+                <span>审核状态:</span>
                 <input type="radio" name="passstate" [(ngModel)]="verifyState" value=""><span>全部</span> 
-                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="1"><span>初审通过</span>
-                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="2"><span>初审驳回</span>
-                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="4"><span>终审通过</span>
-                <input type="radio" name="passstate" style="margin-left: 50px;" [(ngModel)]="verifyState" value="5"><span>终审驳回</span>
+                <input type="radio" name="passstate"  [(ngModel)]="verifyState" value="1"><span>初审通过</span>
+                <input type="radio" name="passstate"  [(ngModel)]="verifyState" value="2"><span>初审驳回</span>
+                <input type="radio" name="passstate"  [(ngModel)]="verifyState" value="4"><span>终审通过</span>
+                <input type="radio" name="passstate"  [(ngModel)]="verifyState" value="5"><span>终审驳回</span>
             </div>
             <div class="headthree">
                 <span>类型：</span>
@@ -53,16 +55,16 @@
                   
             </div>
             <div class="headfour">
-              <span style="margin-left: 30px;">时间：</span>
+              <span>时间：</span>
                   <mat-form-field class="example-full-width">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="addtime">
                   </mat-form-field>
-                 <span style="margin-left: 10px;">🠊</span> 
+                  <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
                   <mat-form-field class="example-full-width" style="margin-left: 10px;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="endtime">
                   </mat-form-field>
-                  <button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >查询</button>
-                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
+                  <button mat-raised-button color="primary"  type="submit" >查询</button>
+                <button mat-raised-button color="primary"  (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
             </div>
           </form>
             
@@ -124,48 +126,51 @@
         
     </div>
     <div class="boxright">
-      <mat-tab-group  *ngIf="showtype == 3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
-        <mat-tab label="基本信息">
-          <ng-template matTabContent>
-            <app-basic-info></app-basic-info>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="平面图">
-          <ng-template matTabContent>
-            <app-plan-list></app-plan-list>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="四周毗邻">
-          <ng-template matTabContent>
-            <app-allaround></app-allaround>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="消防设施">
-          <ng-template matTabContent>
-            <app-fire-facilities></app-fire-facilities>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="重点部位">
-          <ng-template matTabContent>
-            <app-key-site-look></app-key-site-look>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="功能分区">
-          <ng-template matTabContent>
-            <app-function-partition></app-function-partition>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="实景图">
-          <ng-template matTabContent>
-            <app-realistic-picture-look></app-realistic-picture-look>
-          </ng-template>
-        </mat-tab>
-        <mat-tab label="CAD">
-          <ng-template matTabContent>
-            <app-cad-draw></app-cad-draw>
-          </ng-template>
-        </mat-tab>
-      </mat-tab-group>
+      <div class="company">
+        <mat-tab-group  *ngIf="showtype == 3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
+          <mat-tab label="基本信息">
+            <ng-template matTabContent>
+              <app-basic-info></app-basic-info>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="平面图">
+            <ng-template matTabContent>
+              <app-plan-list></app-plan-list>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="四周毗邻">
+            <ng-template matTabContent>
+              <app-allaround></app-allaround>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="消防设施">
+            <ng-template matTabContent>
+              <app-fire-facilities></app-fire-facilities>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="重点部位">
+            <ng-template matTabContent>
+              <app-key-site-look></app-key-site-look>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="功能分区">
+            <ng-template matTabContent>
+              <app-function-partition></app-function-partition>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="实景图">
+            <ng-template matTabContent>
+              <app-realistic-picture-look></app-realistic-picture-look>
+            </ng-template>
+          </mat-tab>
+          <mat-tab label="CAD">
+            <ng-template matTabContent>
+              <app-cad-draw></app-cad-draw>
+            </ng-template>
+          </mat-tab>
+        </mat-tab-group>
+      </div>
+      
         <div class="word" *ngIf="showtype==0">
           <button mat-raised-button color="primary" style="float: right;margin-top: 10px;margin-right: 15px;" (click)='lookNew()'>查看详情</button>
           <iframe [src]='iframeSrc'></iframe>

src/app/plan-audit/plan-record/plan-record.component.scss

@@ -5,6 +5,7 @@
     .boxleft{
         height: 100%;
         width: 45%;
+        overflow-y: auto;
         background-color: #FFFFFF;
         display: flex;
         flex-direction: column;
@@ -12,31 +13,106 @@
             display: flex;
             flex-direction: column;
             .headdiv{
-                margin: 0 0 0 30px;
+                @media screen and (min-device-width:1300px){
+                    margin: 0 0 0 28px;
+                }
+                @media screen and (max-device-width:1300px){
+                    margin-left: 0;
+                }
                 height: 40px;
+                display: flex;
+                flex-direction: row;
                 span{
                     font-size: 16px;
                     margin-left: 3px;
                 }
                 input{
-                    margin-left: 15px;
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 50px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 12px;
+                    }
                     position: relative;
-                    top: 1px;
+                    top: 6px;
+                }
+                .count{
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 110px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 20px;
+                    }
+                }
+            }
+            .headdivtwo{
+                @media screen and (min-device-width:1300px){
+                    margin: 0 0 0 28px;
+                }
+                @media screen and (max-device-width:1300px){
+                    margin-left: 0;
+                }
+                height: 40px;
+                display: flex;
+                flex-direction: row;
+                span{
+                    font-size: 16px;
+                    margin-left: 3px;
+                }
+                input{
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 50px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 0;
+                    }
+                    position: relative;
+                    top: 5px;
+                }
+                .count{
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 110px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 20px;
+                    }
                 }
             }
             .headthree{
-                margin-left: 30px;
+                @media screen and (min-device-width:1300px){
+                    margin-left: 30px;
+                }
+                
                 mat-form-field{
                     width: 150px;
                 }
             }
+            .headfour{
+                span{
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 30px;
+                    }
+                }
+                button{
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 40px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 120px;
+                    }
+                }
+            }
         }
         .tablediv{
             width: 100%;
             height: 100%;
             padding-bottom: 20px;
+            
             .tbodycss{
-                overflow-y: auto;
+                //overflow-y: auto;
+                @media screen and (min-device-width:1300px){
+                    overflow-y: auto;
+                }
                 height:550px;
                 width: 100%;
                 .selectedTr{
@@ -74,6 +150,17 @@
         margin-left: 10px;
         display: flex;
         flex-direction: column;
+        @media screen and (max-device-width:1300px){
+            overflow-y: auto;
+        }
+        .company{
+            @media screen and (min-device-width:1300px){
+                overflow-y: auto;
+            }
+            flex: 1;
+            //overflow-y: auto;
+            margin-top: 10px;
+        }
         .word{
             width: 100%;
             height: 100%;

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -5,16 +5,19 @@
             <div class="headdiv" style="margin-top: 30px;">
               <span>操作类型：</span>
               <input type="radio" name="level" value="" [(ngModel)]="level"><span>全部</span> 
-              <input type="radio" name="level" style="margin-left: 50px;" value="1" [(ngModel)]="level"><span>更新</span>
-              <input type="radio" name="level" style="margin-left: 50px;" value="0" [(ngModel)]="level"><span>新增</span>
-              <input type="radio" name="level" style="margin-left: 50px;" value="2" [(ngModel)]="level"><span>删除</span>
+              <input type="radio" name="level"  value="1" [(ngModel)]="level"><span>更新</span>
+              <input type="radio" name="level"  value="0" [(ngModel)]="level"><span>新增</span>
+              <input type="radio" name="level"  value="2" [(ngModel)]="level"><span>删除</span>
               <!-- <mat-radio-group name='aaa' [(ngModel)]="level" style="position: relative;bottom: 3px;">
                 <mat-radio-button class='radio' style="margin-left: 3px;" value="" >全部</mat-radio-button>
                 <mat-radio-button style="margin-left: 20px;height: 10px;" value="1">更新</mat-radio-button>
                 <mat-radio-button style="margin-left: 20px;" value="0">新增</mat-radio-button>
                 <mat-radio-button style="margin-left: 20px;" value="2">删除</mat-radio-button>
               </mat-radio-group> -->
-              <span style="margin-left: 100px;">共计：{{count}}条</span>
+              <div class="count">
+                <span >共计：{{count}}条</span>
+              </div>
+              
           </div>
           <div class="headthree">
               <span>类型：</span>
@@ -34,13 +37,13 @@
                     <mat-option value="14">联动力量</mat-option>
                   </mat-select>
               </mat-form-field>
-              <span style="margin-left: 30px;">编制级别：</span>
+              <span style="margin-left: 15px;">编制级别：</span>
               <mat-form-field>
                 <mat-select name="preparelevel"  placeholder='请选择编制级别' [(ngModel)]="PlanLevel">
                   <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
                 </mat-select>
               </mat-form-field>
-                <button mat-raised-button color="primary" style="margin-left: 40px;" type="submit" >查询</button>
+                <button mat-raised-button color="primary" style="margin-left: 80px;" type="submit" >查询</button>
                 <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
           </div>
           </form>
@@ -96,7 +99,7 @@
         
       </div>
       <div id="company">
-        <mat-tab-group  *ngIf="showtype == 3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
+        <mat-tab-group  *ngIf="showtype == 3" class="company"  [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
           <mat-tab label="基本信息">
             <ng-template matTabContent>
               <app-basic-info></app-basic-info>

src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@@ -8,12 +8,20 @@
         background-color: #FFFFFF;
         display: flex;
         flex-direction: column;
+        overflow: auto;
         .lefthead{
             display: flex;
             flex-direction: column;
             .headdiv{
-                margin: 0 0 0 30px;
+                @media screen and (min-device-width:1300px){
+                    margin: 0 0 0 28px;
+                }
+                @media screen and (max-device-width:1300px){
+                    margin-left: 5px;
+                }
                 height: 40px;
+                display: flex;
+                flex-direction: row;
                 .radio{
                     height: 10px;
                 }
@@ -22,13 +30,31 @@
                     margin-left: 3px;
                 }
                 input{
-                    margin-left: 15px;
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 50px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 12px;
+                    }
                     position: relative;
-                    top: 1px;
+                    top: 6px;
+                }
+                .count{
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 110px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 20px;
+                    }
                 }
             }
             .headthree{
-                margin-left: 30px;
+                @media screen and (min-device-width:1300px){
+                    margin-left: 30px;
+                }
+                @media screen and (max-device-width:1300px){
+                    margin-left: 7px;
+                }
                 mat-form-field{
                     width: 150px;
                 }
@@ -41,13 +67,17 @@
                     height: 14px;
                     width: 14px;
                 }
+                
             }
         }
         .tablediv{
             width: 100%;
             height: 100%;
             .tbodycss{
-                overflow-y: auto;
+                @media screen and (min-device-width:1300px){
+                    overflow-y: auto;
+                }
+                
                 height: 650px;
                 width: 100%;
                 .selectedTr{
@@ -82,12 +112,23 @@
     }
     .boxright{
         height: 100%;
+        @media screen and (max-device-width:1300px){
+            overflow-y: auto;
+        }
         width: 55%;
         flex: 1;
         background-color: #FFFFFF;
         margin-left: 10px;
         display: flex;
         flex-direction: column;
+        .company{
+            @media screen and (min-device-width:1300px){
+                overflow-y: auto;
+            }
+            flex: 1;
+            //overflow-y: auto;
+            margin-top: 10px;
+        }
         .righthead{
             width: 100%;
             display: flex;
@@ -103,7 +144,7 @@
                 margin-right: 7%;
             }
             .rightheadtwo{
-                width: 40%;
+                width: 50%;
                 margin-right: 2%;
             }
         }

src/app/plan-audit/wait-examineer/wait-examineer.component.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 16:13:50
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-20 15:35:16
+ * @LastEditTime: 2021-03-23 16:36:07
  */
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormControl } from '@angular/forms';

src/app/plan-management/entry-plan-look/entry-plan-look.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 10:59:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-23 15:09:09
+ * @LastEditTime: 2021-03-24 13:36:02
 -->
 <!-- <p>录入预案</p> -->
 <div style="overflow: auto;height: 100%;">
@@ -75,13 +75,13 @@
                 <ng-container *ngIf="isoperation == 'true'" matColumnDef="operation">
                     <th mat-header-cell *matHeaderCellDef>操作</th>
                     <td  mat-cell *matCellDef="let element">
-                        <span (click)="changeName(element)" *ngIf="element.auditStatus!=0||element.auditStatus!=3">改名</span>
+                        <span (click)="changeName(element)" *ngIf="element.auditStatus==8">改名</span>
                         <span (click)="editPlan(element)" [ngClass]="{'grey': element.planMode == '0' || element.planMode == '3' || element.auditStatus == '1' || element.auditStatus == '2'}">编辑</span>
                         <span (click)="lookPlan(element)">查看</span>
                         <span (click)="readFile(element)" [ngClass]="{'grey': element.planMode == '1' || element.planMode == '2' || element.planMode == '3'}">下载</span>
-                        <span (click)="deletePlan(element)">删除</span>
+                        <span (click)="deletePlan(element)" *ngIf="element.auditStatus==8">删除</span>
                         <span (click)="auditResult(element)">审批结果</span>
-                        <span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 || element.auditStatus == 2 || element.auditStatus == 4"  >提交审核</span>
+                        <span (click)="submitAudit(element)" *ngIf="element.auditStatus == 8 "  >提交审核</span>
                         <span (click)="cancelAudit(element)" *ngIf="element.auditStatus == 1">撤销审核</span>
                     </td>
                 </ng-container>

src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts

@@ -87,11 +87,13 @@ export class AddUnitOneComponent implements OnInit {
       },
       legend: {
         //type: tid=="pieone"?'scroll':'',
-        orient: 'vertical',
-        left: tid=="pieone"?0:650,
+        //orient: 'vertical',
+        //left: tid=="pieone"?0:650,
         //right:30,
         //top:100,
-        bottom:tid=="pieone"?600:500,
+        //bottom:tid=="pieone"?600:500,
+        bottom: 90,
+        left: 'center',
         textStyle:{
           fontSize:12,
           color:"#000000"
@@ -102,9 +104,9 @@ export class AddUnitOneComponent implements OnInit {
         {
           name: '访问来源',
           type: 'pie',
-          radius: '70%',
+          radius: '50%',
           center: ['45%', '53%'],
-          top:300,
+          bottom:130,
           left:30,
           label:{
             show:true,

src/app/statistic-analysis/all-plan/all-plan.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-03-05 15:57:08
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-16 13:53:17
+ * @LastEditTime: 2021-03-24 14:19:05
 -->
 <div class="body">
     <div class="topbox">
@@ -44,7 +44,7 @@
         <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
     </table>
-        <mat-paginator style="width: 50%;margin-left: 25%;" pageEvent [length]="length"
+        <mat-paginator style="width: 100%;" pageEvent [length]="length"
             [pageSize]="pageSize"
             [pageSizeOptions]="pageSizeOptions"
             (page)="changePage($event)">

src/app/statistic-analysis/all-plan/all-plan.component.scss

@@ -24,7 +24,7 @@
     .title{
         width: 100%;
         text-align: center;
-        margin-top: 2%;
+        margin-top: 3%;
         span{
             text-align: center;
             font-size: 28px;
@@ -39,10 +39,11 @@
     .tablebox{
         width: 100%;
         text-align: center;
+        margin-top:2%;
         table{
-            width: 50%;
+            width: 100%;
             text-align: center;
-            margin-left: 25%;
+            //margin-left: 25%;
             margin-top:20px;
             th,td{
                 text-align: center;

src/app/statistic-analysis/compang-info/compang-info.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-03-05 15:57:08
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-06 11:35:12
+ * @LastEditTime: 2021-03-24 14:13:53
 -->
 <div class="body">
     <div class="topbox">
@@ -42,7 +42,7 @@
         <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
         <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
     </table>
-        <mat-paginator style="width: 50%;margin-left: 25%;" pageEvent [length]="length"
+        <mat-paginator style="width: 100%;" pageEvent [length]="length"
             [pageSize]="pageSize"
             [pageSizeOptions]="pageSizeOptions"
             (page)="changePage($event)">

src/app/statistic-analysis/compang-info/compang-info.component.scss

@@ -24,7 +24,7 @@
     .title{
         width: 100%;
         text-align: center;
-        margin-top: 2%;
+        margin-top: 3%;
         span{
             text-align: center;
             font-size: 28px;
@@ -39,10 +39,11 @@
     .tablebox{
         width: 100%;
         text-align: center;
+        margin-top:2%;
         table{
-            width: 50%;
+            width: 100%;
             text-align: center;
-            margin-left: 25%;
+            //margin-left: 25%;
             margin-top:20px;
             th,td{
                 text-align: center;