|
@@ -54,7 +54,7 @@
|
|
|
</div>
|
|
|
<details-dialog :iframeSrc="iframeSrc" v-if="myDialog.details" :dialog="myDialog"></details-dialog>
|
|
|
<!-- 关联的系统 -->
|
|
|
- <system-type :device="mess" :dialog="myDialog" :type="onlyRead?'read':'edit'" @change="changeSystemType"></system-type>
|
|
|
+ <system-type :device="mess" :curDevice="curDevice" :dialog="myDialog" :type="onlyRead?'read':'edit'" @change="changeSystemType"></system-type>
|
|
|
<!-- 关联资产 -->
|
|
|
<change-rea @changeProperty="changeProperty" :dialog="myDialog" :category="deviceType"></change-rea>
|
|
|
<look-pic :dialog="myDialog" :keysArr="picsArr"></look-pic>
|
|
@@ -64,7 +64,7 @@
|
|
|
<my-cascader ref="cascader" @change="changeAddType"></my-cascader>
|
|
|
</el-row>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
- <el-button type="primary" @click="addDevice">下 一 步</el-button>
|
|
|
+ <el-button type="primary" @click="toAddDevice">下 一 步</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
@@ -192,16 +192,18 @@ export default {
|
|
|
qrcodeUrl: "", //二维码图片地址
|
|
|
loading: false,
|
|
|
deviceType: {}, //族3位编码及名称
|
|
|
- floorData: []
|
|
|
+ floorData: [],
|
|
|
+ curDevice:'',//当前点击的设备id
|
|
|
+ addData:{}, //添加设备选择的设备类型
|
|
|
};
|
|
|
},
|
|
|
created() { },
|
|
|
computed: {
|
|
|
...mapGetters("layout", ["projectId", "secret", "userId"]),
|
|
|
- showTypes () {
|
|
|
- return this.onlyRead?
|
|
|
- [{value: "all", label: '全部'}, {value: "Visible", label: '只看要采集的信息'}]:
|
|
|
- [{value: "all", label: '全部'}, {value: "Visible", label: '只看要采集的信息'}, {value: "partInfo", label: '隐藏自动填充的信息点'}]
|
|
|
+ showTypes() {
|
|
|
+ return this.onlyRead ?
|
|
|
+ [{ value: "all", label: '全部' }, { value: "Visible", label: '只看要采集的信息' }] :
|
|
|
+ [{ value: "all", label: '全部' }, { value: "Visible", label: '只看要采集的信息' }, { value: "partInfo", label: '隐藏自动填充的信息点' }]
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -261,6 +263,9 @@ export default {
|
|
|
_this.hot = null;
|
|
|
}
|
|
|
if (res.Content && res.Content.length) {
|
|
|
+ if (this.onlyRead) {
|
|
|
+ this.getBatch(res.Content)
|
|
|
+ }
|
|
|
_this.initTable();
|
|
|
}
|
|
|
})
|
|
@@ -346,19 +351,26 @@ export default {
|
|
|
},
|
|
|
//添加设备
|
|
|
addDevice() {
|
|
|
+ this.myDialog.addDevice = true
|
|
|
if (this.mess.deviceId) {
|
|
|
+ this.$nextTick(()=>{
|
|
|
+ this.$refs.cascader.setValue([this.mess.deviceId])
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ //下一步
|
|
|
+ toAddDevice(){
|
|
|
+ if (this.addData.deviceId) {
|
|
|
this.$router.push({
|
|
|
path: "/ledger/addevice",
|
|
|
- query: this.mess
|
|
|
+ query: this.addData
|
|
|
});
|
|
|
- } else {
|
|
|
- this.myDialog.addDevice = true
|
|
|
- }
|
|
|
+ }
|
|
|
},
|
|
|
//选择设备类型-添加设备
|
|
|
changeAddType(val) {
|
|
|
- this.mess.deviceId = val.code;
|
|
|
- this.mess.name = val.facility;
|
|
|
+ this.addData.deviceId = val.code;
|
|
|
+ this.addData.name = val.facility;
|
|
|
},
|
|
|
//下载
|
|
|
download() {
|
|
@@ -392,7 +404,8 @@ export default {
|
|
|
},
|
|
|
{
|
|
|
data: "LinkEquipLocalName",
|
|
|
- readOnly: true
|
|
|
+ readOnly: true,
|
|
|
+ renderer: tools.LinkEquipLocalName
|
|
|
}, {
|
|
|
data: "linkSystem",
|
|
|
renderer: text.systemList,
|
|
@@ -578,6 +591,8 @@ export default {
|
|
|
let val = this.hot.colToProp(row.col);
|
|
|
this.row = row.row;
|
|
|
this.messKey = val;
|
|
|
+ console.log(val)
|
|
|
+ return
|
|
|
switch (val) {
|
|
|
//操作
|
|
|
case 'caozuo':
|
|
@@ -596,6 +611,7 @@ export default {
|
|
|
//关联系统
|
|
|
case 'linkSystem':
|
|
|
if (!this.onlyRead) {
|
|
|
+ this.curDevice = infos.EquipID;
|
|
|
this.systemList = this.tableData[row.row].LinkSystem || [];
|
|
|
this.myDialog.systemType = true;
|
|
|
}
|