From 4001279159dd37942b3cf4c83ab537f95832a82d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 06 六月 2022 13:33:21 +0800
Subject: [PATCH] BUG修改
---
src/views/device/peripheralUnit/index.vue | 49 ++++++++++++++++++++++++++++---------------------
1 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 0de5611..f733fd9 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -119,19 +119,20 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code"/>
- <el-table-column label="澶栬鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="120"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
- <el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText"/>
- <el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate">
+ <el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code" show-overflow-tooltip/>
+ <el-table-column label="澶栬鍚嶇О" align="center" min-width="180" prop="name" show-overflow-tooltip/>
+ <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="120" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText" min-width="200" show-overflow-tooltip/>
+ <el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText" show-overflow-tooltip/>
+ <el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/>
</template>
</el-table-column>
- <el-table-column label="闂鎸囦护" align="center" width="180" prop="readInstruction"/>
- <el-table-column label="杩斿洖闀垮害" width="80" align="center" prop="loopLength"/>
- <el-table-column label="鍔熻兘鎻忚堪" align="center" min-width="300" show-overflow-tooltip prop="description"/>
+ <el-table-column label="闂鎸囦护" align="center" width="220" prop="readInstruction" show-overflow-tooltip/>
+ <el-table-column label="鎸囦护闀垮害" width="80" align="center" prop="orderLength" show-overflow-tooltip/>
+ <el-table-column label="杩斿洖闀垮害" width="80" align="center" prop="loopLength" show-overflow-tooltip/>
+<!-- <el-table-column label="瑙ｆ瀽璇存槑" align="center" min-width="300" show-overflow-tooltip prop="description"/>-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -179,7 +180,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰璁惧崟鍏冨璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="50%" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="澶栬浠ｇ爜" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ璁句唬鐮�" :disabled="disabled"/>
@@ -216,11 +217,14 @@
<el-form-item label="闂鎸囦护" prop="readInstruction">
<el-input v-model="form.readInstruction" placeholder="璇疯緭鍏ラ棶璇㈡寚浠�" :disabled="disabled"/>
</el-form-item>
- <el-form-item label="杩斿洖闀垮害" prop="loopLength">
- <el-input v-model="form.loopLength" placeholder="璇疯緭鍏ヨ繑鍥為暱搴�" :disabled="disabled"/>
+ <el-form-item label="鎸囦护闀垮害" prop="orderLength">
+ <el-input v-model="form.orderLength" type="number" placeholder="璇疯緭鍏ユ寚浠ら暱搴�" :disabled="disabled"/>
</el-form-item>
- <el-form-item label="鍔熻兘鎻忚堪" prop="description">
- <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" :disabled="disabled"/>
+ <el-form-item label="杩斿洖闀垮害" prop="loopLength">
+ <el-input v-model="form.loopLength" type='number' placeholder="璇疯緭鍏ヨ繑鍥為暱搴�" :disabled="disabled"/>
+ </el-form-item>
+ <el-form-item label="瑙ｆ瀽璇存槑" prop="description">
+ <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" maxlength="512" show-word-limit :disabled="disabled"/>
</el-form-item>
<el-form-item label="闄勪欢">
<fileUpload v-model="form.filePath" :disabled="disabled"/>
@@ -341,6 +345,9 @@
{required: true, message: "闂鎸囦护涓嶈兘涓虹┖", trigger: "blur"},
{max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
],
+ orderLength: [
+ {required: true, message: "鎸囦护闀垮害涓嶈兘涓虹┖", trigger: "blur"}
+ ],
loopLength: [
{required: true, message: "杩斿洖闀垮害涓嶈兘涓虹┖", trigger: "blur"}
],
@@ -348,7 +355,7 @@
{required: true, message: "闄勪欢涓嶈兘涓虹┖", trigger: "blur"}
],
description: [
- {max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
+ {max: 512, message: '鏈�澶氳緭鍏�512涓瓧绗�', trigger: 'blur' }
]
},
disabled: false,
@@ -463,12 +470,12 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- if(this.uploadFlag){
- if(!this.form.filePath){
- this.$modal.msgWarning("璇烽�夋嫨涓婁紶闄勪欢");
- return;
- }
- }
+ // if(this.uploadFlag){
+ // if(!this.form.filePath){
+ // this.$modal.msgWarning("璇烽�夋嫨涓婁紶闄勪欢");
+ // return;
+ // }
+ // }
this.buttonLoading = true;
if (this.form.id != null) {
updatePeripheralUnit(this.form).then(response => {
--
Gitblit v1.9.1