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

src/app/pages/audit/audit-record/audit-record.component.ts

@@ -51,7 +51,7 @@ export class AuditRecordComponent implements OnInit {
     let nowD = myDate.getDate();
     this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
     //获取三十天前日期
-    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29);//最后一个数字30可改，30天的意思
     let lastY = lw.getFullYear();
     let lastM = lw.getMonth() + 1;
     let lastD = lw.getDate();

src/app/pages/home-page/home-page.component.html

@@ -190,11 +190,7 @@
                         <img src="../../../assets/images/modelNum.png" alt="">
                         <div class="content">
                             <span class="lightspan lightspan2">{{HomeAggregatioData.dev.violationCount}}</span>
-<<<<<<< HEAD
-                            <span>预警分析模型（个）</span>
-=======
                             <span>预警分析模型(个)</span>
->>>>>>> 5d6008ac406e0fecb3c5dca4e0b3eceef5bc4fac
                         </div>
                     </div>
                     <div class="numlistbox">

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts

@@ -332,7 +332,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
     let nowD = myDate.getDate();
     this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
     //获取三十天前日期
-    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29);//最后一个数字30可改，30天的意思
     let lastY = lw.getFullYear();
     let lastM = lw.getMonth() + 1;
     let lastD = lw.getDate();

src/app/pages/records/criminal-records/criminal-records.component.ts

@@ -342,7 +342,7 @@ export class CriminalRecordsComponent implements OnInit {
     let nowD = myDate.getDate();
     this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
     //获取三十天前日期
-    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29);//最后一个数字30可改，30天的意思
     let lastY = lw.getFullYear();
     let lastM = lw.getMonth() + 1;
     let lastD = lw.getDate();

src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts

@@ -108,7 +108,7 @@ export class OilUnloadingProcessListComponent implements OnInit {
     let nowD = myDate.getDate();
     this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
     //获取三十天前日期
-    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29);//最后一个数字30可改，30天的意思
     let lastY = lw.getFullYear();
     let lastM = lw.getMonth() + 1;
     let lastD = lw.getDate();

src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts

@@ -72,7 +72,7 @@ export class WarningStatisticsListComponent implements OnInit {
     let nowD = myDate.getDate();
     this.enddate = JSON.parse(JSON.stringify(nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD)));//当前日期
     //获取三十天前日期
-    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+    let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 29);//最后一个数字30可改，30天的意思
     let lastY = lw.getFullYear();
     let lastM = lw.getMonth() + 1;
     let lastD = lw.getDate();