From 219f95ef447355d55c8cc37847a4ee7e1cd9f3ea Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期二, 31 五月 2022 21:09:25 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/iot/index.vue | 6 +-
src/views/construction/constructionBatch/index.vue | 2
src/views/construction/reserveIp/index.vue | 29 +++++++++-----
src/views/construction/server/index.vue | 6 +-
src/views/construction/ai/index.vue | 12 +++---
src/views/construction/system/index.vue | 24 ++++++++++-
src/views/construction/nvr/index.vue | 26 ++++++++++---
src/views/construction/ipc/index.vue | 2
8 files changed, 74 insertions(+), 33 deletions(-)
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index 866c227..728db15 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/index.vue
@@ -154,24 +154,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN1" prop="lanOne">
- <el-input v-model="form.lanOne" placeholder="璇疯緭鍏ユ牎鍥綉绔彛"/>
+ <el-input v-model="form.lanOne" maxlength="17" show-word-limit placeholder="璇疯緭鍏ユ牎鍥綉绔彛"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ipOne">
- <el-input v-model="form.ipOne" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ipOne" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="LAN2" prop="lanTwo">
- <el-input v-model="form.lanTwo" placeholder="璇疯緭鍏ュ眬鍩熺綉绔彛"/>
+ <el-input v-model="form.lanTwo" maxlength="17" show-word-limit placeholder="璇疯緭鍏ュ眬鍩熺綉绔彛"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ipTwo">
- <el-input v-model="form.ipTwo" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ipTwo" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
@@ -293,7 +293,7 @@
ipOne: [
{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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
@@ -307,7 +307,7 @@
],
ipTwo: [
{
- 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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
diff --git a/src/views/construction/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index 8b8287e..852e68c 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -58,7 +58,7 @@
<el-table-column label="鏂藉伐鎵规" align="center" prop="batch" />
<el-table-column label="鏂藉伐鍛ㄦ湡" align="center" width="180">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') + ' - ' + parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
+ <span>{{ scope.row.startDate + ' - ' + scope.row.endDate }}</span>
</template>
</el-table-column>
<el-table-column label="璐熻矗浜�" align="center" prop="userId_dictText" />
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 671916d..1fcfc47 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -187,12 +187,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN" prop="lan">
- <el-input v-model="form.lan" placeholder="璇疯緭鍏AN"/>
+ <el-input v-model="form.lan" maxlength="17" show-word-limit placeholder="璇疯緭鍏AN"/>
</el-form-item>
</el-col>
<el-col :span="12">
<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-row>
@@ -341,7 +341,7 @@
ip: [
{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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 1e1aca8..a0f37e2 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -284,7 +284,7 @@
ip: [
{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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 06c1a0c..fd466ca 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -162,24 +162,24 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN1" prop="lanOne">
- <el-input v-model="form.lanOne" placeholder="璇疯緭鍏AN1"/>
+ <el-input v-model="form.lanOne" maxlength="17" show-word-limit placeholder="璇疯緭鍏AN1"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ipOne">
- <el-input v-model="form.ipOne" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ipOne" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="LAN2" prop="lanTwo">
- <el-input v-model="form.lanTwo" placeholder="璇疯緭鍏AN2"/>
+ <el-input v-model="form.lanTwo" maxlength="17" show-word-limit placeholder="璇疯緭鍏AN2"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ipTwo">
- <el-input v-model="form.ipTwo" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ipTwo" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
@@ -310,6 +310,20 @@
passageway: [
{required: true, message: "閫氶亾涓嶈兘涓虹┖", trigger: "blur"}
],
+ lanOne: [
+ {
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑LAN",
+ trigger: "blur"
+ }
+ ],
+ ipOne: [
+ {
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
+ message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
+ trigger: "blur"
+ }
+ ],
lanTwo: [
{required: true, message: "LAN2涓嶈兘涓虹┖", trigger: "blur"},
{
@@ -321,7 +335,7 @@
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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
@@ -337,7 +351,7 @@
// ipTwo: [
// {required: true, message: "ip2涓嶈兘涓虹┖", 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])$/,
+ // pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
// message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
// trigger: "blur"
// }
diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index 6e0406f..d5fefc5 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -69,7 +69,7 @@
<span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks"/>
+ <el-table-column label="澶囨敞" align="center" prop="remarks" :show-overflow-tooltip="true"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -100,7 +100,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀归鐣橧P瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true"
+ <el-dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :destroy-on-close="true"
:close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="IP鍦板潃" prop="ip">
@@ -113,15 +113,16 @@
<building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item label="鐢宠鏃ユ湡" prop="applicationDate">
- <el-date-picker clearable size="small"
- v-model="form.applicationDate"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鐢宠鏃ユ湡">
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.applicationDate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="10" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
@@ -186,13 +187,12 @@
ip: [
{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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
],
mac: [
- {required: true, message: "MAC鍦板潃涓嶈兘涓虹┖", trigger: "blur"},
{
pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑MAC鍦板潃锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
@@ -329,3 +329,12 @@
}
};
</script>
+
+<style lang="css">
+.el-tooltip__popper {
+ font-size: 14px;
+ max-width: 50%
+}
+
+/*璁剧疆鏄剧ず闅愯棌閮ㄥ垎鍐呭锛屾寜50%鏄剧ず*/
+</style>
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index e3330d0..636f1c7 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -147,12 +147,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN" prop="lan">
- <el-input v-model="form.lan" placeholder="璇疯緭鍏AN"/>
+ <el-input v-model="form.lan" maxlength="17" show-word-limit placeholder="璇疯緭鍏AN"/>
</el-form-item>
</el-col>
<el-col :span="12">
<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-row>
@@ -323,7 +323,7 @@
ip: [
{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])$/,
+ pattern: /^((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.){3}(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])$/,
message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
trigger: "blur"
}
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index ebf6b17..89b23f8 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -164,9 +164,6 @@
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="杞戒綋鏈嶅姟鍣�" prop="serverId">
- <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
- </el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
@@ -180,6 +177,21 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="璐﹀彿/瀵嗙爜" prop="account">
+ <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鍙�/瀵嗙爜"/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="杞戒綋鏈嶅姟鍣�" prop="serverId">
+ <server v-if="open" v-model="form.serverId" :schoolId="schoolId"/>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="璁块棶鍦板潃" prop="address">
+ <el-input v-model="form.address" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�"/>
+ </el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
<el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
@@ -306,6 +318,12 @@
constructionBatchId: [
{required: true, message: "鏂藉伐鎵规涓嶈兘涓虹┖", trigger: "blur"}
],
+ account: [
+ {required: true, message: "璐﹀彿/瀵嗙爜涓嶈兘涓虹┖", trigger: "blur"}
+ ],
+ address: [
+ {required: true, message: "璁块棶鍦板潃涓嶈兘涓虹┖", trigger: "blur"}
+ ],
},
disabled: false,
fileOpen: false,
--
Gitblit v1.9.1