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/nvr/index.vue | 94 +++++++++++++++++++++++++++++------------------
1 files changed, 58 insertions(+), 36 deletions(-)
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 303348a..fd466ca 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -17,19 +17,24 @@
<el-form-item label="鎵�灞炲崟浣�" prop="organizationId">
<organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
</el-form-item>
- <el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
- <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
- </el-form-item>
- <el-form-item label="鍨嬪彿" prop="model">
- <el-input
+ <template v-if="showMoreCondition">
+ <el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
+ <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
+ </el-form-item>
+ <el-form-item label="鍨嬪彿" prop="model">
+ <el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
@keyup.enter.native="handleQuery"
- />
- </el-form-item>
+ />
+ </el-form-item>
+ </template>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <div class="show-more-search">
+ <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </div>
</el-form-item>
</el-form>
@@ -75,20 +80,20 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" min-width="150" align="center" prop="deploymentName"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="240" align="center" prop="deploymentName"/>
<el-table-column label="閫氶亾锛堣矾锛�" width="120" align="center" prop="passageway_dictText"/>
- <el-table-column label="LAN1" align="center" width="150" prop="lanOne"/>
- <el-table-column label="IP" align="center" width="130" prop="ipOne"/>
- <el-table-column label="LAN2" align="center" min-width="150" prop="lanTwo"/>
- <el-table-column label="IP" align="center" width="130" prop="ipTwo"/>
- <el-table-column label="鐧诲綍璐︽埛" align="center" min-width="120" prop="loginAccount"/>
+<!-- <el-table-column label="LAN1" align="center" width="150" prop="lanOne"/>-->
+<!-- <el-table-column label="IP" align="center" width="130" prop="ipOne"/>-->
+<!-- <el-table-column label="瀹夎浣嶇疆" align="center" min-width="240" prop="buildingId_dictText"/>-->
+<!-- <el-table-column label="鎵�灞炲崟浣�" align="center" min-width="200" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>-->
+ <el-table-column label="IP锛圠AN2锛�" align="center" width="130" prop="ipTwo"/>
+<!-- <el-table-column label="LAN2" align="center" min-width="150" prop="lanTwo"/>-->
+ <el-table-column label="璐︽埛/瀵嗙爜" align="center" min-width="180" prop="loginAccount"/>
+ <el-table-column label="搴忓垪鍙�" min-width="220" align="center" prop="serialNumber"/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
<el-table-column label="纭洏" align="center" min-width="120" prop="hardDisk"/>
- <el-table-column label="瀹夎浣嶇疆" align="center" min-width="240" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" align="center" min-width="200" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" align="center" prop="model"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -134,7 +139,7 @@
<!-- 娣诲姞鎴栦慨鏀筃VR璁惧瀵硅瘽妗� -->
<el-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" :disabled="disabled">
+ <el-form ref="form" :model="form" :rules="rules" label-width="90px" :disabled="disabled">
<el-row>
<el-col :span="12">
<el-form-item label="閮ㄧ讲鍚嶇О" prop="deploymentName">
@@ -157,31 +162,31 @@
<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>
<el-row>
<el-col :span="12">
- <el-form-item label="鐧诲綍璐﹀彿" prop="loginAccount">
- <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ョ櫥褰曡处鍙�"/>
+ <el-form-item label="璐︽埛/瀵嗙爜" prop="loginAccount">
+ <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -242,6 +247,7 @@
import organization from '../../components/organization'
import constructionBatch from '../../components/constructionBatch'
import manufacturer from '../../components/manufacturer'
+import ShowMore from "@/views/components/showMore";
export default {
name: "Nvr",
@@ -250,7 +256,8 @@
building,
organization,
constructionBatch,
- manufacturer
+ manufacturer,
+ ShowMore
},
props: {
schoolId: {
@@ -304,17 +311,31 @@
{required: true, message: "閫氶亾涓嶈兘涓虹┖", trigger: "blur"}
],
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: "璇疯緭鍏ユ纭殑LAN",
trigger: "blur"
}
],
ipOne: [
- {required: true, message: "ip1涓嶈兘涓虹┖", 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"
+ }
+ ],
+ lanTwo: [
+ {required: true, message: "LAN2涓嶈兘涓虹┖", trigger: "blur"},
+ {
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑LAN",
+ trigger: "blur"
+ }
+ ],
+ ipTwo: [
+ {required: true, message: "IP涓嶈兘涓虹┖", trigger: "blur"},
+ {
+ 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"
}
@@ -322,7 +343,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"
// }
@@ -330,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"
// }
@@ -355,7 +376,8 @@
]
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
watch: {
--
Gitblit v1.9.1