|
@@ -23,8 +23,8 @@
|
|
|
></Cascader>
|
|
|
<Cascader
|
|
|
caption="建筑楼层"
|
|
|
+ allText="全部"
|
|
|
multiple
|
|
|
- :all="false"
|
|
|
:data="buildFloorList"
|
|
|
@confirm="changeFloor"
|
|
|
showPanel
|
|
@@ -47,28 +47,32 @@
|
|
|
v-if="tableHeight > 0"
|
|
|
size="small"
|
|
|
ref="multipleTable"
|
|
|
- :data="tableData"
|
|
|
+ :data="equiptable"
|
|
|
tooltip-effect="dark"
|
|
|
style="width: 100%"
|
|
|
:height="tableHeight"
|
|
|
@selection-change="handleSelectionChange"
|
|
|
>
|
|
|
- <el-table-column type="selection" width="55"> </el-table-column>
|
|
|
+ <el-table-column type="localName" width="55">
|
|
|
+ <template slot-scope="scope">{{ scope.row }}</template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column label="本地名称" width="300">
|
|
|
- <template slot-scope="scope">{{ scope.row.date }}</template>
|
|
|
+ <template slot-scope="scope">{{
|
|
|
+ scope.row.date ? scope.row.date : ""
|
|
|
+ }}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="name" label="本地编码" width="300">
|
|
|
+ <el-table-column prop="localId" label="本地编码" width="300">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="address"
|
|
|
+ prop="bimLocation"
|
|
|
label="位置"
|
|
|
show-overflow-tooltip
|
|
|
width="300"
|
|
|
>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- prop="address"
|
|
|
- label="所属业务空间"
|
|
|
+ prop="codeName"
|
|
|
+ label="类型"
|
|
|
show-overflow-tooltip
|
|
|
width="300"
|
|
|
>
|
|
@@ -77,7 +81,7 @@
|
|
|
<Pagination
|
|
|
class="page-box"
|
|
|
:pageCountShow="true"
|
|
|
- :pageCount="1500"
|
|
|
+ :pageCount="tableTotal"
|
|
|
:pageSizeSetting="true"
|
|
|
@change="currentChangeHandle"
|
|
|
/>
|
|
@@ -144,7 +148,7 @@ export default {
|
|
|
...mapState(["editCmd", "projectId"]),
|
|
|
filtIdListString() {
|
|
|
const filtIdListString = this.filtIdList.length
|
|
|
- ? "not id in " + JSON.stringify(this.filtIdList) + ";"
|
|
|
+ ? ";not id in " + JSON.stringify(this.filtIdList)
|
|
|
: "";
|
|
|
return filtIdListString;
|
|
|
},
|
|
@@ -153,216 +157,11 @@ export default {
|
|
|
return {
|
|
|
inputVal2: "",
|
|
|
isShowModel: true,
|
|
|
- cascaderData6: [
|
|
|
- {
|
|
|
- title: "United Kingdom",
|
|
|
- id: "id1",
|
|
|
- children: [
|
|
|
- { id: "id2", title: "London" },
|
|
|
- { id: "id3", title: "Edinburgh" },
|
|
|
- { id: "id4", title: "Cardiff" },
|
|
|
- { id: "id5", title: "Birmingham" },
|
|
|
- { id: "id6", title: "Liverpool" },
|
|
|
- { id: "id7", title: "Oxford" },
|
|
|
- { id: "id8", title: "Plymouth" },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "AMERICAN",
|
|
|
- id: "id9",
|
|
|
- children: [
|
|
|
- { id: "id10", title: "Chicago" },
|
|
|
- { id: "id11", title: "Philadelphia" },
|
|
|
- { id: "id12", title: "Boston" },
|
|
|
- { id: "id13", title: "Houston" },
|
|
|
- { id: "id14", title: "Atlanta" },
|
|
|
- { id: "id15", title: "San Francisco" },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "CHINA",
|
|
|
- id: "id16",
|
|
|
- children: [
|
|
|
- { id: "id17", title: "BeiJing" },
|
|
|
- { id: "id18", title: "ShangHAI" },
|
|
|
- {
|
|
|
- title: "GuiYang",
|
|
|
- id: "id19",
|
|
|
- children: [
|
|
|
- { id: "id20", title: "Qingyan" },
|
|
|
- { id: "id21", title: "Guian" },
|
|
|
- ],
|
|
|
- },
|
|
|
- { id: "id22", title: "ZunYi" },
|
|
|
- ],
|
|
|
- },
|
|
|
- {
|
|
|
- title: "韩国",
|
|
|
- id: "id23",
|
|
|
- children: [
|
|
|
- { id: "id24", title: "首尔" },
|
|
|
- { id: "id25", title: "仁川" },
|
|
|
- { id: "id26", title: "釜山" },
|
|
|
- {
|
|
|
- id: "id27",
|
|
|
- title: "蔚山",
|
|
|
- children: [
|
|
|
- { id: "id10", title: "Chicago" },
|
|
|
- { id: "id11", title: "Philadelphia" },
|
|
|
- { id: "id12", title: "Boston" },
|
|
|
- { id: "id13", title: "Houston" },
|
|
|
- { id: "id14", title: "Atlanta" },
|
|
|
- { id: "id15", title: "San Francisco" },
|
|
|
- ],
|
|
|
- },
|
|
|
- ],
|
|
|
- },
|
|
|
- ],
|
|
|
equipTypeString: "", //设备类型选中条件
|
|
|
- buildIdString: "",
|
|
|
- floorIdString: "",
|
|
|
- tableData: [
|
|
|
- {
|
|
|
- date: "2016-05-03",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-02",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-04",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-01",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-08",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-06",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-07",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-03",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-02",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-04",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-01",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-08",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-06",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-07",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-03",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-02",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-04",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-01",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-08",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-06",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-07",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-03",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-02",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-04",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-01",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-08",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-06",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- {
|
|
|
- date: "2016-05-07",
|
|
|
- name: "王小虎",
|
|
|
- address: "上海市普陀区金沙江路 1518 弄",
|
|
|
- },
|
|
|
- ],
|
|
|
+ buildIdString: "", //建筑id 类型string
|
|
|
+ floorIdString: "", // 楼层id 类型string
|
|
|
+ tableTotal: 0, //搜索获取得设备总数
|
|
|
+ equiptable: [], //table数据
|
|
|
equipData: EquipmentList,
|
|
|
buildFloorList: [], // 建筑查询数据
|
|
|
categoryList: [], //设备类型
|
|
@@ -380,38 +179,83 @@ export default {
|
|
|
classCode.push(val.id);
|
|
|
}
|
|
|
});
|
|
|
- const floorId = "floorId='' or floorId=''";
|
|
|
- const classCodeString = classCode.length
|
|
|
- ? "classCode in " + JSON.stringify(classCode) + ";"
|
|
|
+ //设备类型转换
|
|
|
+ this.equipTypeString = classCode.length
|
|
|
+ ? ";classCode in " + JSON.stringify(classCode)
|
|
|
: "";
|
|
|
- this.equipTypeString = classCodeString;
|
|
|
+
|
|
|
let data = {
|
|
|
+ Cascade: [
|
|
|
+ {
|
|
|
+ Name: "building",
|
|
|
+ Projection: ["id", "name", "localName"],
|
|
|
+ },
|
|
|
+ {
|
|
|
+ Name: "floor",
|
|
|
+ Projection: ["id", "name", "localName"],
|
|
|
+ },
|
|
|
+ ],
|
|
|
Orders: "name asc, createTime desc",
|
|
|
PageNumber: 1,
|
|
|
- PageSize: 50,
|
|
|
- Filters: `projectId='${this.projectId}';${filtIdListString}${classCodeString}${buildIdString}${floorIdString}`,
|
|
|
+ PageSize: 20,
|
|
|
+ Filters: `projectId='${this.projectId}'${this.filtIdListString}${this.buildIdString}${this.floorIdString}${this.equipTypeString}`,
|
|
|
};
|
|
|
queryEquip(data).then((res) => {
|
|
|
-
|
|
|
+ this.tableTotal = res.total;
|
|
|
});
|
|
|
},
|
|
|
changeFloor(list) {
|
|
|
- const classCode = []; // 设备类型
|
|
|
+ let buildIdList = []; // 设备类型
|
|
|
+ let floorIdList = [];
|
|
|
+ let isfloornull = "";
|
|
|
+ let isbuildnull = "";
|
|
|
list.forEach((val) => {
|
|
|
- if (val.index == 3) {
|
|
|
- classCode.push(val.id);
|
|
|
+ if (val.index == 1) {
|
|
|
+ if (val.id == "bisnull") {
|
|
|
+ isbuildnull = "buildingId isNull";
|
|
|
+ } else {
|
|
|
+ buildIdList.push(val.id);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (val.index == 2) {
|
|
|
+ if (val.id == "fisnull") {
|
|
|
+ isfloornull = "floorId isNull";
|
|
|
+ } else {
|
|
|
+ floorIdList.push(val.id);
|
|
|
+ }
|
|
|
}
|
|
|
});
|
|
|
- this.equipTypeList = classCode;
|
|
|
- const buildId = "buildId='' or buildId=''";
|
|
|
- const floorId = "floorId='' or floorId=''";
|
|
|
+
|
|
|
+ this.buildIdString = buildIdList.length
|
|
|
+ ? ";buildingId in " + JSON.stringify(buildIdList) + " " + isbuildnull
|
|
|
+ : isbuildnull
|
|
|
+ ? ";" + isbuildnull
|
|
|
+ : "";
|
|
|
+ this.floorIdString = floorIdList.length
|
|
|
+ ? ";floorId in " + JSON.stringify(floorIdList) + " or " + isfloornull
|
|
|
+ : isfloornull
|
|
|
+ ? ";" + isfloornull
|
|
|
+ : "";
|
|
|
let data = {
|
|
|
+ Cascade: [
|
|
|
+ {
|
|
|
+ Name: "building",
|
|
|
+ Projection: ["id", "name", "localName"],
|
|
|
+ },
|
|
|
+ {
|
|
|
+ Name: "floor",
|
|
|
+ Projection: ["id", "name", "localName"],
|
|
|
+ },
|
|
|
+ ],
|
|
|
Orders: "name asc, createTime desc",
|
|
|
PageNumber: 1,
|
|
|
- PageSize: 50,
|
|
|
- Filters: `projectId='';not id in${this.filtIdList};classCode in${classCode};${buildId};${floorId}`,
|
|
|
+ PageSize: 20,
|
|
|
+ Filters: `projectId='${this.projectId}'${this.filtIdListString}${this.buildIdString}${this.floorIdString}${this.equipTypeString}`,
|
|
|
};
|
|
|
- queryEquip(data).then((res) => {});
|
|
|
+ queryEquip(data).then((res) => {
|
|
|
+ this.tableTotal = res.total;
|
|
|
+ this.equiptable = res.content;
|
|
|
+ });
|
|
|
},
|
|
|
// 切换分页
|
|
|
currentChangeHandle() {},
|