From 35bff42b22d092d164ef4b9db8701f839c57bd9c Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期六, 11 六月 2022 11:33:08 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/ipc/index.vue | 48 ++++++++++++++++++++----------------------------
1 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 5206727..3e17002 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -73,22 +73,18 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="MAC" min-width="150" align="center" prop="mac"/>
- <el-table-column label="IP" width="130" 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="MAC" min-width="150" align="center" prop="mac" show-overflow-tooltip/>
+ <el-table-column label="IP" width="130" align="center" prop="ip" show-overflow-tooltip/>
+ <el-table-column label="璐︽埛/瀵嗙爜" min-width="180" align="center" prop="loginAccount" show-overflow-tooltip/>
+ <el-table-column label="闅跺睘NVR" align="center" min-width="150" prop="nvrId_dictText" show-overflow-tooltip>
<template slot-scope="scope">
<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="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
- <el-table-column label="鍨嬪彿" min-width="180" align="center" prop="model"/>
- <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+ <el-table-column label="閫氶亾鍙�" align="center" prop="passageway" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -126,9 +122,9 @@
/>
<!-- 娣诲姞鎴栦慨鏀筰pc璁惧瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="900px" :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="8">
<el-form-item label="MAC" prop="mac">
@@ -146,25 +142,18 @@
</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">
- <el-form-item label="nvr" prop="nvrId">
- <nvr v-if="open" v-model="form.nvrId" :schoolId="schoolId"></nvr>
+ <el-form-item label="闅跺睘NVR" prop="nvrId">
+ <nvr v-if="open" v-model="form.nvrId" :schoolId="schoolId" @nvrIdChange="nvrIdChange"></nvr>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�">
- <el-option
- v-for="dict in dict.type.DICT109"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
+ <el-form-item label="閫氶亾鍙�" prop="passageway">
+ <el-input v-model="form.passageway" :disabled="!form.nvrId" maxlength="4" show-word-limit placeholder="璇疯緭鍏ラ�氶亾鍙�"/>
</el-form-item>
</el-col>
</el-row>
@@ -288,7 +277,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"
}
@@ -337,6 +326,9 @@
this.getList();
},
methods: {
+ nvrIdChange () {
+ this.form.passageway = ''
+ },
/** 鏌ヨipc璁惧鍒楄〃 */
getList() {
this.loading = true;
--
Gitblit v1.9.1