Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-11-15 ceb9732e73b00526ed04d39d02afd7ae8ef303b7

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 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) {

 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,

 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