From a1a6630f2eabfc78a379b5808b1bf7231a084d0b Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 11 十月 2023 18:02:44 +0800
Subject: [PATCH] 工序弹框的 列表和详情的更新同步
---
src/views/set.vue | 45 +++++++++++++++++++++++----------------------
1 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/views/set.vue b/src/views/set.vue
index c6b3d23..3311d97 100644
--- a/src/views/set.vue
+++ b/src/views/set.vue
@@ -8,7 +8,7 @@
</div>
<div class="form-content-box">
<div class="form-box-l">
- <div class="form-box-l-item">
+ <!-- <div class="form-box-l-item">
<el-button
type="primary"
@click="buttonClick(1)"
@@ -17,7 +17,7 @@
>
缃戠粶閰嶇疆</el-button
>
- </div>
+ </div> -->
<!-- <div class="form-box-l-item">
<el-button
type="primary"
@@ -28,7 +28,7 @@
鍔犲叆闆嗙兢</el-button
>
</div> -->
- <div class="form-box-l-item">
+ <!-- <div class="form-box-l-item">
<el-button
type="primary"
@click="buttonClick(3)"
@@ -37,7 +37,7 @@
>
PLC閰嶇疆</el-button
>
- </div>
+ </div> -->
</div>
<div class="form-box-r">
<el-form
@@ -236,18 +236,20 @@
</el-form-item>
</div>
<div style="height: 100%" v-if="active == 3">
+ <div class="form-box-r-title" >PLC鍦板潃閰嶇疆</div>
<div
style="
overflow: auto;
- width: 100%;
- min-height: 180px;
+ width: 80%;
+ min-height: 200px;
padding-right: 10px;
+ margin:60px auto 0;
"
>
<el-form-item
label="PLC鍝佺墝"
prop="brand"
- class="form-item2 float_left"
+ class="form-item float_left"
>
<!-- style="width: calc(100% - 30px)" -->
<el-select
@@ -270,7 +272,7 @@
></i> -->
</el-form-item>
- <el-form-item label="鎺ュ彛鏂瑰紡" prop="method" class="form-item2">
+ <el-form-item label="鎺ュ彛鏂瑰紡" prop="method" class="form-item">
<!-- <el-input v-model="form.method" placeholder="璇疯緭鍏�"></el-input> -->
<el-select
v-model="form.method"
@@ -287,7 +289,7 @@
label="娉㈢壒鐜�"
prop="baudRate"
v-if="form.method == 'serial'"
- class="form-item2 float_right margin_left_10px"
+ class="form-item float_right"
>
<el-input
v-model="form.baudRate"
@@ -298,7 +300,7 @@
label="涓插彛鍚嶇О"
prop="serialName"
v-if="form.method == 'serial'"
- class="form-item2 float_right margin_left_10px"
+ class="form-item float_right"
>
<el-input
v-model="form.serialName"
@@ -309,7 +311,7 @@
label="PLC鍦板潃"
v-if="form.method == 'modbusTCP'"
prop="address"
- class="form-item2 float_right margin_left_10px"
+ class="form-item float_right"
>
<el-input
v-model="form.address"
@@ -335,7 +337,7 @@
label="绔彛鍙�"
prop="port"
v-if="form.method == 'modbusTCP'"
- class="form-item2 float_right"
+ class="form-item float_right"
>
<el-input
v-model.number="form.port"
@@ -343,7 +345,7 @@
></el-input>
</el-form-item>
</div>
- <el-button
+ <!-- <el-button
style="margin-bottom: 10px; float: right"
@click="addPreProduction"
type="primary"
@@ -392,7 +394,6 @@
</el-table-column>
<el-table-column prop="type" label="鏁版嵁绫诲瀷" width="120">
<template slot-scope="scope">
- <!-- :popper-append-to-body="false" -->
<el-select
v-if="scope.row.edit"
v-model="scope.row.type"
@@ -417,10 +418,10 @@
placeholder="璇烽�夋嫨"
filterable
>
- <el-option label="瀹屾垚閲�" value="1"></el-option>
- <el-option label="鎬婚噺" value="2"></el-option>
+ <el-option label="瀹屾垚閲�" :value="1"></el-option>
+ <el-option label="鎬婚噺" :value="2"></el-option>
</el-select>
- <span v-else>{{ scope.row.fieldName }}</span>
+ <span v-else>{{ scope.row.fieldName==1?'瀹屾垚閲�':'鎬婚噺' }}</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" width="120">
@@ -444,7 +445,7 @@
</span>
</template>
</el-table-column>
- </el-table>
+ </el-table> -->
</div>
</el-form>
@@ -494,7 +495,7 @@
props: {},
data() {
return {
- active: 1,
+ active: 3,
form: {
isRequired: false,
dns: "",
@@ -570,7 +571,7 @@
};
},
mounted() {
- this.getnetworkCardList();
+ this.buttonClick(this.active)
},
watch: {},
methods: {
@@ -954,7 +955,7 @@
margin: 30px 0 0 40px;
}
.height_100 {
- height: calc(100% - 90px);
+ height: calc(100% - 120px);
}
.el-form {
width: 100%;
@@ -1013,7 +1014,7 @@
// position:absolute;
// left:10px;
// bottom:20px;
- margin-top: 40px;
+ margin-top: 0px;
float: right;
}
--
Gitblit v1.8.0