From 30f7722c68b6570b17d162bd1c435952003265fb Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 8 Sep 2021 16:36:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=8E=BB=E6=8E=89date-fnc?= =?UTF-8?q?=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 23 +++---- package.json | 1 - .../data-collection/data-collection.module.ts | 2 +- .../fire-force/fire-force.component.html | 4 +- .../left-working/left-working.component.ts | 1 - src/app/navigation/navigation.component.ts | 3 - .../material-bank/addmatlibrary.component.ts | 16 +++-- .../addoriginalcopy.component.ts | 1 - .../material-bank/editmatlibrary.component.ts | 14 ++++- .../editoriginalcopy.component.ts | 1 - .../material-bank/material-bank.component.ts | 14 ++++- .../selectoriginalcopy.component.ts | 1 - src/app/ui/role/role.component.ts | 62 +++++++++++++++++-- .../unit-information/addgroups.component.ts | 3 - .../unit-information/addunitinfo.component.ts | 1 - .../unit-information/editgroup.component.ts | 2 - .../editunitinfo.component.ts | 1 - src/app/ui/userdata/userdata.component.ts | 1 - .../working-area/working-area.component.ts | 3 +- 19 files changed, 105 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index fe55dc9..adc9f58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -465,7 +465,7 @@ }, "@ant-design/colors": { "version": "3.2.2", - "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1596611396536&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz", + "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz", "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=", "requires": { "tinycolor2": "^1.4.1" @@ -473,7 +473,7 @@ }, "@ant-design/icons-angular": { "version": "9.0.1", - "resolved": "https://registry.npm.taobao.org/@ant-design/icons-angular/download/@ant-design/icons-angular-9.0.1.tgz?cache=0&sync_timestamp=1601000889997&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-angular%2Fdownload%2F%40ant-design%2Ficons-angular-9.0.1.tgz", + "resolved": "https://registry.nlark.com/@ant-design/icons-angular/download/@ant-design/icons-angular-9.0.1.tgz", "integrity": "sha1-Wsi+xbw00jEgggyT+FEbWaoRe8U=", "requires": { "@ant-design/colors": "^3.1.0" @@ -7097,11 +7097,6 @@ "assert-plus": "^1.0.0" } }, - "date-fns": { - "version": "2.9.0", - "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.9.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.9.0.tgz", - "integrity": "sha1-0LF1pcN+1fF7l+InK7wfpa7Gd9I=" - }, "date-format": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/date-format/download/date-format-2.1.0.tgz?cache=0&sync_timestamp=1572559173297&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-format%2Fdownload%2Fdate-format-2.1.0.tgz", @@ -11986,7 +11981,7 @@ }, "ng-zorro-antd": { "version": "9.3.0", - "resolved": "https://registry.npm.taobao.org/ng-zorro-antd/download/ng-zorro-antd-9.3.0.tgz", + "resolved": "https://registry.nlark.com/ng-zorro-antd/download/ng-zorro-antd-9.3.0.tgz", "integrity": "sha1-+A2+JxXleMR1codzRJRC8AmfFSw=", "requires": { "@angular/cdk": "^9.0.0", @@ -11997,9 +11992,9 @@ }, "dependencies": { "date-fns": { - "version": "2.16.1", - "resolved": "https://registry.npm.taobao.org/date-fns/download/date-fns-2.16.1.tgz?cache=0&sync_timestamp=1598884189690&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdate-fns%2Fdownload%2Fdate-fns-2.16.1.tgz", - "integrity": "sha1-BXdXksPzMx2oEq8lPhqTWFHTg0s=" + "version": "2.23.0", + "resolved": "https://registry.nlark.com/date-fns/download/date-fns-2.23.0.tgz?cache=0&sync_timestamp=1627020353586&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdate-fns%2Fdownload%2Fdate-fns-2.23.0.tgz", + "integrity": "sha1-TohslBZZrwz3sw+v3R6qN+iHiKk=" } } }, @@ -15961,9 +15956,9 @@ "dev": true }, "tinycolor2": { - "version": "1.4.1", - "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz", - "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" + "version": "1.4.2", + "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz", + "integrity": "sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM=" }, "tinyqueue": { "version": "1.2.3", diff --git a/package.json b/package.json index 00ad7bb..c9002ee 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "bson-objectid": "^1.3.1", "cesium": "^1.64.0", "crypto-js": "^4.0.0", - "date-fns": "^2.9.0", "e-ngx-cesium": "^6.3.2", "echarts": "^4.6.0", "firebase": "^7.6.2", diff --git a/src/app/data-collection/data-collection.module.ts b/src/app/data-collection/data-collection.module.ts index aa38d06..40d10b8 100644 --- a/src/app/data-collection/data-collection.module.ts +++ b/src/app/data-collection/data-collection.module.ts @@ -98,7 +98,7 @@ import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; ReactiveFormsModule, DataCollectionRoutingModule, NzTreeModule, - // NzTreeSelectModule + NzTreeSelectModule ] }) export class DataCollectionModule { } diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html index 004cbce..63af1f3 100644 --- a/src/app/data-collection/fire-force/fire-force.component.html +++ b/src/app/data-collection/fire-force/fire-force.component.html @@ -637,9 +637,9 @@ 车辆类别: - + (ngModelChange)="onChange($event)">
diff --git a/src/app/gis-management/left-working/left-working.component.ts b/src/app/gis-management/left-working/left-working.component.ts index 24bf2d3..34ce926 100644 --- a/src/app/gis-management/left-working/left-working.component.ts +++ b/src/app/gis-management/left-working/left-working.component.ts @@ -1,6 +1,5 @@ import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { id } from 'date-fns/locale'; @Component({ selector: 'app-left-working', diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index 3ca0cf8..802ced9 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -8,9 +8,6 @@ import { TreeService } from '../http-interceptors/tree.service' import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { CacheTokenService } from '../http-interceptors/cache-token.service'//引入服务 import { Router, ActivatedRoute, ParamMap } from '@angular/router' -import { is } from 'date-fns/locale'; - - @Component({ selector: 'app-navigation', diff --git a/src/app/ui/material-bank/addmatlibrary.component.ts b/src/app/ui/material-bank/addmatlibrary.component.ts index 366b348..b6f2eef 100644 --- a/src/app/ui/material-bank/addmatlibrary.component.ts +++ b/src/app/ui/material-bank/addmatlibrary.component.ts @@ -5,9 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; - - @Component({ selector: 'addmatlibrary', @@ -33,8 +30,19 @@ import format from 'date-fns/format'; order:number; //order onSubmit(value){ + let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) this.http.post("/api/AssetLibraries",{ id: "", name: value.name, diff --git a/src/app/ui/material-bank/addoriginalcopy.component.ts b/src/app/ui/material-bank/addoriginalcopy.component.ts index abe2bea..628e65f 100644 --- a/src/app/ui/material-bank/addoriginalcopy.component.ts +++ b/src/app/ui/material-bank/addoriginalcopy.component.ts @@ -4,7 +4,6 @@ import {FlatTreeControl} from '@angular/cdk/tree'; import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; -import format from 'date-fns/format'; import { TreeService } from '../../http-interceptors/tree.service' import { FileUploader } from 'ng2-file-upload' import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; diff --git a/src/app/ui/material-bank/editmatlibrary.component.ts b/src/app/ui/material-bank/editmatlibrary.component.ts index fcbba63..101fbee 100644 --- a/src/app/ui/material-bank/editmatlibrary.component.ts +++ b/src/app/ui/material-bank/editmatlibrary.component.ts @@ -5,7 +5,7 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; +// import format from 'date-fns/format'; @Component({ selector: 'editmatlibrary', templateUrl: './editmatlibrary.component.html', @@ -26,7 +26,17 @@ import format from 'date-fns/format'; } onSubmit(value){ let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) this.http.put(`/api/AssetLibraries/${this.data.material.id}`,{ id: this.data.material.id, name: value.name, diff --git a/src/app/ui/material-bank/editoriginalcopy.component.ts b/src/app/ui/material-bank/editoriginalcopy.component.ts index 4a7f751..47b70c7 100644 --- a/src/app/ui/material-bank/editoriginalcopy.component.ts +++ b/src/app/ui/material-bank/editoriginalcopy.component.ts @@ -5,7 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; import { TreeService } from '../../http-interceptors/tree.service' import { FileUploader } from 'ng2-file-upload' import { DomSanitizer } from '@angular/platform-browser' diff --git a/src/app/ui/material-bank/material-bank.component.ts b/src/app/ui/material-bank/material-bank.component.ts index ae0decb..62db7d5 100644 --- a/src/app/ui/material-bank/material-bank.component.ts +++ b/src/app/ui/material-bank/material-bank.component.ts @@ -8,7 +8,7 @@ import { MatTableDataSource } from '@angular/material/table'; import { EditOriginalCopy } from './editoriginalcopy.component' import { SelectOriginalCopy } from './selectoriginalcopy.component' import { MatSnackBar,MatSnackBarConfig } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; +// import format from 'date-fns/format'; @@ -145,7 +145,17 @@ export class MaterialBankComponent implements OnInit { //禁启用素材库 disabled(){ let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) if(this.material.enabled){ this.http.put(`/api/AssetLibraries/${this.material.id}`,{ id: this.material.id, diff --git a/src/app/ui/material-bank/selectoriginalcopy.component.ts b/src/app/ui/material-bank/selectoriginalcopy.component.ts index 65d195f..8b7ad7b 100644 --- a/src/app/ui/material-bank/selectoriginalcopy.component.ts +++ b/src/app/ui/material-bank/selectoriginalcopy.component.ts @@ -5,7 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; @Component({ selector: 'selectoriginalcopy', templateUrl: './selectoriginalcopy.component.html', diff --git a/src/app/ui/role/role.component.ts b/src/app/ui/role/role.component.ts index 8fd68ca..144f439 100644 --- a/src/app/ui/role/role.component.ts +++ b/src/app/ui/role/role.component.ts @@ -3,7 +3,7 @@ import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog import {FormControl} from '@angular/forms'; import { HttpClient } from '@angular/common/http'; import { CacheTokenService } from '../../http-interceptors/cache-token.service' -import format from 'date-fns/format'; +// import format from 'date-fns/format'; import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; import {FlatTreeControl} from '@angular/cdk/tree'; import { TreeService } from '../../http-interceptors/tree.service' @@ -51,7 +51,17 @@ export class RoleComponent implements OnInit { //向上按钮 up(node){ let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) this.http.put(//把上一节点order换成点击的节点 `/api/Roles/${this.dataSource[node.order -1].id}`, { @@ -82,7 +92,17 @@ export class RoleComponent implements OnInit { //向下按钮 down(node){ let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) this.http.put(//把下一节点order换成点击的节点 `/api/Roles/${this.dataSource[node.order + 1].id}`, { @@ -151,7 +171,17 @@ export class RoleComponent implements OnInit { //启用或禁用按钮 open(roledata){ let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) this.http.put( `/api/Roles/${roledata['id']}`, { @@ -296,7 +326,17 @@ export class CreateRole { //提交 onSubmit(value){ let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) this.http.post( '/api/Roles', { @@ -537,7 +577,17 @@ export class EditRole { } } let newdate = new Date(); - let time = format(newdate, 'yyyy-MM-dd') + function getDate(date){ + //date是传过来的时间戳，注意需为13位，10位需*1000 + //也可以不传,获取的就是当前时间 + var time = new Date(date); + var year= time.getFullYear() //年 + var month = ("0" + (time.getMonth() + 1)).slice(-2); //月 + var day = ("0" + time.getDate()).slice(-2); //日 + var mydate = year + "-" + month + "-" + day; + return mydate + } + let time = getDate(newdate) if(this.data['id'] != "0" && this.data['id'] != "1"){ this.http.put( `/api/Roles/${this.data['id']}`, diff --git a/src/app/ui/unit-information/addgroups.component.ts b/src/app/ui/unit-information/addgroups.component.ts index b71963a..7fcf6a4 100644 --- a/src/app/ui/unit-information/addgroups.component.ts +++ b/src/app/ui/unit-information/addgroups.component.ts @@ -5,9 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; - - @Component({ selector: 'addgroups', diff --git a/src/app/ui/unit-information/addunitinfo.component.ts b/src/app/ui/unit-information/addunitinfo.component.ts index 60a0e2f..881fede 100644 --- a/src/app/ui/unit-information/addunitinfo.component.ts +++ b/src/app/ui/unit-information/addunitinfo.component.ts @@ -5,7 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; @Component({ selector: 'addunitinfo', templateUrl: './addunitinfo.component.html', diff --git a/src/app/ui/unit-information/editgroup.component.ts b/src/app/ui/unit-information/editgroup.component.ts index 4bc9385..3103381 100644 --- a/src/app/ui/unit-information/editgroup.component.ts +++ b/src/app/ui/unit-information/editgroup.component.ts @@ -5,8 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; - @Component({ diff --git a/src/app/ui/unit-information/editunitinfo.component.ts b/src/app/ui/unit-information/editunitinfo.component.ts index 749645d..fd4432c 100644 --- a/src/app/ui/unit-information/editunitinfo.component.ts +++ b/src/app/ui/unit-information/editunitinfo.component.ts @@ -5,7 +5,6 @@ import { HttpClient } from '@angular/common/http'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { MatSnackBar } from '@angular/material/snack-bar'; -import format from 'date-fns/format'; @Component({ selector: 'editunitinfo', templateUrl: './editunitinfo.component.html', diff --git a/src/app/ui/userdata/userdata.component.ts b/src/app/ui/userdata/userdata.component.ts index 6df0a23..539ad95 100644 --- a/src/app/ui/userdata/userdata.component.ts +++ b/src/app/ui/userdata/userdata.component.ts @@ -4,7 +4,6 @@ import {MatTableDataSource} from '@angular/material/table'; import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import {FormControl} from '@angular/forms'; import { HttpClient,HttpHeaders } from '@angular/common/http'; -import format from 'date-fns/format'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index e6bd50e..d971242 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -16,7 +16,6 @@ import { PropertyInfo } from './model/PropertyInfo'; import { AxPreviewImageShape } from './model/axPreviewImageShape'; import { AxArrowConnector } from './model/axArrowConnector'; import { AxLegend, Legend } from './model/axLegend'; -import { AxGrid } from './model/axGrid'; import { AxSelection } from './model/axSelection'; import { AxMessageSystem } from './model/axMessageSystem'; import { Grid2D } from './model/grid2D'; @@ -24,7 +23,7 @@ import { Viewport } from 'pixi-viewport'; import { EVENT_IMAGE_RESIZE, EVENT_SELECTION_CHANGED } from './model/events'; import { Dimensioning } from './model/dimensioning'; import { Configuration, viewBounds } from './model/configuration'; -import { id } from 'date-fns/locale'; + @Component({