From cf6e91b8d81b528d65257fdc4912011873977cad Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 04 十一月 2024 14:05:36 +0800
Subject: [PATCH] 完成电路试验模板保存记录
---
src/components/do/b1-inspect-order-plan/circuit-parameters1.vue | 37 +++++++++
src/components/do/b1-inspect-order-plan/circuit-parameters2.vue | 39 +++++++++
src/main.js | 4
src/components/do/b1-inspect-order-plan/Inspection.vue | 133 ++++++++++++++++++++++++++++++++-
src/assets/api/controller.js | 9 ++
src/components/view/index-index.vue | 1
6 files changed, 214 insertions(+), 9 deletions(-)
diff --git a/src/assets/api/controller.js b/src/assets/api/controller.js
index 834e395..32fa955 100644
--- a/src/assets/api/controller.js
+++ b/src/assets/api/controller.js
@@ -33,6 +33,7 @@
auxiliaryOriginalHours,
evaluate,
role,
+ insProductTemplate,
}
}
@@ -416,3 +417,11 @@
const role = {
getRole:"/role/getRole",//鑾峰彇褰撳墠鐢ㄦ埛瑙掕壊
}
+
+// 鐢佃矾璇曢獙妯℃澘
+const insProductTemplate = {
+ addInsProductTemplate:'/insProductTemplate/addInsProductTemplate',//淇濆瓨妯＄増
+ chooseInsProductTemplate:'/insProductTemplate/chooseInsProductTemplate',//閫夋嫨妯＄増
+ getInsProductTemplate:'/insProductTemplate/getInsProductTemplate',//閫夋嫨涔嬪悗鏌ョ湅璇︽儏 浼犲弬id
+ delInsProductTemplate:'/insProductTemplate/delInsProductTemplate',//鍒犻櫎妯＄増 浼犲弬id
+}
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index ebed918..cfc661b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -259,8 +259,19 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">妫�楠屽崟璇︽儏
</el-col>
- <el-col :span="12" style="text-align: right;">
- <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')">妫�楠屾ā鏉垮垏鎹�</el-button>
+ <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end">
+ <el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')">鐢佃皟/闈炵數璋冩ā鏉垮垏鎹�</el-button>
+ <el-select v-model="template" size="medium" placeholder="鐢佃矾棰勮妯℃澘" style="margin-right: 10px;margin-left: 10px;" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')"
+ @change="selectInsProductTemplateById">
+ <el-option v-for="(a, ai) in templates" :key="ai" :value="a.id" :label="a.name">
+ <span style="float: left">{{ a.name }}</span>
+ <i class="el-icon-delete" style="float: right; color: #66b1ff; font-size: 16px;line-height: 34px;"
+ @click.stop="handleDelete(a)" v-if="addInsProductTemplatePower"></i>
+ </el-option>
+ </el-select>
+ <el-button size="medium" @click="templateDia=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')&&addInsProductTemplatePower">
+ <span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
+ </el-button>
<el-button size="small" type="primary" @click="sampleVisible=true;uploadSample()">鏍峰搧鍒囨崲</el-button>
<el-button size="small" type="primary" @click="taskVisible=true" v-show="!isLook">浠诲姟鍒囨崲</el-button>
<el-button size="small" type="primary" @click="handleSubmit" v-if="state==1"
@@ -726,8 +737,8 @@
<!-- 鐢佃矾璇曢獙 -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')" style="width: 100%;overflow-x: auto;overflow-y: visible;">
<!-- <Circuit></Circuit> -->
- <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum"></CircuitParameters1>
- <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum"></CircuitParameters2>
+ <CircuitParameters1 v-if="currentTableState==0" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters1>
+ <CircuitParameters2 v-if="currentTableState==1" :insProduct="currentSample.insProduct" :orderId="id" :sampleId="currentSample.id" :state="state" :num="currentSample.num1" :isLook="isLook" :currentNum="currentNum" ref="CircuitParameters"></CircuitParameters2>
</div>
<!-- 娓╂箍搴﹁瘯楠� -->
<div v-else-if="tableLists.find(m=>m.templateId==currentTable).templateName.includes('娓╂箍搴﹁瘯楠�')">
@@ -912,6 +923,18 @@
width="60%" fullscreen :modal="false">
<filePreview v-if="lookFileVisible" :fileUrl="currentFile.url"
:currentFile="currentFile" style="max-height: 87vh;overflow-y: auto;"/>
+ </el-dialog>
+ <el-dialog title="淇濆瓨妯℃澘" :visible.sync="templateDia" width="400px">
+ <div class="body" style="display: flex;align-items: center;" v-if="templateDia">
+ <div class="search_label" style="width: 90px;"><span class="required-span">* </span>妯℃澘鍚嶇О锛�</div>
+ <div class="search_input">
+ <el-input size="small" clearable v-model="templateName"></el-input>
+ </div>
+ </div>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="templateDia = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
+ </span>
</el-dialog>
</div>
</template>
@@ -1127,6 +1150,12 @@
humidity:''
},
currentFile:{},//褰撳墠鏂囦欢
+ templates:[],//鐢佃矾璇曢獙妯℃澘
+ templateDia:false,//鐢佃矾璇曢獙妯℃澘淇濆瓨妯℃澘寮规
+ template:null,
+ templateLoading:false,
+ templateName:'',
+ addInsProductTemplatePower:false,//閰嶇疆妯℃澘鏉冮檺
}
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -1155,6 +1184,7 @@
this.scrollInit()
this.getPower()
this.startWorker()
+ this.selectInsProductTemplate()
},
watch: {
// 鐩戝惉浠诲姟id锛岃幏鍙栦换鍔′俊鎭�
@@ -2150,6 +2180,7 @@
let fileAdd = false
let collected = false
let temDataAcquisition = false
+ let addInsProductTemplatePower = false;
for (var i = 0; i < power.length; i++) {
if (power[i].menuMethod == 'uploadFile') {
fileAdd = true
@@ -2163,6 +2194,9 @@
if (power[i].menuMethod == 'temDataAcquisition') {
temDataAcquisition = true
}
+ if(power[i].menuMethod == 'addInsProductTemplate'){
+ addInsProductTemplatePower = true
+ }
}
if (!fileDel) {
this.componentData0.do.splice(1, 1)
@@ -2170,6 +2204,7 @@
this.fileAdd = fileAdd
this.collected = collected
this.temDataAcquisition = temDataAcquisition
+ this.addInsProductTemplatePower = addInsProductTemplatePower
},
uploadSample(){
this.$axios.post(this.$api.insOrderPlan.doInsOrder, {
@@ -3767,6 +3802,96 @@
} catch (error) {
this.$emit('goback')
}
+ },
+ selectInsProductTemplate(){
+ this.$axios.post(this.$api.insProductTemplate.chooseInsProductTemplate).then(res => {
+ if (res.code == 201) return
+ this.templates = res.data
+ })
+ },
+ selectInsProductTemplateById(e){
+ if(e){
+ this.$axios.post(this.$api.insProductTemplate.getInsProductTemplate + '?id=' + e).then(res => {
+ if (res.code == 201) return
+ let obj = JSON.parse(res.data.message)
+ if(this.currentTableState!=res.data.version){
+ this.$message.error('鐢佃皟/闈炵數璋冩ā鏉跨増鏈笉涓�鑷达紝璇烽噸鏂伴�夋嫨')
+ this.template = null
+ return
+ }
+ // 褰撳墠妯℃澘涓湭鍖呭惈鎵�鏈夐」鐩�
+ let state = this.currentSample.insProduct.every(item=>{
+ if(obj.allBandList&&obj.allBandList.length>0&&obj.allBandList[0].projectList&&obj.allBandList[0].projectList.length>0&&item.inspectionItemSubclass&&obj.allBandList[0].projectList.find(m=>m.inspectionItemSubclass==item.inspectionItemSubclass)){
+ return true
+ }else{
+ return false
+ }
+ })
+ if(!state){
+ this.template = null
+ this.$message.error('褰撳墠妯℃澘涓湭鍖呭惈鎵�鏈夐」鐩紝璇烽噸鏂伴�夋嫨')
+ return
+ }
+ // 淇濆瓨鐗堟湰
+ this.saveVersion()
+ // 濡傛灉妯℃澘鐨勬楠岄」澶氫簡锛屽垯鍒犻櫎澶氫綑鐨�
+ obj.allBandList.forEach(item=>{
+ item.projectList.forEach((m,i)=>{
+ if(!this.currentSample.insProduct.find(n=>m.inspectionItemSubclass==n.inspectionItemSubclass)){
+ item.projectList.splice(i,1)
+ }
+ })
+ })
+ this.$refs.CircuitParameters.upTemplate(obj)
+ })
+ }
+ },
+ addTemplateDia(){
+ let obj = {
+ allBandList:this.$refs.CircuitParameters.allBandList,
+ intermodulationNum:this.$refs.CircuitParameters.intermodulationNum,
+ angleList:this.$refs.CircuitParameters.angleList,
+ }
+ if (this.templateName) {
+ this.templateLoading = true;
+ this.$axios.post(this.$api.insProductTemplate.addInsProductTemplate, {
+ name: this.templateName,
+ version:this.currentTableState,
+ message:JSON.stringify(obj)
+ }, {
+ headers: {
+ 'Content-Type': 'application/json'
+ }
+ }).then(res => {
+ if (res.code == 201) return
+ this.templateLoading = false;
+ this.templateDia = false;
+ this.$message.success('淇濆瓨鎴愬姛')
+ this.selectInsProductTemplate()
+ this.templateName = ''
+ })
+ } else {
+ this.$message.error('璇峰～鍐欐ā鏉垮悕绉�')
+ }
+ },
+ handleDelete(row){
+ this.$confirm('鏄惁鍒犻櫎褰撳墠鏁版嵁?', "璀﹀憡", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning"
+ }).then(() => {
+ this.$axios.post(this.$api.insProductTemplate.delInsProductTemplate, {
+ id: row.id
+ }).then(res => {
+ if (res.code === 201) {
+ return
+ }
+ this.$message.success('鍒犻櫎鎴愬姛')
+ this.selectInsProductTemplate()
+ }).catch(e => {
+ this.$message.error('鍒犻櫎澶辫触')
+ })
+ }).catch(() => {})
}
}
}
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
index 59dafee..eccd8f6 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters1.vue
@@ -359,12 +359,14 @@
isMore:false,
loading:{},
intermodulationNum:0,//浜掕皟妫�楠岄」鐩殑鏁伴噺
+ upTemplateState:false,
};
},
watch: {
// 瑙掑害鏁伴噺鍙樺寲鏃讹紝鏇存柊鎵�鏈夐娈典笅闈㈢殑鎵�鏈夐」鐩笅鐨勬墍鏈夌鍙ｅ拰瑙掑害
angleList(val) {
- this.allBandList.forEach(item => {
+ if(!this.upTemplateState){
+ this.allBandList.forEach(item => {
item.projectList.forEach(m => {
// 娣诲姞瑙掑害
for(let i=0;i<val.length;i++){
@@ -401,6 +403,7 @@
}
})
})
+ }
// console.log(this.allBandList)
},
currentNum(val) {
@@ -474,6 +477,7 @@
angleList.push({value:m})
})
this.angleList = angleList
+ this.upTemplateState = false;
}
let tell = ''
if(item.tell.includes(',')){
@@ -574,6 +578,7 @@
},
// 鍒犻櫎鏁扮粍
deleteList(index,list,type){
+ this.upTemplateState = false;
if(list.length>1){
if(type=='浜掕皟'){
let index = null;
@@ -629,6 +634,7 @@
},
// 娣诲姞鏁扮粍
addList(list,type){
+ this.upTemplateState = false;
if(type=='浜掕皟'){
let obj = null;
let index = null;
@@ -790,6 +796,35 @@
}).catch(err => {
console.log(err)
})
+ },
+ // 鏇存柊妯℃澘
+ upTemplate(obj){
+ this.upTemplateState = true;
+ // return
+ obj.allBandList.forEach((item,index)=>{
+ if(!this.allBandList[index]){
+ this.allBandList[index] = {
+ projectList:this.HaveJson(this.allBandList[0].projectList)
+ }
+ }
+ this.allBandList[index].band = item.band
+ let arr = []
+ item.projectList.forEach((m,i)=>{
+ if(this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass)){
+ let obj0 = {
+ angleList:m.angleList,
+ portList:m.portList,
+ portNum:m.portNum,
+ value:m.value,
+ valueType:m.valueType
+ }
+ arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
+ }
+ })
+ this.allBandList[index].projectList = arr
+ })
+ this.angleList = obj.angleList
+ this.intermodulationNum = obj.intermodulationNum
}
}
}
diff --git a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
index f9fcd1b..4a506c4 100644
--- a/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
+++ b/src/components/do/b1-inspect-order-plan/circuit-parameters2.vue
@@ -243,13 +243,15 @@
isMore:false,
insProductNew:[],
intermodulationNum:0,//浜掕皟妫�楠岄」鐩殑鏁伴噺
- loading:{}
+ loading:{},
+ upTemplateState:false,
};
},
watch: {
// 瑙掑害鏁伴噺鍙樺寲鏃讹紝鏇存柊鎵�鏈夐娈典笅闈㈢殑鎵�鏈夐」鐩笅鐨勬墍鏈夌鍙ｅ拰瑙掑害
angleList(val) {
- this.allBandList.forEach(item => {
+ if(!this.upTemplateState){
+ this.allBandList.forEach(item => {
item.projectList.forEach(m => {
if(m.angleList.length!==val.length){
m.angleList = JSON.parse(JSON.stringify(this.angleList))
@@ -274,6 +276,7 @@
}
})
})
+ }
},
currentNum(val) {
this.initData()
@@ -345,6 +348,7 @@
angleList.push({value:m})
})
this.angleList = angleList
+ this.upTemplateState = false
}
let tell = ''
if(item.tell.includes(',')){
@@ -447,6 +451,7 @@
},
// 鍒犻櫎鏁扮粍
deleteList(index,list,type){
+ this.upTemplateState = false
if(list.length>1){
if(type=='浜掕皟'){
let index = null;
@@ -502,6 +507,7 @@
},
// 娣诲姞鏁扮粍
addList(list,type){
+ this.upTemplateState = false
if(type=='浜掕皟'){
let obj = null;
let index = null;
@@ -666,6 +672,35 @@
}).catch(err => {
console.log(err)
})
+ },
+ // 鏇存柊妯℃澘
+ upTemplate(obj){
+ this.upTemplateState = true;
+ // return
+ obj.allBandList.forEach((item,index)=>{
+ if(!this.allBandList[index]){
+ this.allBandList[index] = {
+ projectList:this.HaveJson(this.allBandList[0].projectList),
+ band:item.band
+ }
+ }
+ let arr = []
+ item.projectList.forEach((m,i)=>{
+ if(this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass)){
+ let obj0 = {
+ angleList:m.angleList,
+ portList:m.portList,
+ portNum:m.portNum,
+ value:m.value,
+ valueType:m.valueType
+ }
+ arr.push({...this.allBandList[index].projectList.find(n=>n.inspectionItemSubclass==m.inspectionItemSubclass),...obj0})
+ }
+ })
+ this.allBandList[index].projectList = arr
+ })
+ this.angleList = obj.angleList
+ this.intermodulationNum = obj.intermodulationNum
}
}
}
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 465a45c..138696b 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -285,6 +285,7 @@
<div class="left-item-title">
<span style="font-size: 18px;">{{ item }}</span>
<span style="font-size: 14px;color: #999999;">{{ weekdays[index] }}</span>
+ <el-tag style="margin-top: 6px;" size="small">{{workList[index].length}} 鏉�</el-tag>
</div>
<div class="left-item-body">
<div class="body-item" v-for="(m,i) in workList[index]" :key="i" :class="{color0:m.type==0,color1:m.type==1,color2:m.type==2}">
diff --git a/src/main.js b/src/main.js
index b6fd273..afa39b8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,11 +21,11 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-// const javaApi = 'http://172.20.10.5:8001';
+const javaApi = 'http://172.20.10.5:8001';
// //閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
-const javaApi = 'http://10.1.13.77:8001';
+// const javaApi = 'http://10.1.13.77:8001';
// 閫氫俊姝ｅ紡搴�
// Vue.prototype.LOCATIONVUE = "https://ztwxlims.ztt.cn:7443";
--
Gitblit v1.9.3