From cf1b5bf548b870efd0f1b4e3d5a8f88e79cfd9c9 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@126.com>
Date: 星期六, 08 一月 2022 12:15:22 +0800
Subject: [PATCH] 问题修改
---
src/views/device/peripheralUnit/index.vue | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index a5d36be..287644f 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -131,7 +131,7 @@
</el-table-column>
<el-table-column label="璇绘暟鎸囦护" align="center" width="180" prop="readInstruction"/>
<el-table-column label="鍥炴暟闀垮害" align="center" prop="loopLength"/>
- <el-table-column label="鍔熻兘鎻忚堪" align="center" prop="description"/>
+ <el-table-column label="鍔熻兘鎻忚堪" align="center" min-width="180" 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 +179,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰璁惧崟鍏冨璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
<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"/>
@@ -233,7 +233,7 @@
</el-dialog>
<!-- 闄勪欢绐椾綋 -->
- <el-dialog :title="title" :visible.sync="uploadFlag" width="500px" append-to-body>
+ <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="uploadFlag" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="闄勪欢">
<fileUpload v-model="form.filePath" limit="1"/>
@@ -262,6 +262,21 @@
name: "PeripheralUnit",
dicts: ['DICT103'],
data() {
+ var validateModel = (rule, value, callback) => {
+ if (!value) {
+ callback(new Error('瑙勬牸鍨嬪彿涓嶈兘涓虹┖'));
+ return
+ }
+ if (value.length > 32) {
+ callback(new Error('鏈�澶氳緭鍏�32涓瓧绗�'));
+ return
+ }
+ if (!(/^[A-Za-z]+$/.test(value))) {
+ callback(new Error('鍙兘杈撳叆鑻辨枃瀛楃'));
+ return
+ }
+ callback();
+ };
return {
// 鎸夐挳loading
buttonLoading: false,
@@ -293,7 +308,7 @@
model: undefined,
manufacturer: undefined,
vendorCode: undefined,
- baudRate: undefined,
+ baudRate: undefined
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -307,22 +322,24 @@
],
name: [
{required: true, message: "澶栬鍚嶇О涓嶈兘涓虹┖", trigger: "blur"},
- {max: 32, message: '鏈�澶氳緭鍏�32涓枃瀛楃', trigger: 'blur' }
+ {max: 32, message: '鏈�澶氳緭鍏�32涓瓧绗�', trigger: 'blur' }
],
model: [
- {required: true, message: "瑙勬牸鍨嬪彿涓嶈兘涓虹┖", trigger: "blur"}
+ {required: true, validator: validateModel, trigger: "blur"}
],
manufacturer: [
{required: true, message: "鐢熶骇鍘傚晢涓嶈兘涓虹┖", trigger: "blur"}
],
vendorCode: [
- {required: true, message: "鍘傚晢浠ｇ爜涓嶈兘涓虹┖", trigger: "blur"}
+ {required: true, message: "鍘傚晢浠ｇ爜涓嶈兘涓虹┖", trigger: "blur"},
+ {max: 32, message: '鏈�澶氳緭鍏�32涓瓧绗�', trigger: 'blur' }
],
baudRate: [
{required: true, message: "娉㈢壒鐜囦笉鑳戒负绌�", trigger: "change"}
],
readInstruction: [
- {required: true, message: "璇绘暟鎸囦护涓嶈兘涓虹┖", trigger: "blur"}
+ {required: true, message: "璇绘暟鎸囦护涓嶈兘涓虹┖", trigger: "blur"},
+ {max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
],
loopLength: [
{required: true, message: "鍥炴暟闀垮害涓嶈兘涓虹┖", trigger: "blur"}
@@ -330,6 +347,9 @@
filePath: [
{required: true, message: "闄勪欢涓嶈兘涓虹┖", trigger: "blur"}
],
+ description: [
+ {max: 128, message: '鏈�澶氳緭鍏�128涓瓧绗�', trigger: 'blur' }
+ ]
},
disabled: false,
// 鐢熶骇鍘傚晢
@@ -406,7 +426,8 @@
handleAdd() {
this.reset();
this.getManufacturerList();
- this.form.baudRate = '3'
+ this.form.baudRate = '04'
+ this.disabled = false
this.open = true;
this.title = "娣诲姞澶栬鍗曞厓";
},
@@ -425,6 +446,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.loading = true;
+ this.disabled = false
this.reset();
this.getManufacturerList();
const id = row.id || this.ids
--
Gitblit v1.9.1