From d44b083e83ce8e17b681fa8e3f4ea3ed0f1572ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 27 七月 2024 09:59:26 +0800
Subject: [PATCH] 修改班次分页
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 1086 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 898 insertions(+), 188 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index ef99776..1c8fb43 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -63,6 +63,24 @@
word-wrap: break-word;
white-space: normal;
}
+ .thermal-table{
+ min-width: calc(100% - 10px);
+ margin: 5px 5px 0;
+ table-layout: fixed;
+ }
+ .thermal-table td {
+ min-width: 70px;
+ text-align: center;
+ font-size: 14px;
+ word-wrap: break-word;
+ white-space: normal;
+ padding: 5px;
+ }
+ .table-container {
+ overflow-x: auto; /* 浣垮鍣ㄦ敮鎸佹í鍚戞粴鍔� */
+ max-width: 100%; /* 闄愬埗瀹瑰櫒鐨勬渶澶у搴� */
+ margin-bottom: 16px;
+ }
.content {
display: flex;
@@ -204,16 +222,17 @@
display: flex;
align-items: center;
}
+ .thermal-table .el-input{
+ display: flex;
+ align-items: center;
+ }
</style>
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;text-align: left;">妫�楠屽崟璇︽儏
- <!-- <span style="color: #3A7BFA;"> 鏍峰搧</span>
- <span v-if="currentFiberOpticTape" style="color: #3A7BFA;"> - 鍏夌氦甯�</span>
- <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span> -->
+ <el-col :span="12" style="padding-left: 20px;text-align: left;" v-once>妫�楠屽崟璇︽儏
</el-col>
- <el-col :span="12" style="text-align: right;">
+ <el-col :span="12" style="text-align: right;" v-once>
<!-- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
<el-button size="small" type="primary" @click="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">鍏夌氦甯﹀垏鎹�</el-button>
<el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> -->
@@ -252,59 +271,73 @@
<el-input clearable v-model="insOrder.appointed" disabled size="small" placeholder="璇疯緭鍏�"></el-input>
</el-form-item>
<el-form-item label="褰撳墠鏍峰搧浣嶆暟:">
- <el-tag v-if="currentKey">{{ `NO.${currentKey}` }}</el-tag>
+ <el-tag v-show="currentKey">{{ `NO.${currentKey}` }}</el-tag>
</el-form-item>
</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>
+ <span v-show="tableList.length>0">妫�楠屾ā鏉匡細</span>
<el-radio-group v-model="currentTable" size="small">
<el-radio-button :label="item.templateId" v-for="(item,index) in tableLists" :key="index"
size="small">{{ item.templateName }}</el-radio-button>
</el-radio-group>
</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>
- <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-form :inline="true" :model="otherForm" class="form-inline" label-width="50px" style="padding-top: 0;padding-left: 10px;" v-if="PROJECT=='妫�娴嬩腑蹇�'">
+ <span v-show="fibers.length>0"> 鍏夌氦甯︼細</span>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,1)" v-show="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-show="fiber.length>0"> 鍏夌氦锛�</span>
+ <el-select v-model="currentTab" placeholder="璇烽�夋嫨" @change="m=>handleChange(m,2)" v-show="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-show="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>
+ <el-input v-model="otherForm.temperature" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'temperature')" ></el-input>
<span style="margin-left: 4px;">鈩�</span>
</el-form-item>
<el-form-item label="婀垮害:" style="margin-bottom: 0;">
- <el-input v-model="otherForm.humidity" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
+ <el-input v-model="otherForm.humidity" :disabled="state>1" size="small" placeholder="" style="width: 90px;" @change="m=>subOtherForm(m,'humidity')"></el-input>
<span style="margin-left: 4px;">%</span>
</el-form-item>
</el-form>
+ <el-button type="primary" size="small" v-show="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&state==1" @click="getDataAcquisitionDevice" :loading="dataAcquisitionLoading">鏁版嵁閲囬泦</el-button>
+ <el-button :type="dataAcquisitionEidtAble?'':'primary'" size="small" v-show="dataAcquisitionEidt>0&&PROJECT=='妫�娴嬩腑蹇�'&&collected&&state==1" @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!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||(tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')&&!tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙'))">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
<tbody>
<tr v-for="(m,i) in item.arr" :key="i">
<td :id='item.templateId+"-"+n.i+"-"+n.r+"-"+n.c' v-for="(n,j) in m" :key="j"
- v-if="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
+ v-show="n.v.mc==undefined || Object.keys(n.v.mc).length === 4" :colspan="n.v.mc&&n.v.mc.cs?n.v.mc.cs:1"
:rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
: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"
@@ -319,12 +352,12 @@
v-else-if="getInspectionValueType(n.i) == 4">/</span>
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='缁撹'">
- <el-select v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='瑁呭鐢电紗'"
+ <el-select v-show="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state==1&&PROJECT=='瑁呭鐢电紗'"
class="table_input" v-model="n.v.v" @change="saveInsContext()">
<el-option label="鍚堟牸" :value="1"></el-option>
<el-option label="涓嶅悎鏍�" :value="0"></el-option>
</el-select>
- <template v-if="PROJECT=='妫�娴嬩腑蹇�'||PROJECT=='瑁呭鐢电紗'&&getInspectionValueType(n.i) != 2 ">
+ <template v-show="PROJECT=='妫�娴嬩腑蹇�'||PROJECT=='瑁呭鐢电紗'&&getInspectionValueType(n.i) != 2 ">
<span v-if="n.v.v===1" :style="`font-family:${n.v.ff} !important;color: green;`">鍚堟牸</span>
<span v-else-if="n.v.v===0" :style="`font-family:${n.v.ff} !important;color: red;`">涓嶅悎鏍�</span>
<span v-else :style="`font-family:${n.v.ff} !important;`">寰呭畾</span>
@@ -352,10 +385,10 @@
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧缂栧彿'">
<div style="display: flex;flex-wrap: nowrap;align-items: center;width: 100%" :title="currentSample.sampleCode">
- <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-if="!currentFiberOpticTape&&!currentFiberOptic"></i>
+ <i class="el-icon-caret-left table_caret" style="width: 16px;" @click="caretSample(-1)" v-show="!currentFiberOpticTape&&!currentFiberOptic"></i>
<div :style="`font-family:${n.v.ff} !important;overflow: hidden;white-space: nowrap;width: calc(100% - 32px);`">{{currentSample.sampleCode}}</div>
<i class="el-icon-caret-right table_caret" style="width: 16px;"
- v-if="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
+ v-show="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
</div>
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧鍨嬪彿'">
@@ -371,33 +404,33 @@
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鍏夌氦甯�'">
<div style="display: flex;flex-wrap: nowrap;align-items: center;">
<i class="el-icon-caret-left table_caret" @click="caretTape(-1)
- " v-if="currentFiberOpticTape"></i>
+ " v-show="currentFiberOpticTape"></i>
<div :style="`font-family:${n.v.ff} !important;`">{{currentFiberOpticTape?currentFiberOpticTape.code:''}}</div>
<i class="el-icon-caret-right table_caret"
- v-if="currentFiberOpticTape"
+ v-show="currentFiberOpticTape"
@click="caretTape(1)"></i>
</div>
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鍏夌氦'">
<div style="display: flex;flex-wrap: nowrap;align-items: center;">
<i class="el-icon-caret-left table_caret" @click="caretOptic(-1)"
- v-if="currentFiberOptic"></i>
+ v-show="currentFiberOptic"></i>
<div :style="`font-family:${n.v.ff} !important;`">{{currentFiberOptic?currentFiberOptic.color:''}}
</div>
<i
- v-if="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
+ v-show="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
</div>
</template>
- <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" ></span>
+ <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" v-once></span>
</div>
</td>
</tr>
</tbody>
</table>
</div>
- <div class="center-box" v-loading="tableLoading" v-else>
+ <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'">
<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>
@@ -436,7 +469,7 @@
<el-input clearable v-model="equipForm.value0" disabled size="small" placeholder=""></el-input>
</el-form-item>
<el-form-item label="浠櫒缂栧彿:">
- <el-select v-model="equipForm.code0" placeholder="璇烽�夋嫨" size="small">
+ <el-select v-model="equipForm.code0" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
<el-option
v-for="item in equipOptions"
:key="item.value"
@@ -449,7 +482,7 @@
<el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
</el-form-item>
<el-form-item label="浠櫒缂栧彿:">
- <el-select v-model="equipForm.code1" placeholder="璇烽�夋嫨" size="small">
+ <el-select v-model="equipForm.code1" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
<el-option
v-for="item in equipOptions"
:key="item.value"
@@ -464,81 +497,177 @@
ref="wareTableData"
border
v-loading="wareTableDataLoading"
- style="width: 100%;margin-bottom: 30px;" align="center">
+ style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
<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="" :disabled="state>1" @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" :disabled="state>1" 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-show="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-show="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>
+ <div v-loading="tableLoading" v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐑惊鐜�')||tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╁崌璇曢獙')">
+ <el-divider></el-divider>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;text-align: center;">{{tableLists.find(m=>m.templateId==currentTable).templateName}}</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="equipForm.value0" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="浠櫒鍚嶇О:" style="margin-bottom: 0;">
+ <el-input clearable v-model="equipForm.value1" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="鍨嬪彿:" style="margin-bottom: 0;">
+ <el-input clearable v-model="thermalCyclingInfo.model" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="thermalCyclingInfo.methodName" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ </el-form>
+ <el-divider></el-divider>
+ <el-form :inline="true" :model="equipForm" label-width="100px" style="justify-content: flex-start;display: flex;align-items: center;width: 100%;">
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="equipForm.code0" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浠櫒缂栧彿:">
+ <el-select v-model="equipForm.code1" :disabled="state>1" placeholder="璇烽�夋嫨" size="small">
+ <el-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="寰幆娆℃暟:" v-show="thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
+ <el-input-number v-model="thermalCyclingInfo.inspectionItem" :min="1" :max="thermalCyclingInfo.max" label="" style="margin-top:4px;width: 190px;" size="small" @change="thermalCyclingChange"></el-input-number>
+ </el-form-item>
+ <el-button type="primary" size="small" style="margin-bottom: 22px;margin-left: 30px;" @click="handleAddThermal" v-show="state==1">鏂板</el-button>
+ <el-button size="small" style="margin-bottom: 22px;" @click="handleDeleteThermal" v-show="state==1">鍒犻櫎</el-button>
+ </el-form>
+ <div class="table-container" v-loading="thermalCyclingLoading">
+ <table border="1" cellpadding="10" class="thermal-table">
+ <tr>
+ <td>妫�楠岄」鐩�</td>
+ <td :colspan="thermalCyclingInfo.length">妫�楠岃繃绋嬪��</td>
+ <td style="width: 100px;">缁撹</td>
+ </tr>
+ <tr v-for="(item,index) in thermalCyclingInfo.arr">
+ <td style="width: 100px;text-align: center;">{{ item.name }}</td>
+ <td v-for="(m,i) in thermalCyclingInfo.length" style="min-width: 150px;">
+ <div style="display: flex;align-items: center;margin-bottom: 5px;">
+ <label style="width: 100px;white-space: nowrap;font-size: 12px;">娓╁害:</label>
+ <el-input clearable size="small" placeholder="" v-model="item.arr[i].value0" :disabled="state>1" @change="m=>saveThermalCycling(m,item,'value0')"></el-input>
+ <span style="font-size: 12px;margin-left: 13px;margin-right: 13px;"> 鈩�</span>
+ </div>
+ <div style="display: flex;align-items: center;" v-if="item.name!='鐜娓╁害'&&thermalCyclingInfo.inspectionItemClass=='鐩存祦鐢甸樆'">
+ <label style="width: 100px;white-space: nowrap;font-size: 12px;">鐩存祦鐢甸樆:</label>
+ <el-input clearable size="small" :disabled="state>1" placeholder="" v-model="item.arr[i].value1" @change="saveThermalCycling"></el-input>
+ <span style="margin-left: 5px;font-size: 12px;"> 惟/km</span>
+ </div>
+ </td>
+ <td>
+ <template v-if="item.name=='鐜娓╁害'||item.name=='瀵肩嚎娓╁害'">
+ <span>/</span>
+ </template>
+ <template v-else>
+ <span v-if="item.insResult===1" style="color: green;">鍚堟牸</span>
+ <span v-else-if="item.insResult===0" style="color: red;">涓嶅悎鏍�</span>
+ <span v-else>寰呭畾</span>
+ </template>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
<el-upload :action="action"
:data="{
@@ -549,7 +678,7 @@
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar' :headers="headers" :on-change="beforeUpload"
style="width: 80px !important;"
:on-error="onError" ref='upload'>
- <el-button size="small" type="primary">闄勪欢涓婁紶</el-button></el-upload>
+ <el-button size="small" type="primary" v-show="state==1">闄勪欢涓婁紶</el-button></el-upload>
<ValueTable class="value-table" ref="fileList" :url="$api.insOrderPlan.getFileList"
:componentData="componentData0"
:delUrl="$api.insOrderPlan.delfile"
@@ -558,7 +687,7 @@
<el-drawer title="鍏夌氦鍒囨崲" :visible.sync="fiberOpticVisible" :size="500">
<el-table class="el-table" ref="fiberOpticTable" :data="fiberOptic" height="100%" tooltip-effect="dark" border
highlight-current-row @row-click="handleChangeOptic" :row-class-name="tableRowClassName"
- :current-row-key="currentKey2" :row-key="record=>record.index" v-if="fiberOpticVisible">
+ :current-row-key="currentKey2" :row-key="record=>record.index" v-show="fiberOpticVisible">
<el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
<el-table-column prop="bushColor" label="绠″鑹叉爣" min-width="100px" show-overflow-tooltip></el-table-column>
@@ -571,7 +700,7 @@
<el-drawer title="鍏夌氦甯﹀垏鎹�" :visible.sync="fiberOpticTapeVisible" :size="500">
<el-table class="el-table" ref="fiberOpticTapeTable" :data="fiberOpticTape" height="100%" tooltip-effect="dark" border
highlight-current-row @row-click="handleChangeTape" :row-class-name="tableRowClassName"
- :current-row-key="currentKey1" :row-key="record=>record.index" v-if="fiberOpticTapeVisible">
+ :current-row-key="currentKey1" :row-key="record=>record.index" v-show="fiberOpticTapeVisible">
<el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
<el-table-column prop="code" label="鍏夌氦甯︾紪鍙�" min-width="110px" show-overflow-tooltip></el-table-column>
@@ -584,7 +713,7 @@
<el-drawer title="濂楃鍒囨崲" :visible.sync="bushingVisible" :size="500">
<el-table class="el-table" ref="bushingTable" :data="bushing" height="100%" tooltip-effect="dark" border
highlight-current-row @row-click="handleChangeBushing" :row-class-name="tableRowClassName"
- :current-row-key="currentKey0" :row-key="record=>record.index" v-if="bushingVisible">
+ :current-row-key="currentKey0" :row-key="record=>record.index" v-show="bushingVisible">
<el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
<el-table-column prop="color" label="绠¤壊鏍�" min-width="100px" show-overflow-tooltip></el-table-column>
@@ -595,14 +724,14 @@
<el-drawer title="鏍峰搧鍒囨崲" :visible.sync="sampleVisible" :size="500">
<el-table class="el-table" ref="productTable" :data="sampleProduct" height="100%" tooltip-effect="dark" border
highlight-current-row @row-click="handleChangeSample" :row-class-name="tableRowClassName"
- :current-row-key="currentKey" :row-key="record=>record.index" v-if="sampleVisible">
+ :current-row-key="currentKey" :row-key="record=>record.index" v-show="sampleVisible">
<el-table-column type="index" align="center" label="搴忓彿" width="70px" :key="Math.random()">
</el-table-column>
<el-table-column prop="sampleCode" label="鏍峰搧缂栧彿" min-width="100px" show-overflow-tooltip></el-table-column>
<el-table-column prop="model" label="鏍峰搧鍨嬪彿" min-width="100px" show-overflow-tooltip></el-table-column>
<el-table-column prop="insState" label="妫�娴嬬姸鎬�" width="100px" show-overflow-tooltip>
<template slot-scope="scope">
- <el-tag v-for="(item, i) in typeList" :key="i" v-if="item.value == scope.row.insState" :type="item.type"
+ <el-tag v-for="(item, i) in typeList" :key="i" v-show="item.value == scope.row.insState" :type="item.type"
size="medium" style="margin-right: 5px;">{{item.label}}</el-tag>
</template>
</el-table-column>
@@ -613,11 +742,11 @@
</el-table-column>
<!-- 妫�楠屽崟浼氭湁涓�涓槸鍚︽湁閰嶅鏍峰搧瀛楁鎺у埗鏄剧ず -->
<el-table-column prop="joinModel" label="閰嶅鏍峰搧鍨嬪彿" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
+ v-show="insOrder.mating>0"></el-table-column>
<el-table-column prop="joinName" label="閰嶅鏍峰搧鍚嶇О" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
+ v-show="insOrder.mating>0"></el-table-column>
<el-table-column prop="joinNum" label="閰嶅鏍峰搧鏁伴噺" min-width="130px" show-overflow-tooltip
- v-if="insOrder.mating>0"></el-table-column>
+ v-show="insOrder.mating>0"></el-table-column>
</el-table>
</el-drawer>
<el-drawer title="浠诲姟鍒囨崲" :visible.sync="taskVisible" :size="500">
@@ -625,7 +754,7 @@
:componentData="componentData" :key="upIndex" style="height: 100%;"/>
</el-drawer>
<el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="500px">
- <div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
+ <div class="body" style="display: flex;padding: 10px;" v-show="reviewDia">
<div class="search_label" style="width: 150px;"><span class="required-span">* </span>涓嶉�氳繃鐨勭悊鐢憋細</div>
<div class="search_input" style="width: 100%;">
<el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 4}"></el-input>
@@ -798,9 +927,7 @@
wareForm0:{},
numOptions:[],
temperatureOptions:[],
- wareTableData:[
- {}
- ],
+ wareTableData:[],
otherForm:{
humidity:null,
temperature:null,
@@ -813,6 +940,22 @@
},
result: null,
worker: null,
+ worker0: null,
+ wareLength:[],
+ dataAcquisitionInfo:{},
+ dataAcquisitionEidt:0,
+ dataAcquisitionEidtAble:false,
+ dataAcquisitionLoading:false,
+ collected:false,
+ // 鐑惊鐜�---寮�濮�
+ thermalCyclingInfo:{
+ max:0,
+ inspectionItem:1,
+ arr:[],
+ length:1,
+ inspectionItemClass:null,
+ },
+ thermalCyclingLoading:false,
}
},
computed: {
@@ -837,6 +980,7 @@
this.getAuthorizedPerson()
this.scrollInit()
this.getPower()
+ this.startWorker()
},
watch: {
id(val) {
@@ -914,7 +1058,7 @@
equipForm:{
deep:true,
handler(val){
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'&&this.equipOptions&&this.equipOptions.length>0){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))&&this.equipOptions&&this.equipOptions.length>0){
this.param[this.currentSample.insProduct[0].id].equipValue = []
this.param[this.currentSample.insProduct[0].id].equipName = []
if(this.equipForm.code0){
@@ -950,6 +1094,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,19 +1116,107 @@
this.stopWorker();
},
methods: {
+ // 鏁版嵁閲囬泦
+ getDataAcquisitionDevice(){
+ this.dataAcquisitionLoading = true
+ this.$axios.get(this.$api.deviceScope.dataCollection+'?entrustCode='+this.insOrder.entrustCode+'&sampleCode='+this.currentSample.sampleCode + '&id=' + this.currentSample.id).then(res=>{
+ this.dataAcquisitionLoading = false
+ if(res.code!=200){
+ return
+ }
+ this.dataAcquisitionInfo = res.data
+ try {
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker0.postMessage(JSON.stringify({
+ dataAcquisitionInfo: this.dataAcquisitionInfo,
+ list:this.tableList[0].arr
+ }));
+ } catch (error) {
+ console.log(1111,error);
+ }
+ // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
+ this.worker0.onmessage = (event) => {
+ let result = JSON.parse(event.data);
+ if(result.method=='changeInput'){
+ let {list,n} = result.value
+ this.$set(this.tableList[0],'arr',list)
+ this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ }
+ };
+ // let list = this.tableList[0].arr
+ // list.forEach((item,index)=>{
+ // let num = 0;
+ // let str = ''
+ // item.forEach(m=>{
+ // if(m.v.ps&&(m.v.ps.value=='妫�楠屽瓙椤�'||m.v.ps.value=='妫�楠岄」')){
+ // if(m.v.ps&&m.v.ps.value=='妫�楠岄」'){
+ // if(num==0){
+ // str = m.v.v+','
+ // num++
+ // }
+ // }
+ // if(m.v.ps&&m.v.ps.value=='妫�楠屽瓙椤�'){
+ // if(num==1){
+ // str = str+m.v.v
+ // }
+ // }
+ // if(this.dataAcquisitionInfo[str]){
+ // 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,i)=>{
+ // if(n.v.ps&&n.v.ps.value&&typeof n.v.ps.value == 'string'&&n.v.ps.value.includes('妫�楠屽��')){
+ // let arr = n.v.ps.value.split('鍊�')
+ // if(arr[1] ==this.dataAcquisitionInfo.frequency){
+ // setTimeout(()=>{
+ // this.$delete(n.v,'v')
+ // this.$set(n.v,'v',this.dataAcquisitionInfo[str])
+ // this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ // },1000)
+ // }else if(Number(this.dataAcquisitionInfo.frequency)>num){
+ // if(n.v.ps.value.includes(num)){
+ // setTimeout(()=>{
+ // this.$delete(n.v,'v')
+ // this.$set(n.v,'v',this.dataAcquisitionInfo[str])
+ // this.changeInput('',`${this.currentSample.insProduct[0].templateId}-${n.r}-${n.c}-${n.i}`,n)
+ // },1000)
+ // }
+ // }
+ // }
+ // })
+ // }
+ // }
+ // })
+ // })
+ })
+ },
+ // 澶氱嚎绋�
startWorker() {
- if (this.worker) {
+ if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
}
// 鍒涘缓 Worker 瀹炰緥
this.worker = new Worker('/static/js/worker.js');
+ if (this.worker0) {
+ this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
+ }
+ // 鍒涘缓 Worker 瀹炰緥
+ this.worker0 = new Worker('/static/js/worker0.js');
},
stopWorker() {
if (this.worker) {
this.worker.terminate();
this.worker = null;
}
+ if (this.worker0) {
+ this.worker0.terminate();
+ this.worker0 = null;
+ }
},
+ // 娓╁害寰幆---寮�濮�
changeItem(row){
if(row.value0&&row.value1){
this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
@@ -997,7 +1244,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,7 +1267,7 @@
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
}
if(m&&type){
@@ -1120,10 +1367,316 @@
}
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)
+ })
+ this.wareTableData = arr2
})
this.getEquipOptions(true,this.currentSample.insProduct[0].id)
+ // this.$refs.wareTableData&&this.$refs.wareTableData.doLayout()
},
+ // 娓╁害寰幆---缁撴潫
+ // 鐑惊鐜�---寮�濮�
+ thermalCyclingChange(){
+ this.thermalCyclingLoading = true
+ this.$axios.post(this.$api.insOrderPlan.temCycle,{
+ sampleId:this.currentSample.id,
+ inspectionItem:this.thermalCyclingInfo.inspectionItem
+ }).then(res => {
+ this.thermalCyclingLoading = false
+ if (res.code == 201) return
+ let {productVos,sampleVo} = res.data
+ this.thermalCyclingInfo = {...this.thermalCyclingInfo,...sampleVo}
+ if(this.thermalCyclingInfo.inspectionItem>1){
+ for(let i in this.param){
+ if(this.param[i].inspectionItemSubclass){
+ delete this.param[i]
+ }
+ }
+ }
+ if(productVos.length>0){
+ this.thermalCyclingInfo.inspectionItemClass = productVos[0].insProduct.inspectionItemClass
+ productVos.forEach(item=>{
+ this.param[item.insProduct.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: {
+ i:item.insProduct.id,
+ r:0,
+ c:0,
+ v:{
+ v:null
+ }
+ },
+ equipValue: [],
+ equipName: [],
+ insResult: {
+ i:item.insProduct.id,
+ v:{
+ v:null
+ }
+ },
+ inspectionItemSubclass: item.insProduct.inspectionItemSubclass,
+ }
+ let obj = {...item,...item.insProduct}
+ let insProductResult = obj.insProductResult
+ if(insProductResult){
+ for(let i in insProductResult){
+ switch (i) {
+ case 'insValue':
+ let insValue = JSON.parse(insProductResult[i])
+ if(insValue&&insValue.length>0){
+ this.thermalCyclingInfo.length = 0
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ if(a.name==obj.inspectionItemSubclass){
+ a.arr = []
+ for(let i=0;i<insValue.length;i++){
+ a.arr.push({
+ value0:insValue[i].v,
+ value1:insValue[i].w,
+ })
+ this.thermalCyclingInfo.length++
+ }
+ a.insResult = obj.insResult
+ }
+ })
+ this.param[obj.id].insValue = []
+ insValue.forEach(m=>{
+ this.param[obj.id].insValue.push({
+ i:obj.id,
+ r:0,
+ c:0,
+ w:m.w,
+ v:{
+ v:m.v
+ }
+ })
+ })
+ }
+ break;
+ }
+ }
+ this.param[obj.id].insResult = {
+ i:obj.id,
+ v:{
+ v:obj.insResult
+ }
+ }
+ }else{
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ a.insResult = null
+ a.arr = []
+ a.arr.push(
+ {
+ value0:'',
+ value1:''
+ }
+ )
+ })
+ this.thermalCyclingInfo.length = 1
+ }
+ })
+ }
+ this.getEquipOptions(true,this.currentSample.insProduct[0].id)
+ })
+ },
+ handleAddThermal(){
+ this.thermalCyclingInfo.length++
+ this.thermalCyclingInfo.arr.forEach(item=>{
+ item.arr.push({
+ value0:'',
+ value1:''
+ })
+ })
+ },
+ handleDeleteThermal(){
+ if(this.thermalCyclingInfo.length==1){
+ this.$message.error('鏈�鍚庝竴鏉℃暟鎹笉鑳藉垹闄�')
+ return
+ }else{
+ this.thermalCyclingInfo.length--
+ this.thermalCyclingInfo.arr.forEach(item=>{
+ item.arr.pop()
+ })
+ this.saveThermalCycling(true,{name:'瀵肩嚎娓╁害'},true)
+ }
+ },
+ saveThermalCycling(m,item,type){
+ // 缁撴灉鍒ゆ柇
+ if(m&&item&&type){
+ if(item.name=='瀵肩嚎娓╁害'||item.name=='鑰愬紶娓╁害'||item.name=='鎺ョ画娓╁害'){
+ this.thermalCyclingInfo.arr.forEach(a=>{
+ if(a.name=='鑰愬紶娓╁害'){
+ a.arr.forEach((b,i)=>{
+ // 鑾峰彇瀵瑰簲鐨勫绾挎俯搴�
+ let num0 = 0
+ this.thermalCyclingInfo.arr.forEach(c=>{
+ if(c.name=='瀵肩嚎娓╁害'){
+ num0 = c.arr[i].value0
+ }
+ })
+ if(!num0||!b.value0){
+ b.state = null
+ }else if(Number(num0)>Number(b.value0)){
+ b.state = 1
+ }else{
+ b.state = 0
+ }
+ })
+ let state = a.arr.filter(b=>b.state==null).length
+ let state0 = a.arr.filter(b=>b.state==0).length
+ let state1 = a.arr.filter(b=>b.state==1).length
+ if(state>0){
+ a.insResult = null
+ }else if(state0>0){
+ a.insResult = 0
+ }else if(state1==a.arr.length){
+ a.insResult = 1
+ }
+ }
+ if(a.name=='鎺ョ画娓╁害'){
+ a.arr.forEach((b,i)=>{
+ // 鑾峰彇瀵瑰簲鐨勫绾挎俯搴�
+ let num0 = 0
+ this.thermalCyclingInfo.arr.forEach(c=>{
+ if(c.name=='瀵肩嚎娓╁害'){
+ num0 = c.arr[i].value0
+ }
+ })
+ if(!num0||!b.value0){
+ b.state = null
+ }else if(Number(num0)>Number(b.value0)){
+ b.state = 1
+ }else{
+ b.state = 0
+ }
+ })
+ let state = a.arr.filter(b=>b.state==null).length
+ let state0 = a.arr.filter(b=>b.state==0).length
+ let state1 = a.arr.filter(b=>b.state==1).length
+ if(state>0){
+ a.insResult = null
+ }else if(state0>0){
+ a.insResult = 0
+ }else if(state1==a.arr.length){
+ a.insResult = 1
+ }
+ }
+ })
+ }
+ }
+ // 璧嬪��
+ this.thermalCyclingInfo.arr.forEach(item=>{
+ for (let i in this.param){
+ if(this.param[i].inspectionItemSubclass==item.name){
+ switch (item.name){
+ case '鐜娓╁害':
+ this.param[i].insResult.v.v = 1
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ break;
+ case '瀵肩嚎娓╁害':
+ this.param[i].insResult.v.v = 1
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ w:insValue.value1,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ break;
+ case '鑰愬紶娓╁害':
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ w:insValue.value1,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ this.param[i].insResult.v.v = item.insResult
+ break;
+ case '鎺ョ画娓╁害':
+ this.param[i].insValue = []
+ item.arr.forEach(insValue=>{
+ this.param[i].insValue.push({
+ i:i,
+ r:0,
+ c:0,
+ w:insValue.value1,
+ v:{
+ v:insValue.value0
+ }
+ })
+ })
+ this.param[i].insResult.v.v = item.insResult
+ break;
+ }
+ }
+ }
+ })
+ // console.log(1111,this.param)
+ this.saveInsContext()
+ },
+ // 鐑惊鐜�---缁撴潫
subOtherForm(m,type){
let ids = []
for (let i in this.param) {
@@ -1146,6 +1699,7 @@
let power = JSON.parse(sessionStorage.getItem('power'))
let fileDel = false
let fileAdd = false
+ let collected = false
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'uploadFile') {
fileAdd = true
@@ -1153,11 +1707,15 @@
if (power[i].menuMethod == 'delfile') {
fileDel = true
}
+ if (power[i].menuMethod == 'isItAllowedToModifyTheCollectedValues') {
+ collected = true
+ }
}
if (!fileDel) {
this.componentData0.do.splice(1, 1)
}
this.fileAdd = fileAdd
+ this.collected = collected
},
async getCurrentProduct(id,type){
this.tableLoading = true;
@@ -1279,6 +1837,7 @@
}
})
this.getTableLists0(list)
+ this.getReportModel(this.currentSample.id)
}else{
this.tableLists = []
this.tableList = []
@@ -1357,10 +1916,14 @@
this.tableLists = this.currentSample.insProduct.filter(m => {
let num0 = mySet1.size;
if (m.templateId != null&&m.template != null) {
- mySet1.add(JSON.stringify({
- template: m.template,
- templateId: m.templateId
- }))
+ try {
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ } catch (error) {
+ console.log(222,error);
+ }
}
let num1 = mySet1.size;
if (num1 > num0) {
@@ -1380,10 +1943,14 @@
this.tableLists = list.filter(m => {
let num0 = mySet1.size;
if (m.templateId != null&&m.template != null) {
- mySet1.add(JSON.stringify({
- template: m.template,
- templateId: m.templateId
- }))
+ try {
+ mySet1.add(JSON.stringify({
+ template: m.template,
+ templateId: m.templateId
+ }))
+ } catch (error) {
+ console.log(333,error);
+ }
}
let num1 = mySet1.size;
if (num1 > num0) {
@@ -1402,7 +1969,7 @@
this.excelMethodList = []
this.widthList = this.tableList[0].style.columnlen;
// 娓╁害寰幆妫�楠屽師濮嬭褰�--寮�濮�
- if(this.tableLists.find(m=>m.templateId==this.currentTable)||this.tableLists.find(m=>m.templateId==this.currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
let ask = this.currentSample.insProduct[0].ask
let askList = ask.split(';')
this.numOptions = []
@@ -1428,6 +1995,34 @@
this.wareFormChange()
}
// 娓╁害寰幆妫�楠屽師濮嬭褰�---缁撴潫
+ // 鐑惊鐜楠屽師濮嬭褰�---寮�濮�
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
+ let ask = this.currentSample.insProduct[0].ask
+ let askList = ask.split(';')
+ this.thermalCyclingInfo.max = Number(askList[askList.length-1])
+ let arr = []
+ for (let i = 0; i < askList.length-1; i++) {
+ arr.push(askList[i].split(',')[0])
+ }
+ arr = arr.map(item=>{
+ let obj = {}
+ obj.name = item;
+ if(obj.insResult==null||obj.insResult==undefined){
+ obj.arr = [
+ {
+ value0:'',
+ value1:'',
+ }
+ ]
+ obj.insResult = null;
+ }
+ return obj
+ })
+ this.thermalCyclingInfo.arr = arr;
+ // console.log(this.thermalCyclingInfo)
+ this.thermalCyclingChange()
+ }
+ // 鐑惊鐜楠屽師濮嬭褰�---缁撴潫
this.tableList.forEach(a => {
let mcList = []
a.template.forEach(b => {
@@ -1466,42 +2061,61 @@
if (size1 < size2) {
let str = ''
let count4 = 0
+ let isThree = 0
a.template.forEach(c => {
if (b.r === c.r) {
- if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
- if (count4 === 0) {
- str += c.v.v
- count4 += 1
+ if(c.v.ps != undefined && c.v.ps.value === '妫�楠岄」鍒嗙被'&&count4 === 0){
+ // 涓夌骇鍒嗙被
+ isThree = 1
+ }else if(c.v.ps != undefined && c.v.ps.value === '妫�楠岄」'&&count4 === 0){
+ // 浜岀骇鍒嗙被
+ isThree = 0
+ }
+ if(isThree==0){
+ if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
+ if (count4 === 0) {
+ str += c.v.v
+ count4 += 1
+ }
+ } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
+ if (count4 === 1) {
+ str += c.v.v
+ count4 += 1
+ }
}
- } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
- if (count4 === 1) {
- str += c.v.v
- count4 += 1
- }
- }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙瀛愰」'&&this.PROJECT=='瑁呭鐢电紗') {
- if (count4 === 2) {
- str += c.v.v
- count4 += 1
+ }else if(isThree==1){
+ if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」鍒嗙被') {
+ if (count4 === 0) {
+ str += c.v.v
+ count4 += 1
+ }
+ }else if (c.v.ps != undefined && c.v.ps.value === '妫�楠岄」') {
+ if (count4 === 1) {
+ str += c.v.v
+ count4 += 1
+ }
+ } else if (c.v.ps != undefined && c.v.ps.value === '妫�楠屽瓙椤�') {
+ if (count4 === 2) {
+ str += c.v.v
+ count4 += 1
+ }
}
}
- // else if (c.v.ps != undefined && c.v.ps.value === '鍗曚綅'&&this.PROJECT=='妫�娴嬩腑蹇�'){
- // if(count4==1||count4==2){
- // str += c.v.v?c.v.v:''
- // console.log('str',str,c)
- // count4 += 1
- // }
- // }
}
})
if (str != '') {
- console.log('str',str)
let count2 = 0
for (let i in this.currentSample.insProduct) {
- // (this.currentSample
- // .insProduct[i].unit?this.currentSample
- // .insProduct[i].unit:'')
- 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.PROJECT!='瑁呭鐢电紗'?'':this.currentSample.insProduct[i].inspectionItemClass) ===
+ let inspectionItemClass = this.currentSample.insProduct[i].inspectionItemClass==null||this.currentSample.insProduct[i].inspectionItemClass==undefined?'':this.currentSample.insProduct[i].inspectionItemClass
+ let inspectionItem = this.currentSample
+ .insProduct[i].inspectionItem==null||this.currentSample
+ .insProduct[i].inspectionItem==undefined?'':this.currentSample
+ .insProduct[i].inspectionItem
+ let inspectionItemSubclass = this.currentSample
+ .insProduct[i].inspectionItemSubclass==null||this.currentSample
+ .insProduct[i].inspectionItemSubclass==undefined?'':this.currentSample
+ .insProduct[i].inspectionItemSubclass
+ if (this.currentSample.insProduct[i].templateId === a.templateId && inspectionItemClass +inspectionItem+inspectionItemSubclass ===
str) {
ids.push({
r: b.r,
@@ -1568,7 +2182,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++
@@ -1577,7 +2191,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)
@@ -1639,7 +2253,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++) {
@@ -1649,27 +2263,70 @@
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 {
let equipValue = JSON.parse(a.insProductResult.equipValue)
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
+ this.param[a.id].equipValue = []
+ for (let i = 0; i < equipValue.length; i++) {
+ this.param[a.id].equipValue.push({
+ v:{
+ v:''
+ }
+ })
+ }
+ }
for (let i = 0; i < equipValue.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
- // 娓╁害寰幆璧嬪��
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
+ // 娓╁害寰幆璁惧璧嬪��
this.$set(this.equipForm,`code`+i,equipValue[i].v)
+ this.param[a.id].equipValue[i].v.v = 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
+
+ }else{
+ this.param[a.id].equipValue[i].isItADataAcquisitionDevice = false
+ }
+ this.dataAcquisitionEidt = 0
+ if(this.param){
+ for (let key in this.param) {
+ this.param[key].equipValue.forEach(m=>{
+ if(m.isItADataAcquisitionDevice){
+ this.dataAcquisitionEidt++
+ }
+ })
+ }
+ }
}
}
} catch (e) {}
try {
let equipName = JSON.parse(a.insProductResult.equipName)
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('鐑惊鐜�')||this.tableLists.find(m=>m.templateId==this.currentTable).templateName.includes('娓╁崌璇曢獙'))){
+ this.param[a.id].equipName = []
+ for (let i = 0; i < equipName.length; i++) {
+ this.param[a.id].equipName.push({
+ v:{
+ v:''
+ }
+ })
+ }
+ }
for (let i = 0; i < equipName.length; i++) {
- if(this.tableLists.find(m=>m.templateId==this.currentTable)&&this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ if(this.tableLists.find(m=>m.templateId==this.currentTable)&&(this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁害寰幆妫�楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='鐑惊鐜楠屽師濮嬭褰�'||this.tableLists.find(m=>m.templateId==this.currentTable).templateName=='娓╁崌璇曢獙鍘熷璁板綍妯℃澘')){
// 娓╁害寰幆璧嬪��
this.$set(this.equipForm,`value`+i,equipName[i].v)
+ this.param[a.id].equipName[i].v.v = equipName[i].v
}else{
this.param[a.id].equipName[i].v.v = equipName[i].v
}
@@ -1698,18 +2355,20 @@
n.v.v = n.v.v.replace('/', '')
}
}
- this.startWorker()
-
- // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
- this.worker.postMessage(JSON.stringify({
- code: code,
- tableList:this.tableList,
- excelMethodList:this.excelMethodList,
- comparisonList:this.comparisonList,
- currentSample:this.currentSample,
- PROJECT:this.PROJECT,
- param:this.param
- }));
+ try {
+ // 鍚� Worker 鍙戦�佹秷鎭紝寮�濮嬪鐞嗛�昏緫
+ this.worker.postMessage(JSON.stringify({
+ code: code,
+ tableList:this.tableList,
+ excelMethodList:this.excelMethodList,
+ comparisonList:this.comparisonList,
+ currentSample:this.currentSample,
+ PROJECT:this.PROJECT,
+ param:this.param
+ }));
+ } catch (error) {
+ console.log(444,error);
+ }
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker.onmessage = (event) => {
@@ -1717,7 +2376,8 @@
switch (this.result.method){
case 'saveInsContext':
this.$nextTick(()=>{
- this.tableList = this.result.value.tableList
+ // this.$delete(this.tableList[0],'arr')
+ this.$set(this.tableList[0],'arr',this.result.value.tableList[0].arr)
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){
@@ -1728,22 +2388,36 @@
}
}
}
+ // let obj = this.param[code.split('-')[3]]
+ // this.tableList[0].arr.forEach(item=>{
+ // item.forEach(m=>{
+ // if(obj&&obj.insResult&&m.c==obj.insResult.c&&m.r==obj.insResult.r){
+ // m.v.v = obj.insResult.v.v
+ // }
+ // if(obj&&obj.resValue&&m.c==obj.resValue.c&&m.r==obj.resValue.r){
+ // m.v.v = obj.resValue.v.v
+ // }
+ // })
+ // })
+ // console.log(this.tableList,this.param)
this.saveInsContext()
})
break;
case 'tableList':
this.$nextTick(()=>{
- this.tableList = this.result.value
+ this.$delete(this.tableList[0],'arr')
+ this.$set(this.tableList[0],'arr',this.result.value[0].arr)
})
break;
case 'getCurrentInsProduct':
this.getCurrentInsProduct(this.result.value)
break;
}
- // if(this.result.method=='saveInsContext'){
- // 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('/')){
@@ -1775,8 +2449,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(555,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'insValue':
if (value && value.length > 0) {
@@ -1788,8 +2466,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(666,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'equipValue':
if (value && value.length > 0) {
@@ -1800,8 +2482,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(777,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'equipName':
if (value && value.length > 0) {
@@ -1812,8 +2498,12 @@
}
this.tableList[0].insProductResult[m].push(obj);
})
+ try {
+ this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
+ } catch (error) {
+ console.log(888,error);
+ }
}
- this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'resValue':
this.tableList[0].lastValue = value?value.v.v:''
@@ -2026,7 +2716,9 @@
this.$axios.post(this.$api.insOrderPlan.submitPlan, {
orderId: this.orderId,
laboratory: this.sonLaboratory,
- verifyUser: this.verifyUser
+ verifyUser: this.verifyUser,
+ entrustCode: this.insOrder.entrustCode,
+ sampleCode: this.currentSample.sampleCode
}).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛")
@@ -2047,7 +2739,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),
@@ -2079,16 +2771,22 @@
return
},
saveInsContext() {
- if(this.param){
- this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
- param: JSON.stringify(this.param)
- }).then(res => {
- if (res.code == 201) {
- this.$message.error('淇濆瓨澶辫触')
- return
- }
- this.$message.success('宸蹭繚瀛�')
- })
+ // console.profile()
+ // console.log(1111,this.param)
+ try {
+ if(this.param){
+ this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
+ param: JSON.stringify(this.param)
+ }).then(res => {
+ if (res.code == 201) {
+ this.$message.error('淇濆瓨澶辫触')
+ return
+ }
+ this.$message.success('宸蹭繚瀛�')
+ })
+ }
+ }catch (error) {
+ console.log(999,error);
}
},
changeEquip(val, n) {
@@ -2096,12 +2794,24 @@
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.$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].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++
+ }
+ })
+ }
+ }
+ console.log(this.param)
this.saveInsContext()
},
getAuthorizedPerson() {
--
Gitblit v1.9.3