From 740c3bb7eab85c72e3b9093a9b59b2d544db533b Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 29 六月 2024 15:28:34 +0800
Subject: [PATCH] 光纤带模板检验切换
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 102 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 78 insertions(+), 24 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index c729fbb..454ee55 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -205,14 +205,14 @@
<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 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"
@@ -253,11 +253,26 @@
</el-form>
</div>
<div class="center">
- <div class="search" style="text-align: left;">
- <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;">
+ <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>
+ <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>
+ </div>
</div>
<div class="center-box" id="nav" v-loading="tableLoading">
<table border="1" class="tables" cellpadding="10" v-for="(item,index) in tableList" :key="index">
@@ -610,7 +625,11 @@
currentFiberOptic:null,//褰撳墠鍏夌氦
currentBushing:null,//褰撳墠濂楃
tableLoading:false,
- upLoading:false
+ upLoading:false,
+ temptList:null,
+ fiber:[],
+ fibers:[],
+ currentTab:null
}
},
computed: {
@@ -669,6 +688,7 @@
insResult: null
}
})
+ this.getReportModel(this.currentSample.id)
if (this.currentSample.index == undefined) this.currentSample['index'] = 1
let bushing = this.currentSample.bushing
// this.handleTableData()
@@ -683,6 +703,7 @@
this.currentFiberOptic = null;
this.bushing = []
this.currentBushing = null;
+ this.currentTab = null;
if(bushing&&bushing.length>0){
this.bushing = bushing
}
@@ -698,7 +719,7 @@
}
})
}
- }
+ },
},
methods: {
getPower(){
@@ -804,14 +825,43 @@
insResult: null
}
})
+ this.getReportModel(row.id)
let bushing = this.currentSample.bushing
if(bushing&&bushing.length>0){
this.bushing = bushing
- this.bushing.forEach(a => {})
}
- // this.handleTableData()
+ this.handleTableData()
this.getTableLists();
this.currentKey = row.index
+ this.currentTab = null;
+ },
+ getReportModel(id){
+ 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;
@@ -1205,6 +1255,7 @@
let ask = this.currentSample.insProduct.find(m => m.id == item.i).ask?this.currentSample.insProduct.find(m => m.id == item.i).ask.split('&'):null;
let res = Object.values(comValue)[0]
let comp = []
+ console.log(res, ask)
if(res==''||res==null||res==undefined||res=='Infinity'){
item.v.v = ''
}else{
@@ -1213,31 +1264,34 @@
if (m.includes('=')) {
let str = m.split('=')[1]
if(typeof res == 'string'&&typeof str == 'string'){
- return res.trim() == str.trim()
+ return res.trim() == str.trim()
}else{
- return res == str
+ return eval(res) == eval(str)
}
} else if (m.includes('鈮�')) {
- return res >= m.split('鈮�')[1]
+ console.log(res, eval(res <= m.split('鈮�')[1]))
+ return eval(res) >= eval(m.split('鈮�')[1])
}else if (m.includes('鈮�')) {
- return res <= m.split('鈮�')[1]
+ console.log(res,m.split('鈮�')[1])
+ return eval(res) <= eval(m.split('鈮�')[1])
}else if (m.includes('<')) {
- return res < m.split('<')[1]
+ return eval(res) < eval(m.split('<')[1])
}else if (m.includes('>')) {
- return res > m.split('>')[1]
+ return eval(res) > eval(m.split('>')[1])
}else if (m.includes('~')) {
let k = m.split('~')
- return res >= k[0] && res <= k[1]
+ return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
}else if(m.includes('-')){
let k = m.split('-')
- return res >= k[0] && res <= k[1]
+ return eval(res) >= eval(k[0]) && eval(res) <= eval(k[1])
}else if(m.includes('卤')){
let k = m.split('卤')
- return res >= (k[0] - k[1]) && res <= (k[0] + k[1])
+ console.log(eval(res),eval((k[0] - k[1])),eval(res),eval((k[0] + k[1])))
+ return eval(res) >= eval((k[0] - k[1])) && eval(res) <= eval((k[0] + k[1]))
}else if(m.includes('锛�')){
- return res > m.split('锛�')[1]
+ return eval(res) > eval(m.split('锛�')[1])
}else if(m.includes('锛�')){
- return res < m.split('锛�')[1]
+ return eval(res) < eval(m.split('锛�')[1])
}
})
}
--
Gitblit v1.9.3