' +
''
//初始化地图
+ searchTitle:any//搜索内容
+ placeSearch:any//地址搜索类
+ search(){
+ this.placeSearch.search(this.searchTitle, (status, result) => {
+ // 搜索成功时，result即是对应的匹配数据
+ console.log(146,this.searchTitle)
+ console.log(147,result)
+ if(result.info == "OK"){
+ this.newPositionMarker.setPosition([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat])
+ this.markerPosition2 = {x: result.poiList.pois[0].location.lng, y: result.poiList.pois[0].location.lat}
+ this.map.setCenter([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat]); //设置地图中心点
+ }
+
+ })
+
+ }
labelGis(){
this.map = new AMap.Map('container', {
zoom:12
})
+
+
this.map.on('complete', () => {
this.isGisTopBox = true
});
+ //输入提示
+ var autoOptions = {
+ input: "tipinput"
+ };
+ AMap.plugin(['AMap.PlaceSearch','AMap.AutoComplete'], ()=>{
+ var auto = new AMap.AutoComplete(autoOptions);
+ this.placeSearch = new AMap.PlaceSearch(); //构造地点查询类
+ auto.on("select", (e)=>{
+ console.log(e)
+ console.log( this.newPositionMarker)
+ this.newPositionMarker.setPosition([e.poi.location.lng,e.poi.location.lat])
+ this.markerPosition2 = {x: e.poi.location.lng, y: e.poi.location.lat}
+ this.map.setCenter([e.poi.location.lng,e.poi.location.lat]); //设置地图中心点
+ });//注册监听，当选中某条记录时会触发
+
+ });
+
if(this.isMapLabel){//如果已经标注单位坐标
console.log('已标注单位位置')
this.map.setCenter([this.unitinfo.location.x,this.unitinfo.location.y]);
@@ -143,9 +179,15 @@ export class BasicinfoComponent implements OnInit {
this.map.setCity('上海市');
}
}
+
+
+ markerPosition2
//点击位置按钮
setPosition(){
+
+
this.isGisTopBox = false
+ this.isGisTopBoxTwo = true
if(this.isMapLabel){//如果已经标注单位坐标
console.log('已标注单位位置')
@@ -165,36 +207,38 @@ export class BasicinfoComponent implements OnInit {
this.map.add(this.newPositionMarker);
- let markerPosition
if(this.markerPosition.x && this.markerPosition.x != 0){
- markerPosition = {x: this.markerPosition.x,y: this.markerPosition.y}
+ this.markerPosition2 = {x: this.markerPosition.x,y: this.markerPosition.y}
}else{
- markerPosition = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
+ this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
}
this.newPositionMarker.on('dragend', (e)=>{
- markerPosition = {x: e.lnglat.lng, y: e.lnglat.lat}
+ this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
})
//点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
this.map.clearMap();
this.isGisTopBox = true
+ this.isGisTopBoxTwo = false
this.newPositionMarker = new AMap.Marker({
- position: [markerPosition.x,markerPosition.y],
+ position: [this.markerPosition2.x,this.markerPosition2.y],
content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18)
});
- this.markerPosition = markerPosition
+ this.markerPosition = this.markerPosition2
this.map.add(this.newPositionMarker);
})
//点击取消
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{
this.isGisTopBox = true
+ this.isGisTopBoxTwo = false
this.map.clearMap();
this.newPositionMarker = new AMap.Marker({
position: [this.markerPosition.x,this.markerPosition.y],
content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18)
});
+ this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
this.map.add(this.newPositionMarker);
})
@@ -219,19 +263,20 @@ export class BasicinfoComponent implements OnInit {
});
this.map.add(this.newPositionMarker);
- let markerPosition
+ // let markerPosition
if(this.markerPosition.x && this.markerPosition.x != 0){
- markerPosition = {x: this.markerPosition.x,y: this.markerPosition.y}
+ this.markerPosition2 = {x: this.markerPosition.x,y: this.markerPosition.y}
}else{
- markerPosition = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
+ this.markerPosition2 = {x: this.map.getCenter().lng,y: this.map.getCenter().lat} //获取当前地图中心位置
}
this.newPositionMarker.on('dragend', (e)=>{
- markerPosition = {x: e.lnglat.lng, y: e.lnglat.lat}
+ this.markerPosition2 = {x: e.lnglat.lng, y: e.lnglat.lat}
})
//点击确定
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionOk'),'click',(event)=>{
this.isGisTopBox = true
- this.markerPosition = markerPosition
+ this.isGisTopBoxTwo = false
+ this.markerPosition = this.markerPosition2
this.map.clearMap();
this.newPositionMarker = new AMap.Marker({
position: [this.markerPosition.x,this.markerPosition.y],
@@ -243,19 +288,19 @@ export class BasicinfoComponent implements OnInit {
this.renderer2.listen(this.elementRef.nativeElement.querySelector('#setPositionClose'),'click',(event)=>{
this.map.clearMap();
this.isGisTopBox = true
+ this.isGisTopBoxTwo = false
if(this.markerPosition.x && this.markerPosition.x != 0){//说明之前标过点
this.newPositionMarker = new AMap.Marker({
position: [this.markerPosition.x,this.markerPosition.y],
content: this.newPositionMarkerContent,
offset: new AMap.Pixel(-15, -18)
});
+ this.map.setCenter([this.markerPosition.x,this.markerPosition.y]); //设置地图中心点
this.map.add(this.newPositionMarker);
}
})//取消
}
-
-
}
//获得所有单位类型
@@ -278,7 +323,9 @@ export class BasicinfoComponent implements OnInit {
}else{//未标注
_this.isMapLabel = false
}
+
this.labelGis()
+
})
}
)
From 64d9fce2681fb4a81d8fc0e6cabd35268a88f53b Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 28 Dec 2020 10:48:48 +0800
Subject: [PATCH 02/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=A0=87=E6=B3=A8=E5=A2=9E=E5=8A=A0=E6=90=9C?=
=?UTF-8?q?=E7=B4=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/key-unit/basicinfo/basicinfo.component.ts | 6 +++---
.../key-unit-management/key-unit-management.component.html | 4 ++--
src/app/pages/login/login.component.scss | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index 550178f..8485907 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -127,12 +127,12 @@ export class BasicinfoComponent implements OnInit {
search(){
this.placeSearch.search(this.searchTitle, (status, result) => {
// 搜索成功时，result即是对应的匹配数据
- console.log(146,this.searchTitle)
- console.log(147,result)
if(result.info == "OK"){
this.newPositionMarker.setPosition([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat])
this.markerPosition2 = {x: result.poiList.pois[0].location.lng, y: result.poiList.pois[0].location.lat}
this.map.setCenter([result.poiList.pois[0].location.lng,result.poiList.pois[0].location.lat]); //设置地图中心点
+ }else{
+ alert('查询不到输入地址信息')
}
})
@@ -1219,7 +1219,7 @@ export class BasicinfoComponent implements OnInit {
if(invalid){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
- config.duration = 3000
+ config.duration = 3000
this.snackBar.open('请填写必填项','确定',config);
}else{
sessionStorage.setItem('buildingTypeId',value.unittype)
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index f821dd9..9b78ece 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -15,7 +15,7 @@
${item.name}
@@ -448,7 +448,7 @@ export class GisLabelingComponent implements OnInit {
this.keyUnitForm.controls.areaUnit.setValue('0')
this.map.remove(this.circle)
this.clearUnitMarker()//取消显示单位markers
- console.log('取消')
+ // console.log('取消')
}
//取消显示水源
@@ -458,7 +458,7 @@ export class GisLabelingComponent implements OnInit {
this.watertForm.reset()
this.watertForm.controls.areaWater.setValue('0')
this.map.remove(this.circleofwater)
- console.log('取消')
+ // console.log('取消')
}
//右上角点击每一个title
@@ -553,6 +553,7 @@ export class GisLabelingComponent implements OnInit {
layers:[layer], //当只想显示标准图层时layers属性可缺省,
});
+ that.map.setCity('上海市');
AMap.plugin(["AMap.RangingTool", "AMap.MouseTool"],function () {
that.mouseTool=new AMap.MouseTool(that.map);
/* that.measureDistance = new AMap.RangingTool(that.map, rulerOptions); //测距离
@@ -792,6 +793,9 @@ export class GisLabelingComponent implements OnInit {
this.leftDivState = false
this.showLeftDiv = false
this.isShowRouteGIS = true
+ // console.log(1,e)
+ this.routeEnd = e.name
+ this.endCoordinate = new AMap.LngLat(e.location.x, e.location.y)
}
//全景漫游
@@ -864,9 +868,19 @@ export class GisLabelingComponent implements OnInit {
var autoComplete = new AMap.Autocomplete(autoOptions);
autoComplete.search(keywords, function(status, result) {
if (result && result.tips && result.tips.length) { //搜索到数据时
-
- that._ngZone.run(()=>{ e == 0 ? that.routeStartList = result.tips : that.routeEndList = result.tips });
-
+ that._ngZone.run(()=>{
+ if(e == 0){
+ that.routeStartList = result.tips
+
+
+ that.startCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat)
+ // console.log(666,result)
+ }else{
+ that.routeEndList = result.tips
+ that.endCoordinate = new AMap.LngLat(result.tips[0].location.lng, result.tips[0].location.lat)
+ }
+ });
+
}
})
})
@@ -880,9 +894,11 @@ export class GisLabelingComponent implements OnInit {
if (e==0) {
this.routeStart = null
this.routeStartList = []
+ this.startCoordinate = null
} else {
this.routeEnd = null
this.routeEndList = []
+ this.endCoordinate = null
}
}
@@ -892,9 +908,11 @@ export class GisLabelingComponent implements OnInit {
this.routeStartList = []
this.routeEnd = null
this.routeEndList = []
+ this.startCoordinate = null
+ this.endCoordinate = null
this.routeGIS? this.routeGIS.clear() : null
this.routes = { distance: 0, time: 0, steps: [], }
- console.log(this.selectedUnit)
+ // console.log(this.selectedUnit)
this.map.setZoomAndCenter(13,[this.selectedUnit.location.x,this.selectedUnit.location.y]); //设置地图中心点
}
@@ -905,9 +923,16 @@ export class GisLabelingComponent implements OnInit {
this.routeEnd = data
this.routeStartList = []
this.routeEndList = []
+ let data2 = this.startCoordinate
+ this.startCoordinate = this.endCoordinate
+ this.endCoordinate = data2
}
routes:any = { distance: 0, time: 0, steps: [], };//导航查询结果 路线规划
+
+ startCoordinate:any//开始坐标
+ endCoordinate:any//结束坐标
+
//导航查询
queryGISRoute () {
//构造路线导航类
@@ -917,8 +942,10 @@ export class GisLabelingComponent implements OnInit {
this.routeGIS = new AMap.Driving({
map: this.map,
});
+ // console.log(1,this.startCoordinate)
+ // console.log(2,this.endCoordinate)
// 根据起终点名称规划驾车导航路线
- this.routeGIS.search([{keyword: this.routeStart},{keyword: this.routeEnd}],
+ this.routeGIS.search(this.startCoordinate,this.endCoordinate,
function(status, result) {
if (status === 'complete') {
that.routes = result.routes[0]
@@ -938,7 +965,7 @@ export class GisLabelingComponent implements OnInit {
policy: e==true? AMap.DrivingPolicy.LEAST_TIME : AMap.DrivingPolicy.REAL_TRAFFIC
});
// 根据起终点名称规划驾车导航路线
- this.routeGIS.search([{keyword: this.routeStart},{keyword: this.routeEnd}],
+ this.routeGIS.search(this.startCoordinate,this.endCoordinate,
function(status, result) {
if (status === 'complete') {
that.routes = result.routes[0]
@@ -1051,7 +1078,7 @@ export class LookPlanDialog {
ngOnInit() {
- console.log(this.data)
+ // console.log(this.data)
this.getAllPlans()
}
//关闭弹窗
@@ -1073,7 +1100,7 @@ export class LookPlanDialog {
}
this.http.get("/api/PlanComponents",{params:paramsData}).subscribe((data:any)=>{
this.allPlanComponents = data.items
- console.log(this.allPlanComponents)
+ // console.log(this.allPlanComponents)
})
}
//查看预案
@@ -1117,7 +1144,7 @@ export class LookPlanDialog {
dialogRef.afterClosed().subscribe(
data=>{
if(data){
- console.log(123,data)
+ // console.log(123,data)
this.downloadFileName = data.fileName
this.download = data
this.downloadFile()
@@ -1217,7 +1244,7 @@ export class DownloadFile {
selectedFileData : any
ngOnInit(): void {
- console.log(this.data)
+ // console.log(this.data)
this.name = this.data.name
this.fileUrls = this.data.attachmentUrls
this.fileUrls.forEach(item=>{
@@ -1241,7 +1268,7 @@ export class DownloadFile {
//点击想要下载的文件
addurl(item,key){
- console.log(item,key)
+ // console.log(item,key)
this.selectedFileIndex = key
this.selectedFileData = item
}
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index 8485907..06854d8 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -469,7 +469,7 @@ export class BasicinfoComponent implements OnInit {
data[0].buildtype = n.name
data[0].tongyong = true
data[0].index = x.index
- if(data[0].buildtype == "石油化工类"){
+ if(data[0].buildtype == "石油化工类" || data[0].buildtype == "化工生产"){
data[0].tongyong = false
data[0].isshiyou = true
this.deviceinfodata = data[0].buildingBasicGroups[1].propertyInfos //存储装置信息的初始数据，需要转换成datasource形式
@@ -631,7 +631,7 @@ export class BasicinfoComponent implements OnInit {
data[0].tongyong = true
data[0].index = index
- if(data[0].buildtype == "石油化工类"){
+ if(data[0].buildtype == "石油化工类" || data[0].buildtype == "化工生产"){
data[0].tongyong = false
data[0].isshiyou = true
let noemptydeviceArr = data[0].buildingBasicGroups[1].propertyInfos
@@ -890,7 +890,7 @@ export class BasicinfoComponent implements OnInit {
data[0].username = n.name
data[0].tongyong = true
data[0].index = this.houses.length //////////////////
- if(data[0].buildtype == "石油化工类"){
+ if(data[0].buildtype == "石油化工类" || data[0].buildtype == "化工生产"){
data[0].tongyong = false
data[0].isshiyou = true //如果是石油化工则启用石油化工的模板
this.deviceinfodata = data[0].buildingBasicGroups[1].propertyInfos //存储装置信息表格的初始数据，需要转换成datasource形式
@@ -1470,7 +1470,7 @@ export class BasicinfoComponent implements OnInit {
}
- if(item.buildtype != "石油化工类" && item.buildtype != "地铁类"){
+ if(item.buildtype != "石油化工类" && item.buildtype != "地铁类" && item.buildtype != "化工生产"){
// console.log(this.houses[key])
// console.log(value)
this.houses[key].buildingBasicGroups[0].propertyInfos.forEach(item => {
@@ -1522,7 +1522,7 @@ export class BasicinfoComponent implements OnInit {
})
}
}
- if(item.buildtype == "石油化工类"){
+ if(item.buildtype == "石油化工类" || item.buildtype == "化工生产"){
// console.log(888,item)
let bodyObj = _.cloneDeep(item)
delete bodyObj.name
From d69dd80dc083c0a9d2c362edbc9c96895e8ce6f4 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 28 Dec 2020 13:05:26 +0800
Subject: [PATCH 05/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=9F=B3=E6=B2=B9=E5=8C=96=E5=B7=A5=E6=A8=A1=E6=9D=BF=E5=88=A4?=
=?UTF-8?q?=E5=88=AB=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/key-unit/basicinfo-look/basicinfo.component.ts | 10 +++++-----
src/app/key-unit/basicinfo/basicinfo.component.ts | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.ts b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
index dc8a770..afb4dc2 100644
--- a/src/app/key-unit/basicinfo-look/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo-look/basicinfo.component.ts
@@ -383,7 +383,7 @@ export class BasicinfoLookComponent implements OnInit {
data[0].buildtype = n.name
data[0].tongyong = true
data[0].index = x.index
- if(data[0].buildtype == "石油化工类"){
+ if(data[0].buildtype == "石油化工类" || data[0].buildtype.indexOf("化工") != -1 ){
data[0].tongyong = false
data[0].isshiyou = true
this.deviceinfodata = data[0].buildingBasicGroups[1].propertyInfos //存储装置信息的初始数据，需要转换成datasource形式
@@ -545,7 +545,7 @@ export class BasicinfoLookComponent implements OnInit {
data[0].tongyong = true
data[0].index = index
- if(data[0].buildtype == "石油化工类"){
+ if(data[0].buildtype.indexOf("储罐") != -1 || data[0].buildtype.indexOf("化工") != -1 ){
data[0].tongyong = false
data[0].isshiyou = true
let noemptydeviceArr = data[0].buildingBasicGroups[1].propertyInfos
@@ -804,7 +804,7 @@ export class BasicinfoLookComponent implements OnInit {
data[0].username = n.name
data[0].tongyong = true
data[0].index = this.houses.length //////////////////
- if(data[0].buildtype == "石油化工类"){
+ if(data[0].buildtype.indexOf("储罐") != -1 || data[0].buildtype.indexOf("化工") != -1 ){
data[0].tongyong = false
data[0].isshiyou = true //如果是石油化工则启用石油化工的模板
this.deviceinfodata = data[0].buildingBasicGroups[1].propertyInfos //存储装置信息表格的初始数据，需要转换成datasource形式
@@ -1360,7 +1360,7 @@ export class BasicinfoLookComponent implements OnInit {
}
- if(item.buildtype != "石油化工类" && item.buildtype != "地铁类"){
+ if(item.buildtype.indexOf("储罐") == -1 && item.buildtype != "地铁类" && item.buildtype.indexOf("化工") == -1 ){
// console.log(this.houses[key])
// console.log(value)
this.houses[key].buildingBasicGroups[0].propertyInfos.forEach(item => {
@@ -1411,7 +1411,7 @@ export class BasicinfoLookComponent implements OnInit {
})
}
}
- if(item.buildtype == "石油化工类"){
+ if(item.buildtype.indexOf("储罐") != -1 || item.buildtype.indexOf("化工") != -1 ){
// console.log(888,item)
let bodyObj = _.cloneDeep(item)
delete bodyObj.name
diff --git a/src/app/key-unit/basicinfo/basicinfo.component.ts b/src/app/key-unit/basicinfo/basicinfo.component.ts
index 06854d8..4583dc2 100644
--- a/src/app/key-unit/basicinfo/basicinfo.component.ts
+++ b/src/app/key-unit/basicinfo/basicinfo.component.ts
@@ -469,7 +469,7 @@ export class BasicinfoComponent implements OnInit {
data[0].buildtype = n.name
data[0].tongyong = true
data[0].index = x.index
- if(data[0].buildtype == "石油化工类" || data[0].buildtype == "化工生产"){
+ if(data[0].buildtype.indexOf('化工') != -1 || data[0].buildtype.indexOf('储罐') != -1){
data[0].tongyong = false
data[0].isshiyou = true
this.deviceinfodata = data[0].buildingBasicGroups[1].propertyInfos //存储装置信息的初始数据，需要转换成datasource形式
@@ -631,7 +631,7 @@ export class BasicinfoComponent implements OnInit {
data[0].tongyong = true
data[0].index = index
- if(data[0].buildtype == "石油化工类" || data[0].buildtype == "化工生产"){
+ if(data[0].buildtype.indexOf('化工') != -1 || data[0].buildtype.indexOf('储罐') != -1){
data[0].tongyong = false
data[0].isshiyou = true
let noemptydeviceArr = data[0].buildingBasicGroups[1].propertyInfos
@@ -890,7 +890,7 @@ export class BasicinfoComponent implements OnInit {
data[0].username = n.name
data[0].tongyong = true
data[0].index = this.houses.length //////////////////
- if(data[0].buildtype == "石油化工类" || data[0].buildtype == "化工生产"){
+ if(data[0].buildtype.indexOf('化工') != -1 || data[0].buildtype.indexOf('储罐') != -1){
data[0].tongyong = false
data[0].isshiyou = true //如果是石油化工则启用石油化工的模板
this.deviceinfodata = data[0].buildingBasicGroups[1].propertyInfos //存储装置信息表格的初始数据，需要转换成datasource形式
@@ -1470,7 +1470,7 @@ export class BasicinfoComponent implements OnInit {
}
- if(item.buildtype != "石油化工类" && item.buildtype != "地铁类" && item.buildtype != "化工生产"){
+ if(item.buildtype.indexOf('化工') == -1 && item.buildtype != "地铁类" && item.buildtype.indexOf('储罐') == -1){
// console.log(this.houses[key])
// console.log(value)
this.houses[key].buildingBasicGroups[0].propertyInfos.forEach(item => {
@@ -1522,7 +1522,7 @@ export class BasicinfoComponent implements OnInit {
})
}
}
- if(item.buildtype == "石油化工类" || item.buildtype == "化工生产"){
+ if(item.buildtype.indexOf('化工') != -1 || item.buildtype.indexOf('储罐') != -1){
// console.log(888,item)
let bodyObj = _.cloneDeep(item)
delete bodyObj.name
From a0b0212fcd1d26fef2398d3e82425223d61f1f2f Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 28 Dec 2020 13:10:14 +0800
Subject: [PATCH 06/11] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=BF=9B=E5=85=A5=E6=97=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/tabbar/tabbar.component.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/app/tabbar/tabbar.component.ts b/src/app/tabbar/tabbar.component.ts
index 76fabdb..a9c253b 100644
--- a/src/app/tabbar/tabbar.component.ts
+++ b/src/app/tabbar/tabbar.component.ts
@@ -77,7 +77,9 @@ export class TabbarComponent implements OnInit {
USCI : this.route.snapshot.queryParams.usci
}
this.http.get('/api/Companies',{params:params}).subscribe((data:any) => {
- this.companyIntegrityScore = data.items[0].companyIntegrityScore
+ this.companyIntegrityScore ?
+ this.companyIntegrityScore = data.items[0].companyIntegrityScore :
+ null
// console.log(data)
})
}
From 9bc04a400ed260246f3c3b7c164519bfe12166af Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Mon, 28 Dec 2020 14:22:30 +0800
Subject: [PATCH 07/11] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E4=BF=AE=E6=94=B9?=
=?UTF-8?q?=E5=AF=BC=E8=88=AAlogo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/navigation/navigation.component.html | 2 +-
src/app/navigation/navigation.component.scss | 4 +-
src/app/ui/unittype/unittype.component.html | 106 ++++++++++---------
src/assets/images/h130.png | Bin 0 -> 33848 bytes
4 files changed, 57 insertions(+), 55 deletions(-)
create mode 100644 src/assets/images/h130.png
diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html
index 113eca0..81efc94 100644
--- a/src/app/navigation/navigation.component.html
+++ b/src/app/navigation/navigation.component.html
@@ -2,7 +2,7 @@
- 
+ 
+
+
diff --git a/src/assets/images/h130.png b/src/assets/images/h130.png
new file mode 100644
index 0000000000000000000000000000000000000000..384b005f8ee1714e915c7b6462f45ffa32944c21
GIT binary patch
literal 33848
zcmbSy19W9g*JhHAZ96x%ZQHhOyJK~1+qUhF?T&49)WPKa@Xj~0{+apL+_la
+
-
-
+
-
-
-
+
+| 单位类型 | -{{element.name}} | -单位信息模板 | -{{element.basicCategoryName}} | -消防要素模板 | -{{element.fireCategoryName}} | -消防设施模板 | -{{element.facilityCategoryName}} | -操作 | -
+
+
\ No newline at end of file
+ 单位类型 |
+ {{element.name}} |
+ 单位信息模板 |
+ {{element.basicCategoryName}} |
+ 消防要素模板 |
+ {{element.fireCategoryName}} |
+ 消防设施模板 |
+ {{element.facilityCategoryName}} |
+ 操作 |
+
+
+
+
+
+
+
+
+ |
+ |
|---|
@@ -218,7 +217,7 @@