From e28e9395819fd992bc3e168b6ff89fb6f538f1bc Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:25:34 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/constructionBatch/index.vue | 4 ++--
src/views/system/role/index.vue | 2 +-
src/views/device/peripheralUnit/index.vue | 2 +-
src/views/construction/reserveIp/index.vue | 2 +-
src/views/construction/server/index.vue | 2 +-
src/views/system/dept/index.vue | 2 +-
src/views/system/post/index.vue | 2 +-
src/views/construction/ipc/index.vue | 6 +++---
src/views/construction/iot/index.vue | 2 +-
src/views/basics/manufacturer/index.vue | 2 +-
src/views/basics/school/index.vue | 2 +-
src/views/device/equipment/index.vue | 2 +-
src/views/system/user/index.vue | 2 +-
src/views/construction/ai/index.vue | 4 ++--
src/views/construction/nvr/index.vue | 12 ++++++------
src/views/device/batch/index.vue | 2 +-
16 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/views/basics/manufacturer/index.vue b/src/views/basics/manufacturer/index.vue
index 5ce7700..f647474 100644
--- a/src/views/basics/manufacturer/index.vue
+++ b/src/views/basics/manufacturer/index.vue
@@ -131,7 +131,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰巶鍟嗗璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" :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="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ巶鍟嗗悕绉�" />
diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index 1f38640..7f1884b 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -184,7 +184,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰鏍″璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" :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="璇疯緭鍏ュ鏍′唬鐮�"/>
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index ad1a159..84dfbcc 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/index.vue
@@ -277,7 +277,7 @@
lanOne: [
{required: true, message: "LAN1涓嶈兘涓虹┖", trigger: "blur"},
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑LAN1",
trigger: "blur"
}
@@ -292,7 +292,7 @@
],
lanTwo: [
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑LAN2",
trigger: "blur"
}
diff --git a/src/views/construction/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index 30921b3..ca1b7bf 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -92,7 +92,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀规柦宸ユ壒娆″璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂藉伐鎵规" prop="batch">
<el-input v-model="form.batch" maxlength="64" show-word-limit placeholder="璇疯緭鍏ユ柦宸ユ壒娆�" />
@@ -121,7 +121,7 @@
<el-input v-model="form.teamMembers" type="textarea" rows="4" maxlength="64" show-word-limit placeholder="璇疯緭鍏ュ洟闃熸垚鍛�" />
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" rows="6" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.remarks" type="textarea" rows="10" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 77b2760..c8985a1 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -326,7 +326,7 @@
lan: [
{required: true, message: "LAN涓嶈兘涓虹┖", trigger: "blur"},
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑LAN",
trigger: "blur"
}
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index d00d645..1d0aaf0 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -127,12 +127,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="MAC" prop="mac">
- <el-input v-model="form.mac" placeholder="璇疯緭鍏AC"/>
+ <el-input v-model="form.mac" maxlength="17" show-word-limit placeholder="璇疯緭鍏AC"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="IP" prop="ip">
- <el-input v-model="form.ip" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ip" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -273,7 +273,7 @@
mac: [
{required: true, message: "mac涓嶈兘涓虹┖", trigger: "blur"},
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑MAC锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
trigger: "blur"
}
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 303348a..82d71a7 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -303,16 +303,16 @@
passageway: [
{required: true, message: "閫氶亾涓嶈兘涓虹┖", trigger: "blur"}
],
- lanOne: [
- {required: true, message: "LAN1涓嶈兘涓虹┖", trigger: "blur"},
+ lanTwo: [
+ {required: true, message: "LAN2涓嶈兘涓虹┖", trigger: "blur"},
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑LAN",
trigger: "blur"
}
],
- ipOne: [
- {required: true, message: "ip1涓嶈兘涓虹┖", trigger: "blur"},
+ ipTwo: [
+ {required: true, message: "IP涓嶈兘涓虹┖", trigger: "blur"},
{
pattern: /^(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])\.(\d|[1-9]\d|1\d{2}|2[0-5][0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
@@ -322,7 +322,7 @@
// lanTwo: [
// {required: true, message: "LAN2涓嶈兘涓虹┖", trigger: "blur"},
// {
- // pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ // pattern: /^[0-9a-fA-F:]*$/,
// message: "璇疯緭鍏ユ纭殑LAN",
// trigger: "blur"
// }
diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index 5f31cc4..6e0406f 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -194,7 +194,7 @@
mac: [
{required: true, message: "MAC鍦板潃涓嶈兘涓虹┖", trigger: "blur"},
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑MAC鍦板潃锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
trigger: "blur"
}
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 3082a6a..29e19a9 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -308,7 +308,7 @@
lan: [
{required: true, message: "LAN涓嶈兘涓虹┖", trigger: "blur"},
{
- pattern: /^[A-F0-9]{2}(-[A-F0-9]{2}){5}$|^[A-F0-9]{2}(:[A-F0-9]{2}){5}$|^[A-F0-9]{12}$|^[A-F0-9]{4}(\.[A-F0-9]{4}){2}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑LAN",
trigger: "blur"
}
diff --git a/src/views/device/batch/index.vue b/src/views/device/batch/index.vue
index 577df13..90b3f83 100644
--- a/src/views/device/batch/index.vue
+++ b/src/views/device/batch/index.vue
@@ -117,7 +117,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀圭敓浜ф壒娆″璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" :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="batch">
<el-input v-model="form.batch" placeholder="璇疯緭鍏ョ敓浜ф壒娆�" />
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 6800024..5a3f065 100644
--- a/src/views/device/equipment/index.vue
+++ b/src/views/device/equipment/index.vue
@@ -188,7 +188,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="100px">
<el-form-item label="搴忓垪鍙�" prop="serialNumber">
<el-input v-model="form.serialNumber" :disabled="disabled" placeholder="璇疯緭鍏ュ簭鍒楀彿"/>
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index 27b24b2..55b7c49 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -180,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"/>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index d1c6c4d..dd4b2de 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -115,7 +115,7 @@
</el-table>
<!-- 娣诲姞鎴栦慨鏀归儴闂ㄥ璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 4aa8b56..5f49cb4 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -127,7 +127,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰矖浣嶅璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" :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="postName">
<el-input v-model="form.postName" placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 45e1bb7..0e8c5b1 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -163,7 +163,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀硅鑹查厤缃璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
<el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 872616a..de5011e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -209,7 +209,7 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <Dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
--
Gitblit v1.9.1