|
@@ -1,5 +1,5 @@
|
|
<template>
|
|
<template>
|
|
- <div class="tab-content">
|
|
|
|
|
|
+ <div class="tab-content" >
|
|
<div class="search">
|
|
<div class="search">
|
|
<el-cascader
|
|
<el-cascader
|
|
:options="deviceOptions"
|
|
:options="deviceOptions"
|
|
@@ -9,7 +9,7 @@
|
|
@change="handleChangeDevice"
|
|
@change="handleChangeDevice"
|
|
class="item"
|
|
class="item"
|
|
></el-cascader>
|
|
></el-cascader>
|
|
- <admSearch @SearchValue="searchValue" class="item" />
|
|
|
|
|
|
+ <admSearch @SearchValue="searchValue" class="item"/>
|
|
<el-upload
|
|
<el-upload
|
|
style="float: right"
|
|
style="float: right"
|
|
action="https://jsonplaceholder.typicode.com/posts/"
|
|
action="https://jsonplaceholder.typicode.com/posts/"
|
|
@@ -38,7 +38,7 @@
|
|
/>
|
|
/>
|
|
</template>
|
|
</template>
|
|
<div v-else class="void align">
|
|
<div v-else class="void align">
|
|
- <svg-icon name="void" :width="String(120)" :height="String(123)" />
|
|
|
|
|
|
+ <svg-icon name="void" :width="String(120)" :height="String(123)"/>
|
|
<p class="void-title">暂无内容</p>
|
|
<p class="void-title">暂无内容</p>
|
|
<p class="void-tips">可点击左上角筛选</p>
|
|
<p class="void-tips">可点击左上角筛选</p>
|
|
</div>
|
|
</div>
|
|
@@ -46,7 +46,7 @@
|
|
<!--编辑 设备-->
|
|
<!--编辑 设备-->
|
|
<el-dialog title="编辑设备" :visible.sync="dialogVisible">
|
|
<el-dialog title="编辑设备" :visible.sync="dialogVisible">
|
|
<template>
|
|
<template>
|
|
- <baseDataForm :objectHeaders="headersStage" :currRowContent="currRowContent" ref="baseDataForm" />
|
|
|
|
|
|
+ <baseDataForm :objectHeaders="headersStage" :currRowContent="currRowContent" ref="baseDataForm"/>
|
|
<span slot="footer" class="dialog-footer">
|
|
<span slot="footer" class="dialog-footer">
|
|
<el-button @click="dialogVisible = false">取消</el-button>
|
|
<el-button @click="dialogVisible = false">取消</el-button>
|
|
<el-button type="primary" @click="handleDataForm">完成</el-button>
|
|
<el-button type="primary" @click="handleDataForm">完成</el-button>
|
|
@@ -75,6 +75,7 @@ import tools from "@/utils/maintain";
|
|
export default class EquipTab extends Vue {
|
|
export default class EquipTab extends Vue {
|
|
// 信息点输入组组件
|
|
// 信息点输入组组件
|
|
@Ref("baseDataForm") readonly baseDataForm!: baseDataForm;
|
|
@Ref("baseDataForm") readonly baseDataForm!: baseDataForm;
|
|
|
|
+
|
|
// 项目id
|
|
// 项目id
|
|
private get projectId(): string {
|
|
private get projectId(): string {
|
|
return UserModule.projectId;
|
|
return UserModule.projectId;
|
|
@@ -147,14 +148,14 @@ export default class EquipTab extends Vue {
|
|
category: this.deviceType,
|
|
category: this.deviceType,
|
|
};
|
|
};
|
|
let param2 = {
|
|
let param2 = {
|
|
- filters: `classCode='${this.deviceType}'`,
|
|
|
|
|
|
+ filters: `classCode='${ this.deviceType }'`,
|
|
pageNumber: this.paginationList.page,
|
|
pageNumber: this.paginationList.page,
|
|
pageSize: this.paginationList.size,
|
|
pageSize: this.paginationList.size,
|
|
orders: "createTime desc, id asc",
|
|
orders: "createTime desc, id asc",
|
|
projectId: this.projectId,
|
|
projectId: this.projectId,
|
|
};
|
|
};
|
|
if (this.keyWord != "") {
|
|
if (this.keyWord != "") {
|
|
- param2.filters += `;codeName contain '${this.keyWord}' or systemCategory contain '${this.keyWord}' or bimTypeId contain '${this.keyWord}' or localId contain '${this.keyWord}'`;
|
|
|
|
|
|
+ param2.filters += `;codeName contain '${ this.keyWord }' or systemCategory contain '${ this.keyWord }' or bimTypeId contain '${ this.keyWord }' or localId contain '${ this.keyWord }'`;
|
|
}
|
|
}
|
|
let promise = new Promise((resolve) => {
|
|
let promise = new Promise((resolve) => {
|
|
dictInfo(param).then((res: any) => {
|
|
dictInfo(param).then((res: any) => {
|
|
@@ -188,14 +189,14 @@ export default class EquipTab extends Vue {
|
|
if (this.deviceType) {
|
|
if (this.deviceType) {
|
|
this.loading = true;
|
|
this.loading = true;
|
|
let params = {
|
|
let params = {
|
|
- filters: `classCode='${this.deviceType}'`,
|
|
|
|
|
|
+ filters: `classCode='${ this.deviceType }'`,
|
|
pageNumber: this.paginationList.page,
|
|
pageNumber: this.paginationList.page,
|
|
pageSize: this.paginationList.size,
|
|
pageSize: this.paginationList.size,
|
|
orders: "createTime desc, id asc",
|
|
orders: "createTime desc, id asc",
|
|
projectId: this.projectId,
|
|
projectId: this.projectId,
|
|
};
|
|
};
|
|
if (this.keyWord != "") {
|
|
if (this.keyWord != "") {
|
|
- params.filters += `;codeName contain '${this.keyWord}' or systemCategory contain '${this.keyWord}' or bimTypeId contain '${this.keyWord}' or localId contain '${this.keyWord}'`;
|
|
|
|
|
|
+ params.filters += `;codeName contain '${ this.keyWord }' or systemCategory contain '${ this.keyWord }' or bimTypeId contain '${ this.keyWord }' or localId contain '${ this.keyWord }'`;
|
|
}
|
|
}
|
|
const res = await queryEquip(params);
|
|
const res = await queryEquip(params);
|
|
if (res.result === "success") {
|
|
if (res.result === "success") {
|
|
@@ -340,11 +341,13 @@ export default class EquipTab extends Vue {
|
|
|
|
|
|
.search {
|
|
.search {
|
|
padding: 12px;
|
|
padding: 12px;
|
|
|
|
+
|
|
& > .item {
|
|
& > .item {
|
|
margin-right: 12px;
|
|
margin-right: 12px;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
// 数据暂未
|
|
// 数据暂未
|
|
.align {
|
|
.align {
|
|
height: 100%;
|
|
height: 100%;
|