From 0d68be1fa109b0f55fa0b4c023baf4b66dcc9f28 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期四, 09 六月 2022 14:06:39 +0800
Subject: [PATCH] BUG修改
---
src/views/components/nvr/list.vue | 8 +-
src/views/construction/constructionBatch/index.vue | 2
src/views/components/manufacturer/index.vue | 23 ++++++-
src/views/components/peripheralUnit/list.vue | 11 ++-
src/views/components/server/list.vue | 26 ++++----
src/views/construction/reserveIp/index.vue | 2
src/views/basics/building/index.vue | 2
src/views/basics/organization/index.vue | 2
src/views/components/nvr/index.vue | 23 ++++++-
src/views/construction/ipc/index.vue | 15 +++--
src/views/components/building/buildList.vue | 2
src/assets/styles/ruoyi.scss | 3
src/views/basics/manufacturer/index.vue | 2
src/views/basics/school/index.vue | 2
src/views/components/organization/organizationList.vue | 6 +-
src/views/components/manufacturer/list.vue | 1
src/views/components/peripheralUnit/index.vue | 24 ++++++-
src/views/components/constructionBatch/list.vue | 2
18 files changed, 101 insertions(+), 55 deletions(-)
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 8fe1961..20e0e4f 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -100,10 +100,11 @@
/** 琛ㄦ牸甯冨眬 **/
.pagination-container {
position: relative;
- height: 25px;
+ height: 40px;
margin-bottom: 10px;
margin-top: 15px;
padding: 10px 20px !important;
+ box-sizing: border-box;
}
/* tree border */
diff --git a/src/views/basics/building/index.vue b/src/views/basics/building/index.vue
index 1ab522a..3ec40ca 100644
--- a/src/views/basics/building/index.vue
+++ b/src/views/basics/building/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<!-- <el-form-item label="鍗曞厓缂栧彿" prop="code">-->
<!-- <el-input-->
<!-- v-model="queryParams.code"-->
diff --git a/src/views/basics/manufacturer/index.vue b/src/views/basics/manufacturer/index.vue
index 74d718d..85cbf2e 100644
--- a/src/views/basics/manufacturer/index.vue
+++ b/src/views/basics/manufacturer/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="鍘傚晢鍚嶇О" prop="name">
<el-input
v-model="queryParams.name"
diff --git a/src/views/basics/organization/index.vue b/src/views/basics/organization/index.vue
index be5a4d0..f8003a8 100644
--- a/src/views/basics/organization/index.vue
+++ b/src/views/basics/organization/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="鏈烘瀯鍚嶇О" prop="name">
<el-input
v-model="queryParams.name"
diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index 7f1884b..a671b29 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="瀛︽牎浠ｇ爜" prop="code">
<el-input
v-model="queryParams.code"
diff --git a/src/views/components/building/buildList.vue b/src/views/components/building/buildList.vue
index 4fc4a4d..fc262c4 100644
--- a/src/views/components/building/buildList.vue
+++ b/src/views/components/building/buildList.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="鍗曞厓鍚嶇О" prop="name">
<el-input
v-model="queryParams.name"
diff --git a/src/views/components/constructionBatch/list.vue b/src/views/components/constructionBatch/list.vue
index 63503c8..e702ca3 100644
--- a/src/views/components/constructionBatch/list.vue
+++ b/src/views/components/constructionBatch/list.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="鏂藉伐鎵规" prop="batch">
<el-input
v-model="queryParams.batch"
diff --git a/src/views/components/manufacturer/index.vue b/src/views/components/manufacturer/index.vue
index 1977157..cb4b39d 100644
--- a/src/views/components/manufacturer/index.vue
+++ b/src/views/components/manufacturer/index.vue
@@ -1,10 +1,11 @@
<template>
<div>
<el-input placeholder="璇烽�夋嫨" :value="name" disabled>
- <el-button slot="append" icon="el-icon-thumb" @click="handleClick"></el-button>
+ <el-button slot="append" v-if="currentId" icon="el-icon-circle-close" @click="handleClear"></el-button>
+ <el-button slot="append" v-else icon="el-icon-thumb" @click="handleClick"></el-button>
</el-input>
<el-dialog title="鐢熶骇鍘傚晢" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
- <manufacturer-list v-if="open" ref="manufacturerRef"></manufacturer-list>
+ <manufacturer-list v-if="open" ref="manufacturerRef" @setCurrentRow="getCurrentRow"></manufacturer-list>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="open = false">鍙� 娑�</el-button>
@@ -30,14 +31,15 @@
},
props: {
value: {
- type: [Number],
+ type: [Number, String],
default: undefined
}
},
data() {
return {
open: false,
- name: ''
+ name: '',
+ currentId: ''
}
},
watch: {
@@ -45,9 +47,11 @@
if (v) {
getManufacturer(v).then(response => {
this.name = response.data.name;
+ this.currentId = response.data.id;
});
}else {
this.name = '';
+ this.currentId = ''
}
}
},
@@ -55,10 +59,19 @@
if (this.value) {
getManufacturer(this.value).then(response => {
this.name = response.data.name;
+ this.currentId = response.data.id;
});
}
},
methods: {
+ handleClear () {
+ this.currentId = '';
+ this.name = undefined;
+ this.$emit("change", '');
+ },
+ getCurrentRow (e) {
+ this.currentId = e.id
+ },
handleClick() {
this.open = true;
},
@@ -79,4 +92,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/components/manufacturer/list.vue b/src/views/components/manufacturer/list.vue
index a0390ae..2f0af28 100644
--- a/src/views/components/manufacturer/list.vue
+++ b/src/views/components/manufacturer/list.vue
@@ -96,6 +96,7 @@
},
handleCurrentChange(v) {
this.currentRow = v;
+ this.$emit('setCurrentRow', this.currentRow)
}
}
};
diff --git a/src/views/components/nvr/index.vue b/src/views/components/nvr/index.vue
index 33e1b60..c404908 100644
--- a/src/views/components/nvr/index.vue
+++ b/src/views/components/nvr/index.vue
@@ -1,10 +1,11 @@
<template>
<div>
<el-input placeholder="璇烽�夋嫨" :value="name" disabled>
- <el-button slot="append" icon="el-icon-thumb" @click="handleClick"></el-button>
+ <el-button slot="append" v-if="currentId" icon="el-icon-circle-close" @click="handleClear"></el-button>
+ <el-button slot="append" v-else icon="el-icon-thumb" @click="handleClick"></el-button>
</el-input>
- <el-dialog title="NVR" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
- <nvr-list v-if="open" ref="nvrRef" :schoolId="schoolId"></nvr-list>
+ <el-dialog title="闅跺睘NVR" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
+ <nvr-list v-if="open" ref="nvrRef" :schoolId="schoolId" @setCurrentRow="getCurrentRow"></nvr-list>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="open = false">鍙� 娑�</el-button>
@@ -42,7 +43,8 @@
data() {
return {
open: false,
- name: ''
+ name: '',
+ currentId: ''
}
},
watch: {
@@ -50,6 +52,7 @@
if (v) {
getNvr(v).then(response => {
this.name = response.data.deploymentName;
+ this.currentId = response.data.id
});
}else {
this.name = '';
@@ -60,10 +63,20 @@
if (this.value) {
getNvr(this.value).then(response => {
this.name = response.data.deploymentName;
+ this.currentId = response.data.id;
});
}
},
methods: {
+ handleClear () {
+ this.currentId = '';
+ this.name = undefined;
+ this.$emit("change", '');
+ this.$emit('nvrIdChange')
+ },
+ getCurrentRow (e) {
+ this.currentId = e.id
+ },
handleClick() {
this.open = true;
},
@@ -84,4 +97,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/components/nvr/list.vue b/src/views/components/nvr/list.vue
index aeb10b0..1ee67e1 100644
--- a/src/views/components/nvr/list.vue
+++ b/src/views/components/nvr/list.vue
@@ -24,16 +24,16 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="200" align="center" prop="deploymentName"/>
<el-table-column label="閫氶亾锛堣矾锛�" min-width="120" align="center" prop="passageway_dictText"/>
<el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>
<el-table-column label="IP" min-width="130" align="center" prop="ipOne"/>
<el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>
<el-table-column label="IP" min-width="130" align="center" prop="ipTwo"/>
- <el-table-column label="鐧诲綍璐︽埛" min-width="120" align="center" prop="loginAccount"/>
+ <el-table-column label="鐧诲綍璐︽埛" min-width="150" align="center" prop="loginAccount"/>
<el-table-column label="纭洏" align="center" prop="hardDisk"/>
- <el-table-column label="瀹夎浣嶇疆" min-width="220" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" min-width="220" align="center" prop="organizationId_dictText"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="250" align="center" prop="buildingId_dictText"/>
+ <el-table-column label="鎵�灞炲崟浣�" min-width="250" align="center" prop="organizationId_dictText"/>
<!-- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId" />-->
<!-- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber" />-->
<!-- <el-table-column label="鍨嬪彿" align="center" prop="model" />-->
diff --git a/src/views/components/organization/organizationList.vue b/src/views/components/organization/organizationList.vue
index 1e69546..6308c42 100644
--- a/src/views/components/organization/organizationList.vue
+++ b/src/views/components/organization/organizationList.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px" @submit.native.prevent>
<el-form-item label="鏈烘瀯鍚嶇О" prop="name">
<el-input
v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ崟鍏冨悕绉�"
+ placeholder="璇疯緭鍏ユ満鏋勫悕绉�"
clearable
size="small"
@keyup.enter.native="handleQuery"
@@ -27,7 +27,7 @@
highlight-current-row
@current-change="handleCurrentChange"
>
- <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name"/>
+ <el-table-column label="搴忓彿" type="index" width="55"></el-table-column>
<el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name"/>
<el-table-column label="鏈烘瀯缂栧彿" prop="code"/>
<el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum"/>
diff --git a/src/views/components/peripheralUnit/index.vue b/src/views/components/peripheralUnit/index.vue
index d4090a5..bbd406a 100644
--- a/src/views/components/peripheralUnit/index.vue
+++ b/src/views/components/peripheralUnit/index.vue
@@ -1,10 +1,12 @@
<template>
<div>
<el-input placeholder="璇烽�夋嫨" :value="name" disabled>
- <el-button slot="append" icon="el-icon-thumb" @click="handleClick"></el-button>
+ {{ currentId }}
+ <el-button slot="append" v-if="currentId" icon="el-icon-circle-close" @click="handleClear"></el-button>
+ <el-button slot="append" v-else icon="el-icon-thumb" @click="handleClick"></el-button>
</el-input>
<el-dialog title="澶栬鍗曞厓" :visible.sync="open" width="800px" :append-to-body="true" :destroy-on-close="true">
- <peripheral-unit-list v-if="open" ref="peripheralRef"></peripheral-unit-list>
+ <peripheral-unit-list v-if="open" ref="peripheralRef" @setCurrentRow="getCurrentRow"></peripheral-unit-list>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="open = false">鍙� 娑�</el-button>
@@ -31,14 +33,15 @@
},
props: {
value: {
- type: [Number],
+ type: [Number, String],
default: undefined
}
},
data() {
return {
open: false,
- name: ''
+ name: '',
+ currentId: ''
}
},
watch: {
@@ -46,9 +49,11 @@
if (v) {
getPeripheralUnit(v).then(response => {
this.name = response.data.name;
+ this.currentId = response.data.id;
});
} else {
this.name = '';
+ this.currentId = ''
}
}
},
@@ -56,10 +61,19 @@
if (this.value) {
getPeripheralUnit(this.value).then(response => {
this.name = response.data.name;
+ this.currentId = response.data.id;
});
}
},
methods: {
+ handleClear () {
+ this.currentId = '';
+ this.name = undefined;
+ this.$emit("change", '');
+ },
+ getCurrentRow (e) {
+ this.currentId = e.id
+ },
handleClick() {
this.open = true;
},
@@ -80,4 +94,4 @@
<style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/components/peripheralUnit/list.vue b/src/views/components/peripheralUnit/list.vue
index eed3928..9f9c863 100644
--- a/src/views/components/peripheralUnit/list.vue
+++ b/src/views/components/peripheralUnit/list.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="澶栬浠ｇ爜" prop="code">
<el-input
v-model="queryParams.code"
@@ -26,16 +26,16 @@
</el-form>
<el-table v-loading="loading" :data="peripheralUnitList" highlight-current-row
- @current-change="handleCurrentChange">
+ @current-change="handleCurrentChange" height="50vh">
<el-table-column label="搴忓彿" align="center" width="50">
<template slot-scope="scope">
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
<el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code"/>
- <el-table-column label="澶栬鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="60"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
+ <el-table-column label="澶栬鍚嶇О" align="center" min-width="180" prop="name" show-overflow-tooltip/>
+ <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="120"/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="150" show-overflow-tooltip prop="manufacturer_dictText"/>
<el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText"/>
<el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate">
<template slot-scope="scope">
@@ -117,6 +117,7 @@
},
handleCurrentChange(v) {
this.currentRow = v;
+ this.$emit('setCurrentRow', this.currentRow)
}
}
};
diff --git a/src/views/components/server/list.vue b/src/views/components/server/list.vue
index 8ccb372..c198463 100644
--- a/src/views/components/server/list.vue
+++ b/src/views/components/server/list.vue
@@ -1,11 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="閮ㄧ讲浣嶇疆" prop="buildingId">
<building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item label="閮ㄧ讲鍚嶇О" prop="name">
- <el-input v-model="queryParams.deploymentName" placeholder="璇疯緭鍏ラ儴缃插悕绉�" />
+ <el-input v-model="queryParams.deploymentName" @keyup.enter.native="handleQuery" placeholder="璇疯緭鍏ラ儴缃插悕绉�" />
</el-form-item>
<!-- <el-form-item label="鎵�灞炲崟浣�" prop="organizationId">-->
<!-- <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>-->
@@ -38,23 +38,23 @@
<span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
- <el-table-column label="LAN" align="center" prop="lan"/>
- <el-table-column label="IP" align="center" prop="ip"/>
- <el-table-column label="鎿嶄綔绯荤粺" align="center" prop="operatingSystem">
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="150" show-overflow-tooltip align="center" prop="deploymentName"/>
+ <el-table-column label="LAN" min-width="150" show-overflow-tooltip align="center" prop="lan"/>
+ <el-table-column label="IP" min-width="150" show-overflow-tooltip align="center" prop="ip"/>
+ <el-table-column label="鎿嶄綔绯荤粺" align="center" show-overflow-tooltip min-width="200" prop="operatingSystem">
<template slot-scope="scope">
<dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
</template>
</el-table-column>
<!-- <el-table-column label="璐︽埛" align="center" prop="account" />-->
- <el-table-column label="閮ㄧ讲浣嶇疆" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鏈烘煖鍙�" align="center" prop="cabinetNumber"/>
- <el-table-column label="鏈烘灦鍙�" align="center" prop="rackNumber"/>
- <el-table-column label="鎵�灞炲崟浣�" align="center" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
+ <el-table-column label="閮ㄧ讲浣嶇疆" align="center" show-overflow-tooltip min-width="200" prop="buildingId_dictText"/>
+ <el-table-column label="鏈烘煖鍙�" align="center" show-overflow-tooltip prop="cabinetNumber"/>
+ <el-table-column label="鏈烘灦鍙�" align="center" show-overflow-tooltip prop="rackNumber"/>
+ <el-table-column label="鎵�灞炲崟浣�" align="center" show-overflow-tooltip min-width="200" prop="organizationId_dictText"/>
+ <el-table-column label="鏂藉伐鎵规" align="center" show-overflow-tooltip 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" prop="model" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="200" show-overflow-tooltip prop="manufacturerId_dictText"/>
<!-- <el-table-column label="鎬ц兘鎸囨爣" align="center" prop="performanceIndex" />-->
<!-- <el-table-column label="澶囨敞" align="center" prop="remarks" />-->
<!-- <el-table-column label="闄勪欢" align="center" prop="filePath" />-->
diff --git a/src/views/construction/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index 71388c5..f4b0594 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="鏂藉伐鎵规" prop="batch">
<el-input
v-model="queryParams.batch"
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 6d394ef..b0692f3 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -76,12 +76,12 @@
<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>
+ <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" show-overflow-tooltip/>
+ <el-table-column label="閫氶亾鍙�" align="center" prop="passageway_dictText" 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/>
@@ -147,13 +147,13 @@
</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="璇烽�夋嫨閫氶亾锛堣矾锛�" style="width: 100%;">
+ <el-form-item label="閫氶亾鍙�" prop="passageway">
+ <el-select v-model="form.passageway" :disabled="!form.nvrId" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT109"
:key="dict.value"
@@ -333,6 +333,9 @@
this.getList();
},
methods: {
+ nvrIdChange () {
+ this.form.passageway = ''
+ },
/** 鏌ヨipc璁惧鍒楄〃 */
getList() {
this.loading = true;
diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index b099a10..75516f4 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px" @submit.native.prevent>
<el-form-item label="IP鍦板潃" prop="ip">
<el-input
v-model="queryParams.ip"
--
Gitblit v1.9.1