From 8e67a9822ea29c652dd3f27ab5262aeb2751f239 Mon Sep 17 00:00:00 2001
From: whycwx <1272078254@qq.com>
Date: 星期一, 24 五月 2021 18:23:55 +0800
Subject: [PATCH] 绕组试验
---
src/pages/windingTest/windingTest.vue | 237 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 197 insertions(+), 40 deletions(-)
diff --git a/src/pages/windingTest/windingTest.vue b/src/pages/windingTest/windingTest.vue
index 25078a8..97998d4 100644
--- a/src/pages/windingTest/windingTest.vue
+++ b/src/pages/windingTest/windingTest.vue
@@ -17,7 +17,7 @@
<p class="title_list">瀹為獙姝ラ鈶�</p>
<p class="title_list">娴嬮噺缁曠粍缁濈紭鐢甸樆锛氫娇鐢ㄧ粷缂樼數闃绘祴璇曚华锛屽鍚勭浉缁曠粍鐨勫鏈鍧囧紩鍑烘椂锛屽垎鍒祴閲忓悇缁曠粍瀵规満澹冲強缁曠粍鐩镐簰闂寸殑缁濈紭鐢甸樆锛�</p>
<p class="title_list">濡傜數鏈虹粫缁勫凡鍦ㄧ數鏈哄唴閮ㄨ繛鎺ヤ粎寮曞嚭鍑虹嚎绔椂锛屾祴閲忔墍鏈夎繛鍦ㄤ竴璧风殑缁曠粍瀵规満澹崇殑缁濈紭鐢甸樆銆傛墜宸ユ祴璇曞畬鎴愬悗灏嗙粨鏋滃～鍏ヤ笅鍒楄〃鏍笺��</p>
- <p class="title_list">缁濈紭鐢甸樆娴嬮噺缁撴潫鍚庯紝姣忎釜鍥炶矾搴斿鍦版斁鐢点��</p>
+ <p class="title_list" style="color:#F0809F;">缁濈紭鐢甸樆娴嬮噺缁撴潫鍚庯紝姣忎釜鍥炶矾搴斿鍦版斁鐢点��</p>
</div>
<div v-if="next_status == 2">
@@ -66,20 +66,20 @@
<div class="button_box">
<el-button type="primary" v-if="next_status == 2" size="mini" class="complete" @click="complete">瀹屾垚瀹為獙</el-button>
<el-button type="primary" size="mini" @click="reset">閲嶇疆鏁版嵁</el-button>
- <el-button type="primary" size="mini" >淇濆瓨鏁版嵁</el-button>
+ <el-button type="primary" size="mini" @click="seveData">淇濆瓨鏁版嵁</el-button>
<el-button type="primary" size="mini" @click="next()">{{ next_status==1?"涓嬩竴姝ュ疄楠�":"涓婁竴姝ュ疄楠�" }}</el-button>
</div>
</div>
</div>
<div class="content_cent">
- <el-table :data="tableData" style="width: 100%" max-height="330px">
+ <el-table :data="tableData" style="width: 100%" max-height="330px" :span-method="objectSpanMethod"><!--:span-method="objectSpanMethod"-->
<el-table-column prop="id" label="ID" align="center"></el-table-column>
<el-table-column prop="saveTime" label="鏁版嵁淇濆瓨鏃堕棿" width="150" align="center"></el-table-column>
<el-table-column prop="experimentId" label="璁惧SN" width="150" align="center"></el-table-column>
<el-table-column label="璁惧绫诲瀷" align="center">
<template slot-scope="scope">
<div>
- <span>{{ scope.row.deviceId?dutList[scope.row.deviceId-1].label:"" }}</span>
+ <span>{{ getBut(scope.row.deviceId) }}</span>
</div>
</template>
</el-table-column>
@@ -92,7 +92,7 @@
<template slot-scope="scope">
<div>
<el-button type="error" size="mini" @click="handleDel(scope.row)">鍒犻櫎</el-button>
- <el-button @click="handleUpdate(scope.row)" type="success" size="mini">缂栬緫</el-button>
+ <el-button @click="handleUpdate(scope.row,scope.$index)" type="success" size="mini">缂栬緫</el-button>
</div>
</template>
</el-table-column>
@@ -105,26 +105,30 @@
</div>
</template>
<script>
-import { getDataList,daleteData,getThisNumber,complete } from "./js/apis"
+import { getDataList,daleteData,getThisNumber,complete,seveData,updateRZStep } from "./js/apis"
export default {
data(){
return {
+ routeObj:{},
+ seveStatus:1,//1锛氭湭淇濆瓨 2锛氬凡淇濆瓨
+ compileSatus:1,// 1锛氭柊澧炵姸鎬� 2锛氱紪杈戠姸鎬�
thisNumber:"",
disStatus:false,
- list_status:1,
- next_status:1,
+ list_status:1,//1锛氬悇鐩哥粫缁勮緭鍏ュ垪琛� 2锛氱粫缁勮緭鍏ュ垪琛�
+ next_status:1,//1: 瀹為獙绗竴姝� 2锛氬疄楠岀浜屾
dutList:[
- {value:1,label:"1鍨嬪彿鐢垫満"},
- {value:2,label:"2鍨嬪彿鐢垫満"},
- {value:3,label:"3鍨嬪彿鐢垫満"},
- {value:4,label:"3鍨嬪彿鐢垫満"},
- {value:5,label:"4鍨嬪彿鐢垫満"},
+ {value:60001,label:"1鍨嬪彿鐢垫満"},
+ {value:60002,label:"2鍨嬪彿鐢垫満"},
+ {value:60003,label:"3鍨嬪彿鐢垫満"},
+ {value:60004,label:"4鍨嬪彿鐢垫満"},
+ {value:60005,label:"5鍨嬪彿鐢垫満"},
],
rzObj:{
rz1:"",
rz2:"",
rz3:"",
- rz4:""
+ rz4:"",
+ name:"缁曠粍"
},
tebleList:[
{rz1:"",rz2:"",rz3:"",rz4:"",name:"缁曠粍1"},
@@ -133,10 +137,10 @@
],
tableData:[],
- selsectVal:1,
+ selsectVal:"0",//0锛氬悇鐩哥粫缁� 1锛氱粫缁�
options:[
- {value:1,label:"娴嬪悇鐩哥粫缁勫紩绾�"},
- {value:2,label:"娴嬬粫缁勫紩绾�"},
+ {value:"0",label:"娴嬪悇鐩哥粫缁勫紩绾�"},
+ {value:"1",label:"娴嬬粫缁勫紩绾�"},
],
}
},
@@ -144,10 +148,43 @@
// ContentBox
},
mounted() {
- this.getList();
- this.getThisNumber();
+ let self = this;
+ self.routeObj = self.$route.query;
+ if(self.routeObj.gxrzljqk){
+ self.selsectVal = self.routeObj.gxrzljqk;
+ }
+ self.getList();
+ self.getThisNumber();
},
methods: {
+ // 鑾峰彇璁惧绫诲瀷
+ getBut:function(id){
+ let self = this;
+ let text = "";
+ for(let i =0;i<self.dutList.length;i++){
+ if(id == self.dutList[i].value){
+ text = self.dutList[i].label;
+ }
+ }
+ return text;
+ },
+ // 鍚堝苟鍗曞厓鏍�
+ objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+ let self = this;
+ if (columnIndex === 9) {
+ if (rowIndex % 3 === 0 && self.selsectVal == 0) {
+ return {
+ rowspan: 3,
+ colspan: 1
+ };
+ } else {
+ return {
+ rowspan: 1,
+ colspan: 1
+ };
+ }
+ }
+ },
// 瀹屾垚璇曢獙
complete:function(){
let self = this;
@@ -172,7 +209,6 @@
getThisNumber(data).then(res=>{
if(res.data.code == 1){
self.thisNumber = res.data.data;
- console.log(self.thisNumber)
}
})
@@ -186,7 +222,8 @@
handleDel:function(data){
let self = this;
let params = {
- experimentId:data.experimentId
+ experimentId:data.experimentId,
+ uuid:data.uuid
}
self.$confirm("纭鍒犻櫎", "鎻愮ず", {
confirmButtonText: '纭畾',
@@ -206,32 +243,39 @@
}).catch(err=>{
})
-
- console.log(data)
},
// 缂栬緫
- handleUpdate:function(data){
+ handleUpdate:function(data,index){
let self = this;
- if(self.tebleList.length>1){
- self.tebleList[data.indexId-1].rz1 = data.electricCurrent;//鐢垫祦
- self.tebleList[data.indexId-1].rz2 = data.vol;//鐢靛帇
- self.tebleList[data.indexId-1].rz3 = data.resistance;//缁濈紭鐢甸樆
- self.tebleList[data.indexId-1].rz4 = data.temperature;//娓╁害
+ if(self.selsectVal == 0){
+ for(let i= 0;i<3;i++){
+ self.tebleList[self.tableData[index + i].indexId-1].rz1 = self.tableData[index + i].electricCurrent;//鐢垫祦
+ self.tebleList[self.tableData[index + i].indexId-1].rz2 = self.tableData[index + i].vol;//鐢靛帇
+ self.tebleList[self.tableData[index + i].indexId-1].rz3 = self.tableData[index + i].resistance;//缁濈紭鐢甸樆
+ self.tebleList[self.tableData[index + i].indexId-1].rz4 = self.tableData[index + i].temperature;//娓╁害
+ self.tebleList[self.tableData[index + i].indexId-1].experimentId = self.tableData[index + i].experimentId;//experimentId
+ self.tebleList[self.tableData[index + i].indexId-1].uuid = self.tableData[index + i].uuid;
+ }
+
}else{
self.rzObj.rz1 = data.electricCurrent;//鐢垫祦
self.rzObj.rz2 = data.vol;//鐢靛帇
self.rzObj.rz3 = data.resistance;//缁濈紭鐢甸樆
self.rzObj.rz4 = data.temperature;//娓╁害
+ self.rzObj.experimentId = data.experimentId;
+ self.rzObj.uuid = data.uuid;
}
- console.log(data)
+
+ self.compileSatus = 2;
},
// 鍒濆鍖栨煡璇�
getList:function(){
let self = this;
- self.list_status = self.selsectVal == 1?1:2;
+ self.list_status = self.selsectVal == 0?1:2;
let data = {
step:self.next_status,
+ rzLink:self.selsectVal,
pageNum:1,
pageSize:1000
}
@@ -241,26 +285,139 @@
if(self.tableData.length>0){
self.disStatus = true;
}
- console.log(res)
}).catch(err=>{
})
},
- // 涓�/涓嬩竴姝ュ疄楠�
- next:function(){
+ // 淇濆瓨鏁版嵁
+ seveData:function(){
let self = this;
- switch (self.next_status) {
- case 1:
- self.next_status = 2;
+ let data = [];
+ switch (self.selsectVal) {
+ case "0"://鍚勭浉缁曠粍
+ self.tebleList.forEach((element,index) => {
+ let obj = {
+ indexId:index+1,
+ step:self.next_status,
+ electricCurrent:element.rz1,
+ vol:element.rz2,
+ resistance:element.rz3,
+ temperature:element.rz4,
+ deviceId:'',
+ experimentId:element.experimentId?element.experimentId:self.routeObj.experimentId,
+ realName:'',
+ saveTime:'',
+ status:'',
+ winding:element.name,
+ rzLink:self.selsectVal,
+ uuid:element.uuid
+ }
+ data.push(obj)
+ });
break;
- case 2:
- self.next_status = 1;
+ case "1"://缁曠粍
+ let obj = {
+ indexId:index+1,
+ step:self.next_status,
+ electricCurrent:self.rzObj.rz1,
+ vol:self.rzObj.rz2,
+ resistance:self.rzObj.rz3,
+ temperature:self.rzObj.rz4,
+ deviceId:'',
+ experimentId:self.rzObj.experimentId?self.rzObj.experimentId:self.routeObj.experimentId,
+ realName:'',
+ saveTime:'',
+ status:'',
+ winding:self.rzObj.name,
+ rzLink:self.selsectVal,
+ uuid:self.rzObj.uuid
+ }
+ data.push(obj)
break;
default:
break;
}
- self.getList();
+
+ switch (self.compileSatus) {
+ case 1://鏂板淇濆瓨鏁版嵁
+ seveData(data).then(res=>{
+ if(res.data.code == 1){
+ self.$layer.msg("娣诲姞鎴愬姛");
+ self.getList();
+ self.reset();
+ self.seveStatus = 2;
+ }else{
+ self.$layer.msg("娣诲姞澶辫触");
+ }
+ })
+ break;
+ case 2://缂栬緫淇濆瓨鏁版嵁
+ updateRZStep(data).then(res=>{
+ if(res.data.code == 1){
+ self.$layer.msg("淇敼鎴愬姛");
+ self.getList();
+ self.reset();
+ self.compileSatus = 1;
+ self.seveStatus = 2;
+ }else{
+ self.$layer.msg("淇敼澶辫触");
+ }
+ })
+ break;
+
+ default:
+ break;
+ }
+
+ },
+ // 涓�/涓嬩竴姝ュ疄楠�
+ next:function(){
+ let self = this;
+ switch (self.seveStatus) {
+ case 1://鏈繚瀛�
+ self.$confirm("鏁版嵁杩樻湭淇濆瓨锛屾槸鍚︿繚瀛橈紵", "鎻愮ず", {
+ confirmButtonText: '鏄�',
+ cancelButtonText: '鍚�',
+ type: 'warning'
+ }).then(()=>{
+ self.seveData();
+ }).catch(err=>{
+ switch (self.next_status) {
+ case 1:
+ self.next_status = 2;
+ break;
+ case 2:
+ self.next_status = 1;
+ break;
+
+ default:
+ break;
+ }
+ self.getList();
+ self.reset();
+ })
+ break;
+ case 2://宸蹭繚瀛�
+ switch (self.next_status) {
+ case 1:
+ self.next_status = 2;
+ break;
+ case 2:
+ self.next_status = 1;
+ break;
+
+ default:
+ break;
+ }
+ self.getList();
+ self.seveStatus = 1;
+ self.reset();
+ break;
+
+ default:
+ break;
+ }
},
},
destroyed(){
--
Gitblit v1.9.1