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/nvr/index.vue | 114 ++++++++++++++++++++++++++++----------------------------
1 files changed, 57 insertions(+), 57 deletions(-)
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index a148e00..0e9809e 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -1,5 +1,5 @@
<template>
- <div class="app-container">
+ <div class="construction-view">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
<el-form-item label="閫氶亾锛堣矾锛�" prop="passageway">
<el-select v-model="queryParams.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�">
@@ -17,21 +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="璇疯緭鍏ュ瀷鍙�"
- clearable
- size="small"
@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>
@@ -43,7 +46,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:nvr:add']"
>鏂板
</el-button>
</el-col>
@@ -55,7 +57,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:nvr:edit']"
>淇敼
</el-button>
</el-col>
@@ -67,7 +68,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:nvr:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -80,21 +80,21 @@
<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="閫氶亾锛堣矾锛�" align="center" prop="passageway"/>
- <el-table-column label="LAN1" align="center" prop="lanOne"/>
- <el-table-column label="IP" align="center" prop="ipOne"/>
- <el-table-column label="LAN2" align="center" prop="lanTwo"/>
- <el-table-column label="IP" align="center" prop="ipTwo"/>
- <el-table-column label="鐧诲綍璐︽埛" align="center" prop="loginAccount"/>
- <el-table-column label="纭洏" align="center" prop="hardDisk"/>
- <el-table-column label="瀹夎浣嶇疆" align="center" prop="buildingId"/>
- <el-table-column label="鎵�灞炲崟浣�" align="center" prop="organizationId"/>
- <!-- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId" />-->
- <!-- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber" />-->
- <!-- <el-table-column label="鍨嬪彿" align="center" prop="model" />-->
- <!-- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId" />-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="150" 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="纭洏" 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="搴忓垪鍙�" 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
size="mini"
@@ -108,7 +108,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:nvr:edit']"
>淇敼
</el-button>
<el-button
@@ -124,7 +123,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:nvr:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -249,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",
@@ -257,7 +256,8 @@
building,
organization,
constructionBatch,
- manufacturer
+ manufacturer,
+ ShowMore
},
props: {
schoolId: {
@@ -310,38 +310,38 @@
passageway: [
{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}$/,
- 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])$/,
- message: "璇疯緭鍏ユ纭殑ip鍦板潃",
- trigger: "blur"
- }
- ],
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"
}
],
ipTwo: [
- {required: true, message: "ip2涓嶈兘涓虹┖", trigger: "blur"},
+ {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鍦板潃",
+ 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: "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])$/,
+ // message: "璇疯緭鍏ユ纭殑ip鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
+ // trigger: "blur"
+ // }
+ // ],
loginAccount: [
{required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖", trigger: "blur"}
],
@@ -362,7 +362,8 @@
]
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
watch: {
@@ -446,7 +447,7 @@
this.loading = false;
this.form = response.data;
this.open = true;
- this.title = "淇敼NVR璁惧";
+ this.title = "NVR璁惧璇︽儏";
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -493,7 +494,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎NVR璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delNvr(ids);
}).then(() => {
@@ -515,8 +516,7 @@
this.loading = true;
this.disabled = false;
this.reset();
- const id = row.id || this.ids
- getNvr(id).then(response => {
+ getNvr(row.id).then(response => {
this.loading = false;
this.form = response.data;
this.fileOpen = true;
--
Gitblit v1.9.1