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/ipc/index.vue | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 752a527..a0f37e2 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -10,19 +10,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>
@@ -34,7 +39,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:ipc:add']"
>鏂板
</el-button>
</el-col>
@@ -46,7 +50,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:ipc:edit']"
>淇敼
</el-button>
</el-col>
@@ -58,7 +61,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:ipc:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -72,21 +74,17 @@
</template>
</el-table-column>
<el-table-column label="MAC" min-width="150" align="center" prop="mac"/>
- <el-table-column label="IP" width="120" align="center" prop="ip"/>
- <el-table-column label="绔彛" width="80" align="center" prop="port"/>
- <el-table-column label="鐧诲綍璐︽埛" min-width="120" align="center" prop="loginAccount"/>
- <el-table-column label="NVR" align="center" prop="nvrId_dictText">
+ <el-table-column label="IP" width="130" align="center" prop="ip"/>
+ <el-table-column label="璐︽埛/瀵嗙爜" min-width="180" align="center" prop="loginAccount"/>
+ <el-table-column label="NVR" align="center" min-width="150" prop="nvrId_dictText">
<template slot-scope="scope">
- <el-link type="primary" @click="nvrClick(scope.row)">{{scope.row.nvrId_dictText}}</el-link>
+ <el-link type="primary" @click="nvrClick(scope.row)">{{ scope.row.nvrId_dictText }}</el-link>
</template>
</el-table-column>
<el-table-column label="閫氶亾" align="center" prop="passageway_dictText"/>
- <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="200" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" min-width="120" 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="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -101,7 +99,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:ipc:edit']"
>淇敼
</el-button>
<el-button
@@ -110,7 +107,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:ipc:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -126,28 +122,28 @@
/>
<!-- 娣诲姞鎴栦慨鏀筰pc璁惧瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="700px" :append-to-body="true" :close-on-click-modal="false"
+ <el-dialog :title="title" :visible.sync="open" width="920px" :append-to-body="true" :close-on-click-modal="false"
:destroy-on-close="true">
- <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="9">
+ <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="9">
+ <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="6">
+ <el-col :span="8">
<el-form-item label="绔彛" prop="port">
<el-input-number v-model="form.port" controls-position="right" :min="0" :max="65535"/>
</el-form-item>
</el-col>
</el-row>
- <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-row>
<el-col :span="12">
@@ -157,7 +153,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�">
+ <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT109"
:key="dict.value"
@@ -218,6 +214,7 @@
import manufacturer from "../../components/manufacturer";
import nvr from '../../components/nvr'
import nvrForm from '../../components/nvr/form'
+import ShowMore from "@/views/components/showMore";
export default {
name: "Ipc",
@@ -228,7 +225,8 @@
constructionBatch,
manufacturer,
nvr,
- nvrForm
+ nvrForm,
+ ShowMore
},
props: {
schoolId: {
@@ -278,16 +276,16 @@
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}$/,
- message: "璇疯緭鍏ユ纭殑MAC",
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑MAC锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
trigger: "blur"
}
],
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])$/,
- message: "璇疯緭鍏ユ纭殑ip鍦板潃",
+ 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"
}
],
@@ -310,7 +308,8 @@
},
disabled: false,
nvrOpen: false,
- nvrId: undefined
+ nvrId: undefined,
+ showMoreCondition: false
};
},
computed: {
@@ -476,7 +475,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎ipc璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delIpc(ids);
}).then(() => {
--
Gitblit v1.9.1