|
@@ -15,16 +15,19 @@
|
|
</el-row>
|
|
</el-row>
|
|
|
|
|
|
<div class="table-box">
|
|
<div class="table-box">
|
|
- <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle" ref="multipleTable"
|
|
|
|
- @selection-change="handleSelectionChange">
|
|
|
|
|
|
+ <el-table :data="tableData" style="width: 100%" height="350" v-loading="loading" :header-cell-style="headerStyle"
|
|
|
|
+ ref="multipleTable"
|
|
|
|
+ @selection-change="handleSelectionChange">
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
<el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
|
|
<el-table-column :label="`${inSpaceType}名称`" show-overflow-tooltip min-width="100">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
- <div>{{scope.row.EquipLocalName||scope.row.EquipName||''}}</div>
|
|
|
|
|
|
+ <div>{{ scope.row.EquipLocalName || scope.row.EquipName || '' }}</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
|
- <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></el-table-column>
|
|
|
|
|
|
+ <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip
|
|
|
|
+ min-width="100"></el-table-column>
|
|
|
|
+ <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip
|
|
|
|
+ min-width="100"></el-table-column>
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
<el-table-column prop="action" label="操作" min-width="100">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<el-button size="mini" @click="toDetail(scope.$index, scope.row)" plain>查看详情</el-button>
|
|
<el-button size="mini" @click="toDetail(scope.$index, scope.row)" plain>查看详情</el-button>
|
|
@@ -32,9 +35,11 @@
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<!-- 分页 -->
|
|
<!-- 分页 -->
|
|
- <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange" @current-change="handleCurrentChange"
|
|
|
|
- :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize" layout="total, sizes, prev, pager, next, jumper"
|
|
|
|
- :total="page.total"></el-pagination>
|
|
|
|
|
|
+ <el-pagination class="fr" v-show="tableData && tableData.length" @size-change="handleSizeChange"
|
|
|
|
+ @current-change="handleCurrentChange"
|
|
|
|
+ :current-page="page.pageNumber" :page-sizes="page.pageSizes" :page-size="page.pageSize"
|
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
|
+ :total="page.total"></el-pagination>
|
|
</div>
|
|
</div>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
|
|
<el-button size="small" @click="dialogVisible = false">取 消</el-button>
|
|
@@ -48,14 +53,13 @@ import { sysLinkEquip, unSysEq } from "@/api/scan/request";
|
|
import floorCascader from "@/components/ledger/lib/floorCascader";
|
|
import floorCascader from "@/components/ledger/lib/floorCascader";
|
|
import myCascader from "@/components/ledger/system/lib/equipType";
|
|
import myCascader from "@/components/ledger/system/lib/equipType";
|
|
import { mapGetters } from "vuex";
|
|
import { mapGetters } from "vuex";
|
|
|
|
+
|
|
export default {
|
|
export default {
|
|
components: {
|
|
components: {
|
|
floorCascader,
|
|
floorCascader,
|
|
myCascader
|
|
myCascader
|
|
},
|
|
},
|
|
- computed: {
|
|
|
|
- ...mapGetters("layout", ["projectId"])
|
|
|
|
- },
|
|
|
|
|
|
+
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
title: "添加系统内设备",
|
|
title: "添加系统内设备",
|
|
@@ -81,6 +85,7 @@ export default {
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
|
|
+ ...mapGetters("layout", ["projectId"]),
|
|
childParams() {
|
|
childParams() {
|
|
let temp = JSON.parse(JSON.stringify(this.params));
|
|
let temp = JSON.parse(JSON.stringify(this.params));
|
|
temp.SysType = null;
|
|
temp.SysType = null;
|
|
@@ -91,7 +96,8 @@ export default {
|
|
type: String, //选中的tab页
|
|
type: String, //选中的tab页
|
|
params: Object //查看的竖井关系信息
|
|
params: Object //查看的竖井关系信息
|
|
},
|
|
},
|
|
- created() { },
|
|
|
|
|
|
+ created() {
|
|
|
|
+ },
|
|
methods: {
|
|
methods: {
|
|
//修改建筑楼层
|
|
//修改建筑楼层
|
|
changeFloor(value) {
|
|
changeFloor(value) {
|
|
@@ -108,33 +114,34 @@ export default {
|
|
getTableData() {
|
|
getTableData() {
|
|
let params = {
|
|
let params = {
|
|
data: {
|
|
data: {
|
|
- Filters: `not EquipID isNull`,
|
|
|
|
- Cascade: [{ Name: "equipCategory" }],
|
|
|
|
- Orders: "createTime desc, EquipID desc",
|
|
|
|
- PageNumber: this.page.pageNumber,
|
|
|
|
- PageSize: this.page.pageSize
|
|
|
|
|
|
+ filters: `not id isNull`,
|
|
|
|
+ cascade: [{ name: "equipCategory" }],
|
|
|
|
+ orders: "createTime desc, id desc",
|
|
|
|
+ pageNumber: this.page.pageNumber,
|
|
|
|
+ pageSize: this.page.pageSize,
|
|
|
|
+ sysId: this.$route.query.SysID,
|
|
|
|
+ shaftId: this.params.ShaftID,
|
|
},
|
|
},
|
|
- shaftId: this.params.ShaftID,
|
|
|
|
- sysId: this.$route.query.SysID
|
|
|
|
};
|
|
};
|
|
if (this.Buildfloor[0] == "noKnow") {
|
|
if (this.Buildfloor[0] == "noKnow") {
|
|
- params.data.Filters += `;buildingId isNull`;
|
|
|
|
|
|
+ params.data.filters += `;buildingId isNull`;
|
|
} else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
|
|
} else if (this.Buildfloor[0] && this.Buildfloor[0] != "all") {
|
|
- params.data.Filters += `;buildingId='${this.Buildfloor[0]}'`;
|
|
|
|
|
|
+ params.data.filters += `;buildingId='${this.Buildfloor[0]}'`;
|
|
}
|
|
}
|
|
if (this.Buildfloor[1] == "noKnow") {
|
|
if (this.Buildfloor[1] == "noKnow") {
|
|
- params.data.Filters += `;floorId isNull`;
|
|
|
|
|
|
+ params.data.filters += `;floorId isNull`;
|
|
} else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
|
|
} else if (this.Buildfloor[1] && this.Buildfloor[1] != "all") {
|
|
- params.data.Filters += `;floorId='${this.Buildfloor[1]}'`;
|
|
|
|
|
|
+ params.data.filters += `;floorId='${this.Buildfloor[1]}'`;
|
|
}
|
|
}
|
|
if (this.keycode != "") {
|
|
if (this.keycode != "") {
|
|
- params.data.Filters += `;EquipName contain '${this.keycode}' or EquipLocalName contain '${this.keycode}' or EquipLocalID contain '${this.keycode}'`;
|
|
|
|
|
|
+ params.data.filters += `;name contain '${this.keycode}' or localName contain '${this.keycode}' or localId contain '${this.keycode}'`;
|
|
}
|
|
}
|
|
if (this.Equipcategory) {
|
|
if (this.Equipcategory) {
|
|
- params.data.Filters += `;category='${this.Equipcategory}'`;
|
|
|
|
|
|
+ params.data.filters += `;classCode='${this.Equipcategory}'`;
|
|
}
|
|
}
|
|
unSysEq(params, res => {
|
|
unSysEq(params, res => {
|
|
- res.Content.forEach(item => {
|
|
|
|
|
|
+ debugger
|
|
|
|
+ res.content.forEach(item => {
|
|
item.ShaftListName = "";
|
|
item.ShaftListName = "";
|
|
if (item.ShaftList && item.ShaftList.length) {
|
|
if (item.ShaftList && item.ShaftList.length) {
|
|
item.ShaftListName = item.ShaftList.map(shaft => {
|
|
item.ShaftListName = item.ShaftList.map(shaft => {
|
|
@@ -144,8 +151,8 @@ export default {
|
|
}).join("、");
|
|
}).join("、");
|
|
}
|
|
}
|
|
});
|
|
});
|
|
- this.tableData = res.Content;
|
|
|
|
- this.page.total = res.Total;
|
|
|
|
|
|
+ this.tableData = res.content;
|
|
|
|
+ this.page.total = res.total;
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//选中项修改
|
|
//选中项修改
|
|
@@ -196,14 +203,17 @@ export default {
|
|
.filters {
|
|
.filters {
|
|
margin-bottom: 10px;
|
|
margin-bottom: 10px;
|
|
}
|
|
}
|
|
|
|
+
|
|
.table-box {
|
|
.table-box {
|
|
height: 370px;
|
|
height: 370px;
|
|
|
|
+
|
|
.fr {
|
|
.fr {
|
|
margin-top: 10px;
|
|
margin-top: 10px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
/deep/ #buildFloor .buildFloor {
|
|
/deep/ #buildFloor .buildFloor {
|
|
margin: 0 5px 0 5px;
|
|
margin: 0 5px 0 5px;
|
|
}
|
|
}
|
|
-</style>
|
|
|
|
|
|
+</style>
|