|
@@ -5,24 +5,26 @@
|
|
|
<div class="action-box">
|
|
|
<div>
|
|
|
<el-button @click="addBuild" icon="el-icon-plus" size="small" type="default"/>
|
|
|
-
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="160"
|
|
|
- v-model="visible">
|
|
|
- <p>确定删除吗?</p>
|
|
|
- <div style="text-align: right; margin: 0">
|
|
|
- <el-button size="mini" type="text" @click="visible = false">取消</el-button>
|
|
|
- <el-button type="primary" size="mini" @click="delBuild">确定</el-button>
|
|
|
- </div>
|
|
|
- <el-button slot="reference" icon="el-icon-minus" size="small" type="default"/>
|
|
|
- </el-popover>
|
|
|
+ <!-- <el-popover-->
|
|
|
+ <!-- placement="top"-->
|
|
|
+ <!-- width="160"-->
|
|
|
+ <!-- v-model="visible">-->
|
|
|
+ <!-- <p>确定删除吗?</p>-->
|
|
|
+ <!-- <div style="text-align: right; margin: 0">-->
|
|
|
+ <!-- <el-button size="mini" type="text" @click="visible = false">取消</el-button>-->
|
|
|
+ <!-- <el-button type="primary" size="mini" @click="delBuild">确定</el-button>-->
|
|
|
+ <!-- </div>-->
|
|
|
+ <!-- <el-button slot="reference" icon="el-icon-minus" size="small" type="default"/>-->
|
|
|
+ <!-- </el-popover>-->
|
|
|
+ <el-button @click="delBuild" icon="el-icon-minus" size="small" type="default"/>
|
|
|
<el-button @click="editBuild" icon="el-icon-edit-outline" size="small" type="default"/>
|
|
|
</div>
|
|
|
</div>
|
|
|
<h4>建筑</h4>
|
|
|
<div class="build-list">
|
|
|
- <div :class="{'floor-item':true,active:item.active}" :key="item.BuildID" @click="changeBuild(index)"
|
|
|
+ <div :class="{'floor-item':true,active:item.active}"
|
|
|
+ :key="item.BuildID"
|
|
|
+ @click="changeBuild(index)"
|
|
|
v-for="(item,index) in buildList">
|
|
|
<span>
|
|
|
{{item.BuildLocalName || item.BuildName}}
|
|
@@ -163,7 +165,6 @@
|
|
|
alreadyRelatedModel: [],
|
|
|
// currentType: 'add'
|
|
|
buildMessage: {},
|
|
|
- visible: false,
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
@@ -220,33 +221,35 @@
|
|
|
type: 'Building'
|
|
|
};
|
|
|
getDataDictionary(params, res => {
|
|
|
- // let list = res.Content.map(item => {
|
|
|
- // if (item.InputMode === 'D1' && item.DataSource != undefined) {
|
|
|
- // item.options = JSON.parse(item.DataSource)
|
|
|
- // }
|
|
|
- // return item
|
|
|
- // })
|
|
|
let first = {}
|
|
|
//一级循环出来一级标签
|
|
|
- res.Content.map(item => {
|
|
|
- if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2'|| item.InputMode === 'D1L') && item.DataSource != undefined) {
|
|
|
+ let list = res.Content.filter(i => (i.FirstName !== '工作历') && (i.FirstName !== '能耗信息') && (i.FirstName !== '人员信息'))
|
|
|
+ list.map(item => {
|
|
|
+ console.log(item.FirstName)
|
|
|
+ if ((item.InputMode === 'D1' || item.InputMode === 'D2' || item.InputMode === 'E2' || item.InputMode === 'D1L') && item.DataSource != undefined) {
|
|
|
item.options = JSON.parse(item.DataSource)
|
|
|
}
|
|
|
if (first[item.FirstName] && first[item.FirstName].length) {
|
|
|
} else {
|
|
|
first[item.FirstName] = []
|
|
|
}
|
|
|
- first[item.FirstName].push({
|
|
|
- InfoPointName: item.InfoPointName,
|
|
|
- InfoPointCode: item.InfoPointCode,
|
|
|
- Visible: item.Visible,
|
|
|
- UnDisabled: item.UnDisabled,
|
|
|
- SecondName: item.SecondName ? item.SecondName : "",
|
|
|
- Path: item.Path,
|
|
|
- InputMode: item.InputMode,
|
|
|
- options: item.options,
|
|
|
- Unit: item.Unit
|
|
|
- })
|
|
|
+ if (
|
|
|
+ item.Path !== 'BuildingInfo.AreaInfo.AreaTree' &&
|
|
|
+ item.Path !== 'DefaultQRCode' &&
|
|
|
+ item.Path !== 'BuildQRCode'
|
|
|
+ ) {
|
|
|
+ first[item.FirstName].push({
|
|
|
+ InfoPointName: item.InfoPointName,
|
|
|
+ InfoPointCode: item.InfoPointCode,
|
|
|
+ Visible: item.Visible,
|
|
|
+ UnDisabled: item.UnDisabled,
|
|
|
+ SecondName: item.SecondName ? item.SecondName : "",
|
|
|
+ InputMode: item.InputMode,
|
|
|
+ options: item.options,
|
|
|
+ Unit: item.Unit,
|
|
|
+ Path: item.Path
|
|
|
+ })
|
|
|
+ }
|
|
|
})
|
|
|
this.buildMessage = first
|
|
|
|
|
@@ -254,18 +257,8 @@
|
|
|
},
|
|
|
//delete build ,根据id删除建筑信息
|
|
|
delBuild() {
|
|
|
- // this.$message.warning("开发中...");
|
|
|
- // return;
|
|
|
-
|
|
|
- let param = [{BuildId: this.curBuildId}];
|
|
|
- objectDeleteBuild(param, res => {
|
|
|
- setTimeout(() => {
|
|
|
- this.handleBuildQuery()
|
|
|
- this.init()
|
|
|
- })
|
|
|
- this.visible = false
|
|
|
- this.$message.success("删除成功");
|
|
|
- })
|
|
|
+ this.delText = '建筑'
|
|
|
+ this.delDialogVis = true;
|
|
|
},
|
|
|
//edit build
|
|
|
editBuild() {
|
|
@@ -276,11 +269,7 @@
|
|
|
for (let i = 0; i < list.length; i++) {
|
|
|
obj = list[i]
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
this.$refs.addBuildDialog.showDialog(obj);
|
|
|
-
|
|
|
},
|
|
|
handleFile(val,name) {
|
|
|
},
|
|
@@ -351,6 +340,22 @@
|
|
|
});
|
|
|
} else {
|
|
|
//todo
|
|
|
+ // 删除建筑
|
|
|
+ if (this.tableData && this.tableData.length) {
|
|
|
+ this.$message.error("当前建筑中包含楼层,不可删除");
|
|
|
+ this.delDialogVis = false;
|
|
|
+ } else {
|
|
|
+ let param = [{BuildId: this.curBuildId}];
|
|
|
+ objectDeleteBuild(param, res => {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.handleBuildQuery()
|
|
|
+ this.init()
|
|
|
+ })
|
|
|
+ this.$message.success("删除成功");
|
|
|
+ this.delDialogVis = false;
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
// 修改楼层信息
|