From 4001279159dd37942b3cf4c83ab537f95832a82d Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期一, 06 六月 2022 13:33:21 +0800
Subject: [PATCH] BUG修改
---
src/views/construction/iot/index.vue | 131 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 64 deletions(-)
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 7d63c1e..e972c02 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
@@ -23,40 +23,45 @@
<el-form-item label="瀹夎浣嶇疆" prop="buildingId">
<building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
</el-form-item>
- <el-form-item label="鎵�灞炲崟浣�" prop="organizationId">
- <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
- </el-form-item>
- <el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
- <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
- </el-form-item>
- <el-form-item label="鐩戞帶瀵硅薄" prop="monitorObject">
- <el-input
- v-model="queryParams.monitorObject"
- placeholder="璇疯緭鍏ョ洃鎺у璞�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="queryParams.passageway" placeholder="璇烽�夋嫨閫氶亾" clearable size="small">
- <el-option
- v-for="dict in dict.type.DICT111"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="澶栬" prop="peripheralUnit">
- <peripheralUnit v-model="queryParams.peripheralUnit"></peripheralUnit>
- </el-form-item>
- <el-form-item label="澶栬鏁伴噺">
- <el-input v-model="sum" disabled/>
- </el-form-item>
+ <template v-if="showMoreCondition">
+ <el-form-item label="鎵�灞炲崟浣�" prop="organizationId">
+ <organization v-model="queryParams.organizationId" :schoolId="schoolId"></organization>
+ </el-form-item>
+ <el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
+ <construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
+ </el-form-item>
+ <el-form-item label="鐩戞帶瀵硅薄" prop="monitorObject">
+ <el-input
+ v-model="queryParams.monitorObject"
+ placeholder="璇疯緭鍏ョ洃鎺у璞�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閫氶亾" prop="passageway">
+ <el-select v-model="queryParams.passageway" placeholder="璇烽�夋嫨閫氶亾" clearable size="small">
+ <el-option
+ v-for="dict in dict.type.DICT111"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="澶栬" prop="peripheralUnit">
+ <peripheralUnit v-model="queryParams.peripheralUnit"></peripheralUnit>
+ </el-form-item>
+ <el-form-item label="澶栬鏁伴噺">
+ <el-input v-model="sum" disabled/>
+ </el-form-item>
+ </template>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <div class="show-more-search">
+ <ShowMore :showMoreCondition.sync="showMoreCondition"></ShowMore>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </div>
</el-form-item>
</el-form>
@@ -68,7 +73,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:iot:add']"
>鏂板
</el-button>
</el-col>
@@ -80,7 +84,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:iot:edit']"
>淇敼
</el-button>
</el-col>
@@ -92,7 +95,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:iot:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -105,26 +107,26 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
- <el-table-column label="鐗堟湰" align="center" prop="edition">
+ <el-table-column label="閮ㄧ讲鍚嶇О" align="center" min-width="300" prop="deploymentName" show-overflow-tooltip/>
+ <el-table-column label="鐗堟湰" align="center" prop="edition" show-overflow-tooltip>
<template slot-scope="scope">
<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="LAN" align="center" min-width="150" prop="lan"/>-->
+ <el-table-column label="IP" align="center" min-width="130" prop="ip" show-overflow-tooltip/>
+ <el-table-column label="鐩戞帶瀵硅薄" align="center" min-width="220" prop="monitorObject" show-overflow-tooltip/>
+ <el-table-column label="搴忓垪鍙�" align="center" min-width="220" prop="serialNumber" show-overflow-tooltip/>
+ <el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText" show-overflow-tooltip/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText" show-overflow-tooltip/>
+<!-- <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="organizationId_dictText"/>-->
+<!-- <el-table-column label="鏂藉伐鎵规" min-width="150" align="center" prop="constructionBatchId_dictText"/>-->
<!-- <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="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -138,7 +140,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:iot:edit']"
>淇敼
</el-button>
<el-button
@@ -147,7 +148,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:iot:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -173,7 +173,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="鐗堟湰" prop="edition">
- <el-select v-model="form.edition" placeholder="璇烽�夋嫨鐗堟湰">
+ <el-select v-model="form.edition" placeholder="璇烽�夋嫨鐗堟湰" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT110"
:key="dict.value"
@@ -187,12 +187,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN" prop="lan">
- <el-input v-model="form.lan" placeholder="璇疯緭鍏AN"/>
+ <el-input v-model="form.lan" maxlength="17" show-word-limit placeholder="璇疯緭鍏AN"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ip">
- <el-input v-model="form.ip" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ip" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
@@ -245,7 +245,7 @@
</el-col>
</el-row>
<el-form-item label="鐩戞帶瀵硅薄" prop="monitorObject">
- <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="8" placeholder="璇疯緭鍏ュ唴瀹�"/>
+ <el-input v-model="form.monitorObject" type="textarea" maxlength="512" show-word-limit :rows="3" placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -263,6 +263,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import peripheralUnit from '../../components/peripheralUnit'
+import ShowMore from "@/views/components/showMore";
export default {
name: "Iot",
@@ -278,7 +279,8 @@
organization,
constructionBatch,
manufacturer,
- peripheralUnit
+ peripheralUnit,
+ ShowMore
},
data() {
return {
@@ -331,7 +333,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"
}
@@ -339,8 +341,8 @@
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鍦板潃",
+ 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"
}
],
@@ -355,7 +357,8 @@
],
},
disabled: false,
- sum: undefined
+ sum: undefined,
+ showMoreCondition: false
};
},
computed: {
@@ -505,7 +508,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