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/construction/reserveIp/index.vue | 177 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 106 insertions(+), 71 deletions(-)
diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index 673999a..75516f4 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -1,14 +1,17 @@
<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"
- placeholder="璇疯緭鍏p鍦板潃"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
+ v-model="queryParams.ip"
+ placeholder="璇疯緭鍏p鍦板潃"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
/>
+ </el-form-item>
+ <el-form-item label="閫傜敤鍦扮偣" prop="buildingId">
+ <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -19,104 +22,108 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['oa:reserveIp:add']"
- >鏂板</el-button>
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ >鏂板
+ </el-button>
</el-col>
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['oa:reserveIp:edit']"
- >淇敼</el-button>
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ >淇敼
+ </el-button>
</el-col>
<el-col :span="1.5">
<el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['oa:reserveIp:remove']"
- >鍒犻櫎</el-button>
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ >鍒犻櫎
+ </el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="reserveIpList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="搴忓彿" type="index" align="center">
<template slot-scope="scope">
- <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+ <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="IP鍦板潃" align="center" prop="ip" />
- <el-table-column label="MAC鍦板潃" align="center" prop="mac" />
- <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText" />
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applicationDate" width="180">
+ <el-table-column label="IP鍦板潃" align="center" prop="ip" show-overflow-tooltip/>
+ <el-table-column label="MAC鍦板潃" align="center" prop="mac" show-overflow-tooltip/>
+ <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="applicationDate" width="180" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks" />
+ <el-table-column label="澶囨敞" align="center" prop="remarks" show-overflow-tooltip/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['oa:reserveIp:edit']"
- >淇敼</el-button>
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >淇敼
+ </el-button>
<el-button
- size="mini"
- type="text"
- class="del-btn"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['oa:reserveIp:remove']"
- >鍒犻櫎</el-button>
+ size="mini"
+ type="text"
+ class="del-btn"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎
+ </el-button>
</template>
</el-table-column>
</el-table>
<pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
/>
<!-- 娣诲姞鎴栦慨鏀归鐣橧P瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true" :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="open" width="600px" :append-to-body="true" :destroy-on-close="true"
+ :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="IP鍦板潃" prop="ip">
- <el-input v-model="form.ip" placeholder="璇疯緭鍏p鍦板潃" />
+ <el-input v-model="form.ip" placeholder="璇疯緭鍏p鍦板潃"/>
</el-form-item>
<el-form-item label="MAC鍦板潃" prop="mac">
- <el-input v-model="form.mac" placeholder="璇疯緭鍏AC鍦板潃" />
+ <el-input v-model="form.mac" placeholder="璇疯緭鍏AC鍦板潃"/>
</el-form-item>
<el-form-item label="閫傜敤鍦扮偣" prop="buildingId">
- <building v-model="form.buildingId"></building>
+ <building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item label="鐢宠鏃ユ湡" prop="applicationDate">
- <el-date-picker clearable size="small"
- v-model="form.applicationDate"
- type="date"
- placeholder="閫夋嫨鐢宠鏃ユ湡">
+ <el-date-picker
+ style="width: 100%"
+ v-model="form.applicationDate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="8" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.remarks" type="textarea" :rows="4" maxlength="512" show-word-limit
+ placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -130,13 +137,19 @@
</template>
<script>
-import { listReserveIp, getReserveIp, delReserveIp, addReserveIp, updateReserveIp } from "@/api/oa/reserveIp";
+import {listReserveIp, getReserveIp, delReserveIp, addReserveIp, updateReserveIp} from "@/api/oa/reserveIp";
import building from '../../components/building'
export default {
name: "ReserveIp",
components: {
building
+ },
+ props: {
+ schoolId: {
+ type: Number,
+ default: undefined
+ }
},
data() {
return {
@@ -172,19 +185,31 @@
// 琛ㄥ崟鏍￠獙
rules: {
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鍦板潃", trigger: "blur" }
+ {required: true, message: "ip鍦板潃涓嶈兘涓虹┖", trigger: "blur"},
+ {
+ 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"
+ }
],
mac: [
- { required: true, message: "MAC鍦板潃涓嶈兘涓虹┖", 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: "璇疯緭鍏ユ纭殑MAC鍦板潃", trigger: "blur" }
+ {
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑MAC鍦板潃锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
+ trigger: "blur"
+ }
],
buildingId: [
- { required: true, message: "寤虹瓚鍗曞厓涓嶈兘涓虹┖", trigger: "change" }
+ {required: true, message: "寤虹瓚鍗曞厓涓嶈兘涓虹┖", trigger: "change"}
],
},
buildOpen: false
};
+ },
+ watch: {
+ 'schoolId': function () {
+ this.getList()
+ }
},
created() {
this.getList();
@@ -193,7 +218,7 @@
/** 鏌ヨ棰勭暀IP鍒楄〃 */
getList() {
this.loading = true;
- listReserveIp(this.queryParams).then(response => {
+ listReserveIp(Object.assign({}, this.queryParams, {schoolId: this.schoolId})).then(response => {
this.reserveIpList = response.rows;
this.total = response.total;
this.loading = false;
@@ -234,7 +259,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -260,6 +285,7 @@
this.$refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
+ this.form.schoolId = this.schoolId;
if (this.form.id != null) {
updateReserveIp(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -303,3 +329,12 @@
}
};
</script>
+
+<style lang="css">
+.el-tooltip__popper {
+ font-size: 14px;
+ max-width: 50%
+}
+
+/*璁剧疆鏄剧ず闅愯棌閮ㄥ垎鍐呭锛屾寜50%鏄剧ず*/
+</style>
--
Gitblit v1.9.1