From 1c01e669cca92f94eea5d1a73ff60f3bd34b9079 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 23 五月 2022 16:38:27 +0800
Subject: [PATCH] BUG修改
---
src/views/construction/iot/index.vue | 78 ++++++-----
src/views/construction/constructionBatch/index.vue | 3
src/views/components/organization/organizationList.vue | 3
src/assets/styles/custom.scss | 21 +++
src/views/construction/server/index.vue | 36 +++--
src/views/construction/ai/index.vue | 30 ++-
src/views/construction/system/index.vue | 16 +
src/views/construction/nvr/index.vue | 36 +++--
src/views/components/showMore/index.vue | 27 +++
src/views/construction/exchange/index.vue | 78 ++++++-----
src/views/construction/ipc/index.vue | 36 +++--
src/views/components/building/buildList.vue | 2
12 files changed, 235 insertions(+), 131 deletions(-)
diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss
index e69de29..af4dd1e 100644
--- a/src/assets/styles/custom.scss
+++ b/src/assets/styles/custom.scss
@@ -0,0 +1,21 @@
+/*婊氬姩鏉℃牱寮�*/
+::-webkit-scrollbar-track-piece { //婊氬姩鏉″嚬妲界殑棰滆壊锛岃繕鍙互璁剧疆杈规灞炴��
+ background-color:#f8f8f8;
+}
+::-webkit-scrollbar {//婊氬姩鏉＄殑瀹藉害
+ width:6px;
+ height:6px;
+}
+::-webkit-scrollbar-thumb {//婊氬姩鏉＄殑璁剧疆
+ background-color:#dddddd;
+ background-clip:padding-box;
+ min-height:28px;
+}
+::-webkit-scrollbar-thumb:hover {
+ background-color:#bbb;
+}
+.show-more-search {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+}
diff --git a/src/views/components/building/buildList.vue b/src/views/components/building/buildList.vue
index 59c1008..4fc4a4d 100644
--- a/src/views/components/building/buildList.vue
+++ b/src/views/components/building/buildList.vue
@@ -27,7 +27,7 @@
highlight-current-row
@current-change="handleCurrentChange"
>
- <el-table-column label="鍗曞厓鍚嶇О" align="center" prop="name"/>
+ <el-table-column label="鍗曞厓鍚嶇О" align="left" prop="name"/>
<el-table-column label="鍗曞厓缂栧彿" prop="code"/>
<el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum"/>
</el-table>
diff --git a/src/views/components/organization/organizationList.vue b/src/views/components/organization/organizationList.vue
index 67ebf49..50caf0e 100644
--- a/src/views/components/organization/organizationList.vue
+++ b/src/views/components/organization/organizationList.vue
@@ -26,7 +26,8 @@
highlight-current-row
@current-change="handleCurrentChange"
>
- <el-table-column label="鏈烘瀯鍚嶇О" align="center" prop="name"/>
+ <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name"/>
+ <el-table-column label="鏈烘瀯鍚嶇О" align="left" prop="name"/>
<el-table-column label="鏈烘瀯缂栧彿" prop="code"/>
<el-table-column label="鏄剧ず椤哄簭" align="center" prop="orderNum"/>
</el-table>
diff --git a/src/views/components/showMore/index.vue b/src/views/components/showMore/index.vue
new file mode 100644
index 0000000..7a86c91
--- /dev/null
+++ b/src/views/components/showMore/index.vue
@@ -0,0 +1,27 @@
+<template>
+ <div style="margin-right: 10px; color:#1890ff; cursor: pointer; user-select锛歯one;" @click="moreToggle">
+ <span style="margin-right: 5px">{{ showMore ? '鏀惰捣' : '灞曞紑'}}</span>
+ <i :class="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'" style="font-size: 16px;"></i>
+ </div>
+</template>
+
+<script>
+export default {
+ name: 'show-more',
+ data () {
+ return {
+ showMore: false
+ }
+ },
+ methods: {
+ moreToggle () {
+ this.showMore = !this.showMore
+ this.$emit('update:showMoreCondition', this.showMore)
+ },
+ }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index 84dfbcc..bbd840f 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/index.vue
@@ -10,21 +10,26 @@
<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="model">
+ <el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
clearable
size="small"
@keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
- <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
- </el-form-item>
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
+ </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>
@@ -212,6 +217,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
+import ShowMore from "@/views/components/showMore";
export default {
name: "Ai",
@@ -227,7 +233,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
data() {
return {
@@ -314,7 +321,8 @@
{required: true, message: "鏂藉伐鎵规涓嶈兘涓虹┖", trigger: "blur"}
],
},
- disabled: false
+ disabled: false,
+ showMoreCondition: false
};
},
created() {
diff --git a/src/views/construction/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index ca1b7bf..8b8287e 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -99,6 +99,7 @@
</el-form-item>
<el-form-item label="鏂藉伐鍛ㄦ湡" prop="date">
<el-date-picker
+ style="width: 100%"
v-model="form.date"
type="daterange"
value-format="yyyy-MM-dd"
@@ -108,7 +109,7 @@
</el-date-picker>
</el-form-item>
<el-form-item label="璐熻矗浜�" prop="userId">
- <el-select v-model="form.userId" filterable placeholder="璇烽�夋嫨璐熻矗浜�">
+ <el-select v-model="form.userId" style="width: 100%" filterable placeholder="璇烽�夋嫨璐熻矗浜�">
<el-option
v-for="item in userList"
:key="item.userId"
diff --git a/src/views/construction/exchange/index.vue b/src/views/construction/exchange/index.vue
index 7be34b5..2edb98f 100644
--- a/src/views/construction/exchange/index.vue
+++ b/src/views/construction/exchange/index.vue
@@ -10,61 +10,66 @@
<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="model">
+ <el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
clearable
size="small"
@keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
- <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
- </el-form-item>
- <el-form-item label="缃戠粶绔彛" prop="networkPort">
- <el-select v-model="queryParams.networkPort" placeholder="璇烽�夋嫨缃戠粶绔彛" clearable size="small">
- <el-option
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
+ </el-form-item>
+ <el-form-item label="缃戠粶绔彛" prop="networkPort">
+ <el-select v-model="queryParams.networkPort" placeholder="璇烽�夋嫨缃戠粶绔彛" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT113"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣A" prop="idnexA">
- <el-select v-model="queryParams.idnexA" placeholder="璇烽�夋嫨鎸囨爣A" clearable size="small">
- <el-option
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎸囨爣A" prop="idnexA">
+ <el-select v-model="queryParams.idnexA" placeholder="璇烽�夋嫨鎸囨爣A" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT114"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="绾ц仈绔彛" prop="cascadePort">
- <el-select v-model="queryParams.cascadePort" placeholder="璇烽�夋嫨绾ц仈绔彛" clearable size="small">
- <el-option
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="绾ц仈绔彛" prop="cascadePort">
+ <el-select v-model="queryParams.cascadePort" placeholder="璇烽�夋嫨绾ц仈绔彛" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT113"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎸囨爣B" prop="indexB">
- <el-select v-model="queryParams.indexB" placeholder="璇烽�夋嫨鎸囨爣B" clearable size="small">
- <el-option
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎸囨爣B" prop="indexB">
+ <el-select v-model="queryParams.indexB" placeholder="璇烽�夋嫨鎸囨爣B" clearable size="small">
+ <el-option
v-for="dict in dict.type.DICT114"
:key="dict.value"
:label="dict.label"
:value="dict.value"
- />
- </el-select>
- </el-form-item>
+ />
+ </el-select>
+ </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>
@@ -291,6 +296,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
+import ShowMore from "@/views/components/showMore";
export default {
name: "Exchange",
@@ -300,7 +306,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
props: {
schoolId: {
@@ -378,7 +385,8 @@
],
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
created() {
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index c8985a1..d658ea5 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -23,40 +23,45 @@
<el-form-item label="瀹夎浣嶇疆" prop="buildingId">
<building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
</el-form-item>
- <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="monitorObject">
- <el-input
- v-model="queryParams.monitorObject"
- placeholder="璇疯緭鍏ョ洃鎺у璞�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="queryParams.passageway" placeholder="璇烽�夋嫨閫氶亾" clearable size="small">
- <el-option
- v-for="dict in dict.type.DICT111"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="澶栬" prop="peripheralUnit">
- <peripheralUnit v-model="queryParams.peripheralUnit"></peripheralUnit>
- </el-form-item>
- <el-form-item label="澶栬鏁伴噺">
- <el-input v-model="sum" disabled/>
- </el-form-item>
+ <template v-if="showMoreCondition">
+ <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="monitorObject">
+ <el-input
+ v-model="queryParams.monitorObject"
+ placeholder="璇疯緭鍏ョ洃鎺у璞�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閫氶亾" prop="passageway">
+ <el-select v-model="queryParams.passageway" placeholder="璇烽�夋嫨閫氶亾" clearable size="small">
+ <el-option
+ v-for="dict in dict.type.DICT111"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶栬" prop="peripheralUnit">
+ <peripheralUnit v-model="queryParams.peripheralUnit"></peripheralUnit>
+ </el-form-item>
+ <el-form-item label="澶栬鏁伴噺">
+ <el-input v-model="sum" disabled/>
+ </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>
@@ -258,6 +263,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import peripheralUnit from '../../components/peripheralUnit'
+import ShowMore from "@/views/components/showMore";
export default {
name: "Iot",
@@ -273,7 +279,8 @@
organization,
constructionBatch,
manufacturer,
- peripheralUnit
+ peripheralUnit,
+ ShowMore
},
data() {
return {
@@ -350,7 +357,8 @@
],
},
disabled: false,
- sum: undefined
+ sum: undefined,
+ showMoreCondition: false
};
},
computed: {
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 1d0aaf0..5206727 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>
@@ -81,9 +86,9 @@
<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="180" align="center" prop="model"/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -213,6 +218,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",
@@ -223,7 +229,8 @@
constructionBatch,
manufacturer,
nvr,
- nvrForm
+ nvrForm,
+ ShowMore
},
props: {
schoolId: {
@@ -305,7 +312,8 @@
},
disabled: false,
nvrOpen: false,
- nvrId: undefined
+ nvrId: undefined,
+ showMoreCondition: false
};
},
computed: {
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 82d71a7..0e9809e 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>
@@ -86,9 +91,9 @@
<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="搴忓垪鍙�" min-width="180" align="center" prop="serialNumber"/>
+ <el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="200" 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
@@ -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: {
@@ -355,7 +362,8 @@
]
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
watch: {
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 29e19a9..e274cbc 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -10,21 +10,26 @@
<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="model">
+ <el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
clearable
size="small"
@keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
- <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
- </el-form-item>
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
+ </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>
@@ -84,11 +89,11 @@
<el-table-column label="鏈烘灦鍙�" align="center" prop="rackNumber"/>
<el-table-column label="鎵�灞炲崟浣�" align="center" min-width="180" prop="organizationId_dictText"/>
<el-table-column label="鏂藉伐鎵规" align="center" min-width="180" prop="constructionBatchId_dictText"/>
- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="180" prop="serialNumber"/>
<el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" 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" min-width="120" prop="performanceIndex"/>
+ <el-table-column label="澶囨敞" align="center" min-width="120" prop="remarks"/>
<!-- <el-table-column label="闄勪欢" align="center" prop="filePath" />-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -243,6 +248,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
+import ShowMore from "@/views/components/showMore";
export default {
name: "Server",
@@ -252,7 +258,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
props: {
schoolId: {
@@ -338,7 +345,8 @@
],
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
created() {
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index 6ba6fbd..222e84e 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -16,12 +16,15 @@
<el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
<construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
</el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <el-form-item v-if="showMoreCondition" label="鐢熶骇鍘傚晢" prop="manufacturerId">
<manufacturer v-model="queryParams.manufacturerId"></manufacturer>
</el-form-item>
<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>
@@ -219,6 +222,7 @@
import nvr from "../../components/nvr";
import server from '../../components/server'
import serverForm from '../../components/server/form'
+import ShowMore from "@/views/components/showMore";
export default {
name: "System",
@@ -230,7 +234,8 @@
manufacturer,
nvr,
server,
- serverForm
+ serverForm,
+ ShowMore
},
props: {
schoolId: {
@@ -305,7 +310,8 @@
disabled: false,
fileOpen: false,
serverOpen: false,
- serverId: undefined
+ serverId: undefined,
+ showMoreCondition: false
};
},
created() {
--
Gitblit v1.9.1