|
@@ -280,8 +280,6 @@
|
|
|
import zhCN from 'handsontable-pro/languages/zh-CN';
|
|
|
//接口
|
|
|
import {
|
|
|
- getBuildSelect, //根据项目ID获得建筑列表
|
|
|
- getFloor, //根据建筑id获取楼层id
|
|
|
getPT, //根据时间、建筑名称、楼层查询点位标签
|
|
|
getPoint, //获取点位标签详情
|
|
|
updatePoint, //修改点位标签
|
|
@@ -290,18 +288,19 @@
|
|
|
getTableMain, //获取表格主体内容
|
|
|
upDateTableMain, //提交修改设备资产
|
|
|
delErrAssets, //删除设备资产
|
|
|
- getAllFamily, //获取所有设备族
|
|
|
- defaultFloor, //获取默认楼层
|
|
|
getdelMain, //获取过滤掉后的表格主体
|
|
|
getBasicMatch, //获取完全匹配的厂商库id
|
|
|
- buildingQuery,
|
|
|
- floorQuery
|
|
|
+ buildingQuery, //数据中心-建筑查询
|
|
|
+ floorQuery, //数据中心-楼层查询
|
|
|
+ queryLocationPoint, //数据中心-点位标签查询
|
|
|
+ updateLocationPoint, //数据中心-更新点位标签
|
|
|
+ getEquipBelongs, //获取设备族
|
|
|
} from "@/api/scan/request";
|
|
|
import { mapGetters, mapActions } from "vuex"
|
|
|
export default {
|
|
|
components: {
|
|
|
- "build-time": buildTime,
|
|
|
- "drag": drag,
|
|
|
+ buildTime,
|
|
|
+ drag,
|
|
|
recommend
|
|
|
},
|
|
|
data() {
|
|
@@ -324,8 +323,6 @@
|
|
|
picShow: false, //最底层图片窗
|
|
|
pointList: "", //点位标签详情数组
|
|
|
pointId: "", //点位标签详情查询需求的id
|
|
|
- // ProjId: this.$route.query.projId, //项目id
|
|
|
- // UserId: this.$route.query.userId, //用户id
|
|
|
checkPointClass: "all", //点击点位标签的当前标签
|
|
|
pointCheck: "", //当前点击到的点位标签
|
|
|
checked: 0, //审核标志
|
|
@@ -388,13 +385,17 @@
|
|
|
methods: {
|
|
|
//获取所有设备族
|
|
|
getAllFamily() {
|
|
|
- getAllFamily().then(result => {
|
|
|
- if (result.data.Result == "success") {
|
|
|
- this.AllFamily = this.changeArr(result.data.Content);
|
|
|
- } else {
|
|
|
- this.$message.error("请求出错")
|
|
|
- }
|
|
|
- });
|
|
|
+ let pa = {
|
|
|
+ data:{ Orders:'Family asc', PageSize: 500 }
|
|
|
+ }
|
|
|
+ getEquipBelongs(pa, res => {
|
|
|
+ this.AllFamily = res.Content.map(t => {
|
|
|
+ return {
|
|
|
+ Code: t.Family,
|
|
|
+ Name: t.FamilyName
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
},
|
|
|
//重新获取数据loadhot
|
|
|
loadData() {
|
|
@@ -579,6 +580,14 @@
|
|
|
this.$message.error("请求出错")
|
|
|
}
|
|
|
});
|
|
|
+ // let pa = {
|
|
|
+ // Filters: `Id='${this.pointId}'`
|
|
|
+ // }
|
|
|
+ // queryLocationPoint(pa, res => {
|
|
|
+ // this.pointList = res.Content[0];
|
|
|
+ // this.imgList = this.delImage(res.Content[0].ImageList);
|
|
|
+ // this.dialogTableVisible = true;
|
|
|
+ // })
|
|
|
},
|
|
|
delImage(imageList) {
|
|
|
let list = {
|
|
@@ -675,6 +684,18 @@
|
|
|
this.$message.error("请求出错")
|
|
|
}
|
|
|
});
|
|
|
+ // let pa = {
|
|
|
+ // Filters: `LastUpdate>='${this.checkTimeArr[0]}';LastUpdate<='${this.checkTimeArr[1]}';Build='${this.buildId}'`,
|
|
|
+ // PageSize: 100
|
|
|
+ // }
|
|
|
+ // if(this.floorId == 'noKnow'){
|
|
|
+ // pa.Filters += `;FloorId isNull`
|
|
|
+ // }else if(this.floorId!='all'){
|
|
|
+ // pa.Filters += `;FloorId='${this.floorId}'`
|
|
|
+ // }
|
|
|
+ // queryLocationPoint(pa, res => {
|
|
|
+ // this.PTArr = result.data.PointList;
|
|
|
+ // })
|
|
|
},
|
|
|
//获取楼层列表
|
|
|
getFloorData() {
|
|
@@ -1645,18 +1666,6 @@
|
|
|
console.log(data)
|
|
|
return data;
|
|
|
},
|
|
|
- changeArr(arr) {
|
|
|
- if (arr.length) {
|
|
|
- return arr.map(item => {
|
|
|
- return {
|
|
|
- Code: item.code,
|
|
|
- Name: item.name
|
|
|
- };
|
|
|
- });
|
|
|
- } else {
|
|
|
- return "";
|
|
|
- }
|
|
|
- },
|
|
|
//工具函数浅复制深拷贝,防止共用存储空间
|
|
|
deepCopy(obj) {
|
|
|
var out = [],
|