From b4441138994189667b7c6cd1190dd16c84971c36 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 26 Nov 2021 10:22:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BF=9B=E5=BA=A6?= =?UTF-8?q?=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../left-domain/left-domain.component.ts | 1 - src/app/pages/pages.module.ts | 4 +- src/app/pages/plan/plan.component.html | 8 +- src/app/pages/plan/plan.component.ts | 102 ++++++++---------- 4 files changed, 52 insertions(+), 63 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index 03245d4..b0f88b5 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -230,7 +230,6 @@ export class LeftDomainComponent implements OnInit { updateFatherData(index) { PlanComponent.instance.nzCurrent = index PlanComponent.instance.isSuspend = true //暂停 - PlanComponent.instance.timer? window.clearTimeout(PlanComponent.instance.timer) : null //清除定时器 PlanComponent.instance.updateTimer? window.clearTimeout(PlanComponent.instance.updateTimer) : null //清除定时器 } diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 3324872..e176876 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -37,6 +37,7 @@ import { NzCheckboxModule } from 'ng-zorro-antd/checkbox'; import { NzTimePickerModule } from 'ng-zorro-antd/time-picker'; import { NzProgressModule } from 'ng-zorro-antd/progress'; import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm'; +import { NzBadgeModule } from 'ng-zorro-antd/badge'; import { TodayWarningAdminComponent } from './today-warning-admin/today-warning-admin.component'; import { CriminalRecordsAdminComponent } from './criminal-records-admin/criminal-records-admin.component'; import { EquipmentInfoComponent } from './equipment-info/equipment-info.component'; @@ -90,7 +91,8 @@ import { NzNotificationModule } from 'ng-zorro-antd/notification'; NzTimePickerModule, NzProgressModule, NzNotificationModule, - NzPopconfirmModule + NzPopconfirmModule, + NzBadgeModule ], entryComponents: [AddequipmentComponent, EditequipmentComponent,GetOutOfLineDetailsComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index 5ed645a..c090567 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -161,7 +161,7 @@
-
+
@@ -169,7 +169,7 @@ - + @@ -233,6 +233,10 @@ + + + + \ No newline at end of file diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 5633852..2ffbaa6 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -338,7 +338,6 @@ export class PlanComponent implements OnInit { beforePlanNode: MarkNodeData = new MarkNodeData(-99, "请选择节点"); //当前选择 预案节点 nzCurrent: number = -1; //当前选择 预案节点Index isSuspend: boolean = false; //是否暂停 自动切换节点 - timer: any; //定时器 progressList: number[] = []; //进度条 条/值 updateTimer: any; //更新进度条定时器 @@ -347,7 +346,6 @@ export class PlanComponent implements OnInit { this.beforeEmergencyPlan = new MarkPlanData(-99, "请选择节点") this.beforePlanNode = new MarkNodeData(-99, "请选择节点") this.isSuspend = false //初始化暂停状态 - window.clearTimeout(this.timer) //清除定时器 this.progressList = [] window.clearTimeout(this.updateTimer) //清除定时器 } @@ -369,62 +367,50 @@ export class PlanComponent implements OnInit { selectChildNode(item: MarkPlanData) { if (this.isShowChildComponent && this.leftDomain) { if (item.nodes.length) { - let isTrue = confirm("即将开始播放节点") - if (isTrue) { - this.timer? window.clearTimeout(this.timer) : null //清除定时器 - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 - this.nzCurrent = 0 - this.beforeEmergencyPlan = item - this.updateProgressList().then(res=>{ - this.publicToggleNode().then(data=>{ - !this.isSuspend? this.autoPlay() : null - }) - }) - } + this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.nzCurrent = 0 + this.beforeEmergencyPlan = item + this.updateProgressList().then(res=>{ + this.publicToggleNode() + }) } else { this.message.info('暂无数据节点'); } } } + //更新进度条 条数 + updateProgressList() { + return new Promise((resolve, reject) => { + this.progressList = [] + this.beforeEmergencyPlan.nodes.forEach(item=>{ this.progressList.push(0) }) + resolve(true) + }) + } + //更新进度条 值 updateProgress() { if (this.progressList[this.nzCurrent] >= 100) { this.progressList[this.nzCurrent] = 100 window.clearTimeout(this.updateTimer) //清除定时器 + !this.isSuspend? this.autoPlay() : null return } let time: number = this.beforePlanNode.getShowTime() || 1 this.updateTimer = window.setTimeout(()=>{ - this.progressList[this.nzCurrent] = this.progressList[this.nzCurrent] + Math.ceil(100 / time) + this.progressList[this.nzCurrent] = this.progressList[this.nzCurrent] + Number((100 / time).toFixed(2)) / 10 this.updateProgress() - },1000) - } - - //更新进度条 条数 - updateProgressList() { - return new Promise((resolve, reject) => { - this.progressList = [] - this.beforeEmergencyPlan.nodes.forEach(item=>{ this.progressList.push(0) }) - resolve(true) - }) + },100) } //自动播放-切换接点 autoPlay() { - let time: number = this.beforePlanNode.getShowTime() || 1 - this.timer = window.setTimeout(()=>{ - if (this.nzCurrent >= this.beforeEmergencyPlan.nodes.length - 1) { - this.isSuspend = false //初始化暂停状态 - window.clearTimeout(this.timer) //清除定时器 - this.message.info('已播放至最后一节点'); - return - } - this.nzCurrent = this.nzCurrent + 1 - this.publicToggleNode().then(data=>{ - !this.isSuspend? this.autoPlay() : null - }) - },time * 1000) + if (this.nzCurrent >= this.beforeEmergencyPlan.nodes.length - 1) { + this.message.info('已播放至最后一节点'); + return + } + this.nzCurrent = this.nzCurrent + 1 + this.publicToggleNode() } //切换预案节点 @@ -432,10 +418,10 @@ export class PlanComponent implements OnInit { if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) { this.updateProgressList() } - this.timer? window.clearTimeout(this.timer) : null //清除定时器 this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.isSuspend = true //暂停 this.nzCurrent = event - this.progressList[this.nzCurrent] = 0 + this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) this.publicToggleNode() } @@ -452,13 +438,10 @@ export class PlanComponent implements OnInit { if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) { this.updateProgressList() } - this.timer? window.clearTimeout(this.timer) : null //清除定时器 this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = this.nzCurrent - 1 - this.progressList[this.nzCurrent] = 0 - this.publicToggleNode().then(data=>{ - //!this.isSuspend? this.autoPlay() : null - }) + this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.publicToggleNode() } //切换预案节点 暂停 @@ -474,15 +457,11 @@ export class PlanComponent implements OnInit { let msg: string = this.isSuspend? "目前已暂停" : "目前已开始播放" this.message.info(msg); if (this.isSuspend) { //暂停 - window.clearTimeout(this.timer) //清除定时器 window.clearTimeout(this.updateTimer) //清除定时器 } else { //开启 - this.timer? window.clearTimeout(this.timer) : null //清除定时器 this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) - MarkWindow.instance.selectMarkNode(this.beforeEmergencyPlan.id, this.beforePlanNode.id, false, true) + this.progressList.forEach((item,index)=>{ index > this.nzCurrent? this.progressList[index] = 0 : null }) this.updateProgress() - this.autoPlay() } } @@ -492,13 +471,10 @@ export class PlanComponent implements OnInit { this.message.info('请选择节点'); return } - this.timer? window.clearTimeout(this.timer) : null //清除定时器 this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 this.updateProgressList().then(res=>{ this.nzCurrent = 0 - this.publicToggleNode().then(data=>{ - !this.isSuspend? this.autoPlay() : null - }) + this.publicToggleNode() }) } @@ -515,13 +491,10 @@ export class PlanComponent implements OnInit { if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) { this.updateProgressList() } - this.timer? window.clearTimeout(this.timer) : null //清除定时器 this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = this.nzCurrent + 1 - this.progressList[this.nzCurrent] = 0 - this.publicToggleNode().then(data=>{ - //!this.isSuspend? this.autoPlay() : null - }) + this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.publicToggleNode() } //获取进度条 flex分布 @@ -569,6 +542,8 @@ export class PlanComponent implements OnInit { this.contingencyPlanTask = null //关闭弹窗 } + videoDialogType: videoDialog = new videoDialog(true, null); //全景图/视频 弹窗 + selectRightTopFast: number = 0; //当前选择功能 快捷栏 selectAdsorb: boolean = false; //吸附状态 topLevelView: boolean = false; //顶视图状态 @@ -644,6 +619,15 @@ export class PlanComponent implements OnInit { } +//全景图/视频 type +export class videoDialog { + isVideo: boolean + url: string + constructor(isVideo: boolean, url: string) { + this.isVideo = isVideo + this.url = url + } +} //设备任务窗口 数据类型 export class taskDialog { institution: string; //单位 From 9a5a8893ff42f54c06c4cc4b1f7a46070cf6f1d6 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Fri, 26 Nov 2021 10:42:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=80=89=E4=B8=AD?= =?UTF-8?q?=E6=95=88=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../babylon/model/data/mark/all-mark-data.ts | 4 +- .../view/building-window/building-window.ts | 2 +- .../facilityinfoinscene-window.ts | 18 +- .../babylon/view/mark-window/mark-window.ts | 6 +- yarn.lock | 404 ++++++++++++++++-- 5 files changed, 396 insertions(+), 38 deletions(-) diff --git a/src/app/babylon/model/data/mark/all-mark-data.ts b/src/app/babylon/model/data/mark/all-mark-data.ts index 2c14be3..8e4d901 100644 --- a/src/app/babylon/model/data/mark/all-mark-data.ts +++ b/src/app/babylon/model/data/mark/all-mark-data.ts @@ -71,8 +71,8 @@ export class AllMarkData { AllMarkData.newMarkData(MarkType.XYY, MarkKindType.Persion, tagPos, result); AllMarkData.newMarkData(MarkType.YGC, MarkKindType.Car, tagPos, result); AllMarkData.newMarkData(MarkType.YGCSJ, MarkKindType.Persion, tagPos, result); - AllMarkData.newMarkData(MarkType.XFSD, MarkKindType.Persion, tagPos, result); - AllMarkData.newMarkData(MarkType.XFSQ, MarkKindType.Persion, tagPos, result); + AllMarkData.newMarkData(MarkType.XFSD, MarkKindType.Goods, tagPos, result); + AllMarkData.newMarkData(MarkType.XFSQ, MarkKindType.Goods, tagPos, result); AllMarkData.newMarkData(MarkType.ZYMBRQ, MarkKindType.Goods, tagPos, result); AllMarkData.newMarkData(MarkType.PTMHQ, MarkKindType.Goods, tagPos, result); AllMarkData.newMarkData(MarkType.GFMHQ, MarkKindType.Goods, tagPos, result); diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts index 8e285bf..ffbb7c3 100644 --- a/src/app/babylon/view/building-window/building-window.ts +++ b/src/app/babylon/view/building-window/building-window.ts @@ -809,7 +809,7 @@ export class BuildingWindow extends UIBase { for (let i = 0; i < showNameFacilitys.length; i++) { showNameFacilitys[i].showNameUI(isShowNameUI_JYJ_YG); } - SceneManager.Instance.openInnerGlow(!isShowNameUI_JYJ_YG); //输油管和油气回收管太细,关闭内发光 + //SceneManager.Instance.openInnerGlow(!isShowNameUI_JYJ_YG); //输油管和油气回收管太细,关闭内发光 diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts index bc28516..87d6761 100644 --- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts +++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts @@ -1,4 +1,3 @@ -import { EventManager } from "@angular/platform-browser"; import { AbstractMesh, Color3, EventState, Mesh, PickingInfo, PointerEventTypes, PointerInfo, Ray, RayHelper, Vector3 } from "@babylonjs/core"; import { classToClass } from "class-transformer"; import { PlanComponent } from "src/app/pages/plan/plan.component"; @@ -496,8 +495,10 @@ export class FacilityInfoInSceneWindow extends UIBase { let facilityInfosByType = BuildingWindow.instance.currentBuidngItem.buildingInfo.ModelInfo.facilityInfos; for (let i = 0; i < facilityInfosByType.length; i++) { - if ((currentMoudle == null || currentMoudle == JYZInfoMoudleType.JYJ) && facilityInfosByType[i].type == FacilityType.JY_JYJ || - (currentMoudle == null || currentMoudle == JYZInfoMoudleType.YG) && facilityInfosByType[i].type == FacilityType.JY_YG) { + if ((currentMoudle == null || currentMoudle == JYZInfoMoudleType.JYJ) && facilityInfosByType[i].type == FacilityType.JY_JYJ + || (currentMoudle == null || currentMoudle == JYZInfoMoudleType.YG) && facilityInfosByType[i].type == FacilityType.JY_YG + || (currentMoudle == null || currentMoudle == JYZInfoMoudleType.SYG) && facilityInfosByType[i].type == FacilityType.JY_SYGX + ) { allJYJInfo = allJYJInfo.concat(facilityInfosByType[i].facilityInfo); } } @@ -540,8 +541,9 @@ export class FacilityInfoInSceneWindow extends UIBase { //if (play) { let facilityData = facilityInfo.modelData as ModelData_facility; if (facilityData.facilityType != FacilityType.JY_JYJ && - facilityData.facilityType != FacilityType.JY_YG) { - //只有加油机和油罐有高亮显示和取消 + facilityData.facilityType != FacilityType.JY_YG && + facilityData.facilityType != FacilityType.JY_SYGX) { + //只有加油机和油罐和输油管有高亮显示和取消 return; } //} @@ -551,7 +553,8 @@ export class FacilityInfoInSceneWindow extends UIBase { this.currentSelectJYJInfo = facilityInfo; //正在展示加油机或油罐 if (BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.JYJ - || BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.YG) { + || BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.YG + || BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.SYG) { SceneManager.Instance.removeFromHighLight(facilityInfo.modelBox as Mesh); } SceneManager.Instance.addToHighLight(facilityInfo.modelBox as Mesh, FacilityInfoInSceneWindow.c_selectJYJColor); @@ -561,7 +564,8 @@ export class FacilityInfoInSceneWindow extends UIBase { SceneManager.Instance.removeFromHighLight(facilityInfo.modelBox as Mesh); //正在展示加油机或油罐 if (BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.JYJ - || BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.YG) { + || BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.YG + || BuildingWindow.instance.currentJYZInfoMoudleType == JYZInfoMoudleType.SYG) { SceneManager.Instance.addToHighLight(facilityInfo.modelBox as Mesh, ModelInfo_facility.c_hightLightColor); } diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts index 6fcedc9..9e295f4 100644 --- a/src/app/babylon/view/mark-window/mark-window.ts +++ b/src/app/babylon/view/mark-window/mark-window.ts @@ -139,8 +139,8 @@ export class MarkWindow extends UIBase { DataManager.initMarkData((data: AllMarkPlanData) => { instance.onGetAllMarkPlanData(data); MarkWindow.instance.selectMarkNode(null, null, true); //模拟选中空节点,创建游离节点 - console.log("标绘信息", data); - console.log(JSON.stringify(data)); + // console.log("标绘信息", data); + // console.log(JSON.stringify(data)); }); this.weatherTool = new WeatherTool(SceneManager.Instance.defaultCamera, SceneManager.Instance.scene); @@ -524,7 +524,7 @@ export class MarkWindow extends UIBase { */ openProperty(markInfo: ModelInfo_mark) { if (markInfo != null) { - PlanComponent.instance.getSandTableNature(markInfo.markData); + PlanComponent.instance.getSandTableNature(markInfo.markData); } } diff --git a/yarn.lock b/yarn.lock index 3baaeb1..42fc322 100644 --- a/yarn.lock +++ b/yarn.lock @@ -223,15 +223,6 @@ resolved "https://registry.npmmirror.com/@angular/router/download/@angular/router-9.0.7.tgz?cache=0&sync_timestamp=1634753064604&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40angular%2Frouter%2Fdownload%2F%40angular%2Frouter-9.0.7.tgz#0296d11a17a6b94c0463c9b166dc4244b8fea5e5" integrity sha1-ApbRGhemuUwEY8mxZtxCRLj+peU= -"@aspnet/signalr@^1.1.4": - version "1.1.4" - resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.1.4.tgz#417cf808f4074a8aec45d27f03c4b8df9d96bb0b" - integrity sha512-Jp9nPc8hmmhbG9OKiHe2fOKskBHfg+3Y9foSKHxjgGtyI743hXjGFv3uFlUg503K9f8Ilu63gQt3fDkLICBRyg== - dependencies: - eventsource "^1.0.7" - request "^2.88.0" - ws "^6.0.0" - "@ant-design/colors@^3.1.0": version "3.2.2" resolved "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz#5ad43d619e911f3488ebac303d606e66a8423903" @@ -246,6 +237,15 @@ dependencies: "@ant-design/colors" "^3.1.0" +"@aspnet/signalr@^1.1.4": + version "1.1.4" + resolved "https://registry.yarnpkg.com/@aspnet/signalr/-/signalr-1.1.4.tgz#417cf808f4074a8aec45d27f03c4b8df9d96bb0b" + integrity sha512-Jp9nPc8hmmhbG9OKiHe2fOKskBHfg+3Y9foSKHxjgGtyI743hXjGFv3uFlUg503K9f8Ilu63gQt3fDkLICBRyg== + dependencies: + eventsource "^1.0.7" + request "^2.88.0" + ws "^6.0.0" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.5.5": version "7.5.5" resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.5.5.tgz#bc0782f6d69f7b7d49531219699b988f669a8f9d" @@ -1422,6 +1422,21 @@ resolved "https://registry.npm.taobao.org/@istanbuljs/schema/download/@istanbuljs/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha1-5F44TkuOwWvOL9kDr3hFD2v37Jg= +"@mapbox/node-pre-gyp@^1.0.4": + version "1.0.7" + resolved "https://registry.npmmirror.com/@mapbox/node-pre-gyp/download/@mapbox/node-pre-gyp-1.0.7.tgz?cache=0&sync_timestamp=1637089317231&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2F%40mapbox%2Fnode-pre-gyp%2Fdownload%2F%40mapbox%2Fnode-pre-gyp-1.0.7.tgz#a26919cac6595662703330d1820a0ca206f45521" + integrity sha512-PplSvl4pJ5N3BkVjAdDzpPhVUPdC73JgttkR+LnBx2OORC1GCQsBjUeEuipf9uOaAM1SbxcdZFfR3KDTKm2S0A== + dependencies: + detect-libc "^1.0.3" + https-proxy-agent "^5.0.0" + make-dir "^3.1.0" + node-fetch "^2.6.5" + nopt "^5.0.0" + npmlog "^6.0.0" + rimraf "^3.0.2" + semver "^7.3.5" + tar "^6.1.11" + "@mattlewis92/dom-autoscroller@^2.4.2": version "2.4.2" resolved "https://registry.nlark.com/@mattlewis92/dom-autoscroller/download/@mattlewis92/dom-autoscroller-2.4.2.tgz#ccb753fbcf6b3672b0273e0c3bda7924fe238013" @@ -2685,6 +2700,14 @@ "@turf/invariant" "^5.1.5" d3-voronoi "1.1.2" +"@types/bytebuffer@^5.0.40": + version "5.0.42" + resolved "https://registry.npmmirror.com/@types/bytebuffer/download/@types/bytebuffer-5.0.42.tgz#1c602a77942d34c5c0879ad75c58d5d8c07dfb3b" + integrity sha1-HGAqd5QtNMXAh5rXXFjV2MB9+zs= + dependencies: + "@types/long" "*" + "@types/node" "*" + "@types/cesium@^1.59.5": version "1.70.0" resolved "https://registry.npmmirror.com/@types/cesium/download/@types/cesium-1.70.0.tgz#081afd9d890e31a751db1df2526cb8cbf182c578" @@ -2738,7 +2761,7 @@ resolved "https://registry.nlark.com/@types/json-schema/download/@types/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" integrity sha1-l+3JA36gw4WFMgsolk3eOznkZg0= -"@types/long@^4.0.1": +"@types/long@*", "@types/long@^4.0.1": version "4.0.1" resolved "https://registry.nlark.com/@types/long/download/@types/long-4.0.1.tgz?cache=0&sync_timestamp=1629708364799&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Flong%2Fdownload%2F%40types%2Flong-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha1-RZxl+hhn2v5qjzIsTFFpVmPMVek= @@ -2992,6 +3015,23 @@ JSONStream@^1.3.4: jsonparse "^1.2.0" through ">=2.2.7 <3" +abbrev@1: + version "1.1.1" + resolved "https://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" + integrity sha1-+PLIh60Qv2f2NPAFtph/7TF5qsg= + +abp-ng2-module@^6.4.0: + version "6.4.0" + resolved "https://registry.npmmirror.com/abp-ng2-module/download/abp-ng2-module-6.4.0.tgz#ba4b1bbe1e18717002051901f624cb0ad3f72e2e" + integrity sha1-uksbvh4YcXACBRkB9iTLCtP3Li4= + dependencies: + tslib "^2.0.3" + +abp-web-resources@^5.4.0: + version "5.4.0" + resolved "https://registry.nlark.com/abp-web-resources/download/abp-web-resources-5.4.0.tgz#ea09f1702da52269b63020257dcfc8fe726c2b61" + integrity sha1-6gnxcC2lImm2MCAlfc/I/nJsK2E= + accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: version "1.3.7" resolved "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" @@ -3027,6 +3067,13 @@ agent-base@4, agent-base@^4.3.0: dependencies: es6-promisify "^5.0.0" +agent-base@6: + version "6.0.2" + resolved "https://registry.npm.taobao.org/agent-base/download/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha1-Sf/1hXfP7j83F2/qtMIuAPhtf3c= + dependencies: + debug "4" + agent-base@~4.2.1: version "4.2.1" resolved "https://registry.npm.taobao.org/agent-base/download/agent-base-4.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fagent-base%2Fdownload%2Fagent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9" @@ -3218,11 +3265,24 @@ append-transform@^1.0.0: dependencies: default-require-extensions "^2.0.0" +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.npm.taobao.org/aproba/download/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha1-UlILiuW1aSFbNU78DKo/4eRaitw= + aproba@^1.1.1: version "1.2.0" resolved "https://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha1-aALmJk79GMeQobDVF/DyYnvyyUo= +are-we-there-yet@^2.0.0: + version "2.0.0" + resolved "https://registry.nlark.com/are-we-there-yet/download/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c" + integrity sha1-Ny4Oe9J52OlMZTqqH2cgCIS/Phw= + dependencies: + delegates "^1.0.0" + readable-stream "^3.6.0" + argparse@^1.0.7: version "1.0.10" resolved "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -3295,6 +3355,14 @@ asap@^2.0.0, asap@~2.0.3: resolved "https://registry.npm.taobao.org/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= +ascli@~1: + version "1.0.1" + resolved "https://registry.npm.taobao.org/ascli/download/ascli-1.0.1.tgz#bcfa5974a62f18e81cabaeb49732ab4a88f906bc" + integrity sha1-vPpZdKYvGOgcq660lzKrSoj5Brw= + dependencies: + colour "~0.7.1" + optjs "~3.2.2" + asn1.js@^4.0.0: version "4.10.1" resolved "https://registry.npm.taobao.org/asn1.js/download/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0" @@ -3740,6 +3808,13 @@ builtins@^1.0.3: resolved "https://registry.npm.taobao.org/builtins/download/builtins-1.0.3.tgz?cache=0&sync_timestamp=1576512797634&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuiltins%2Fdownload%2Fbuiltins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= +bytebuffer@~5: + version "5.0.1" + resolved "https://registry.npm.taobao.org/bytebuffer/download/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" + integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= + dependencies: + long "~3" + bytes@3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" @@ -3847,6 +3922,11 @@ callsites@^2.0.0: resolved "https://registry.npm.taobao.org/callsites/download/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= +camelcase@^2.0.1: + version "2.1.1" + resolved "https://registry.npmmirror.com/camelcase/download/camelcase-2.1.1.tgz?cache=0&sync_timestamp=1636945122112&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcamelcase%2Fdownload%2Fcamelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" + integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8= + camelcase@^5.0.0: version "5.3.1" resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -3976,6 +4056,11 @@ chownr@^1.1.2, chownr@^1.1.4: resolved "https://registry.npm.taobao.org/chownr/download/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha1-b8nXtC0ypYNZYzdmbn0ICE2izGs= +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.npm.taobao.org/chownr/download/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha1-Fb++U9LqtM9w8YqM1o6+Wzyx3s4= + chrome-trace-event@^1.0.2: version "1.0.2" resolved "https://registry.npm.taobao.org/chrome-trace-event/download/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" @@ -4033,6 +4118,15 @@ cli-width@^2.0.0: resolved "https://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= +cliui@^3.0.3: + version "3.2.0" + resolved "https://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz?cache=0&sync_timestamp=1604880267387&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" + integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0= + dependencies: + string-width "^1.0.1" + strip-ansi "^3.0.1" + wrap-ansi "^2.0.0" + cliui@^4.0.0: version "4.1.0" resolved "https://registry.npm.taobao.org/cliui/download/cliui-4.1.0.tgz?cache=0&sync_timestamp=1573943106490&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" @@ -4139,6 +4233,11 @@ color-string@^1.6.0: color-name "^1.0.0" simple-swizzle "^0.2.2" +color-support@^1.1.2: + version "1.1.3" + resolved "https://registry.npmmirror.com/color-support/download/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha1-k4NDeaHMmgxh+C9S8NBDIiUb1aI= + color@^3.0.0: version "3.2.1" resolved "https://registry.nlark.com/color/download/color-3.2.1.tgz?cache=0&sync_timestamp=1628105303224&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fcolor%2Fdownload%2Fcolor-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" @@ -4157,6 +4256,11 @@ colors@^1.1.0: resolved "https://registry.npm.taobao.org/colors/download/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha1-xQSRR51MG9rtLJztMs98fcI2D3g= +colour@~0.7.1: + version "0.7.1" + resolved "https://registry.npm.taobao.org/colour/download/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778" + integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g= + combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" resolved "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -4264,6 +4368,11 @@ console-browserify@^1.1.0: resolved "https://registry.npm.taobao.org/console-browserify/download/console-browserify-1.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fconsole-browserify%2Fdownload%2Fconsole-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha1-ZwY871fOts9Jk6KrOlWECujEkzY= +console-control-strings@^1.0.0, console-control-strings@^1.1.0: + version "1.1.0" + resolved "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" + integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -4681,6 +4790,13 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" +debug@4: + version "4.3.2" + resolved "https://registry.npmmirror.com/debug/download/debug-4.3.2.tgz?cache=0&sync_timestamp=1636300872595&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdebug%2Fdownload%2Fdebug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha1-8KScGKyHeeMdSgxgKd+3aHPHQos= + dependencies: + ms "2.1.2" + debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: version "3.2.6" resolved "https://registry.npm.taobao.org/debug/download/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" @@ -4700,9 +4816,9 @@ debuglog@^1.0.1: resolved "https://registry.npm.taobao.org/debuglog/download/debuglog-1.0.1.tgz?cache=0&sync_timestamp=1571696609964&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebuglog%2Fdownload%2Fdebuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= -decamelize@^1.2.0: +decamelize@^1.1.1, decamelize@^1.2.0: version "1.2.0" - resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" + resolved "https://registry.npmmirror.com/decamelize/download/decamelize-1.2.0.tgz?cache=0&sync_timestamp=1633055728451&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdecamelize%2Fdownload%2Fdecamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= decode-uri-component@^0.2.0: @@ -4804,6 +4920,11 @@ delayed-stream@~1.0.0: resolved "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= +delegates@^1.0.0: + version "1.0.0" + resolved "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" + integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + density-clustering@1.3.0: version "1.3.0" resolved "https://registry.nlark.com/density-clustering/download/density-clustering-1.3.0.tgz#dc9f59c8f0ab97e1624ac64930fd3194817dcac5" @@ -4832,6 +4953,11 @@ destroy@~1.0.4: resolved "https://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= +detect-libc@^1.0.3: + version "1.0.3" + resolved "https://registry.npm.taobao.org/detect-libc/download/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + detect-node@^2.0.4: version "2.0.4" resolved "https://registry.npm.taobao.org/detect-node/download/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" @@ -5701,6 +5827,21 @@ function-bind@^1.1.1: resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= +gauge@^4.0.0: + version "4.0.0" + resolved "https://registry.npmmirror.com/gauge/download/gauge-4.0.0.tgz?cache=0&sync_timestamp=1636989413004&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fgauge%2Fdownload%2Fgauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8" + integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw== + dependencies: + ansi-regex "^5.0.1" + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.2" + console-control-strings "^1.0.0" + has-unicode "^2.0.1" + signal-exit "^3.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.2" + genfun@^5.0.0: version "5.0.0" resolved "https://registry.npm.taobao.org/genfun/download/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537" @@ -5824,6 +5965,18 @@ glob@^7.0.3, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^7.0.5: + version "7.2.0" + resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" + integrity sha1-0VU1r3cy4C6Uj0xBYovZECk/YCM= + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + globals@^11.1.0: version "11.12.0" resolved "https://registry.npm.taobao.org/globals/download/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -5874,6 +6027,18 @@ graceful-fs@^4.2.2: resolved "https://registry.nlark.com/graceful-fs/download/graceful-fs-4.2.8.tgz?cache=0&sync_timestamp=1628194007768&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fgraceful-fs%2Fdownload%2Fgraceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha1-5BK40z9eAGWTy9PO5t+fLOu+gCo= +grpc@^1.24.2: + version "1.24.11" + resolved "https://registry.npmmirror.com/grpc/download/grpc-1.24.11.tgz#7039da9f6f22ce35168535a6d5dda618398a5966" + integrity sha1-cDnan28izjUWhTWm1d2mGDmKWWY= + dependencies: + "@mapbox/node-pre-gyp" "^1.0.4" + "@types/bytebuffer" "^5.0.40" + lodash.camelcase "^4.3.0" + lodash.clone "^4.5.0" + nan "^2.13.2" + protobufjs "^5.0.3" + handle-thing@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754" @@ -5954,6 +6119,11 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-unicode@^2.0.1: + version "2.0.1" + resolved "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" + integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + has-value@^0.3.1: version "0.3.1" resolved "https://registry.npm.taobao.org/has-value/download/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" @@ -6155,6 +6325,14 @@ https-proxy-agent@^2.2.1, https-proxy-agent@^2.2.3: agent-base "^4.3.0" debug "^3.1.0" +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.npm.taobao.org/https-proxy-agent/download/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha1-4qkFQqu2inYuCghQ9sntrf2FBrI= + dependencies: + agent-base "6" + debug "4" + humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.npm.taobao.org/humanize-ms/download/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" @@ -6337,6 +6515,11 @@ invariant@^2.2.2: dependencies: loose-envify "^1.0.0" +invert-kv@^1.0.0: + version "1.0.0" + resolved "https://registry.nlark.com/invert-kv/download/invert-kv-1.0.0.tgz?cache=0&sync_timestamp=1630996775723&other_urls=https%3A%2F%2Fregistry.nlark.com%2Finvert-kv%2Fdownload%2Finvert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" + integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY= + invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/invert-kv/download/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -7116,6 +7299,13 @@ kind-of@^6.0.0, kind-of@^6.0.2: resolved "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" integrity sha1-ARRrNqYhjmTljzqNZt5df8b20FE= +lcid@^1.0.0: + version "1.0.0" + resolved "https://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" + integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU= + dependencies: + invert-kv "^1.0.0" + lcid@^2.0.0: version "2.0.0" resolved "https://registry.npm.taobao.org/lcid/download/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -7207,6 +7397,11 @@ lodash.camelcase@^4.3.0: resolved "https://registry.npm.taobao.org/lodash.camelcase/download/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= +lodash.clone@^4.5.0: + version "4.5.0" + resolved "https://registry.npm.taobao.org/lodash.clone/download/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" + integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -7255,6 +7450,11 @@ long@^4.0.0: resolved "https://registry.nlark.com/long/download/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" integrity sha1-mntxz7fTYaGU6lVSQckvdGjVvyg= +long@~3: + version "3.2.0" + resolved "https://registry.npmmirror.com/long/download/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" + integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= + loose-envify@^1.0.0: version "1.4.0" resolved "https://registry.npm.taobao.org/loose-envify/download/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -7313,7 +7513,7 @@ make-dir@^3.0.0: dependencies: semver "^6.0.0" -make-dir@^3.0.2: +make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.npm.taobao.org/make-dir/download/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha1-QV6WcEazp/HRhSd9hKpYIDcmoT8= @@ -7581,6 +7781,14 @@ minizlib@^1.3.3: dependencies: minipass "^2.9.0" +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.npm.taobao.org/minizlib/download/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha1-6Q00Zrogm5MkUVCKEc49NjIUWTE= + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mississippi@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" @@ -7619,6 +7827,11 @@ mkdirp@^0.5.5, mkdirp@~0.5.1, mkdirp@~0.5.x: dependencies: minimist "^1.2.5" +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.npmmirror.com/mkdirp/download/mkdirp-1.0.4.tgz?cache=0&sync_timestamp=1636300883420&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fmkdirp%2Fdownload%2Fmkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha1-PrXtYmInVteaXw4qIh3+utdcL34= + moment@^2.29.1: version "2.29.1" resolved "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" @@ -7646,9 +7859,9 @@ ms@2.1.1: resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha1-MKWGTrPrsKZvLr5tcnrwagnYbgo= -ms@^2.0.0, ms@^2.1.1: +ms@2.1.2, ms@^2.0.0, ms@^2.1.1: version "2.1.2" - resolved "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmmirror.com/ms/download/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk= multicast-dns-service-types@^1.1.0: @@ -7674,6 +7887,11 @@ nan@^2.12.1: resolved "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c" integrity sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw= +nan@^2.13.2: + version "2.15.0" + resolved "https://registry.nlark.com/nan/download/nan-2.15.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnan%2Fdownload%2Fnan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha1-PzSkc/8Y4VwbVia2KQO1rW5mX+4= + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -7760,6 +7978,13 @@ node-fetch@2.6.1: resolved "https://registry.npmmirror.com/node-fetch/download/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha1-BFvTI2Mfdu0uK1VXM5RBa2OaAFI= +node-fetch@^2.6.5: + version "2.6.6" + resolved "https://registry.npmmirror.com/node-fetch/download/node-fetch-2.6.6.tgz#1751a7c01834e8e1697758732e9efb6eeadfaf89" + integrity sha1-F1GnwBg06OFpd1hzLp77burfr4k= + dependencies: + whatwg-url "^5.0.0" + node-forge@0.9.0: version "0.9.0" resolved "https://registry.npm.taobao.org/node-forge/download/node-forge-0.9.0.tgz?cache=0&sync_timestamp=1569524669712&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-forge%2Fdownload%2Fnode-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579" @@ -7806,6 +8031,13 @@ node-releases@^2.0.1: resolved "https://registry.npmmirror.com/node-releases/download/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha1-PR05XyBPHy8ppUNYuftnh2WtL8U= +nopt@^5.0.0: + version "5.0.0" + resolved "https://registry.npm.taobao.org/nopt/download/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" + integrity sha1-UwlCu1ilEvzK/lP+IQ8TolNV3Ig= + dependencies: + abbrev "1" + normalize-package-data@^2.0.0, normalize-package-data@^2.4.0: version "2.5.0" resolved "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" @@ -7917,6 +8149,16 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" +npmlog@^6.0.0: + version "6.0.0" + resolved "https://registry.npmmirror.com/npmlog/download/npmlog-6.0.0.tgz?cache=0&sync_timestamp=1637084951649&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnpmlog%2Fdownload%2Fnpmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c" + integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q== + dependencies: + are-we-there-yet "^2.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.0" + set-blocking "^2.0.0" + nth-check@^1.0.2: version "1.0.2" resolved "https://registry.nlark.com/nth-check/download/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" @@ -8096,6 +8338,11 @@ optimist@^0.6.1, optimist@~0.6.0: minimist "~0.0.1" wordwrap "~0.0.2" +optjs@~3.2.2: + version "3.2.2" + resolved "https://registry.npm.taobao.org/optjs/download/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee" + integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4= + ora@4.0.2: version "4.0.2" resolved "https://registry.nlark.com/ora/download/ora-4.0.2.tgz?cache=0&sync_timestamp=1631556531519&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fora%2Fdownload%2Fora-4.0.2.tgz#0e1e68fd45b135d28648b27cf08081fa6e8a297d" @@ -8126,6 +8373,13 @@ os-homedir@^1.0.0: resolved "https://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= +os-locale@^1.4.0: + version "1.4.0" + resolved "https://registry.npmmirror.com/os-locale/download/os-locale-1.4.0.tgz?cache=0&sync_timestamp=1633618260196&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fos-locale%2Fdownload%2Fos-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" + integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk= + dependencies: + lcid "^1.0.0" + os-locale@^3.0.0, os-locale@^3.1.0: version "3.1.0" resolved "https://registry.npm.taobao.org/os-locale/download/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -8848,6 +9102,16 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +protobufjs@^5.0.3: + version "5.0.3" + resolved "https://registry.nlark.com/protobufjs/download/protobufjs-5.0.3.tgz?cache=0&sync_timestamp=1619804321279&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fprotobufjs%2Fdownload%2Fprotobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" + integrity sha1-5N/p+2fJCyYw0VhoJJvMSWFGehc= + dependencies: + ascli "~1" + bytebuffer "~5" + glob "^7.0.5" + yargs "^3.10.0" + protobufjs@^6.10.0, protobufjs@^6.8.6: version "6.11.2" resolved "https://registry.nlark.com/protobufjs/download/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" @@ -9130,6 +9394,15 @@ readable-stream@^3.0.6: string_decoder "^1.1.1" util-deprecate "^1.0.1" +readable-stream@^3.6.0: + version "3.6.0" + resolved "https://registry.npm.taobao.org/readable-stream/download/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" + integrity sha1-M3u9o63AcGvT4CRCaihtS0sskZg= + dependencies: + inherits "^2.0.3" + string_decoder "^1.1.1" + util-deprecate "^1.0.1" + readdir-scoped-modules@^1.0.0: version "1.1.0" resolved "https://registry.npm.taobao.org/readdir-scoped-modules/download/readdir-scoped-modules-1.1.0.tgz#8d45407b4f870a0dcaebc0e28670d18e74514309" @@ -9431,6 +9704,13 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.2, rimra dependencies: glob "^7.1.3" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho= + dependencies: + glob "^7.1.3" + ripemd160@^2.0.0, ripemd160@^2.0.1: version "2.0.2" resolved "https://registry.npm.taobao.org/ripemd160/download/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" @@ -9622,6 +9902,13 @@ semver@7.0.0: resolved "https://registry.npm.taobao.org/semver/download/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha1-XzyjV2HkfgWyBsba/yz4FPAxa44= +semver@^7.3.5: + version "7.3.5" + resolved "https://registry.npm.taobao.org/semver/download/semver-7.3.5.tgz?cache=0&sync_timestamp=1616463603361&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha1-C2Ich5NI2JmOSw5L6Us/EuYBjvc= + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.npm.taobao.org/send/download/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -10138,6 +10425,15 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421054789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + string-width@^2.0.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" @@ -10164,15 +10460,6 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string-width@^4.2.0: - version "4.2.3" - resolved "https://registry.npmmirror.com/string-width/download/string-width-4.2.3.tgz?cache=0&sync_timestamp=1632421054789&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fstring-width%2Fdownload%2Fstring-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha1-JpxxF9J7Ba0uU2gwqOyJXvnG0BA= - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - string.prototype.trimend@^1.0.4: version "1.0.4" resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -10380,6 +10667,18 @@ tar@^4.4.10: safe-buffer "^5.2.1" yallist "^3.1.1" +tar@^6.1.11: + version "6.1.11" + resolved "https://registry.nlark.com/tar/download/tar-6.1.11.tgz?cache=0&sync_timestamp=1629994598621&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ftar%2Fdownload%2Ftar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + integrity sha1-Z2CjjwA6+hsv/Q/+npq70Oqz1iE= + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^3.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + terser-webpack-plugin@2.3.3: version "2.3.3" resolved "https://registry.nlark.com/terser-webpack-plugin/download/terser-webpack-plugin-2.3.3.tgz?cache=0&sync_timestamp=1631202287446&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.3.3.tgz#b89043168bd414153bab86f4362ac23d537b78b0" @@ -10556,6 +10855,11 @@ tough-cookie@~2.4.3: psl "^1.1.24" punycode "^1.4.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.npmmirror.com/tr46/download/tr46-0.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Ftr46%2Fdownload%2Ftr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + tree-kill@1.2.2: version "1.2.2" resolved "https://registry.npm.taobao.org/tree-kill/download/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" @@ -10580,7 +10884,7 @@ tslib@1.10.0, tslib@^1.10.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: resolved "https://registry.npm.taobao.org/tslib/download/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo= -tslib@>=1.10.0, tslib@^2.0.0: +tslib@>=1.10.0, tslib@^2.0.0, tslib@^2.0.3: version "2.3.1" resolved "https://registry.nlark.com/tslib/download/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha1-6KM1rdXOrlGqJh0ypJAVjvBC7wE= @@ -10990,6 +11294,11 @@ webdriver-manager@^12.0.6: semver "^5.3.0" xml2js "^0.4.17" +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.nlark.com/webidl-conversions/download/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webpack-dev-middleware@3.7.2, webpack-dev-middleware@^3.7.2: version "3.7.2" resolved "https://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-3.7.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-dev-middleware%2Fdownload%2Fwebpack-dev-middleware-3.7.2.tgz#0019c3db716e3fa5cecbf64f2ab88a74bab331f3" @@ -11118,6 +11427,14 @@ whatwg-fetch@2.0.4: resolved "https://registry.npm.taobao.org/whatwg-fetch/download/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f" integrity sha1-3eal3zFfnTmZGqF2IYU9cguFVm8= +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.npmmirror.com/whatwg-url/download/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + when@~3.6.x: version "3.6.4" resolved "https://registry.npm.taobao.org/when/download/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e" @@ -11146,6 +11463,18 @@ which@^1.2.1, which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" +wide-align@^1.1.2: + version "1.1.5" + resolved "https://registry.npmmirror.com/wide-align/download/wide-align-1.1.5.tgz?cache=0&sync_timestamp=1634307502489&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fwide-align%2Fdownload%2Fwide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" + integrity sha1-3x1MIGhUNp7PPJpImPGyP72dFdM= + dependencies: + string-width "^1.0.2 || 2 || 3 || 4" + +window-size@^0.1.4: + version "0.1.4" + resolved "https://registry.npm.taobao.org/window-size/download/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" + integrity sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY= + wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" @@ -11187,6 +11516,13 @@ wrappy@1: resolved "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= +ws@^6.0.0: + version "6.2.2" + resolved "https://registry.npmmirror.com/ws/download/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha1-3Vzb1XqZeZFgl2UtePHMX66gwy4= + dependencies: + async-limiter "~1.0.0" + ws@^6.2.1: version "6.2.1" resolved "https://registry.npm.taobao.org/ws/download/ws-6.2.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fws%2Fdownload%2Fws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" @@ -11231,6 +11567,11 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.npm.taobao.org/xtend/download/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha1-u3J3n1+kZRhrH0OPZ0+jR/2121Q= +y18n@^3.2.0: + version "3.2.2" + resolved "https://registry.npm.taobao.org/y18n/download/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696" + integrity sha1-hckBvWRwznH8S7cjrSCbcPfyhpY= + "y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: version "4.0.0" resolved "https://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -11325,6 +11666,19 @@ yargs@^16.1.1: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@^3.10.0: + version "3.32.0" + resolved "https://registry.npmmirror.com/yargs/download/yargs-3.32.0.tgz?cache=0&sync_timestamp=1632604856058&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fyargs%2Fdownload%2Fyargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" + integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU= + dependencies: + camelcase "^2.0.1" + cliui "^3.0.3" + decamelize "^1.1.1" + os-locale "^1.4.0" + string-width "^1.0.1" + window-size "^0.1.4" + y18n "^3.2.0" + yeast@0.1.2: version "0.1.2" resolved "https://registry.npm.taobao.org/yeast/download/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" From 21d1d6741e087ae62e20eb0ba6283aa59889a109 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Fri, 26 Nov 2021 11:42:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/left-domain/left-domain.component.ts | 4 ++++ src/app/pages/plan/plan.component.html | 8 +++++--- src/app/pages/plan/plan.component.ts | 10 +++++----- src/styles.scss | 5 +++++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/app/pages/left-domain/left-domain.component.ts b/src/app/pages/left-domain/left-domain.component.ts index b0f88b5..e263429 100644 --- a/src/app/pages/left-domain/left-domain.component.ts +++ b/src/app/pages/left-domain/left-domain.component.ts @@ -210,6 +210,9 @@ export class LeftDomainComponent implements OnInit { //选中 数据节点 selectNode(item: MarkPlanData, e: MarkNodeData, index: number) { if (this.selectPlanId != item.id || this.selectNodeId != e.id) { //选中 + if (PlanComponent.instance.progressList.length != item.nodes.length) { + PlanComponent.instance.updateProgressList() + } this.updateFatherData(index) //更新/初始化父组件 数据 this.selectPlanId = item.id this.selectNodeId = e.id @@ -228,6 +231,7 @@ export class LeftDomainComponent implements OnInit { //更新/初始化父组件 数据 updateFatherData(index) { + PlanComponent.instance.progressList.forEach((item,key)=>{ key >= index? PlanComponent.instance.progressList[key] = 0 : PlanComponent.instance.progressList[key] = 100 }) PlanComponent.instance.nzCurrent = index PlanComponent.instance.isSuspend = true //暂停 PlanComponent.instance.updateTimer? window.clearTimeout(PlanComponent.instance.updateTimer) : null //清除定时器 diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html index c090567..a182b17 100644 --- a/src/app/pages/plan/plan.component.html +++ b/src/app/pages/plan/plan.component.html @@ -26,7 +26,7 @@ -
+
{{allFence[selectFence]}}
@@ -160,7 +160,7 @@
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 2ffbaa6..c1cf58c 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -354,8 +354,8 @@ export class PlanComponent implements OnInit { publicToggleNode() { return new Promise((resolve, reject) => { this.beforePlanNode = this.beforeEmergencyPlan.nodes[this.nzCurrent] - this.leftDomain.selectPlanId = this.beforeEmergencyPlan.id - this.leftDomain.selectNodeId = this.beforePlanNode.id + this.isShowChildComponent && this.leftDomain? this.leftDomain.selectPlanId = this.beforeEmergencyPlan.id : null + this.isShowChildComponent && this.leftDomain? this.leftDomain.selectNodeId = this.beforePlanNode.id : null MarkWindow.instance.selectMarkNode(this.beforeEmergencyPlan.id, this.beforePlanNode.id, false, true) this.beforePlanNode = MarkWindow.instance.currentMarkNodeInfo.nodeData this.updateProgress() //更新进度条 @@ -421,7 +421,7 @@ export class PlanComponent implements OnInit { this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 this.isSuspend = true //暂停 this.nzCurrent = event - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : this.progressList[index] = 100 }) this.publicToggleNode() } @@ -440,7 +440,7 @@ export class PlanComponent implements OnInit { } this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = this.nzCurrent - 1 - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : this.progressList[index] = 100 }) this.publicToggleNode() } @@ -493,7 +493,7 @@ export class PlanComponent implements OnInit { } this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = this.nzCurrent + 1 - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : this.progressList[index] = 100 }) this.publicToggleNode() } diff --git a/src/styles.scss b/src/styles.scss index 2b3311d..528abfe 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -125,6 +125,11 @@ h1 { .ant-input { background: rgba(145, 204, 255, 0.41); border: 1px solid #91CCFF; } textarea { resize: none; outline: none; } } +.videoDialog{ + height: 80%; + .ant-modal-footer { padding: 0; } + .ant-modal-body,.ant-modal-content { height: 100%; } +} #threeDimensional { .ant-tree{ color: #C4E2FC; } //tree .ant-tree,.ant-tree-node-content-wrapper:hover,.ant-tree-node-content-wrapper.ant-tree-node-selected { background-color: transparent; } //tree From b65e1f320e65cedd08adf4e73b58d21a599ded6d Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Fri, 26 Nov 2021 11:46:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/babylon/controller/mode-manager.ts | 2 +- .../babylon/model/data/mark/mark-plan-data.ts | 12 ++- .../babylon/view/mark-window/mark-window.ts | 2 + src/app/pages/plan/plan.component.ts | 95 +++++++++---------- 4 files changed, 56 insertions(+), 55 deletions(-) diff --git a/src/app/babylon/controller/mode-manager.ts b/src/app/babylon/controller/mode-manager.ts index 92eb799..5038bc5 100644 --- a/src/app/babylon/controller/mode-manager.ts +++ b/src/app/babylon/controller/mode-manager.ts @@ -23,7 +23,7 @@ export class ModeManager { /** * 制作模式代表内部编辑人员,可新增单位、上传模型,查看模式代表交付的模式 */ - public static s_isMakeMode = true; + public static s_isMakeMode = false; /** * 调试模式 diff --git a/src/app/babylon/model/data/mark/mark-plan-data.ts b/src/app/babylon/model/data/mark/mark-plan-data.ts index 358dc28..916cf31 100644 --- a/src/app/babylon/model/data/mark/mark-plan-data.ts +++ b/src/app/babylon/model/data/mark/mark-plan-data.ts @@ -354,6 +354,7 @@ export class MarkNodeData { /** * 获取展示此节点所需要完整时间 + * 最短3秒 */ getShowTime() { let textNum = 0; @@ -361,9 +362,16 @@ export class MarkNodeData { textNum = this.describe.length; } - let timeScale = 1; + let timeScale = 0.3; - return textNum * timeScale; + let minTime = 3; //最短停留时间 + + let result = textNum * timeScale; + if (result < minTime) { + result = minTime; + } + + return result; } } diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts index 9e295f4..e7b6907 100644 --- a/src/app/babylon/view/mark-window/mark-window.ts +++ b/src/app/babylon/view/mark-window/mark-window.ts @@ -9,6 +9,7 @@ import { Event_GetAllMarkPlanData } from "../../controller/event-manager/events/ import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input"; import { Event_MarkInfoChange, MarkInfoChangeType } from "../../controller/event-manager/events/event-mark-info-change"; import { InputController } from "../../controller/inputController"; +import { ModeManager } from "../../controller/mode-manager"; import { SceneManager } from "../../controller/scene-manager"; import { BuildingStatus } from "../../controller/status/building-status"; import { IndoorStatus } from "../../controller/status/indoor-status"; @@ -149,6 +150,7 @@ export class MarkWindow extends UIBase { instance.onUpdateShow(); }) + } diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 2ffbaa6..7b3f763 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -367,10 +367,10 @@ export class PlanComponent implements OnInit { selectChildNode(item: MarkPlanData) { if (this.isShowChildComponent && this.leftDomain) { if (item.nodes.length) { - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = 0 this.beforeEmergencyPlan = item - this.updateProgressList().then(res=>{ + this.updateProgressList().then(res => { this.publicToggleNode() }) } else { @@ -383,7 +383,7 @@ export class PlanComponent implements OnInit { updateProgressList() { return new Promise((resolve, reject) => { this.progressList = [] - this.beforeEmergencyPlan.nodes.forEach(item=>{ this.progressList.push(0) }) + this.beforeEmergencyPlan.nodes.forEach(item => { this.progressList.push(0) }) resolve(true) }) } @@ -393,14 +393,14 @@ export class PlanComponent implements OnInit { if (this.progressList[this.nzCurrent] >= 100) { this.progressList[this.nzCurrent] = 100 window.clearTimeout(this.updateTimer) //清除定时器 - !this.isSuspend? this.autoPlay() : null + !this.isSuspend ? this.autoPlay() : null return } let time: number = this.beforePlanNode.getShowTime() || 1 - this.updateTimer = window.setTimeout(()=>{ + this.updateTimer = window.setTimeout(() => { this.progressList[this.nzCurrent] = this.progressList[this.nzCurrent] + Number((100 / time).toFixed(2)) / 10 this.updateProgress() - },100) + }, 100) } //自动播放-切换接点 @@ -414,14 +414,14 @@ export class PlanComponent implements OnInit { } //切换预案节点 - changePlanNode(event){ + changePlanNode(event) { if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) { this.updateProgressList() } - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 this.isSuspend = true //暂停 this.nzCurrent = event - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.progressList.forEach((item, index) => { index >= this.nzCurrent ? this.progressList[index] = 0 : null }) this.publicToggleNode() } @@ -438,9 +438,9 @@ export class PlanComponent implements OnInit { if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) { this.updateProgressList() } - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = this.nzCurrent - 1 - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.progressList.forEach((item, index) => { index >= this.nzCurrent ? this.progressList[index] = 0 : null }) this.publicToggleNode() } @@ -454,13 +454,13 @@ export class PlanComponent implements OnInit { this.updateProgressList() } this.isSuspend = isSuspend - let msg: string = this.isSuspend? "目前已暂停" : "目前已开始播放" + let msg: string = this.isSuspend ? "目前已暂停" : "目前已开始播放" this.message.info(msg); if (this.isSuspend) { //暂停 window.clearTimeout(this.updateTimer) //清除定时器 } else { //开启 - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 - this.progressList.forEach((item,index)=>{ index > this.nzCurrent? this.progressList[index] = 0 : null }) + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.progressList.forEach((item, index) => { index > this.nzCurrent ? this.progressList[index] = 0 : null }) this.updateProgress() } } @@ -471,8 +471,8 @@ export class PlanComponent implements OnInit { this.message.info('请选择节点'); return } - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 - this.updateProgressList().then(res=>{ + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.updateProgressList().then(res => { this.nzCurrent = 0 this.publicToggleNode() }) @@ -491,16 +491,16 @@ export class PlanComponent implements OnInit { if (this.progressList.length != this.beforeEmergencyPlan.nodes.length) { this.updateProgressList() } - this.updateTimer? window.clearTimeout(this.updateTimer) : null //清除定时器 + this.updateTimer ? window.clearTimeout(this.updateTimer) : null //清除定时器 this.nzCurrent = this.nzCurrent + 1 - this.progressList.forEach((item,index)=>{ index >= this.nzCurrent? this.progressList[index] = 0 : null }) + this.progressList.forEach((item, index) => { index >= this.nzCurrent ? this.progressList[index] = 0 : null }) this.publicToggleNode() } //获取进度条 flex分布 - getProgressFlex(e: MarkNodeData):string { + getProgressFlex(e: MarkNodeData): string { let length: number = 0 - this.beforeEmergencyPlan.nodes.forEach(item=>{ + this.beforeEmergencyPlan.nodes.forEach(item => { length = length + (item.getShowTime() || 1) }) let percentage: number = (e.getShowTime() || 1) / length @@ -642,42 +642,33 @@ export class taskDialog { //设备任务list export class taskList { character: any[] = [ - { taskName: "外部控火" }, - { taskName: "内部控火" }, - { taskName: "外部侦察" }, - { taskName: "内部侦察" }, - { taskName: "外部观察" }, - { taskName: "外部疏散救生" }, - { taskName: "询问知情人" }, - { taskName: "占领消控室" }, - { taskName: "水源引导" }, - { taskName: "断电气" }, + { taskName: "加油" }, + { taskName: "卸油" }, + { taskName: "按下紧急切断按钮" }, + { taskName: "呼喊示警" }, + { taskName: "停止加油" }, + { taskName: "关闭泄油阀" }, + { taskName: "指挥疏通撤离" }, + { taskName: "向运营、QHSE报告" }, + { taskName: "撤离" }, + { taskName: "119报警" }, + { taskName: "110报警" }, + { taskName: "120报警" }, + { taskName: "使用灭火毯" }, + { taskName: "使用灭火器" }, { taskName: "灭火" }, - { taskName: "掩护" }, - { taskName: "警戒" }, - { taskName: "破拆" }, - { taskName: "排烟" }, - { taskName: "照明" }, - { taskName: "通信" }, + { taskName: "协助灭火" }, + { taskName: "确认安全" }, + { taskName: "保持冷静" }, { taskName: "待命" }, ]; car: any[] = [ - { taskName: "内攻" }, - { taskName: "出枪掩护" }, - { taskName: "出枪冷却" }, - { taskName: "出枪灭火" }, - { taskName: "供水" }, - { taskName: "供泡沫" }, - { taskName: "连接消火栓" }, - { taskName: "遥控水炮冷却" }, - { taskName: "遥控水炮灭火" }, - { taskName: "抢险救援" }, - { taskName: "救人" }, - { taskName: "指挥" }, - { taskName: "排烟" }, - { taskName: "提供器材" }, - { taskName: "照明" }, - { taskName: "供电" }, + { taskName: "加油" }, + { taskName: "停止加油" }, + { taskName: "灭火" }, + { taskName: "逃逸" }, + { taskName: "撤离" }, + { taskName: "损毁" }, { taskName: "待命" }, ] firemonitor: any[] = [