shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

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

tangshan
陈敬瑜 3 years ago
parent
3b7566b50e 83f460b11b
commit
7961da1252
6 changed files with 73 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/app/data-collection/fire-force/fire-force.component.ts
  2. 92
      src/app/gis-management/gis-labeling/gis-labeling.component.ts
  3. 2
      src/app/key-unit/water-road/water-road.component.ts
  4. 30
      src/app/ui/collection-tools-building/collection-tools.component.ts
  5. 4
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  6. 4
      src/app/ui/collection-tools/collection-tools.component.ts

2
src/app/data-collection/fire-force/fire-force.component.ts
Unescape View File

@ -751,6 +751,8 @@ export class FireForceComponent implements OnInit {
image = '/assets/fireForcesMarkers/dadui.png' image = '/assets/fireForcesMarkers/dadui.png'
} else if (item.level == 3) { } else if (item.level == 3) {
image = '/assets/fireForcesMarkers/zhongdui.png' image = '/assets/fireForcesMarkers/zhongdui.png'
}else{
image = '/assets/fireForcesMarkers/qita.png'
} }
// 用于点集合的数组 // 用于点集合的数组
item.fireForceDetailInfo.location ? item.fireForceDetailInfo.location ?

92
src/app/gis-management/gis-labeling/gis-labeling.component.ts
Unescape View File

@ -402,7 +402,7 @@ export class GisLabelingComponent implements OnInit {
} }
this.unitCluster = MapFactory.MarkerClusterInstance(this.map, unitMarkerArrcluster, { this.unitCluster = MapFactory.MarkerClusterInstance(this.map, unitMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
maxZoom :15, maxZoom: 15,
render: render //自定义聚合点样式, 自定义非聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
}); });
this.unitCluster.on('click', (e) => { this.unitCluster.on('click', (e) => {
@ -537,6 +537,8 @@ export class GisLabelingComponent implements OnInit {
image = '/assets/fireForcesMarkers/dadui.png' image = '/assets/fireForcesMarkers/dadui.png'
} else if (item.level == 3) { } else if (item.level == 3) {
image = '/assets/fireForcesMarkers/zhongdui.png' image = '/assets/fireForcesMarkers/zhongdui.png'
}else{
image = '/assets/fireForcesMarkers/qita.png'
} }
// 用于点集合的数组 // 用于点集合的数组
item.fireForceDetailInfo.location ? item.fireForceDetailInfo.location ?
@ -585,7 +587,7 @@ export class GisLabelingComponent implements OnInit {
} }
this.fireForceCluster = MapFactory.MarkerClusterInstance(this.map, fireForceMarkerArrcluster, { this.fireForceCluster = MapFactory.MarkerClusterInstance(this.map, fireForceMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
maxZoom :15, maxZoom: 15,
render: render //自定义聚合点样式, 自定义非聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
}); });
@ -735,7 +737,7 @@ export class GisLabelingComponent implements OnInit {
this.linkageForcesCluster = MapFactory.MarkerClusterInstance(this.map, linkageForcesMarkerArrcluster, { this.linkageForcesCluster = MapFactory.MarkerClusterInstance(this.map, linkageForcesMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
maxZoom :15, maxZoom: 15,
render: render //自定义聚合点样式, 自定义非聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
}); });
@ -910,7 +912,7 @@ export class GisLabelingComponent implements OnInit {
// } // }
this.waterCluster = MapFactory.MarkerClusterInstance(this.map, waterMarkerArrcluster, { this.waterCluster = MapFactory.MarkerClusterInstance(this.map, waterMarkerArrcluster, {
gridSize: gridSize, // 设置网格像素大小 gridSize: gridSize, // 设置网格像素大小
maxZoom :15, maxZoom: 15,
render: render //自定义聚合点样式, 自定义非聚合点样式 render: render //自定义聚合点样式, 自定义非聚合点样式
}); });
@ -1308,7 +1310,7 @@ export class GisLabelingComponent implements OnInit {
//分享 //分享
share(e) { share(e) {
let data = { let data = {
url: 'https://www.baidu.com/', url: 'https://',
buildingType: e.buildingTypes[0].name, buildingType: e.buildingTypes[0].name,
address: e.address address: e.address
} }
@ -1577,7 +1579,8 @@ export class LookPlanDialog {
ngOnInit() { ngOnInit() {
console.log(this.data) sessionStorage.setItem("companyId", this.data.id)
console.log(this.data)
this.getAllPlans() this.getAllPlans()
} }
//关闭弹窗 //关闭弹窗
@ -1639,53 +1642,56 @@ export class LookPlanDialog {
} */ } */
let companyId = sessionStorage.getItem("companyId") let companyId = sessionStorage.getItem("companyId")
if (e.planType == 16 || e.planType == 4 || e.planType == 8) { if (e.planType == 16 || e.planType == 4 || e.planType == 8) {
if (e.planType == 16&&e.attachmentUrls == null){ if (e.planType == 16 && e.attachmentUrls == null) {
window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${companyId}&planName=${e.name}&unitName=${this.data.name}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.data.buildingTypes[0].id}&orName=${this.data.organizationName}&pattern=false`) window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${companyId}&planName=${e.name}&unitName=${this.data.name}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.data.buildingTypes[0].id}&orName=${this.data.organizationName}&pattern=false`)
}else{ } else {
var index = e.attachmentUrls[0].indexOf("\/") var index = e.attachmentUrls[0].indexOf("\/")
let fetchUrl = e.attachmentUrls[0] let fetchUrl = e.attachmentUrls[0]
//console.log(fetchUrl) //console.log(fetchUrl)
if (fetchUrl) { if (fetchUrl) {
let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase() let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase()
if (suffix == 'docx' || suffix == 'doc') { if (suffix == 'docx' || suffix == 'doc') {
let arr = fetchUrl.split('.') let arr = fetchUrl.split('.')
arr[arr.length - 1] = 'pdf' arr[arr.length - 1] = 'pdf'
window.open(`/api/Objects/PlanPlatform/` + arr.join('.')) window.open(`/api/Objects/PlanPlatform/` + arr.join('.'))
} else if (suffix == 'pdf') { } else if (suffix == 'pdf') {
window.open(`/api/Objects/PlanPlatform/` + fetchUrl) window.open(`/api/Objects/PlanPlatform/` + fetchUrl)
} else { } else {
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('该文件类型暂不支持在线查看', '确定', config); this.snackBar.open('该文件类型暂不支持在线查看', '确定', config);
}
} }
}
} }
} }
if (e.planType == 1) { //如果是在线编辑 if (e.planType == 1) { //如果是在线编辑
let id = e.id let id = e.id
console.log(e)
let companyId = sessionStorage.getItem("companyId")
sessionStorage.setItem("companyName", this.data.name)
sessionStorage.setItem("companyId", companyId)
sessionStorage.setItem("planId", id) sessionStorage.setItem("planId", id)
//sessionStorage.setItem("companyId", companyId)
sessionStorage.setItem("buildingTypeId", this.data.buildingTypes[0].id) sessionStorage.setItem("buildingTypeId", this.data.buildingTypes[0].id)
sessionStorage.setItem("editable", "0") sessionStorage.setItem("editable", "0")
sessionStorage.setItem("planName", e.name) sessionStorage.setItem("planName", e.name)
let companyId = sessionStorage.getItem("companyId")
window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`) window.open(`/keyUnit/viewunitinfoplan?id=${companyId}&orName=${this.data.organizationName}&orId=${this.data.organizationId}`)
} }
if (e.planType == 2) { //如果是跳转网页 if (e.planType == 2) { //如果是跳转网页
if (e.url.indexOf('app') == 0) { if (e.url.indexOf('app') == 0) {
window.location.href = e.url window.location.href = e.url
} else { } else {
sessionStorage.setItem("url", e.url) sessionStorage.setItem("url", e.url)
if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案 if ((e.url as string).includes('gis/threeDimensionalHome')) { //三维预案
window.open(`${e.url}?unitId=${this.data.id}&unitName=${this.data.name}&editMode=false`) window.open(`${e.url}?unitId=${this.data.id}&unitName=${this.data.name}&editMode=false`)
} else { } else {
window.open(`/planManagement/webLook`) window.open(`/planManagement/webLook`)
} }
} }
} }
} }
//点击下载 //点击下载

2
src/app/key-unit/water-road/water-road.component.ts
Unescape View File

@ -214,6 +214,8 @@ export class WaterRoadComponent implements OnInit {
image = '/assets/fireForcesMarkers/dadui.png' image = '/assets/fireForcesMarkers/dadui.png'
} else if (item.level == 3) { } else if (item.level == 3) {
image = '/assets/fireForcesMarkers/zhongdui.png' image = '/assets/fireForcesMarkers/zhongdui.png'
}else{
image = '/assets/fireForcesMarkers/qita.png'
} }
// 用于点集合的数组 // 用于点集合的数组
item.fireForceDetailInfo.location ? item.fireForceDetailInfo.location ?

30
src/app/ui/collection-tools-building/collection-tools.component.ts
Unescape View File

@ -479,7 +479,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
let _this = this let _this = this
let file = imgFile || null //获取上传的文件 let file = imgFile || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小 let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片 let shardSize = 10 * 1024 * 1024 //5MB一个分片
let companyId = sessionStorage.getItem("companyId") let companyId = sessionStorage.getItem("companyId")
if (file && fileSize <= shardSize) { //上传文件<=5MB时 if (file && fileSize <= shardSize) { //上传文件<=5MB时
let formData = new FormData() let formData = new FormData()
@ -542,7 +542,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('上传图片文件不允许大于5mb', '确定', config); this.snackBar.open('上传图片文件不允许大于10mb', '确定', config);
} }
} }
@ -632,6 +632,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
AxMessageSystem.addListener('selectionChanged', () => { AxMessageSystem.addListener('selectionChanged', () => {
if (this.canvas.selection.size() == 1) {//如果是单选 if (this.canvas.selection.size() == 1) {//如果是单选
this.isMultipleAsset = false this.isMultipleAsset = false
console.log('单选', this.canvas.selection.first().assetData)
this.setAssetsProperty(this.canvas.selection.first().assetData) this.setAssetsProperty(this.canvas.selection.first().assetData)
} else if (this.canvas.selection.size()) { } else if (this.canvas.selection.size()) {
this.isShowProperty = true this.isShowProperty = true
@ -671,6 +672,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
}); });
}) })
}) })
// console.log(666,_this.multipleAsset.PropertyInfos)
} else if (this.canvas.selection.size() == 0) { } else if (this.canvas.selection.size() == 0) {
this.isShowProperty = false this.isShowProperty = false
} }
@ -772,19 +774,20 @@ export class CollectionToolsBuildingComponent implements OnInit {
//多选状态动态属性素材input框值改变 //多选状态动态属性素材input框值改变
multipleAssetInputChange(i, e) { multipleAssetInputChange(i, e) {
e.stopPropagation() e.stopPropagation()
this.multipleAssetData.forEach(item => { setTimeout(() => {
// console.log(item) this.multipleAssetData.forEach(item => {
item.assetData.PropertyInfos.forEach(element => { item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) { if (element.PropertyName == i.PropertyName) {
if (this.myIsNaN(i.PropertyValue)) { if (this.myIsNaN(i.PropertyValue)) {
i.PropertyValue = String(i.PropertyValue) i.PropertyValue = String(i.PropertyValue)
}
element.PropertyValue = i.PropertyValue
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
} }
element.PropertyValue = i.PropertyValue })
this.canvas.refreshIcon(item.assetData.Id)
this.canvasData.isChange = true
}
}) })
}) }, 0);
} }
//多选状态动态属性素材radio框值改变 //多选状态动态属性素材radio框值改变
multipleAssetRadioChange(i, value) { multipleAssetRadioChange(i, value) {
@ -804,7 +807,6 @@ export class CollectionToolsBuildingComponent implements OnInit {
multipleSupplyArea(i, e) { multipleSupplyArea(i, e) {
e.stopPropagation() e.stopPropagation()
this.multipleAssetData.forEach(item => { this.multipleAssetData.forEach(item => {
// console.log(item)
item.assetData.PropertyInfos.forEach(element => { item.assetData.PropertyInfos.forEach(element => {
if (element.PropertyName == i.PropertyName) { if (element.PropertyName == i.PropertyName) {
element.PropertyValue = i.PropertyValue element.PropertyValue = i.PropertyValue

4
src/app/ui/collection-tools-plan/collection-tools.component.ts
Unescape View File

@ -342,7 +342,7 @@ export class CollectionToolsPlanComponent implements OnInit {
let _this = this let _this = this
let file = imgFile || null //获取上传的文件 let file = imgFile || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小 let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片 let shardSize = 10 * 1024 * 1024 //5MB一个分片
let companyId = sessionStorage.getItem("companyId") let companyId = sessionStorage.getItem("companyId")
if (file && fileSize <= shardSize) { //上传文件<=5MB时 if (file && fileSize <= shardSize) { //上传文件<=5MB时
let formData = new FormData() let formData = new FormData()
@ -405,7 +405,7 @@ export class CollectionToolsPlanComponent implements OnInit {
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('上传图片文件不允许大于5mb', '确定', config); this.snackBar.open('上传图片文件不允许大于10mb', '确定', config);
} }
} }

4
src/app/ui/collection-tools/collection-tools.component.ts
Unescape View File

@ -488,7 +488,7 @@ export class CollectionToolsComponent implements OnInit {
let _this = this let _this = this
let file = imgFile || null //获取上传的文件 let file = imgFile || null //获取上传的文件
let fileSize = file.size || null //上传文件的总大小 let fileSize = file.size || null //上传文件的总大小
let shardSize = 5 * 1024 * 1024 //5MB一个分片 let shardSize = 10 * 1024 * 1024 //5MB一个分片
let companyId = sessionStorage.getItem("companyId") let companyId = sessionStorage.getItem("companyId")
if (file && fileSize <= shardSize) { //上传文件<=5MB时 if (file && fileSize <= shardSize) { //上传文件<=5MB时
let formData = new FormData() let formData = new FormData()
@ -551,7 +551,7 @@ export class CollectionToolsComponent implements OnInit {
let config = new MatSnackBarConfig(); let config = new MatSnackBarConfig();
config.verticalPosition = 'top'; config.verticalPosition = 'top';
config.duration = 3000 config.duration = 3000
this.snackBar.open('上传图片文件不允许大于5mb', '确定', config); this.snackBar.open('上传图片文件不允许大于10mb', '确定', config);
} }
} }

Write Preview
Loading…
Cancel
Save