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/iot/index.vue | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 7c2ebc4..c8985a1 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -68,7 +68,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:iot:add']"
>鏂板
</el-button>
</el-col>
@@ -80,7 +79,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:iot:edit']"
>淇敼
</el-button>
</el-col>
@@ -92,7 +90,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:iot:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -112,7 +109,7 @@
</template>
</el-table-column>
<el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
- <el-table-column label="IP" align="center" min-width="120" prop="ip"/>
+ <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"/>
@@ -120,8 +117,8 @@
<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" 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">
@@ -138,7 +135,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:iot:edit']"
>淇敼
</el-button>
<el-button
@@ -147,7 +143,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:iot:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -331,7 +326,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"
}
@@ -340,7 +335,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"
}
],
@@ -505,7 +500,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