|
@@ -32,7 +32,20 @@
|
|
<details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
|
|
<details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
|
|
<system-relevance @close="reset" :id="systemId" :dialog="myDialog"></system-relevance>
|
|
<system-relevance @close="reset" :id="systemId" :dialog="myDialog"></system-relevance>
|
|
<!-- 不支持的输入方式 -->
|
|
<!-- 不支持的输入方式 -->
|
|
- <editSysfloor ref="editFloor" @handleClickUpdate="handleClickUpdate"></editSysfloor>
|
|
|
|
|
|
+ <el-dialog title="临时维护信息点" :visible.sync="myDialog.update" @close="handleCloseUpdate" width="670px">
|
|
|
|
+ <el-row>
|
|
|
|
+ 该信息点未定义对应组件,现在维护数据不确定后续是否可用。如确实需要维护,请点击<el-link @click="updateInputShow = true" type="primary" :underline="false">继续维护</el-link>。
|
|
|
|
+ </el-row>
|
|
|
|
+ <el-row style="margin-top:20px;" v-show="updateInputShow">
|
|
|
|
+ <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8}" placeholder="请输入内容" v-model="updateInput"></el-input>
|
|
|
|
+ </el-row>
|
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
|
+ <el-button @click="myDialog.update = false">取 消</el-button>
|
|
|
|
+ <el-button type="primary" @click="handleClickUpdate">确 认</el-button>
|
|
|
|
+ </span>
|
|
|
|
+ </el-dialog>
|
|
|
|
+ <!-- 关联楼层 -->
|
|
|
|
+ <editSysfloor ref="editFloor" @relateSuccess="relateSuccess"></editSysfloor>
|
|
<!-- 新增系统 -->
|
|
<!-- 新增系统 -->
|
|
<el-dialog title="确定新增系统的类型" :visible.sync="myDialog.addDevice" width="30%">
|
|
<el-dialog title="确定新增系统的类型" :visible.sync="myDialog.addDevice" width="30%">
|
|
<el-row>
|
|
<el-row>
|
|
@@ -48,7 +61,7 @@
|
|
import {
|
|
import {
|
|
BeatchQueryParam,
|
|
BeatchQueryParam,
|
|
getDataDictionary,
|
|
getDataDictionary,
|
|
- queryLinkSys,
|
|
|
|
|
|
+ querySysLinkBuild,
|
|
updateGeneralSys,
|
|
updateGeneralSys,
|
|
deleteGeneralSys
|
|
deleteGeneralSys
|
|
} from "@/api/scan/request"
|
|
} from "@/api/scan/request"
|
|
@@ -189,17 +202,24 @@ export default {
|
|
this.loading = true
|
|
this.loading = true
|
|
if (!!this.mess.deviceId) {
|
|
if (!!this.mess.deviceId) {
|
|
let param = {
|
|
let param = {
|
|
- PageSize: this.page.size,
|
|
|
|
- Orders: "createTime desc, SysID desc",
|
|
|
|
- PageNumber: this.page.currentPage,
|
|
|
|
- Filters: `category='${this.mess.deviceId}'`
|
|
|
|
|
|
+ data: {
|
|
|
|
+ PageSize: this.page.size,
|
|
|
|
+ Orders: "createTime desc, SysID desc",
|
|
|
|
+ PageNumber: this.page.currentPage,
|
|
|
|
+ Filters: `category='${this.mess.deviceId}'`
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (this.mess.buildId == "noKnow") {
|
|
if (this.mess.buildId == "noKnow") {
|
|
- param.Filters += `;buildingId isNull`
|
|
|
|
|
|
+ param.buildingId = 1;
|
|
} else if (this.mess.buildId && this.mess.buildId != "all") {
|
|
} else if (this.mess.buildId && this.mess.buildId != "all") {
|
|
- param.Filters += `;buildingId='${this.mess.buildId}'`
|
|
|
|
|
|
+ param.buildingId = this.mess.buildId;
|
|
|
|
+ }
|
|
|
|
+ if (this.mess.floorId == "noKnow") {
|
|
|
|
+ param.floorId = 1;
|
|
|
|
+ } else if (this.mess.floorId && this.mess.floorId != "all") {
|
|
|
|
+ param.floorId = this.mess.floorId;
|
|
}
|
|
}
|
|
- queryLinkSys(param, res => {
|
|
|
|
|
|
+ querySysLinkBuild(param, res => {
|
|
this.loading = false;
|
|
this.loading = false;
|
|
_this.tableData = res.Content;
|
|
_this.tableData = res.Content;
|
|
_this.copyMain = tools.deepCopy(res.Content);
|
|
_this.copyMain = tools.deepCopy(res.Content);
|
|
@@ -284,7 +304,7 @@ export default {
|
|
}
|
|
}
|
|
if (this.showType == "all") {
|
|
if (this.showType == "all") {
|
|
data.splice(3, 0, {
|
|
data.splice(3, 0, {
|
|
- data: "sysInBuildFloor",
|
|
|
|
|
|
+ data: "BuildingFloorInfoList",
|
|
renderer: text.sysInBuildFloor,
|
|
renderer: text.sysInBuildFloor,
|
|
readOnly: this.onlyRead
|
|
readOnly: this.onlyRead
|
|
})
|
|
})
|
|
@@ -341,7 +361,7 @@ export default {
|
|
item,
|
|
item,
|
|
head.Path,
|
|
head.Path,
|
|
// child.error ? "表号功能号格式错误" : "表号功能号不存在"
|
|
// child.error ? "表号功能号格式错误" : "表号功能号不存在"
|
|
- child.error ? child.value? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
|
|
|
|
|
|
+ child.error ? child.value ? "表号功能号格式错误" : "表号功能号不存在" : "暂未采集到实时数据"
|
|
);
|
|
);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -373,6 +393,7 @@ export default {
|
|
columnSorting: true, //添加排序
|
|
columnSorting: true, //添加排序
|
|
sortIndicator: true, //添加排序
|
|
sortIndicator: true, //添加排序
|
|
renderAllRows: true,
|
|
renderAllRows: true,
|
|
|
|
+ // observeChanges: false,
|
|
// colWidths: 200,
|
|
// colWidths: 200,
|
|
autoColumnSize: true,
|
|
autoColumnSize: true,
|
|
language: "zh-CN",
|
|
language: "zh-CN",
|
|
@@ -453,6 +474,9 @@ export default {
|
|
},
|
|
},
|
|
//删除资产
|
|
//删除资产
|
|
async handleDeleteTableRow() {
|
|
async handleDeleteTableRow() {
|
|
|
|
+ if (arguments[2] == "ObserveChanges.change") {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
this.$confirm('此操作将删除该系统, 是否继续?', '提示', {
|
|
this.$confirm('此操作将删除该系统, 是否继续?', '提示', {
|
|
confirmButtonText: '确定',
|
|
confirmButtonText: '确定',
|
|
cancelButtonText: '取消',
|
|
cancelButtonText: '取消',
|
|
@@ -517,7 +541,7 @@ export default {
|
|
// this.$message("开发中...")
|
|
// this.$message("开发中...")
|
|
this.$router.push({
|
|
this.$router.push({
|
|
path: "/ledger/systemDetail",
|
|
path: "/ledger/systemDetail",
|
|
- query: { SysID: infos.SysID, Name: infos.SysLocalName || infos.SysName, SysType:infos.Category }
|
|
|
|
|
|
+ query: { SysID: infos.SysID, Name: infos.SysLocalName || infos.SysName, SysType: infos.Category }
|
|
})
|
|
})
|
|
return false
|
|
return false
|
|
//设备二维码图片
|
|
//设备二维码图片
|
|
@@ -535,25 +559,37 @@ export default {
|
|
this.myDialog.relevance = true
|
|
this.myDialog.relevance = true
|
|
}
|
|
}
|
|
return false
|
|
return false
|
|
|
|
+ case 'BuildingFloorInfoList':
|
|
|
|
+ this.$refs.editFloor.showDialog(this.tableData[row.row]);
|
|
|
|
+ return false
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
if (!this.onlyRead && showTools.InputModeArr.indexOf(inputMode) == '-1') {
|
|
if (!this.onlyRead && showTools.InputModeArr.indexOf(inputMode) == '-1') {
|
|
- // this.updateInfoPoint = val
|
|
|
|
- // this.updateInput = tools.dataForKey(this.tableData[row.row], val)
|
|
|
|
- // console.log("this is ",this.tableData[row.row])
|
|
|
|
- // let floor = tools.dataForKey(this.tableData[row.row], val);
|
|
|
|
- this.$refs.editFloor.showDialog(this.tableData[row.row]);
|
|
|
|
|
|
+ this.updateInfoPoint = val
|
|
|
|
+ this.updateInput = tools.dataForKey(this.tableData[row.row], val)
|
|
|
|
+ this.myDialog.update = true
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ //关闭临时维护弹窗回调
|
|
|
|
+ handleCloseUpdate() {
|
|
|
|
+ this.updateInputShow = false
|
|
|
|
+ this.updateInfoPoint = ''
|
|
|
|
+ this.updateInput = ''
|
|
|
|
+ },
|
|
//更新临时维护信息点
|
|
//更新临时维护信息点
|
|
handleClickUpdate() {
|
|
handleClickUpdate() {
|
|
// this.$message("更新成功");
|
|
// this.$message("更新成功");
|
|
- // tools.setDataForKey(this.tableData[this.row], this.updateInfoPoint, this.updateInput)
|
|
|
|
- // this.handleUpdataTable([[this.row, this.updateInfoPoint, null, this.updateInput]], "edit")
|
|
|
|
- // this.updateInputShow = false
|
|
|
|
- // this.myDialog.update = false
|
|
|
|
- // this.updateInput = ''
|
|
|
|
|
|
+ tools.setDataForKey(this.tableData[this.row], this.updateInfoPoint, this.updateInput)
|
|
|
|
+ this.handleUpdataTable([[this.row, this.updateInfoPoint, null, this.updateInput]], "edit")
|
|
|
|
+ this.updateInputShow = false
|
|
|
|
+ this.myDialog.update = false
|
|
|
|
+ this.updateInput = ''
|
|
|
|
+ },
|
|
|
|
+ //关联建筑楼层成功
|
|
|
|
+ relateSuccess(data) {
|
|
|
|
+ this.tableData[this.row].BuildingFloorInfoList = data
|
|
|
|
+ // tools.setDataForKey(this.tableData[this.row], "BuildingFloorInfoList", data)
|
|
},
|
|
},
|
|
//获取被筛选掉的行号
|
|
//获取被筛选掉的行号
|
|
trimmedRows() {
|
|
trimmedRows() {
|