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 | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index c9d1d95..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"
@@ -27,7 +27,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:reserveIp:add']"
>鏂板
</el-button>
</el-col>
@@ -39,7 +38,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:reserveIp:edit']"
>淇敼
</el-button>
</el-col>
@@ -51,7 +49,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:reserveIp:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -64,15 +61,15 @@
<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
@@ -80,7 +77,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:reserveIp:edit']"
>淇敼
</el-button>
<el-button
@@ -89,7 +85,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:reserveIp:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -105,7 +100,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀归鐣橧P瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true"
+ <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">
@@ -118,15 +113,16 @@
<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"
- value-format="yyyy-MM-dd"
- 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" maxlength="512" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="4" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
@@ -191,15 +187,14 @@
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])$/,
+ 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}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑MAC鍦板潃锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
trigger: "blur"
}
@@ -334,3 +329,12 @@
}
};
</script>
+
+<style lang="css">
+.el-tooltip__popper {
+ font-size: 14px;
+ max-width: 50%
+}
+
+/*璁剧疆鏄剧ず闅愯棌閮ㄥ垎鍐呭锛屾寜50%鏄剧ず*/
+</style>
--
Gitblit v1.9.1