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/ai/index.vue | 110 ++++++++++++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 53 deletions(-)
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index 144ba80..017e969 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>
@@ -10,21 +10,26 @@
<el-form-item label="鏂藉伐鎵规" prop="constructionBatchId">
<construction-batch v-model="queryParams.constructionBatchId" :schoolId="schoolId"></construction-batch>
</el-form-item>
- <el-form-item label="鍨嬪彿" prop="model">
- <el-input
+ <template v-if="showMoreCondition">
+ <el-form-item label="鍨嬪彿" prop="model">
+ <el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
clearable
size="small"
@keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
- <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
- </el-form-item>
+ />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鍘傚晢" prop="manufacturerId">
+ <manufacturer v-model="queryParams.manufacturerId"></manufacturer>
+ </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>
@@ -36,7 +41,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:ai:add']"
>鏂板
</el-button>
</el-col>
@@ -48,7 +52,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:ai:edit']"
>淇敼
</el-button>
</el-col>
@@ -60,7 +63,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:ai:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -68,29 +70,30 @@
<el-table v-loading="loading" :data="aiList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
- <el-table-column label="搴忓彿" type="index" align="center">
+ <el-table-column label="搴忓彿" type="index" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
</template>
</el-table-column>
- <el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
- <el-table-column label="鏀寔閫氶亾" align="center" prop="passageway">
- <template slot-scope="scope">
- <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_dictText"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="300" align="center" prop="deploymentName" show-overflow-tooltip/>
+<!-- <el-table-column label="鏀寔閫氶亾" align="center" prop="passageway">-->
+<!-- <template slot-scope="scope">-->
+<!-- <dict-tag :options="dict.type.DICT112" :value="scope.row.passageway"/>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column label="IP锛圠AN1锛�" width="130" align="center" prop="ipOne" show-overflow-tooltip/>
+<!-- <el-table-column label="LAN1" min-width="150" align="center" prop="lanOne"/>-->
+
+<!-- <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="220" align="center" prop="loginAccount" show-overflow-tooltip/>
+<!-- <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" show-overflow-tooltip/>
+<!-- <el-table-column label="鍨嬪彿" min-width="120" align="center" prop="model"/>-->
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" 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="鎿嶄綔" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -104,7 +107,6 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:ai:edit']"
>淇敼
</el-button>
<el-button
@@ -113,7 +115,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:ai:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -139,7 +140,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="閫氶亾" prop="passageway">
- <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾">
+ <el-select v-model="form.passageway" placeholder="璇烽�夋嫨閫氶亾" style="width: 100%;">
<el-option
v-for="dict in dict.type.DICT112"
:key="dict.value"
@@ -153,29 +154,29 @@
<el-row>
<el-col :span="12">
<el-form-item label="LAN1" prop="lanOne">
- <el-input v-model="form.lanOne" placeholder="璇疯緭鍏AN1"/>
+ <el-input v-model="form.lanOne" maxlength="17" show-word-limit placeholder="璇疯緭鍏ユ牎鍥綉绔彛"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ipOne">
- <el-input v-model="form.ipOne" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ipOne" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="LAN2" prop="lanTwo">
- <el-input v-model="form.lanTwo" placeholder="璇疯緭鍏AN2"/>
+ <el-input v-model="form.lanTwo" maxlength="17" show-word-limit placeholder="璇疯緭鍏ュ眬鍩熺綉绔彛"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="IP" prop="ipTwo">
- <el-input v-model="form.ipTwo" placeholder="璇疯緭鍏P"/>
+ <el-input v-model="form.ipTwo" maxlength="15" show-word-limit placeholder="璇疯緭鍏P"/>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="鐧诲綍璐︽埛" prop="loginAccount">
- <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ョ櫥褰曡处鎴�"/>
+ <el-form-item label="璐︽埛/瀵嗙爜" prop="loginAccount">
+ <el-input v-model="form.loginAccount" maxlength="64" show-word-limit placeholder="璇疯緭鍏ヨ处鎴�/瀵嗙爜"/>
</el-form-item>
<el-form-item label="瀹夎浣嶇疆" prop="buildingId">
<building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
@@ -217,6 +218,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from "../../components/nvr";
+import ShowMore from "@/views/components/showMore";
export default {
name: "Ai",
@@ -232,7 +234,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ ShowMore
},
data() {
return {
@@ -280,32 +283,32 @@
{required: true, message: "閫氶亾涓嶈兘涓虹┖", trigger: "change"}
],
lanOne: [
- {required: true, message: "LAN1涓嶈兘涓虹┖", trigger: "blur"},
+ {required: true, message: "鏍″洯缃戠鍙ｄ笉鑳戒负绌�", 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}$/,
- message: "璇疯緭鍏ユ纭殑LAN1",
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑鏍″洯缃戠鍙�",
trigger: "blur"
}
],
ipOne: [
{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"
}
],
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}$/,
- message: "璇疯緭鍏ユ纭殑LAN2",
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑灞�鍩熺綉绔彛",
trigger: "blur"
}
],
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鍦板潃",
+ 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"
}
],
@@ -319,7 +322,8 @@
{required: true, message: "鏂藉伐鎵规涓嶈兘涓虹┖", trigger: "blur"}
],
},
- disabled: false
+ disabled: false,
+ showMoreCondition: false
};
},
created() {
@@ -441,7 +445,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