From e28e9395819fd992bc3e168b6ff89fb6f538f1bc Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期一, 23 五月 2022 15:25:34 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/ai/index.vue | 41 ++++++++++++++++++-----------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index 033ecb4..84dfbcc 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/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>
@@ -36,7 +36,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:ai:add']"
>鏂板
</el-button>
</el-col>
@@ -48,7 +47,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:ai:edit']"
>淇敼
</el-button>
</el-col>
@@ -60,7 +58,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:ai:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -79,18 +76,18 @@
<dict-tag :options="dict.type.DICT112" :value="scope.row.passageway"/>
</template>
</el-table-column>
- <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="buildingId_dictText"/>
- <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"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>
+ <el-table-column label="IP" width="130" align="center" prop="ipOne"/>
+ <el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>
+ <el-table-column label="IP" width="130" align="center" prop="ipTwo"/>
+ <el-table-column label="鐧诲綍璐︽埛" min-width="180" align="center" prop="loginAccount"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="180" align="center" prop="buildingId_dictText"/>
+ <el-table-column label="鎵�灞炲崟浣�" min-width="180" align="center" prop="organizationId_dictText"/>
+ <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
+ <el-table-column label="搴忓垪鍙�" min-width="150" align="center" prop="serialNumber"/>
+ <el-table-column label="鍨嬪彿" min-width="120" 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
size="mini"
@@ -104,7 +101,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:ai:edit']"
>淇敼
</el-button>
<el-button
@@ -113,7 +109,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:ai:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -282,7 +277,7 @@
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}$/,
+ pattern: /^[0-9a-fA-F:]*$/,
message: "璇疯緭鍏ユ纭殑LAN1",
trigger: "blur"
}
@@ -291,13 +286,13 @@
{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: [
{
- 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: "璇疯緭鍏ユ纭殑LAN2",
trigger: "blur"
}
@@ -305,7 +300,7 @@
ipTwo: [
{
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"
}
],
@@ -441,7 +436,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎AI璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delAi(ids);
}).then(() => {
--
Gitblit v1.9.1