From e855dbe46e6161add15b91df4e8067e05b866326 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 09 十一月 2023 17:13:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 4 ++--
vue.config.js | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 47cac32..1ab5234 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -442,14 +442,14 @@
},
// 娣诲姞琛�
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,
diff --git a/vue.config.js b/vue.config.js
index f55c91d..e73dd2f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,8 +2,9 @@
* 閰嶇疆鍙傝��:
* 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'
--
Gitblit v1.9.3