|
@@ -52,7 +52,7 @@
|
|
|
:loadName="loadName"
|
|
|
:type="'system'"
|
|
|
></floorMap>
|
|
|
- <div class="legend-boxs">
|
|
|
+ <div class="legend-boxs" ref="legendBoxs">
|
|
|
<Legend
|
|
|
:key="keyLd"
|
|
|
:systemName="systemName"
|
|
@@ -99,8 +99,10 @@
|
|
|
v-show="showView === 3"
|
|
|
class="add-img-container"
|
|
|
ref="addImgContainer"
|
|
|
- :style="`bottom: ${bottomOffset}px;`"
|
|
|
+
|
|
|
+ :style="`top: ${bottomOffset}px;bottom:unset`"
|
|
|
>
|
|
|
+ <!-- :style="`bottom: ${bottomOffset}px;`"-->
|
|
|
<!-- <div class="add-img" ref="addImg">
|
|
|
<img :src="fqPic[0].url" alt />
|
|
|
</div> -->
|
|
@@ -203,6 +205,13 @@ export default {
|
|
|
//附加数据弹窗取消
|
|
|
handelCancel(data){
|
|
|
this.addDataVisible = data;
|
|
|
+ this.addDataCheckCompleteFun();
|
|
|
+ if(this.systemName =='消防系统'){
|
|
|
+ this.addDataPreviewFireControlFun();
|
|
|
+ }
|
|
|
+ if(this.systemName =='弱电系统'){
|
|
|
+ this.addDataPreviewWeakCurrentFun();
|
|
|
+ }
|
|
|
},
|
|
|
showToolTip() {
|
|
|
this.showExeclTooltip = true;
|
|
@@ -418,7 +427,6 @@ export default {
|
|
|
},
|
|
|
//附加数据图片查看 showView为3展示状态
|
|
|
additionalColl() {
|
|
|
- console.log('this.floorInfo',this.floorInfo);
|
|
|
// // 走预览接口
|
|
|
// this.previewExl();
|
|
|
// 调整样式
|
|
@@ -427,9 +435,10 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
let p = this.$refs.additionalBox.offsetTop;
|
|
|
let d = this.$refs.addImgContainer.offsetHeight;
|
|
|
+ let lb= this.$refs.legendBoxs.offsetHeight;
|
|
|
let bottomOffset = p + 44 - d;
|
|
|
- if (bottomOffset >= 0) {
|
|
|
- this.bottomOffset = this.visibleTooltip?0:-100;
|
|
|
+ if (bottomOffset >= 0) {
|
|
|
+ this.bottomOffset = this.systemName =='消防系统'?-lb+44:-lb-1+44;
|
|
|
} else {
|
|
|
this.bottomOffset = bottomOffset;
|
|
|
}
|
|
@@ -508,7 +517,7 @@ export default {
|
|
|
}
|
|
|
addDataCheckComplete({postParams}).then(res=>{
|
|
|
if (res.data.result == 'success') {
|
|
|
- if (res.data.data.isComplate) {
|
|
|
+ if (res.data.data.isComplete=='true') {
|
|
|
this.visibleTooltip = false;
|
|
|
} else {
|
|
|
this.visibleTooltip = true;
|
|
@@ -522,37 +531,36 @@ export default {
|
|
|
projectId: this.plazaId,
|
|
|
systemCode: this.smsxt,
|
|
|
floor: this.floorInfo.gname,
|
|
|
- getTotal:'0'
|
|
|
+ getTotal:'1'
|
|
|
}
|
|
|
addDataPreviewFireControl({postParams}).then(res=>{
|
|
|
- // let res = {
|
|
|
- // "result": "success", //状态信息 success:调用成功 fail:调用失败
|
|
|
- // "data":{
|
|
|
- // "infoList":[{
|
|
|
- // "fireZone":"C1-C1-C1-C1-9", //防火分区
|
|
|
- // "isFm": "1", //是否属于工程物业管理范围,0:否,1:是
|
|
|
- // "hostNum":"2", //主机编号
|
|
|
- // //烟感数量
|
|
|
- // "warmCount":"999999", //温感数量
|
|
|
- // "handNewCount":"13", //手报数量
|
|
|
- //
|
|
|
- // "moduleCount":"999999" //模块数量
|
|
|
- // },{
|
|
|
- // "fireZone":"C1-10", //防火分区
|
|
|
- // "isFm": "0", //是否属于工程物业管理范围,0:否,1:是
|
|
|
- // "manageScope":"合作方管理范围" //管理范围
|
|
|
- // } ],
|
|
|
- // "totalCount":{ //总数量,当传入的参数getTotal的值为1时有该数据
|
|
|
- // "smokeTotalCount":"20", //烟感总数量
|
|
|
- // "warmTotalCount":"12", //温感总数量
|
|
|
- // "handNewTotalCount":"13", //手报总数量
|
|
|
- // "fireHydrantTotalCount":"15", //消火栓总数量
|
|
|
- // "moduleTotalCount":"33" //模块总数量
|
|
|
- // }
|
|
|
- // }
|
|
|
- // };
|
|
|
+ this.tableData= [];
|
|
|
if(res.data.result=='success'){
|
|
|
- this.tableData = res.data.infoList;
|
|
|
+ if(res.data.data&&res.data.data.infoList.length){
|
|
|
+ this.tableData = res.data.data.infoList;
|
|
|
+ }else{
|
|
|
+ let obj = {
|
|
|
+ key :''+new Date().getTime(),
|
|
|
+ fireZone:"", //防火分区
|
|
|
+ isFm: "1", //是否属于工程物业管理范围,0:否,1:是
|
|
|
+ hostNum:"", //主机编号
|
|
|
+ loopNum:"", //回路编号
|
|
|
+ smokeCount:"", //烟感数量
|
|
|
+ warmCount:"", //温感数量
|
|
|
+ handNewCount:"", //手报数量
|
|
|
+ fireHydrantCount:"", //消火栓数量
|
|
|
+ moduleCount:"", //模块数量
|
|
|
+ manageScope:'',
|
|
|
+ errorMsg1:true,
|
|
|
+ errorMsg2:true,
|
|
|
+ errorMsg3:true,
|
|
|
+ errorMsg4:true,
|
|
|
+ errorMsg5:true,
|
|
|
+ };
|
|
|
+ this.tableData.push(obj)
|
|
|
+ }
|
|
|
+ this.totalCount = res.data.data && res.data.data.totalCount ? res.data.data.totalCount :{};
|
|
|
+
|
|
|
}else{
|
|
|
this.$message({
|
|
|
message: res.message,
|
|
@@ -571,65 +579,75 @@ export default {
|
|
|
getTotal:'1'
|
|
|
}
|
|
|
addDataPreviewWeakCurrent({postParams}).then(res=>{
|
|
|
- // let res = {
|
|
|
- // "result": "success", //状态信息 success:调用成功 fail:调用失败
|
|
|
- // "data":{
|
|
|
- // "infoList":[{
|
|
|
- // "fireZone":"C区", //分区
|
|
|
- // "monitorCount":"2", //监控系统数量
|
|
|
- // "baCount":"3", //BA系统数量
|
|
|
- // "ddcCount":"4", //DDC数量
|
|
|
- // "accessCount":"20" //门禁系统数量
|
|
|
- // },{
|
|
|
- // "fireZone":"C区", //分区
|
|
|
- // "monitorCount":"2", //监控系统数量
|
|
|
- // "baCount":"5", //BA系统数量
|
|
|
- // "ddcCount":"4", //DDC数量
|
|
|
- // "accessCount":"20" //门禁系统数量
|
|
|
- // } ],
|
|
|
- // "totalCount":{ //总数量,当传入的参数getTotal的值为1时有该数据
|
|
|
- // "monitorTotalCount":"2", //监控系统总数量
|
|
|
- // "baTotalCount":"3", //BA系统总数量
|
|
|
- // "ddcTotalCount":"4", //DDC总数量
|
|
|
- // "accessTotalCount":"20" //门禁系统总数量
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
this.tableData =[];
|
|
|
if(res.data.result=='success'){
|
|
|
+ if(res.data.data && res.data.data.infoList.length){
|
|
|
+ res.data.data.infoList.length && res.data.data.infoList.map(item=>{
|
|
|
+ let arr = [
|
|
|
+ {
|
|
|
+ fireZone: '',
|
|
|
+ system: '监控系统',
|
|
|
+ monitorCount: '',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ fireZone: '',
|
|
|
+ system: 'BA系统',
|
|
|
+ baCount: '',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ fireZone: '',
|
|
|
+ system: 'DDC',
|
|
|
+ ddcCount: '',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ fireZone: '',
|
|
|
+ system: '门禁系统',
|
|
|
+ accessCount: '',
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ arr[0].fireZone = item.fireZone;
|
|
|
+ arr[0].monitorCount = item.monitorCount;
|
|
|
+ arr[1].baCount = item.baCount;
|
|
|
+ arr[2].ddcCount = item.ddcCount;
|
|
|
+ arr[3].accessCount = item.accessCount;
|
|
|
+ this.tableData.push(...arr);
|
|
|
+ })
|
|
|
+ }else{
|
|
|
+ let arr = [
|
|
|
+ {
|
|
|
+ key :''+new Date().getTime()+1,
|
|
|
+ fireZone: '',
|
|
|
+ system: '监控系统',
|
|
|
+ monitorCount: '',
|
|
|
+ errorMsg:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key :''+new Date().getTime()+2,
|
|
|
+ fireZone: '',
|
|
|
+ system: 'BA系统',
|
|
|
+ baCount: '',
|
|
|
+ errorMsg:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key :''+new Date().getTime()+3,
|
|
|
+ fireZone: '',
|
|
|
+ system: 'DDC',
|
|
|
+ ddcCount: '',
|
|
|
+ errorMsg:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ key :''+new Date().getTime()+4,
|
|
|
+ fireZone: '',
|
|
|
+ system: '门禁系统',
|
|
|
+ accessCount: '',
|
|
|
+ errorMsg:true
|
|
|
+ },
|
|
|
+ ];
|
|
|
+ this.tableData.push(...arr);
|
|
|
+ }
|
|
|
+
|
|
|
+ this.totalCount = res.data.data && res.data.data.totalCount ? res.data.data.totalCount :{};
|
|
|
|
|
|
- res.data.infoList.length && res.data.infoList.map(item=>{
|
|
|
- let arr = [
|
|
|
- {
|
|
|
- fireZone: '',
|
|
|
- system: '监控系统',
|
|
|
- monitorCount: '',
|
|
|
- },
|
|
|
- {
|
|
|
- fireZone: '',
|
|
|
- system: 'BA系统',
|
|
|
- baCount: '',
|
|
|
- },
|
|
|
- {
|
|
|
- fireZone: '',
|
|
|
- system: 'DDC',
|
|
|
- ddcCount: '',
|
|
|
- },
|
|
|
- {
|
|
|
- fireZone: '',
|
|
|
- system: '门禁系统',
|
|
|
- accessCount: '',
|
|
|
- },
|
|
|
- ];
|
|
|
- arr[0].fireZone = item.fireZone;
|
|
|
- arr[0].monitorCount = item.monitorCount;
|
|
|
- arr[1].baCount = item.baCount;
|
|
|
- arr[2].ddcCount = item.ddcCount;
|
|
|
- arr[3].accessCount = item.accessCount;
|
|
|
- this.tableData.push(...arr);
|
|
|
- })
|
|
|
- console.log(this.tableData);
|
|
|
- this.totalCount = res.data.totalCount
|
|
|
|
|
|
}else{
|
|
|
this.$message({
|
|
@@ -661,7 +679,6 @@ export default {
|
|
|
*/
|
|
|
// this.$refs.floorMap.init(this.floorInfo.gname)
|
|
|
if (this.$route.query.smsxt) {
|
|
|
- console.log(this.$route.query.smsxt);
|
|
|
this.smsxt = this.$route.query.smsxt;
|
|
|
this.smsxtQuery();
|
|
|
this.system.forEach((el) => {
|