From b403195a75a452b54fe2112158b454f6d80c0e11 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期四, 11 七月 2024 15:03:55 +0800
Subject: [PATCH] 科学计数法逻辑修改
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 924 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 697 insertions(+), 227 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index d97b387..dd44df3 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -60,6 +60,8 @@
width: 100px;
text-align: center;
font-size: 14px;
+ word-wrap: break-word;
+ white-space: normal;
}
.content {
@@ -133,6 +135,18 @@
.table_caret:active{
opacity: .8;
}
+ >>>input::-webkit-inner-spin-button {
+ -webkit-appearance: none !important; /* 闅愯棌寰皟鎸夐挳 */
+ margin: 0 !important; /* 绉婚櫎寰皟鎸夐挳鐨勮竟璺� */
+ }
+
+ >>>input[type=number] {
+ -moz-appearance: textfield !important; /* 閽堝 Firefox */
+ }
+ >>>.el-form-item__content{
+ display: inline-flex;
+ align-items: center;
+ }
</style>
<style>
.inspection .el-form-item__label {
@@ -155,9 +169,12 @@
}
.inspection .el-input-group__append {
- padding: 0 10px;
+ padding: 0 14px;
color: #3A7BFA;
background-color: #fff;
+ height: 100%;
+ display: flex;
+ align-items: center;
}
.inspection .center-box .el-input__inner {
@@ -191,15 +208,15 @@
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏
- <span style="color: #3A7BFA;"> 鏍峰搧</span>
+ <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>
+ <span v-if="currentFiberOptic" style="color: #3A7BFA;"> - 鍏夌氦</span> -->
</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary" @click="fiberOpticVisible=true" v-if="fiberOptic.length>0">鍏夌氦鍒囨崲</el-button>
+ <!-- <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>
+ <el-button size="small" type="primary" @click="bushingVisible=true" v-if="bushing.length>0">濂楃鍒囨崲</el-button> -->
<el-button size="small" type="primary" @click="sampleVisible=true">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="addVerifyDia = true" v-show="state==1"
@@ -240,26 +257,52 @@
</el-form>
</div>
<div class="center">
- <div class="search">
- <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 class="search" style="text-align: left;display: flex;align-items: center;justify-content: space-between;overflow-x: auto;">
+ <div style="display: flex;align-items: center;">
+ <span v-if="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=='妫�娴嬩腑蹇�'">
+ <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>
+ <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>
+ <span style="margin-left: 4px;">%</span>
+ </el-form-item>
+ </el-form>
+ </div>
</div>
- <div class="center-box" id="nav" v-loading="tableLoading">
+ <div class="center-box" id="nav" v-loading="tableLoading" v-if="!tableLists.find(m=>m.templateId==currentTable)||tableLists.find(m=>m.templateId==currentTable).templateName!='娓╁害寰幆妫�楠屽師濮嬭褰�'">
<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"
:rowspan="n.v.mc&&n.v.mc.rs?n.v.mc.rs:1"
- :style="`background:${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':''};`">
+ :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;background:${n.v.bg};`">
+ :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">
<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 != '')"
- @change="m=>changeInput(m,`${item.templateId}-${n.r}-${n.c}-${n.i}`)">
+ :disabled="getInspectionItemType(n.i) == 1 || (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-input>
@@ -276,12 +319,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"
+ <el-select v-if="(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-else>
+ <template v-if="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>
@@ -305,7 +348,7 @@
:disabled="state>1" @visible-change="e=>getDic(e,n.i)" @change="saveInsContext()">
<el-option v-for="(e, i) in enumList" :key="i" :label="e.label" :value="e.value"></el-option>
</el-select> -->
- <span :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
+ <span :style="`font-family:${n.v.ff} !important;`">{{ toFixed(n.v.v,n.v.ct) }}</span>
</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">
@@ -345,12 +388,157 @@
v-if="currentFiberOptic" class="el-icon-caret-right table_caret" @click="caretOptic(1)"></i>
</div>
</template>
- <span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
+ <span v-else :style="`font-family:${n.v.ff} !important;`" v-html="getValue(n.v)" ></span>
</div>
</td>
</tr>
</tbody>
</table>
+ </div>
+ <div class="center-box" v-loading="tableLoading" v-else>
+ <el-divider></el-divider>
+ <h4 style="margin-bottom: 20px;font-size: 24px;font-weight: 400;">娓╁害寰幆妫�楠屽師濮嬭褰�</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>
+ </el-form-item>
+ <el-form-item label="璇曢獙鏂规硶:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm0.methodName" disabled size="small" placeholder=""></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="妫�娴嬩緷鎹�:" style="margin-bottom: 0;">
+ <el-input clearable v-model="wareForm0.sample" disabled size="small" placeholder=""></el-input>
+ </el-form-item> -->
+ <el-form-item label="寰幆娆℃暟:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.inspectionItem" placeholder="璇烽�夋嫨" size="small" @change="m=>wareFormChange(m,'inspectionItem')">
+ <el-option
+ v-for="item in numOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娓╁害:" style="margin-bottom: 0;">
+ <el-select v-model="wareForm.inspectionItemSubclass" placeholder="璇烽�夋嫨" size="small" @change="m=>wareFormChange(m,'inspectionItemSubclass')">
+ <el-option
+ v-for="item in temperatureOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ <span style="margin-left: 4px;">鈩�</span>
+ </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-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-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-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-option
+ v-for="item in equipOptions"
+ :key="item.value"
+ :label="item.value"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <el-table
+ :data="wareTableData"
+ ref="wareTableData"
+ border
+ v-loading="wareTableDataLoading"
+ style="width: 100%;margin-bottom: 30px;" align="center">
+ <el-table-column
+ label="搴忓彿"
+ type="index"
+ width="65"
+ align="center"
+ >
+ </el-table-column>
+ <el-table-column
+ prop="bushColor"
+ label="绠¤壊鏍�"
+ width="120"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="code"
+ label="鍏夌氦甯︾紪鍙�"
+ width="150"
+ align="center">
+ </el-table-column>
+ <el-table-column
+ prop="color"
+ label="鍏夌氦鑹叉爣"
+ align="center"
+ width="120">
+ </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>
+ </el-table>
</div>
<el-upload :action="action"
:data="{
@@ -469,6 +657,7 @@
<script>
import ValueTable from '../../tool/value-table.vue'
import file from '../../../util/file'
+ import excelFunction from '../../../util/excelFountion'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
components: {
@@ -476,6 +665,7 @@
},
data() {
return {
+ wareTableDataLoading:false,
fileAdd:false,
sampleVisible: false,
taskVisible: false,
@@ -596,7 +786,33 @@
currentFiberOptic:null,//褰撳墠鍏夌氦
currentBushing:null,//褰撳墠濂楃
tableLoading:false,
- upLoading:false
+ upLoading:false,
+ temptList:null,
+ fiber:[],
+ fibers:[],
+ currentTab:null,
+ wareForm:{
+ inspectionItem:1,
+ inspectionItemSubclass:'20(甯告俯)',
+ },
+ wareForm0:{},
+ numOptions:[],
+ temperatureOptions:[],
+ wareTableData:[
+ {}
+ ],
+ otherForm:{
+ humidity:null,
+ temperature:null,
+ },
+ equipForm:{
+ value0:null,
+ code0:null,
+ value1:null,
+ code1:null,
+ },
+ result: null,
+ worker: null,
}
},
computed: {
@@ -643,8 +859,17 @@
}
this.sampleProduct = res.data.sampleProduct
this.currentSample = this.HaveJson(this.sampleProduct[0])
+ let insProduct = this.HaveJson(this.currentSample.insProduct)
+ if(insProduct&&insProduct.length>0){
+ let {temperature,humidity} = insProduct[0];
+ this.otherForm = {
+ temperature:temperature?temperature:null,
+ humidity:humidity?humidity:null,
+ }
+ }
let list = await this.getCurrentProduct(this.currentSample.id,0)
this.currentSample.insProduct = this.HaveJson(list)
+ // console.log(this.currentSample)
this.currentSample.insProduct.forEach(a => {
this.param[a.id] = {
insValue: [],
@@ -655,9 +880,9 @@
insResult: null
}
})
+ this.getReportModel(this.currentSample.id)
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
- // this.handleTableData()
this.getTableLists();
this.componentData.currentId = val;
this.currentKey = 1;
@@ -669,6 +894,7 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
+ this.currentTab = null;
if(bushing&&bushing.length>0){
this.bushing = bushing
}
@@ -684,9 +910,238 @@
}
})
}
+ },
+ 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){
+ this.param[this.currentSample.insProduct[0].id].equipValue = []
+ this.param[this.currentSample.insProduct[0].id].equipName = []
+ if(this.equipForm.code0){
+ this.equipForm.value0 = this.equipOptions.find(m=>m.value==this.equipForm.code0).label
+ this.param[this.currentSample.insProduct[0].id].equipValue.push({
+ i:this.currentSample.insProduct[0].id,
+ v:{
+ v:this.equipForm.code0
+ }
+ })
+ this.param[this.currentSample.insProduct[0].id].equipName.push({
+ i:this.currentSample.insProduct[0].id,
+ v:{
+ v:this.equipForm.value0
+ }
+ })
+ }
+ if(this.equipForm.code1){
+ this.equipForm.value1 = this.equipOptions.find(m=>m.value==this.equipForm.code1).label
+ this.param[this.currentSample.insProduct[0].id].equipValue.push({
+ i:this.currentSample.insProduct[0].id,
+ v:{
+ v:this.equipForm.code1
+ }
+ })
+ this.param[this.currentSample.insProduct[0].id].equipName.push({
+ i:this.currentSample.insProduct[0].id,
+ v:{
+ v:this.equipForm.value1
+ }
+ })
+ }
+ this.saveInsContext()
+ }
+ }
}
},
+ beforeDestroy() {
+ // 鍦ㄧ粍浠堕攢姣佸墠纭繚鍋滄 Worker锛岄伩鍏嶅唴瀛樻硠婕�
+ this.stopWorker();
+ },
methods: {
+ startWorker() {
+ if (this.worker) {
+ this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
+ }
+ // 鍒涘缓 Worker 瀹炰緥
+ this.worker = new Worker('/static/js/worker.js');
+ },
+ stopWorker() {
+ if (this.worker) {
+ this.worker.terminate();
+ this.worker = null;
+ }
+ },
+ changeItem(row){
+ if(row.value0&&row.value1){
+ this.$set(row,'comValue',((Number(row.value0)+Number(row.value1))/2).toFixed(3))
+ }else{
+ return
+ }
+ this.param[row.id].insValue = [
+ {
+ i:row.id,
+ v:{
+ v:row.value0
+ }
+ },
+ {
+ i:row.id,
+ v:{
+ v:row.value1
+ }
+ }
+ ]
+ this.param[row.id].comValue = [{
+ i:row.id,
+ v:{
+ v:row.comValue
+ }
+ }]
+ if(this.wareForm.inspectionItemSubclass!='20(甯告俯)'){
+ row.resValue = row.comValue?Math.abs(row.comValue-20).toFixed(3):''
+ this.param[row.id].resValue.v.v = row.resValue
+ if(row.ask&&row.resValue){
+ if(row.ask.includes('<')){
+ row.insResult = row.resValue<row.ask.split('<')[1]?1:0
+ }else if(row.ask.includes('>')){
+ row.insResult = row.resValue<row.ask.split('>')[1]?1:0
+ }else if(row.ask.includes('=')){
+ row.insResult = row.resValue==row.ask.split('=')[1]?1:0
+ }else if(row.ask.includes('鈮�')){
+ row.insResult = row.resValue>=row.ask.split('鈮�')[1]?1:0
+ }else if(row.ask.includes('鈮�')){
+ row.insResult = row.resValue<=row.ask.split('鈮�')[1]?1:0
+ }
+ this.param[row.id].insResult.v.v = row.insResult
+ }
+ }else{
+ this.param[row.id].insResult.v.v = 1
+ }
+ this.$refs.wareTableData.doLayout()
+ this.saveInsContext()
+ },
+ wareFormChange(m,type){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ return
+ }
+ if(m&&type){
+ this.wareForm[type] = m
+ }
+ let wareForm = {...this.wareForm}
+ if(this.wareForm.inspectionItemSubclass=='20(甯告俯)'){
+ wareForm.inspectionItemSubclass ='20鈩�(甯告俯)'
+ }else{
+ wareForm.inspectionItemSubclass = wareForm.inspectionItemSubclass+'鈩�'
+ }
+ this.wareTableDataLoading = true
+ this.$axios.post(this.$api.insOrderPlan.temCycle,{
+ sampleId:this.currentSample.id,
+ ...wareForm
+ }).then(res => {
+ this.wareTableDataLoading = false
+ if (res.code == 201) return
+ let {productVos,sampleVo} = res.data
+ this.wareForm0 = sampleVo
+ productVos = productVos.map(m=>{
+ let obj = {...m,...m.insProduct}
+ this.param[obj.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: {
+ i:obj.id,
+ v:{
+ v:null
+ }
+ },
+ equipValue: [],
+ equipName: [],
+ insResult: {
+ i:obj.id,
+ v:{
+ v:null
+ }
+ }
+ }
+ 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>1){
+ this.param[obj.id].insValue = [
+ {
+ i:obj.id,
+ v:{
+ v:insValue[0].v
+ }
+ },
+ {
+ i:obj.id,
+ v:{
+ v:insValue[1].v
+ }
+ }
+ ]
+ obj.value0 = insValue[0].v
+ obj.value1 = insValue[1].v
+ }
+ break;
+ case 'comValue':
+ let comValue = JSON.parse(insProductResult[i])
+ if(comValue&&comValue.length>0){
+ this.param[obj.id].comValue = [
+ {
+ i:obj.id,
+ v:{
+ v:comValue[0].v
+ }
+ }
+ ]
+ obj.comValue = comValue[0].v
+ }
+ break;
+ default:
+ break;
+ }
+ }
+ this.param[obj.id].resValue = {
+ i:obj.id,
+ v:{
+ v:obj.lastValue
+ }
+ }
+ obj.resValue = obj.lastValue
+ this.param[obj.id].insResult = {
+ i:obj.id,
+ v:{
+ v:obj.insResult
+ }
+ }
+ }
+ return obj
+ })
+ this.wareTableData = productVos
+ })
+ this.getEquipOptions(true,this.currentSample.insProduct[0].id)
+ },
+ subOtherForm(m,type){
+ let ids = []
+ for (let i in this.param) {
+ ids.push(i)
+ }
+ this.$axios.post(this.$api.insOrderPlan.write,{
+ [type]:Number(m),
+ ids
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ },
+ noQs:true
+ }).then(res => {
+ if (res.code == 201) return
+ this.$message.success('淇濆瓨鎴愬姛')
+ })
+ },
getPower(){
let power = JSON.parse(sessionStorage.getItem('power'))
let fileDel = false
@@ -790,6 +1245,7 @@
insResult: null
}
})
+ this.getReportModel(row.id)
let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
@@ -797,6 +1253,38 @@
// this.handleTableData()
this.getTableLists();
this.currentKey = row.index
+ this.currentTab = null;
+ },
+ getReportModel(id){
+ if(this.PROJECT!='妫�娴嬩腑蹇�'){
+ return
+ }
+ this.$axios.post(this.$api.insOrderPlan.getReportModel+'?sampleId='+id, {}).then(res => {
+ this.fibers = res.data['鍏夌氦甯�']
+ this.fiber = res.data['鍏夌氦']
+ })
+ },
+ async handleChange(m,type){
+ if(m){
+ let list = await this.getCurrentProduct(m,type)
+ if(list.length>0){
+ list.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ this.getTableLists0(list)
+ }else{
+ this.tableLists = []
+ this.tableList = []
+ this.$message.error('妫�楠岄」涓虹┖')
+ }
+ }
},
handleChangeTask(row) {
if (row.length > 0) this.id = row[0].id;
@@ -913,6 +1401,33 @@
handleTableData() {
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!='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ let ask = this.currentSample.insProduct[0].ask
+ let askList = ask.split(';')
+ this.numOptions = []
+ for (let i = 1; i <= askList[askList.length-1]; i++) {
+ this.numOptions.push({
+ value:i,
+ label:i
+ })
+ }
+ let mySet1 = new Set();
+ askList.forEach((m,i) => {
+ if(i<askList.length-1){
+ mySet1.add(m.split(',')[0].replace('鈩�',''))
+ }
+ })
+ this.temperatureOptions = []
+ mySet1.forEach(m => {
+ this.temperatureOptions.push({
+ value:String(m),
+ label:m
+ })
+ })
+ this.wareFormChange()
+ }
+ // 娓╁害寰幆妫�楠屽師濮嬭褰�---缁撴潫
this.tableList.forEach(a => {
let mcList = []
a.template.forEach(b => {
@@ -1074,12 +1589,12 @@
} else {
this.param[b.i].resValue = b
} */
- if (b.i !== undefined) {
+ if (b.i !== undefined&&!this.param[b.i].resValue) {
this.param[b.i].resValue = b
}
}
if (b.v.ps != undefined && b.v.ps.value === '缁撹') {
- if (b.i !== undefined) {
+ if (b.i !== undefined&&!this.param[b.i].insResult) {
this.param[b.i].insResult = b
conclusionList.forEach((n, i) => {
if (n.r == b.r && n.c == b.c) {
@@ -1119,21 +1634,31 @@
} catch (e) {}
try {
let insValue = JSON.parse(a.insProductResult.insValue)
- for (var i = 0; i < insValue.length; i++) {
+ 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
}
} catch (e) {}
try {
let equipValue = JSON.parse(a.insProductResult.equipValue)
- for (var i = 0; i < equipValue.length; i++) {
- this.param[a.id].equipValue[i].v.v = equipValue[i].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=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ // 娓╁害寰幆璧嬪��
+ this.$set(this.equipForm,`code`+i,equipValue[i].v)
+ }else{
+ this.param[a.id].equipValue[i].v.v = equipValue[i].v
+ }
}
} catch (e) {}
try {
let equipName = JSON.parse(a.insProductResult.equipName)
- for (var i = 0; i < equipName.length; i++) {
- this.param[a.id].equipName[i].v.v = equipName[i].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=='娓╁害寰幆妫�楠屽師濮嬭褰�'){
+ // 娓╁害寰幆璧嬪��
+ this.$set(this.equipForm,`value`+i,equipName[i].v)
+ }else{
+ this.param[a.id].equipName[i].v.v = equipName[i].v
+ }
}
} catch (e) {}
try {
@@ -1143,152 +1668,73 @@
})
this.handleExcelMethod()
},
- changeInput(m, code) {
- let str = code.split('-')
- let r = str[1]
- let c = str[2]
- let id = str[0]
- let pId = str[3]
- var list = []
- for (let a in this.tableList) {
- if (this.tableList[a].templateId == id) {
- list = this.tableList[a].arr
- break
+ changeInput(m, code, n) {
+ if (n) {
+ // if (this.PROJECT === '瑁呭鐢电紗') {
+ // let num2 = new this.$Big(n.v.v)
+ // n.v.v = num2.toExponential()
+ // }
+ // 瀹氫箟涓�涓嚱鏁版潵楠岃瘉鍒嗘暟鏄惁鏈夋晥
+ function isValidFraction(fraction) {
+ const [numerator, denominator] = fraction.split('/'); // 鍒嗗瓙鍜屽垎姣�
+ return !(!denominator || !numerator);
+ }
+ const isTrue = isValidFraction(n.v.v)
+ if (!isTrue) {
+ n.v.v = n.v.v.replace('/', '')
}
}
- this.excelMethodList.forEach(item => {
- if (item.valueList.find(m => m.r == r && m.c == c)) {
- var comValue = {}
- item.valueList.forEach(a => {
- list.forEach(b => {
- if (b[0].r == a.r) {
- b.forEach(c => {
- if (c.c == a.c) {
- var tableCode = ''
- for (var d in this.comparisonList) {
- if (c.c == this.comparisonList[d].value) {
- tableCode = this.comparisonList[d].label
- break
- }
- }
- if(this.getInspectionValueType(item.i)==1){
- if (!isNaN(parseFloat(c.v.v))) {
- comValue[(tableCode + (c.r + 1))] = parseFloat(c.v.v)
- }
- }else{
- comValue[(tableCode + (c.r + 1))] = c.v.v
- }
- }
- })
- }
- })
- })
- if (item.methodName == '鑷畾涔夋柟娉�' && item.v.ps != undefined && item.v.ps.value == '缁撹') {
- if (this.currentSample.insProduct.find(m => m.id == item.i)) {
- let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&');
- let res = Object.values(comValue)[0]
- let comp = ask.map((m, i) => {
- if (m.includes('=')) {
- return res == m.split('=')[1]
- } else if (m.includes('鈮�')) {
- return res >= m.split('鈮�')[1]
- }else if (m.includes('鈮�')) {
- return res <= m.split('鈮�')[1]
- }else if (m.includes('<')) {
- return res < m.split('<')[1]
- }else if (m.includes('>')) {
- return res > m.split('>')[1]
- }else if (m.includes('~')) {
- let k = m.split('~')
- return res >= k[0] && res <= k[1]
- }else if(m.includes('-')){
- let k = m.split('-')
- return res >= k[0] && res <= k[1]
- }else if(m.includes('卤')){
- let k = m.split('卤')
- return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
- }
- })
- if(this.getInspectionValueType(item.i)==1){
- if (comp.every(m => m)) {
- item.v.v = 1
- } else {
- item.v.v = 0
- }
- }
+ 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
+ }));
+
+ // 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
+ this.worker.onmessage = (event) => {
+ this.result = JSON.parse(event.data);
+ switch (this.result.method){
+ case 'saveInsContext':
+ this.$nextTick(()=>{
+ this.tableList = this.result.value.tableList
+ this.param = this.result.value.param
this.saveInsContext()
- }
- } else {
- let comResult = 0;
- switch (item.methodName) {
- case 'AVERAGE':
- let num = 0
- for (var a in comValue) {
- num += comValue[a]
- }
- comResult = num / Object.keys(comValue).length
- break;
- case 'SUM':
- let sum = 0
- for (var a in comValue) {
- sum += comValue[a]
- }
- comResult = sum
- break;
- default:
- let valueList = [];
- item.valueList.forEach(a => {
- valueList.push({
- name: `${this.comparisonList[a.c].label}${a.r+1}`,
- value: 0,
- })
- })
- for (var a in comValue) {
- valueList.forEach(b => {
- if (b.name == a) {
- b.value = comValue[a]
- }
- })
- }
- let str = item.v.f.replace(/=/g, ' ');
- valueList.forEach(b => {
- str = str.replace(b.name, b.value)
- })
- if (item.v.f.includes('/')) {
- if (Object.getOwnPropertyNames(comValue).length == valueList.length) {
- comResult = eval(str)
- } else {
- comResult = ''
- }
- } else {
- if(this.getInspectionValueType(item.i)==1){
- comResult = eval(str)
- }else{
- comResult = str
- }
- }
- break;
- }
- list.forEach(a => {
- if (a[0].r == item.r && comResult != '') {
- for (var b in a) {
- if (a[b].c == item.c) {
- try{
- let val = parseFloat(comResult.toFixed(3))
- a[b].v.v = isNaN(val) ? '' : val
- }catch(e){
- a[b].v.v = comResult
- }
- break
- }
- }
- }
})
- this.changeInput(comResult, `${id}-${item.r}-${item.c}-${pId}`) //鏀瑰彉鏈�缁堝��
- }
+ break;
+ case 'tableList':
+ this.$nextTick(()=>{
+ this.tableList = this.result.value
+ })
+ break;
+ case 'getCurrentInsProduct':
+ this.getCurrentInsProduct(this.result.value)
+ break;
}
- })
- this.getCurrentInsProduct(pId)
+ // if(this.result.method=='saveInsContext'){
+ // this.stopWorker(); // 澶勭悊瀹屾垚鍚庡仠姝� Worker
+ // }
+ };
+ },
+ handleFraction(str){
+ if(str&&typeof(str)=='string'&&str.includes('/')){
+ return eval(str.split('/')[0]/str.split('/')[1])
+ } else if (str && typeof(str) == 'string' && str.includes('*') && str.includes('^')) {
+ const num1 = str.split('*')
+ const num2 = num1[1].split('^')
+ let num3 = new this.$Big(num2[0]);
+ let num4 = new this.$Big(num2[1]);
+ let num5 = Math.pow(num3, num4) // 璁＄畻娆℃柟
+ return num1[0] * num5 // 鏈�鍚庤绠椾箻娉�
+ } else{
+ return str
+ }
},
getCurrentInsProduct(pId) {
if (!this.tableList[0].insProductResult) {
@@ -1347,10 +1793,10 @@
this.tableList[0].insProductResult[m] = JSON.stringify(this.tableList[0].insProductResult[m])
break;
case 'resValue':
- this.tableList[0].lastValue = value.v.v
+ this.tableList[0].lastValue = value?value.v.v:''
break;
case 'insResult':
- this.tableList[0].insResult = value.v.v
+ this.tableList[0].insResult = value?value.v.v:''
break;
}
}
@@ -1358,47 +1804,29 @@
handleExcelMethod() {
if (this.excelMethodList.length > 0) {
this.excelMethodList.map(item => {
- item.methodName = item.v.f.split('=').length > 1 && item.v.f.split('=')[1].split('(') && item.v.f.split(
- '=')[1].split('(')[0] ? item.v.f.split('=')[1].split('(')[0] : '鑷畾涔夋柟娉�';
- let valueList = [];
- if (item.v.f.includes(':')) {
- valueList = [];
- let r0 = null;
- let c0 = null;
- let r1 = null;
- let c1 = null;
- let mode = item.v.f.split('(')[1].split(')')[0];
- let start = mode.split(':')[0]
- let end = mode.split(':')[1]
- c0 = this.comparisonList.find(j => j.label == start.split('')[0]).value
- r0 = start.replace(/[a-zA-Z]/g, "") - 1
- c1 = this.comparisonList.find(j => j.label == end.split('')[0]).value
- r1 = end.replace(/[a-zA-Z]/g, "") - 1
- for (let i = Number(r0); i <= Number(r1); i++) {
- for (let u = Number(c0); u <= Number(c1); u++) {
- valueList.push({
- r: i,
- c: u
- })
- }
- }
- } else {
- valueList = []
- let regex = /[=\+\-\*\%\(\)\/\s]/g
- let mode = item.v.f.replace(regex, ' ').split(' ');
- mode.filter(m => m && !Number(m)).forEach(m => {
- let r = m.replace(/[a-zA-Z]/g, "") - 1
- let c = this.comparisonList.find(j => j.label == m.split('')[0]).value
- valueList.push({
- c,
- r
- })
- })
- }
- item.valueList = valueList;
+ item.valueList = excelFunction.changeParameter(item.v.f);
return item;
})
}
+ },
+ median(arr) {
+ // 瀵规暟缁勮繘琛屾帓搴�
+ const sortedArr = arr.sort((a, b) => a - b);
+ // 璁＄畻鏁扮粍闀垮害鐨勪竴鍗�
+ const half = Math.floor(sortedArr.length / 2);
+ // 濡傛灉鏁扮粍闀垮害涓哄鏁帮紝杩斿洖涓棿鐨勫厓绱狅紱濡傛灉涓哄伓鏁帮紝杩斿洖涓棿涓や釜鍏冪礌鐨勫钩鍧囧��
+ if (sortedArr.length % 2) {
+ // 濂囨暟浣嶇疆鐨勫厓绱�
+ return sortedArr[half];
+ } else {
+ // 鍋舵暟浣嶇疆鐨勫钩鍧囧��
+ return (sortedArr[half - 1] + sortedArr[half]) / 2;
+ }
+ },
+ 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/>'):'')
+ // str.replace(new RegExp(search, 'g'), replace)
+ return str
},
getInspectionValueType(id) {
for (var a in this.currentSample.insProduct) {
@@ -1426,6 +1854,13 @@
}
return sum
},
+ handleInput (n) {
+ n.v.v = n.v.v.replace(/[^\d.^e\-/+]/g, '');
+ n.v.v = n.v.v.replace(/\.{2,}/g,"."); //鍙繚鐣欑涓�涓�. 娓呴櫎澶氫綑鐨�
+ n.v.v = n.v.v.replace(".","$#$").replace(/\./g,"").replace("$#$",".");
+ n.v.v = n.v.v.replace(/\/{2,}/g,"/"); //鍙繚鐣欑涓�涓�/娓呴櫎澶氫綑鐨�
+ n.v.v = n.v.v.replace("/","$#$").replace(/\//g,"").replace("$#$","/");
+ },
getInspectionItemType(id) {
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == id) {
@@ -1441,20 +1876,34 @@
}
},
getSystemValue(n) {
+ let code = null
try {
- if (this.param[n.i].equipValue.v.v == null || this.param[n.i].equipValue.v.v == '') {
- this.$message.error('璇峰厛閫夋嫨閲囬泦鐨勮澶�')
- return
- }
+ this.param[n.i].equipValue.forEach(a=>{
+ if(a.r === n.r){
+ if (a.v.v == null || a.v.v == '') {
+ this.$message.error('璇峰厛閫夋嫨閲囬泦鐨勮澶�')
+ return
+ }else{
+ code = a.v.v
+ }
+ }
+ })
} catch (e) {
+ // console.log(e);
this.$message.error('鎵句笉鍒拌澶囧唴瀹�')
}
- this.$message.error('閲囬泦澶辫触銆愬凡寮�鏀炬墜鍔ㄦ柟寮忋��')
+ // console.log(n, code);
+ fetch('http://localhost:82/寰俊鍥剧墖_20240518100811.png').then(res=>res.blob()).then(blob=>{
+ // console.log(blob);
+ const url = URL.createObjectURL(blob)
+ // console.log(url);
+ })
+ /* this.$message.error('閲囬泦澶辫触銆愬凡寮�鏀炬墜鍔ㄦ柟寮忋��')
for (var a in this.currentSample.insProduct) {
if (this.currentSample.insProduct[a].id == n.i) {
this.currentSample.insProduct[a].inspectionItemType = 0
}
- }
+ } */
},
getEquipOptions(e, id) {
if (e) {
@@ -1551,7 +2000,6 @@
laboratory: this.sonLaboratory,
}).then(res => {
if (res.code === 200) {
- console.log(res.data)
if(!res.data||res.data.length==0){
this.$axios.post(this.$api.insOrderPlan.submitPlan, {
orderId: this.orderId,
@@ -1575,7 +2023,7 @@
if(lastChar=='-'){
res.data[i] = res.data[i].slice(0, -1);
}
- newData.push(h('p', {style: 'font-size: 12px;'}, (Number(i)+1)+'銆�'+res.data[i]))
+ 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' },'浠ヤ笂椤圭洰涓嶅悎鏍硷紝纭畾鎻愪氦锛�'))
this.$confirm('鎻愮ず',{
@@ -1609,15 +2057,17 @@
return
},
saveInsContext() {
- 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('宸蹭繚瀛�')
- })
+ 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('宸蹭繚瀛�')
+ })
+ }
},
changeEquip(val, n) {
for (let i in this.equipOptions) {
@@ -1815,6 +2265,26 @@
}).catch(error => {
})
+ },
+ /**
+ * 灏嗘暟鍊紇淇濈暀ct.fa涓�'##'鍚庣殑鎸囧畾灏忔暟浣嶆暟锛屽苟杩斿洖鏍煎紡鍖栧悗鐨勫瓧绗︿覆銆�
+ *
+ * @param v 瑕佹牸寮忓寲鐨勬暟鍊�
+ * @param ct 鍖呭惈鏍煎紡鍖栭厤缃殑瀵硅薄
+ * @param ct.fa 鏍煎紡鍖栭厤缃瓧绗︿覆锛岃嫢鍖呭惈'##'鍒欐寜鐓у叾鍚庣殑鍐呭纭畾灏忔暟浣嶆暟
+ * @returns 鏍煎紡鍖栧悗鐨勫瓧绗︿覆鎴栧師濮嬫暟鍊硷紙鑻ラ厤缃笉绗﹀悎瑕佹眰锛�
+ */
+ toFixed(v,ct){
+ if(v&&ct&&ct.fa&&ct.fa.includes('##')){
+ if(ct.fa.includes('.')){
+ let num = ct.fa.slice(4).length
+ return Number(v).toFixed(num)
+ }else{
+ return Number(v).toFixed(0)
+ }
+ }else{
+ return v
+ }
}
}
}
--
Gitblit v1.9.3