Merge remote-tracking branch 'origin/master'
# Conflicts:
# vue.config.js
| | |
|---|
| | | }, |
|---|
| | | // 添加行 |
|---|
| | | clickAddLine(row) { |
|---|
| | | console.log(row); |
|---|
| | | let ele = { |
|---|
| | | fId: Math.random(), |
|---|
| | | father: row.father?row.father:null, |
|---|
| | | father: null, |
|---|
| | | iid: Math.random(), |
|---|
| | | children:[] |
|---|
| | | } |
|---|
| | | if(row){ |
|---|
| | | ele.father = row.father?row.father:null |
|---|
| | | row.children.forEach(item => { |
|---|
| | | ele.children.push({ |
|---|
| | | deviceId: null, |
|---|
| | |
|---|
| | | * 配置参考: |
|---|
| | | * https://cli.vuejs.org/zh/config/ |
|---|
| | | */ |
|---|
| | | const url = 'http://192.168.0.23:9999' |
|---|
| | | // const url = 'http://192.168.0.23:9999' |
|---|
| | | // const url = 'http://192.168.0.51:9999' |
|---|
| | | const url = 'http://192.168.0.23:9999' |
|---|
| | | // const url = 'http://ztt-gateway:9999' |
|---|
| | | const localUrl = 'http://localhost:8089' |
|---|
| | | //const localUrl = 'http://10.88.15.95:8089' |
|---|
