From a62d9ff3b7bebf15f1bee8827ed5c263d9a1776c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 06 六月 2024 13:47:44 +0800
Subject: [PATCH] 在检验执行的模板渲染进行处理
---
src/main.js | 2
src/components/do/b1-inspect-order-plan/Inspection.vue | 131 +++++++++++++++++++++++++++++++++++++++++--
2 files changed, 124 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index ba5a5bb..f29a1e4 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -191,7 +191,11 @@
<template>
<div v-loading="loading" class="inspection">
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏</el-col>
+ <el-col :span="12" style="padding-left: 20px;">妫�楠屽崟璇︽儏
+ <span style="color: #3A7BFA;"> 鏍峰搧</span>
+ <span v-if="currentFiberOpticTape" 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="fiberOpticTapeVisible=true" v-if="fiberOpticTape.length>0">鍏夌氦甯﹀垏鎹�</el-button>
@@ -305,13 +309,41 @@
</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="caretSample(-1)"></i>
+ <i class="el-icon-caret-left table_caret" @click="caretSample(-1)" v-if="!currentFiberOpticTape&&!currentFiberOptic"></i>
<div :style="`font-family:${n.v.ff} !important;`">{{currentSample.sampleCode}}</div>
- <i class="el-icon-caret-right table_caret" @click="caretSample(1)"></i>
+ <i class="el-icon-caret-right table_caret"
+ v-if="!currentFiberOpticTape&&!currentFiberOptic"@click="caretSample(1)"></i>
</div>
</template>
<template v-else-if="n.v.ps!=undefined && n.v.ps.value==='鏍峰搧鍨嬪彿'">
<div :style="`font-family:${n.v.ff} !important;`" v-if="currentSample.model!==undefined&¤tSample.model!==null">{{currentSample.model}}</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="caretBushing(-1)"></i> -->
+ <div :style="`font-family:${n.v.ff} !important;`">{{currentBushing?currentBushing.color:''}}</div>
+ <!-- <i class="el-icon-caret-right table_caret" @click="caretBushing(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="caretTape(-1)
+ " v-if="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"
+ @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>
+ <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>
+ </div>
</template>
<span v-else :style="`font-family:${n.v.ff} !important;`">{{n.v.v}}</span>
</div>
@@ -337,7 +369,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="currentKey" :row-key="record=>record.index" v-if="fiberOpticVisible">
+ :current-row-key="currentKey2" :row-key="record=>record.index" v-if="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>
@@ -350,7 +382,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="currentKey" :row-key="record=>record.index" v-if="fiberOpticTapeVisible">
+ :current-row-key="currentKey1" :row-key="record=>record.index" v-if="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>
@@ -363,7 +395,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="currentKey" :row-key="record=>record.index" v-if="bushingVisible">
+ :current-row-key="currentKey0" :row-key="record=>record.index" v-if="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>
@@ -535,6 +567,9 @@
ps: {},
param: {},
currentKey: 1,
+ currentKey0: 1,
+ currentKey1: 1,
+ currentKey2: 1,
comparisonList: [],
excelMethodList: [],
equipOptions: [],
@@ -667,6 +702,7 @@
this.fiberOpticTape = row.fibers;
}
this.bushingVisible = false;
+ this.currentKey0 = row.index
},
async handleChangeOptic(row, column, event){
this.currentFiberOptic = row;
@@ -683,7 +719,7 @@
this.fiberOpticVisible = false;
let list = await this.getCurrentProduct(row.id,2)
this.getTableLists0(list)
- this.currentKey = row.index
+ this.currentKey2 = row.index
},
async handleChangeTape(row, column, event){
this.currentFiberOpticTape = row;
@@ -707,7 +743,7 @@
// 閰嶇疆鍏夌氦
this.fiberOptic = row.fiber;
}
- this.currentKey = row.index
+ this.currentKey1 = row.index
},
async handleChangeSample(row, column, event) {
this.param = {}
@@ -1637,6 +1673,85 @@
})
this.getTableLists()
},
+ caretBushing(num){
+ let index = this.currentKey0 + num
+ if(index < 1){
+ this.$message.error('褰撳墠鏄涓�涓绠�')
+ return
+ } else if(index > this.bushing.length){
+ this.$message.error('褰撳墠鏄渶鍚庝竴涓绠�')
+ return
+ }
+ this.currentKey0 = index
+ this.currentBushing = this.HaveJson(this.bushing[index - 1])
+ this.fiberOpticTape = []
+ this.currentFiberOpticTape = null;
+ this.fiberOptic = []
+ this.currentFiberOptic = null;
+ if( this.currentBushing.fiber&& this.currentBushing.fiber.length>0){
+ // 鐩存帴閰嶇疆鍏夌氦
+ this.fiberOptic = this.currentBushing.fiber;
+ }else if( this.currentBushing.fibers&& this.currentBushing.fibers.length>0){
+ // 閰嶇疆鍏夌氦甯﹀悗锛屽啀閰嶇疆鍏夌氦
+ this.fiberOpticTape = this.currentBushing.fibers;
+ }
+ },
+ async caretTape(num){
+ let index = this.currentKey1 + num
+ if(index < 1){
+ this.$message.error('褰撳墠鏄涓�涓厜绾ゅ甫')
+ return
+ } else if(index > this.fiberOpticTape.length){
+ this.$message.error('褰撳墠鏄渶鍚庝竴涓厜绾ゅ甫')
+ return
+ }
+ this.currentKey1 = index
+ this.currentFiberOpticTape = this.HaveJson(this.fiberOpticTape[index - 1])
+ this.param = {}
+ this.fiberOptic = []
+ this.currentFiberOptic = null;
+ this.currentFiberOpticTape.productList.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ this.fiberOpticTapeVisible = false;
+ let list = await this.getCurrentProduct(this.currentFiberOpticTape.id,1)
+ this.getTableLists0(list)
+ if(this.currentFiberOpticTape.fiber&&this.currentFiberOpticTape.fiber.length>0){
+ // 閰嶇疆鍏夌氦
+ this.fiberOptic = this.currentFiberOpticTape.fiber;
+ }
+ },
+ async caretOptic(num){
+ let index = this.currentKey2 + num
+ if(index < 1){
+ this.$message.error('褰撳墠鏄涓�涓厜绾�')
+ return
+ } else if(index > this.fiberOptic.length){
+ this.$message.error('褰撳墠鏄渶鍚庝竴涓厜绾�')
+ return
+ }
+ this.currentKey2 = index
+ this.currentFiberOptic = this.HaveJson(this.fiberOptic[index - 1])
+ this.currentFiberOptic.productList.forEach(a => {
+ this.param[a.id] = {
+ insValue: [],
+ comValue: [],
+ resValue: null,
+ equipValue: [],
+ equipName: [],
+ insResult: null
+ }
+ })
+ let list = await this.getCurrentProduct(this.currentFiberOptic.id,2)
+ this.getTableLists0(list)
+ },
handleSuccessUp(response, ) {
this.upLoading = false;
if (response.code == 200) {
diff --git a/src/main.js b/src/main.js
index 18e552a..48d9e41 100644
--- a/src/main.js
+++ b/src/main.js
@@ -14,7 +14,7 @@
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
const javaApi = 'http://192.168.11.200:8001';//鏉�
-// const javaApi = 'http://192.168.11.249:8001';//寮�
+// const javaApi = 'http://192.168.144.249:8001';//寮�
// const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
// const javaApi = 'http://127.0.0.1:8001';//鏅�
--
Gitblit v1.9.3