From c01dff9a24f98f10f247d2f2e449383f567ec338 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期三, 18 五月 2022 14:55:48 +0800
Subject: [PATCH] 提交代码
---
src/views/construction/iot/index.vue | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 7485690..644097d 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/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="deploymentName">
<el-input
@@ -111,27 +111,26 @@
<dict-tag :options="dict.type.DICT110" :value="scope.row.edition"/>
</template>
</el-table-column>
- <el-table-column label="LAN" align="center" prop="lan"/>
- <el-table-column label="IP" align="center" prop="ip"/>
- <el-table-column label="閫氶亾1" align="center" prop="passagewayOne_dictText"/>
- <el-table-column label="閫氶亾2" align="center" prop="passagewayTwo_dictText"/>
- <el-table-column label="閫氶亾3" align="center" prop="passagewayThree_dictText"/>
- <el-table-column label="閫氶亾4" align="center" prop="passagewayFour_dictText"/>
- <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_dictText"/>
- <el-table-column label="鐩戞帶瀵硅薄" align="center" prop="monitorObject"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
+ <el-table-column label="IP" align="center" min-width="130" prop="ip"/>
+ <el-table-column label="閫氶亾1" align="center" min-width="180" prop="passagewayOne_dictText"/>
+ <el-table-column label="閫氶亾2" align="center" min-width="180" prop="passagewayTwo_dictText"/>
+ <el-table-column label="閫氶亾3" align="center" min-width="180" prop="passagewayThree_dictText"/>
+ <el-table-column label="閫氶亾4" align="center" min-width="180" prop="passagewayFour_dictText"/>
+ <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="150" 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" min-width="220" prop="manufacturerId_dictText"/>
+ <el-table-column label="鐩戞帶瀵硅薄" align="center" min-width="180" prop="monitorObject"/>
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-view"
@click="handleInfo(scope.row)"
- v-hasPermi="['oa:iot:edit']"
>鏌ョ湅
</el-button>
<el-button
@@ -341,7 +340,7 @@
{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"
}
],
@@ -506,7 +505,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎IoT璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delIot(ids);
}).then(() => {
--
Gitblit v1.9.1