代码合并
This commit is contained in:
parent
bbce3dc6d9
commit
70c87e41b1
|
|
@ -56,13 +56,13 @@
|
|||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="二维码">
|
||||
<!-- <el-table-column align="center" label="二维码">
|
||||
<template slot-scope="{ row }">
|
||||
<el-button type="text" @click="showQrCode(row)"
|
||||
>查看</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column> -->
|
||||
<el-table-column align="center" label="绑定状态">
|
||||
<template slot-scope="{ row }">
|
||||
<el-tag
|
||||
|
|
@ -290,6 +290,8 @@ export default {
|
|||
addDevice(row) {
|
||||
if (!row) {
|
||||
this.dialogConfig.outerTitle = '添加设备'
|
||||
this.addDeviceParams.iotId = ''
|
||||
this.addDeviceParams.iotCode = ''
|
||||
} else {
|
||||
this.dialogConfig.outerTitle = '修改设备'
|
||||
this.addDeviceParams.iotId = row.iotId
|
||||
|
|
|
|||
|
|
@ -43,12 +43,12 @@ module.exports = {
|
|||
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网
|
||||
// target: `https://z.csgmall.com.cn`,
|
||||
|
||||
target: `http://192.168.2.154:28080`, //超
|
||||
// target: `http://192.168.2.154:28080`, //超
|
||||
// target: `http://10.40.92.81:28080`, //韩/
|
||||
// target: `http://192.168.2.82:28080`,//旭/
|
||||
// target: `http://192.168.2.248:28080`, //帅
|
||||
// target: `http://192.168.2.209:28080`, //福
|
||||
// target: `http://192.168.2.114:39080`, //王
|
||||
target: `http://192.168.2.125:39080`, //王
|
||||
|
||||
//******** 注意事项 ********* */
|
||||
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;
|
||||
|
|
|
|||
Loading…
Reference in New Issue