From 5cf1a230144fc023b07c1aeccd8795b9741f7328 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 09 十一月 2023 16:11:04 +0800
Subject: [PATCH] modified: src/views/equipment/equipment/index.vue modified: src/views/quality/finishedProductInspection/index.vue modified: src/views/quality/rawMaterial/index.vue modified: src/views/quality/rawMaterial/rawMaterial-form.vue modified: vue.config.js
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 5 +++--
src/views/equipment/equipment/index.vue | 2 +-
vue.config.js | 4 ++--
src/views/quality/finishedProductInspection/index.vue | 1 +
src/views/quality/rawMaterial/index.vue | 1 +
5 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/views/equipment/equipment/index.vue b/src/views/equipment/equipment/index.vue
index 5a2a8dc..7f41a17 100644
--- a/src/views/equipment/equipment/index.vue
+++ b/src/views/equipment/equipment/index.vue
@@ -27,7 +27,7 @@
</el-row>
<el-row>
<el-col :span="10" :offset="3">缂栧彿锛�</el-col>
- <el-col :span="10" style="font-weight: bold;">{{ tem.code }}</el-col>
+ <el-col :span="10" style="font-weight: bold;">{{ tem.number }}</el-col>
</el-row>
<el-row>
<el-col :span="10" :offset="3">璁惧鍚嶇О锛�</el-col>
diff --git a/src/views/quality/finishedProductInspection/index.vue b/src/views/quality/finishedProductInspection/index.vue
index 0dfbc01..b1ee15b 100644
--- a/src/views/quality/finishedProductInspection/index.vue
+++ b/src/views/quality/finishedProductInspection/index.vue
@@ -182,6 +182,7 @@
show: {
val: [
'1',
+ '0'
],
key: 'result'
}
diff --git a/src/views/quality/rawMaterial/index.vue b/src/views/quality/rawMaterial/index.vue
index 99b0d0b..b10d298 100644
--- a/src/views/quality/rawMaterial/index.vue
+++ b/src/views/quality/rawMaterial/index.vue
@@ -218,6 +218,7 @@
show: {
val: [
'1',
+ '0'
],
key: 'judgeState'
}
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 3535b6d..47cac32 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -200,7 +200,7 @@
</el-table-column>
<el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="鎿嶄綔" width="150">
<template slot-scope="scope">
- <div v-if="scope.row.father!=null">
+ <div v-if="scope.row.fId!=null">
<el-button type="text" @click="addChildren(scope.row)">娣诲姞椤圭洰</el-button>
<el-button type="text" @click="delChildren(scope.row,scope.$index,true)">鍒犻櫎琛�</el-button>
</div>
@@ -444,6 +444,7 @@
clickAddLine(row) {
console.log(row);
let ele = {
+ fId: Math.random(),
father: row.father?row.father:null,
iid: Math.random(),
children:[]
@@ -472,7 +473,7 @@
this.list.push(ele)
})
}else{
- ele.push({
+ ele.children.push({
deviceId: null,
deviceName: null,
iid: Math.random(),
diff --git a/vue.config.js b/vue.config.js
index f55c91d..2072109 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -2,9 +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://ztt-gateway:9999'
+const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'
const CompressionWebpackPlugin = require('compression-webpack-plugin')
--
Gitblit v1.9.3