From 4001279159dd37942b3cf4c83ab537f95832a82d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 06 六月 2022 13:33:21 +0800
Subject: [PATCH] BUG修改
---
src/views/construction/server/index.vue | 93 ++++++++++++++++++++++++----------------------
1 files changed, 48 insertions(+), 45 deletions(-)
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 28dccd1..dd8c1ce 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/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="68px">
<el-form-item label="閮ㄧ讲浣嶇疆" prop="buildingId">
<building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
@@ -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>
@@ -36,7 +41,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:server:add']"
>鏂板
</el-button>
</el-col>
@@ -48,7 +52,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:server:edit']"
>淇敼
</el-button>
</el-col>
@@ -60,7 +63,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:server:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -73,27 +75,27 @@
<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="300" align="center" prop="deploymentName" show-overflow-tooltip/>
+ <el-table-column label="鎿嶄綔绯荤粺" align="center" min-width="180" prop="operatingSystem" show-overflow-tooltip>
<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" 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="performanceIndex" />-->
- <!-- <el-table-column label="澶囨敞" align="center" prop="remarks" />-->
+<!-- <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>-->
+ <el-table-column label="IP" align="center" prop="ip" min-width="130" show-overflow-tooltip/>
+ <el-table-column label="璐﹀彿/瀵嗙爜" align="center" width="220" prop="account" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="240" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="澶囨敞" align="center" min-width="220" prop="remarks" show-overflow-tooltip/>
+<!-- <el-table-column label="閮ㄧ讲浣嶇疆" align="center" min-width="180" 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" min-width="180" prop="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" align="center" min-width="180" prop="constructionBatchId_dictText"/>-->
+<!-- <el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>-->
+<!-- <el-table-column label="鎬ц兘鎸囨爣" align="center" min-width="120" prop="performanceIndex"/>-->
<!-- <el-table-column label="闄勪欢" align="center" prop="filePath" />-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -107,7 +109,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:server:edit']"
>淇敼
</el-button>
<el-button
@@ -123,7 +124,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:server:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -140,26 +140,26 @@
<!-- 娣诲姞鎴栦慨鏀规湇鍔″櫒瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="700px" :append-to-body="true" :close-on-click-modal="false">
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="disabled">
<el-form-item label="閮ㄧ讲鍚嶇О" prop="deploymentName">
<el-input v-model="form.deploymentName" maxlength="64" show-word-limit placeholder="璇疯緭鍏ラ儴缃插悕绉�"/>
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item label="LAN" prop="lan">
- <el-input v-model="form.lan" placeholder="璇疯緭鍏AN"/>
+ <el-input v-model="form.lan" maxlength="17" show-word-limit placeholder="璇疯緭鍏AN"/>
</el-form-item>
</el-col>
<el-col :span="12">
<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-row>
<el-row>
<el-col :span="12">
<el-form-item label="鎿嶄綔绯荤粺" prop="operatingSystem">
- <el-select v-model="form.operatingSystem" placeholder="璇烽�夋嫨鎿嶄綔绯荤粺">
+ <el-select v-model="form.operatingSystem" placeholder="璇烽�夋嫨鎿嶄綔绯荤粺" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT115"
:key="dict.value"
@@ -170,8 +170,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐︽埛" prop="account">
- <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�"/>
+ <el-form-item label="璐︽埛/瀵嗙爜" prop="account">
+ <el-input v-model="form.account" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
</el-col>
</el-row>
@@ -212,11 +212,11 @@
</el-col>
</el-row>
<el-form-item label="鎬ц兘鎸囨爣" prop="performanceIndex">
- <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="64" show-word-limit
+ <el-input v-model="form.performanceIndex" type="textarea" :rows="3" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="64" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="3" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
@@ -248,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",
@@ -257,7 +258,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
props: {
schoolId: {
@@ -313,7 +315,7 @@
lan: [
{required: true, message: "LAN涓嶈兘涓虹┖", 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"
}
@@ -321,8 +323,8 @@
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"
}
],
@@ -343,7 +345,8 @@
],
},
disabled: false,
- fileOpen: false
+ fileOpen: false,
+ showMoreCondition: false
};
},
created() {
@@ -482,7 +485,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏈嶅姟鍣ㄧ紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delServer(ids);
}).then(() => {
--
Gitblit v1.9.1