From 2a9256b4a3121c3f9eeb25a1b1ca24e5c3eb2f49 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 七月 2024 14:41:56 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 363 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 271 insertions(+), 92 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index a51e023..28d912b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -257,7 +257,7 @@
</el-form>
</div>
<div class="center">
- <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;overflow-x: auto;">
+ <div class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;">
<div style="display: flex;align-items: center;">
<span v-if="tableList.length>0">妫�楠屾ā鏉匡細</span>
<el-radio-group v-model="currentTable" size="small">
@@ -267,15 +267,27 @@
</div>
<div style="display: flex;align-items: center;">
<span v-if="fibers.length>0"> 鍏夌氦甯︼細</span>
- <el-radio-group v-model="currentTab" size="small" v-if="fibers.length>0" @input="m=>handleChange(m,1)">
- <el-radio-button :label="item.id" v-for="(item,index) in fibers" :key="index"
- size="small">{{ item.code }}</el-radio-button>
- </el-radio-group>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-if="fibers.length>0" size="small">
+ <el-option
+ v-for="item in fibers"
+ :key="item.value"
+ :label="item.code"
+ :value="item.id">
+ <span style="float: left">{{ item.code}}</span>
+ <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
+ </el-option>
+ </el-select>
<span v-if="fiber.length>0"> 鍏夌氦锛�</span>
- <el-radio-group v-model="currentTab" size="small" v-if="fiber.length>0" @input="m=>handleChange(m,2)">
- <el-radio-button :label="item.id" v-for="(item,index) in fiber" :key="index"
- size="small">{{ item.color }}</el-radio-button>
- </el-radio-group>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-if="fiber.length>0" size="small">
+ <el-option
+ v-for="item in fiber"
+ :label="item.bushColor+'-'+item.color"
+ :key="item.id"
+ :value="item.id">
+ <span style="float: left">{{ item.bushColor+'-'+item.color }}</span>
+ <el-tag :type="item.state==1?'success':'danger'" style="float: right;margin-top: 5px;" size="small">{{ item.state==1?'宸叉':'鏈' }}</el-tag>
+ </el-option>
+ </el-select>
<el-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
<el-form-item label="娓╁害:" style="margin-bottom: 0;">
<el-input v-model="otherForm.temperature" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')"></el-input>
@@ -286,6 +298,8 @@
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
+ <el-button type="primary" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-if="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'" @click="dataAcquisitionEidtAble=!dataAcquisitionEidtAble">{{dataAcquisitionEidtAble?'鍏抽棴缂栬緫':'缂栬緫鏁伴噰'}}</el-button>
</div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
@@ -298,13 +312,13 @@
:style="`background:${n.v.bg?n.v.bg:''};color:${n.v.fc};font-size:${n.v.fs}px;width:${handleWidth(n)}px !important;height:${item.style.rowlen[n.r]}px;font-wight:${n.v.bl?'bold':''};`">
<div class="content" :class="`content-h-${n.v.ht} content-v-${n.v.vt}`"
:style="`width:${handleWidth(n)}px !important;min-height:${item.style.rowlen[n.r]}px;`">
- <template v-if="n.v.ps!=undefined && n.v.ps.value==='妫�楠屽��' && state==1">
+ <template v-if="n.v.ps!=undefined && typeof n.v.ps.value ==='string'&& n.v.ps.value.includes('妫�楠屽��') && state==1">
<el-input v-if="getInspectionValueType(n.i) == 1" class="table_input" v-model="n.v.v"
- :disabled="getInspectionItemType(n.i) == 1 || (n.u != userId && n.u != undefined && n.u != '')"
+ :disabled="(getInspectionItemType(n.i) == 1 && !dataAcquisitionEidtAble )|| (n.u != userId && n.u != undefined && n.u != '')"
@input="handleInput(n)"
@change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`, n)" @mousewheel.native.prevent :key="'abc-'+'000'+index+'000'+i+'000'+j">
- <el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
- v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button>
+ <!-- <el-button slot="append" type="primary" icon="el-icon-edit" size="mini"
+ v-if="getInspectionItemType(n.i) == 1" @click="getSystemValue(n)"></el-button> -->
</el-input>
<el-input v-else-if="getInspectionValueType(n.i) == 2" class="table_input" type="textarea"
v-model="n.v.v"
@@ -336,6 +350,7 @@
<el-option v-for="item in equipOptions" :key="item.value" :label="item.value" :value="item.value">
</el-option>
</el-select>
+ <!-- <el-button type="primary" icon="el-icon-document-copy" size="small" circle title="鏁伴噰" v-if="n.isItADataAcquisitionDevice&&PROJECT=='妫�娴嬩腑蹇�'" @click="getDataAcquisitionDevice(n.v.v)"></el-button> -->
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='瑕佹眰鍊�' && state==1">
<span :style="`font-family:${n.v.ff} !important;`">{{getTell(n.i)}}</span>
@@ -395,9 +410,9 @@
</tbody>
</table>
</div>
- <div class="center-box" v-loading="tableLoading" v-else>
+ <div v-loading="tableLoading" v-else>
<el-divider></el-divider>
- <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">娓╁害寰幆妫�楠屽師濮嬭褰�</h4>
<el-form :inline="true" :model="wareForm" class="form-inline" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
<el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
<el-input clearable v-model="wareForm0.model" disabled size="small" placeholder=""></el-input>
@@ -468,76 +483,92 @@
<el-table-column
label="搴忓彿"
type="index"
- width="65"
+ width="60"
align="center"
>
</el-table-column>
<el-table-column
prop="bushColor"
label="绠¤壊鏍�"
- width="120"
+ width="80"
align="center">
</el-table-column>
<el-table-column
prop="code"
label="鍏夌氦甯︾紪鍙�"
- width="150"
+ width="110"
align="center">
</el-table-column>
<el-table-column
prop="color"
label="鍏夌氦鑹叉爣"
align="center"
- width="120">
+ width="90">
</el-table-column>
- <el-table-column
- prop="inspectionItemClass"
- label="鍏夌氦椤圭洰"
- align="center"
- width="130">
- </el-table-column>
- <el-table-column
- prop="value0"
- label="澶栫"
- align="center"
- width="130">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.value0" placeholder="" @change="m=>changeItem(scope.row)"></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="value1"
- label="鍐呯"
- align="center"
- width="130">
- <template slot-scope="scope">
- <el-input size="small" v-model="scope.row.value1" placeholder="" @change="m=>changeItem(scope.row)"></el-input>
- </template>
- </el-table-column>
- <el-table-column
- prop="comValue"
- align="center"
- label="琛板噺绯绘暟"
- min-width="150">
- </el-table-column>
- <el-table-column
- prop="resValue"
- label="琛板噺宸�"
- align="center"
- v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
- min-width="150">
- </el-table-column>
- <el-table-column
- prop="insResult"
- label="缁撹"
- align="center"
- min-width="150" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'">
- <template slot-scope="scope">
- <span v-if="scope.row.insResult===1" style="color: green;">鍚堟牸</span>
- <span v-else-if="scope.row.insResult===0" style="color: red;">涓嶅悎鏍�</span>
- <span v-else>寰呭畾</span>
- </template>
- </el-table-column>
+ <template v-for="(item,index) in wareLength">
+ <el-table-column
+ prop="value0"
+ label="澶栫"
+ align="center"
+ width="80" :key="(new Date())+'1'">
+ <template slot="header">
+ {{ '澶栫'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.arr[index].value0" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="value1"
+ label="鍐呯"
+ align="center"
+ width="80" :key="(new Date())+'2'">
+ <template slot="header">
+ {{ '鍐呯'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <el-input size="small" v-model="scope.row.arr[index].value1" placeholder="" @change="m=>changeItem(scope.row.arr[index])"></el-input>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="comValue"
+ align="center"
+ min-width="150" :key="(new Date())+'3'">
+ <template slot="header">
+ {{ '琛板噺绯绘暟'+item }}
+ </template>
+ <template slot-scope="scope">
+ <span>{{ scope.row.arr[index].comValue }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="resValue"
+ label="琛板噺宸�"
+ align="center"
+ v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'"
+ min-width="90" :key="(new Date())+'4'">
+ <template slot="header">
+ {{ '琛板噺宸�'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <span>{{ scope.row.arr[index].resValue }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="insResult"
+ label="缁撹"
+ align="center"
+ min-width="70" v-if="wareForm.inspectionItemSubclass!='20(甯告俯)'" :key="(new Date())+'5'">
+ <template slot="header">
+ {{ '缁撹'+(index+1) }}
+ </template>
+ <template slot-scope="scope">
+ <span v-if="scope.row.arr[index].insResult===1" style="color: green;">鍚堟牸</span>
+ <span v-else-if="scope.row.arr[index].insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else>寰呭畾</span>
+ </template>
+ </el-table-column>
+ </template>
</el-table>
</div>
<el-upload :action="action"
@@ -798,9 +829,7 @@
wareForm0:{},
numOptions:[],
temperatureOptions:[],
- wareTableData:[
- {}
- ],
+ wareTableData:[],
otherForm:{
humidity:null,
temperature:null,
@@ -813,6 +842,11 @@
},
result: null,
worker: null,
+ wareLength:[],
+ dataAcquisitionInfo:{},
+ dataAcquisitionEidt:0,
+ dataAcquisitionEidtAble:false,
+ dataAcquisitionLoading:false
}
},
computed: {
@@ -837,6 +871,7 @@
this.getAuthorizedPerson()
this.scrollInit()
this.getPower()
+ this.startWorker()
},
watch: {
id(val) {
@@ -950,6 +985,21 @@
this.saveInsContext()
}
}
+ },
+ param:{
+ deep:true,
+ handler(val){
+ this.dataAcquisitionEidt = 0
+ if(val){
+ for (let key in val) {
+ val[key].equipValue.forEach(m=>{
+ if(m.isItADataAcquisitionDevice){
+ this.dataAcquisitionEidt++
+ }
+ })
+ }
+ }
+ }
}
},
beforeDestroy() {
@@ -957,6 +1007,48 @@
this.stopWorker();
},
methods: {
+ getDataAcquisitionDevice(){
+ this.dataAcquisitionLoading = true
+ this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode).then(res=>{
+ this.dataAcquisitionLoading = false
+ if(res.code!=200){
+ return
+ }
+ this.dataAcquisitionInfo = res.data
+ let list = this.currentSample.insProduct[0].arr
+ list.forEach((item,index)=>{
+ item.forEach(m=>{
+ if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
+ if(this.dataAcquisitionInfo[m.v.m]){
+ let num = 0;
+ list[index].forEach(n=>{
+ if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
+ num++
+ }
+ })
+ list[index].forEach(n=>{
+ if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
+ if(n.v.ps.value.includes(this.dataAcquisitionInfo.frequency)){
+ setTimeout(()=>{
+ n.v.v = this.dataAcquisitionInfo[m.v.m]
+ this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ },1000)
+ }else if(this.dataAcquisitionInfo.frequency>num){
+ if(n.v.ps.value.includes(num)){
+ setTimeout(()=>{
+ n.v.v = this.dataAcquisitionInfo[m.v.m]
+ this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ },200)
+ }
+ }
+ }
+ })
+ }
+ }
+ })
+ })
+ })
+ },
startWorker() {
if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
@@ -997,7 +1089,7 @@
}
}]
if(this.wareForm.inspectionItemSubclass!='20(甯告俯)'){
- row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
+ row.resValue = row.comValue?Math.abs(row.comValue-Number(row.insProduct.complue)).toFixed(3):''
this.param[row.id].resValue.v.v = row.resValue
if(row.ask&&row.resValue){
if(row.ask.includes('<')){
@@ -1020,9 +1112,10 @@
this.saveInsContext()
},
wareFormChange(m,type){
- if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'||!this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
return
}
+ // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
if(m&&type){
this.wareForm[type] = m
}
@@ -1120,9 +1213,54 @@
}
return obj
})
- this.wareTableData = productVos
+ let arr = []
+ let arr0 = []
+ let mySet = new Set()
+ productVos.forEach((m,i)=>{
+ let num0 = mySet.size
+ mySet.add(m.inspectionItemClass)
+ let num1 = mySet.size
+ if(num0!=num1){
+ if(i>0){
+ arr.push(arr0)
+ }
+ arr0 = []
+ arr0.push(m)
+ }else{
+ arr0.push(m)
+ }
+ })
+ arr.push(arr0)
+ let arr1 = []
+ this.wareLength = [];
+ for(let i=0;i<arr.length;i++){
+ arr1.push([])
+ this.wareLength.push(arr[i][0].inspectionItemClass)
+ }
+ arr.forEach((item,index)=>{
+ item.forEach((m,i)=>{
+ try {
+ arr1[i].push(m)
+ } catch (e) {
+ console.log(e)
+ }
+ })
+ })
+ let arr2 = []
+ arr1.forEach(item=>{
+ let obj = {
+ bushColor:item[0].bushColor,
+ code:item[0].code,
+ color:item[0].color,
+ arr:item
+ }
+ arr2.push(obj)
+ })
+ console.log(arr2)
+ this.wareTableData = arr2
})
this.getEquipOptions(true,this.currentSample.insProduct[0].id)
+ // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
},
subOtherForm(m,type){
let ids = []
@@ -1279,6 +1417,7 @@
}
})
this.getTableLists0(list)
+ this.getReportModel(this.currentSample.id)
}else{
this.tableLists = []
this.tableList = []
@@ -1478,8 +1617,7 @@
str += c.v.v
count4 += 1
}
- }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」') {
- console.log('妫�楠屽瓙瀛愰」',c)
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」'&&this.PROJECT=='瑁呭鐢电紗') {
if (count4 === 2) {
str += c.v.v
count4 += 1
@@ -1490,14 +1628,8 @@
if (str != '') {
let count2 = 0
for (let i in this.currentSample.insProduct) {
- console.log(this.currentSample
- .insProduct[i].inspectionItem,'---',this.currentSample
- .insProduct[i].inspectionItemSubclass,'---',this.currentSample.insProduct[i].inspectionItemClass,'===',str,this.currentSample
- .insProduct[i])
if (this.currentSample.insProduct[i].templateId === a.templateId && this.currentSample
- .insProduct[i].inspectionItem +
- (this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample
- .insProduct[i].inspectionItemSubclass+this.currentSample.insProduct[i].inspectionItemClass==null?'':this.currentSample.insProduct[i].inspectionItemClass) ===
+ .insProduct[i].inspectionItem +(this.currentSample.insProduct[i].inspectionItemSubclass == null ? '' : this.currentSample.insProduct[i].inspectionItemSubclass)+(this.currentSample.insProduct[i].inspectionItemClass==null||this.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
str) {
ids.push({
r: b.r,
@@ -1564,7 +1696,7 @@
let finalList = []; //鏈�缁堝�煎垪琛�
conclusionList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '缁撹')
finalList = a.template.filter(n => n.v.ps != undefined && n.v.ps.value === '鏈�缁堝��')
- a.template.forEach(b => {
+ a.template.forEach( b => {
if (b.v.ps != undefined && b.v.ps.value === '搴忓彿' && (b.v.mc == undefined || Object.keys(b.v.mc)
.length === 4)) {
count1++
@@ -1573,7 +1705,7 @@
if (b.v.ps != undefined && b.v.ps.value === '瑕佹眰鍊�') {
b.v.v = this.getAsk(b.i)
}
- if (b.v.ps != undefined && b.v.ps.value === '妫�楠屽��') {
+ if (b.v.ps != undefined && typeof b.v.ps.value ==='string'&&b.v.ps.value.includes('妫�楠屽��')) {
b.v.v = ''
b.u = ''
b.i && this.param[b.i].insValue.push(b)
@@ -1635,7 +1767,7 @@
this.tableWidth += (a.style.columnlen[i] === undefined ? 100 : a.style.columnlen[i])
}
})
- this.currentSample.insProduct.forEach(a => {
+ this.currentSample.insProduct.forEach(async a => {
try {
let comValue = JSON.parse(a.insProductResult.comValue)
for (var i = 0; i < comValue.length; i++) {
@@ -1645,8 +1777,12 @@
try {
let insValue = JSON.parse(a.insProductResult.insValue)
for (let i = 0; i < insValue.length; i++) {
- this.param[a.id].insValue[i].v.v = insValue[i].v
- this.param[a.id].insValue[i].u = insValue[i].u
+ if(this.param[a.id].insValue.find(m=>m.c==insValue[i].c&&m.r==insValue[i].r)){
+ this.param[a.id].insValue.find(m=>m.c==insValue[i].c&&m.r==insValue[i].r).v.v = insValue[i].v
+ this.param[a.id].insValue.find(m=>m.c==insValue[i].c&&m.r==insValue[i].r).u = insValue[i].u
+ // this.param[a.id].insValue[i].v.v = insValue[i].v
+ // this.param[a.id].insValue[i].u = insValue[i].u
+ }
}
} catch (e) {}
try {
@@ -1657,6 +1793,22 @@
this.$set(this.equipForm,`code`+i,equipValue[i].v)
}else{
this.param[a.id].equipValue[i].v.v = equipValue[i].v
+ if(equipValue[i].v){
+ let isItADataAcquisitionDevice = await this.determineWhetherToCollectData(equipValue[i].v)
+ this.param[a.id].equipValue[i].isItADataAcquisitionDevice = isItADataAcquisitionDevice
+ this.dataAcquisitionEidt = 0
+ if(this.param){
+ for (let key in this.param) {
+ this.param[key].equipValue.forEach(m=>{
+ if(m.isItADataAcquisitionDevice){
+ this.dataAcquisitionEidt++
+ }
+ })
+ }
+ }
+ }else{
+ this.param[a.id].equipValue[i].isItADataAcquisitionDevice = false
+ }
}
}
} catch (e) {}
@@ -1679,6 +1831,7 @@
this.handleExcelMethod()
},
changeInput(m, code, n) {
+ console.log(m, code)
if (n) {
// if (this.PROJECT === '瑁呭鐢电紗') {
// let num2 = new this.$Big(n.v.v)
@@ -1694,8 +1847,6 @@
n.v.v = n.v.v.replace('/', '')
}
}
- this.startWorker()
-
// 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
this.worker.postMessage(JSON.stringify({
code: code,
@@ -1715,6 +1866,15 @@
this.$nextTick(()=>{
this.tableList = this.result.value.tableList
this.param = this.result.value.param
+ for (var i in this.param){
+ if(this.param[i].insResult&&this.param[i].insResult.v&&this.param[i].insResult.v.v){
+ if(this.param[i].insResult.v.v=='鍚堟牸'){
+ this.$set(this.param[i].insResult.v,'v',1)
+ }else if(this.param[i].insResult.v.v=='涓嶅悎鏍�'){
+ this.$set(this.param[i].insResult.v,'v',0)
+ }
+ }
+ }
this.saveInsContext()
})
break;
@@ -1731,6 +1891,10 @@
// this.stopWorker(); // 澶勭悊瀹屾垚鍚庡仠姝� Worker
// }
};
+ },
+ async determineWhetherToCollectData(managementNumber){
+ let res = await this.$axios.get(this.$api.deviceScope.determineWhetherToCollectData+'?managementNumber='+managementNumber)
+ return res.data
},
handleFraction(str){
if(str&&typeof(str)=='string'&&str.includes('/')){
@@ -1834,7 +1998,7 @@
}
},
getValue(v){
- let str = v.v?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):'')
+ let str = v.v?v.v:(v.v===0?v.v:(v.ct&&v.ct.s?v.ct.s.length>0&&v.ct.s[0].v.replace(new RegExp('\n', 'g'), '<br/>').replace(new RegExp('@', 'g'), '<br/>'):''))
return str
},
getInspectionValueType(id) {
@@ -1926,6 +2090,7 @@
this.equipOptions = res.data.map(m => {
m.value = m.managementNumber
m.label = m.deviceName
+ m.isItADataAcquisitionDevice = m.isItADataAcquisitionDevice
return m
})
}
@@ -2034,7 +2199,7 @@
}
newData.push(h('p', {style: 'font-size: 14px;color: red;'}, (Number(i)+1)+'銆�'+res.data[i]))
}
- newData.push(h('p', { style: 'font-size: 16px;color:#000;margin-top:12px' },'浠ヤ笂椤圭洰涓嶅悎鏍硷紝纭畾鎻愪氦锛�'))
+ newData.push(h('p', { style: 'font-size: 16px;color:#000;margin-top:12px;overflow-y: auto;max-height:80vh' },'浠ヤ笂椤圭洰涓嶅悎鏍硷紝纭畾鎻愪氦锛�'))
this.$confirm('鎻愮ず',{
title:'鎻愮ず',
message: h('div', null, newData),
@@ -2066,6 +2231,7 @@
return
},
saveInsContext() {
+ console.log(1111,this.param)
if(this.param){
this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
param: JSON.stringify(this.param)
@@ -2083,9 +2249,21 @@
if (this.equipOptions[i].value === val) {
for (let i1 in this.param[n.i].equipName) {
if (this.param[n.i].equipName[i1].i === n.i && this.param[n.i].equipName[i1].r === n.r) {
- this.param[n.i].equipName[i1].v.v = this.equipOptions[i].label
+ this.$set(this.param[n.i].equipValue[i1].v,'v',val)
+ this.$set(this.param[n.i].equipName[i1].v,'v',this.equipOptions[i].label)
+ this.param[n.i].equipValue[i1].isItADataAcquisitionDevice = this.equipOptions[i].isItADataAcquisitionDevice
}
}
+ }
+ }
+ this.dataAcquisitionEidt = 0
+ if(this.param){
+ for (let key in this.param) {
+ this.param[key].equipValue.forEach(m=>{
+ if(m.isItADataAcquisitionDevice){
+ this.dataAcquisitionEidt++
+ }
+ })
}
}
this.saveInsContext()
@@ -2142,6 +2320,7 @@
this.currentSample = this.HaveJson(this.sampleProduct[index - 1])
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ this.param = {}
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
--
Gitblit v1.9.3