From ceb9732e73b00526ed04d39d02afd7ae8ef303b7 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 15 十一月 2023 16:10:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/quality/rawMaterial/rawMaterial-form.vue | 11 +++++++----
src/api/aps/capability.js | 12 ++++++------
src/views/technology/routing/routing-form.vue | 8 ++++----
3 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/api/aps/capability.js b/src/api/aps/capability.js
index e2d919f..02b5a92 100644
--- a/src/api/aps/capability.js
+++ b/src/api/aps/capability.js
@@ -57,12 +57,12 @@
}
-export function fetchCapabilityForOperation() {
- return request({
- url: '/mes/capability/all',
- method: 'get'
- })
-}
+// export function fetchCapabilityForOperation() {
+// return request({
+// url: '/mes/capability/all',
+// method: 'get'
+// })
+// }
export function getByOperation(id) {
diff --git a/src/views/quality/rawMaterial/rawMaterial-form.vue b/src/views/quality/rawMaterial/rawMaterial-form.vue
index 296b671..7f01ce0 100644
--- a/src/views/quality/rawMaterial/rawMaterial-form.vue
+++ b/src/views/quality/rawMaterial/rawMaterial-form.vue
@@ -580,16 +580,19 @@
}
ele.iid = Math.random()
ele.father = item.rpFather
+ if (item.children != undefined) {
item.children.forEach(obj => {
+ let arr= []
if(obj.userName){
userNameList.push(obj.userName)
}
- let arr= []
-
+
if(obj.testValue){
arr = obj.testValue.split(",")
}
-
+ if (arr.length > this.empiricalValueAdd) {
+ this.empiricalValueAdd = arr.length
+ }
let o = {
deviceId: obj.deviceId,
deviceName: obj.deviceName,
@@ -607,7 +610,7 @@
ele.children.push(o)
})
this.list.push(ele)
- }
+ }}
})
this.conclusionTable = [{
code: data.code,
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index a75de54..b65541c 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -464,7 +464,7 @@
</el-checkbox-group>
</div>
- <el-divider content-position="left">鑳藉姏</el-divider>
+ <!-- <el-divider content-position="left">鑳藉姏</el-divider>
<div class="node-content">
<label
v-if="capacities == null || capacities.length == 0"
@@ -473,7 +473,7 @@
娌℃湁閰嶇疆鑳藉姏
</label>
- <el-tag
+ <el-tag
size="medium"
v-for="item in capacities"
:key="item.id"
@@ -484,8 +484,8 @@
effect="dark"
>
{{ item.label }}
- </el-tag>
- </div>
+ </el-tag>
+ </div> -->
<el-divider content-position="left">澶囨敞</el-divider>
<div class="node-content-remark">
<rich-text
--
Gitblit v1.9.3