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 | 8
src/views/construction/constructionBatch/index.vue | 7
src/views/construction/reserveIp/index.vue | 151 +++++++++++++++++-------------
src/views/construction/server/index.vue | 16 +-
src/views/construction/ai/index.vue | 6
src/views/construction/system/index.vue | 6
src/views/basics/building/index.vue | 2
src/views/basics/organization/index.vue | 4
src/views/construction/nvr/index.vue | 46 ++++----
src/views/construction/exchange/index.vue | 3
src/views/construction/ipc/index.vue | 16 +-
11 files changed, 142 insertions(+), 123 deletions(-)
diff --git a/src/views/basics/building/index.vue b/src/views/basics/building/index.vue
index 6ebe0a9..a8d8b5f 100644
--- a/src/views/basics/building/index.vue
+++ b/src/views/basics/building/index.vue
@@ -277,7 +277,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎"' + row.detailedName + '"锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delBuilding(row.id);
}).then(() => {
diff --git a/src/views/basics/organization/index.vue b/src/views/basics/organization/index.vue
index 946b4f6..5dc98e3 100644
--- a/src/views/basics/organization/index.vue
+++ b/src/views/basics/organization/index.vue
@@ -181,7 +181,7 @@
},
/** 鏌ヨ楂樻牎缁勭粐鏈烘瀯涓嬫媺鏍戠粨鏋� */
getTreeselect() {
- listOrganization().then(response => {
+ listOrganization({schoolId: this.schoolId}).then(response => {
this.organizationOptions = [];
const data = {id: 0, name: '椤剁骇鑺傜偣', children: []};
data.children = this.handleTree(response.data, "id", "parentId");
@@ -276,7 +276,7 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$modal.confirm('鏄惁纭鍒犻櫎楂樻牎缁勭粐鏈烘瀯缂栧彿涓�"' + row.id + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delOrganization(row.id);
}).then(() => {
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index b3f4ec6..8468fa9 100644
--- a/src/views/construction/ai/index.vue
+++ b/src/views/construction/ai/index.vue
@@ -291,7 +291,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"
}
],
@@ -305,7 +305,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 +441,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(() => {
diff --git a/src/views/construction/constructionBatch/index.vue b/src/views/construction/constructionBatch/index.vue
index 639584a..52da7f9 100644
--- a/src/views/construction/constructionBatch/index.vue
+++ b/src/views/construction/constructionBatch/index.vue
@@ -106,6 +106,7 @@
<el-date-picker
v-model="form.date"
type="daterange"
+ value-format="yyyy-MM-dd"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="鎴嚦鏃ユ湡">
@@ -275,8 +276,9 @@
const id = row.id || this.ids
getConstructionBatch(id).then(response => {
this.loading = false;
- this.form = response.data;
- this.form.date = [this.form.startDate, this.form.endDate]
+ // this.form = response.data;
+ const localDate = [response.data.startDate, response.data.endDate];
+ this.form = Object.assign({}, response.data, {date: localDate})
this.open = true;
this.title = "淇敼鏂藉伐鎵规";
});
@@ -284,7 +286,6 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
- console.log(this.form.date)
this.form.startDate = this.form.date[0];
this.form.endDate = this.form.date[1];
if (valid) {
diff --git a/src/views/construction/exchange/index.vue b/src/views/construction/exchange/index.vue
index 1e98493..93777dd 100644
--- a/src/views/construction/exchange/index.vue
+++ b/src/views/construction/exchange/index.vue
@@ -137,6 +137,7 @@
<el-table-column label="鍏蜂綋浣嶇疆" min-width="220" align="center" prop="address"/>
<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="180" align="center" prop="serialNumber"/>
<el-table-column label="鍨嬪彿" min-width="180" 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="220" class-name="small-padding fixed-width">
@@ -516,7 +517,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎浜ゆ崲璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delExchange(ids);
}).then(() => {
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 33ed67e..644097d 100644
--- a/src/views/construction/iot/index.vue
+++ b/src/views/construction/iot/index.vue
@@ -120,8 +120,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">
@@ -340,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"
}
],
@@ -505,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(() => {
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index fa14c89..3018494 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/index.vue
@@ -77,16 +77,16 @@
<el-table-column label="鐧诲綍璐︽埛" min-width="120" align="center" prop="loginAccount"/>
<el-table-column label="NVR" align="center" prop="nvrId_dictText">
<template slot-scope="scope">
- <el-link type="primary" @click="nvrClick(scope.row)">{{scope.row.nvrId_dictText}}</el-link>
+ <el-link type="primary" @click="nvrClick(scope.row)">{{ scope.row.nvrId_dictText }}</el-link>
</template>
</el-table-column>
<el-table-column label="閫氶亾" align="center" prop="passageway_dictText"/>
- <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
+ <el-table-column label="瀹夎浣嶇疆" min-width="240" align="center" prop="buildingId_dictText"/>
<el-table-column label="鎵�灞炲崟浣�" min-width="200" align="center" prop="organizationId_dictText"/>
<el-table-column label="鏂藉伐鎵规" min-width="120" 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="serialNumber"/>
+ <el-table-column label="鍨嬪彿" align="center" prop="model"/>
+ <el-table-column label="鐢熶骇鍘傚晢" 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
@@ -279,7 +279,7 @@
{required: true, message: "mac涓嶈兘涓虹┖", 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: "璇疯緭鍏ユ纭殑MAC",
+ message: "璇疯緭鍏ユ纭殑MAC锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
trigger: "blur"
}
],
@@ -287,7 +287,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"
}
],
@@ -476,7 +476,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎ipc璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delIpc(ids);
}).then(() => {
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index 23a6dee..eeea648 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/index.vue
@@ -24,8 +24,6 @@
<el-input
v-model="queryParams.model"
placeholder="璇疯緭鍏ュ瀷鍙�"
- clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -90,10 +88,10 @@
<el-table-column label="纭洏" align="center" min-width="120" prop="hardDisk"/>
<el-table-column label="瀹夎浣嶇疆" align="center" min-width="240" prop="buildingId_dictText"/>
<el-table-column label="鎵�灞炲崟浣�" align="center" min-width="200" prop="organizationId_dictText"/>
- <!-- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId" />-->
- <!-- <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" 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" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -322,26 +320,26 @@
{required: true, message: "ip1涓嶈兘涓虹┖", 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: [
- {required: true, message: "LAN2涓嶈兘涓虹┖", 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: "璇疯緭鍏ユ纭殑LAN",
- trigger: "blur"
- }
- ],
- ipTwo: [
- {required: true, message: "ip2涓嶈兘涓虹┖", 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鍦板潃",
- trigger: "blur"
- }
- ],
+ // lanTwo: [
+ // {required: true, message: "LAN2涓嶈兘涓虹┖", 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: "璇疯緭鍏ユ纭殑LAN",
+ // trigger: "blur"
+ // }
+ // ],
+ // ipTwo: [
+ // {required: true, message: "ip2涓嶈兘涓虹┖", 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鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
+ // trigger: "blur"
+ // }
+ // ],
loginAccount: [
{required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖", trigger: "blur"}
],
@@ -493,7 +491,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎NVR璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delNvr(ids);
}).then(() => {
diff --git a/src/views/construction/reserveIp/index.vue b/src/views/construction/reserveIp/index.vue
index 7e59d54..c9d1d95 100644
--- a/src/views/construction/reserveIp/index.vue
+++ b/src/views/construction/reserveIp/index.vue
@@ -3,12 +3,15 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="IP鍦板潃" prop="ip">
<el-input
- v-model="queryParams.ip"
- placeholder="璇疯緭鍏p鍦板潃"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
+ v-model="queryParams.ip"
+ placeholder="璇疯緭鍏p鍦板潃"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
/>
+ </el-form-item>
+ <el-form-item label="閫傜敤鍦扮偣" prop="buildingId">
+ <building v-model="queryParams.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -19,104 +22,112 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['oa:reserveIp:add']"
- >鏂板</el-button>
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['oa:reserveIp:add']"
+ >鏂板
+ </el-button>
</el-col>
<el-col :span="1.5">
<el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['oa:reserveIp:edit']"
- >淇敼</el-button>
+ type="success"
+ plain
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['oa:reserveIp:edit']"
+ >淇敼
+ </el-button>
</el-col>
<el-col :span="1.5">
<el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['oa:reserveIp:remove']"
- >鍒犻櫎</el-button>
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['oa:reserveIp:remove']"
+ >鍒犻櫎
+ </el-button>
</el-col>
</el-row>
<el-table v-loading="loading" :data="reserveIpList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="搴忓彿" type="index" align="center">
<template slot-scope="scope">
- <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+ <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
- <el-table-column label="IP鍦板潃" align="center" prop="ip" />
- <el-table-column label="MAC鍦板潃" align="center" prop="mac" />
- <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText" />
+ <el-table-column label="IP鍦板潃" align="center" prop="ip"/>
+ <el-table-column label="MAC鍦板潃" align="center" prop="mac"/>
+ <el-table-column label="閫傜敤鍦扮偣" align="center" prop="buildingId_dictText"/>
<el-table-column label="鐢宠鏃ユ湡" align="center" prop="applicationDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applicationDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
- <el-table-column label="澶囨敞" align="center" prop="remarks" />
+ <el-table-column label="澶囨敞" align="center" prop="remarks"/>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['oa:reserveIp:edit']"
- >淇敼</el-button>
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['oa:reserveIp:edit']"
+ >淇敼
+ </el-button>
<el-button
- size="mini"
- type="text"
- class="del-btn"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['oa:reserveIp:remove']"
- >鍒犻櫎</el-button>
+ size="mini"
+ type="text"
+ class="del-btn"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['oa:reserveIp:remove']"
+ >鍒犻櫎
+ </el-button>
</template>
</el-table-column>
</el-table>
<pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
+ v-show="total>0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
/>
<!-- 娣诲姞鎴栦慨鏀归鐣橧P瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true" :close-on-click-modal="false">
+ <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :destroy-on-close="true"
+ :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="IP鍦板潃" prop="ip">
- <el-input v-model="form.ip" placeholder="璇疯緭鍏p鍦板潃" />
+ <el-input v-model="form.ip" placeholder="璇疯緭鍏p鍦板潃"/>
</el-form-item>
<el-form-item label="MAC鍦板潃" prop="mac">
- <el-input v-model="form.mac" placeholder="璇疯緭鍏AC鍦板潃" />
+ <el-input v-model="form.mac" placeholder="璇疯緭鍏AC鍦板潃"/>
</el-form-item>
<el-form-item label="閫傜敤鍦扮偣" prop="buildingId">
<building v-if="open" v-model="form.buildingId" :schoolId="schoolId"></building>
</el-form-item>
<el-form-item label="鐢宠鏃ユ湡" prop="applicationDate">
<el-date-picker clearable size="small"
- v-model="form.applicationDate"
- type="date"
- placeholder="閫夋嫨鐢宠鏃ユ湡">
+ v-model="form.applicationDate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
+ placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -130,7 +141,7 @@
</template>
<script>
-import { listReserveIp, getReserveIp, delReserveIp, addReserveIp, updateReserveIp } from "@/api/oa/reserveIp";
+import {listReserveIp, getReserveIp, delReserveIp, addReserveIp, updateReserveIp} from "@/api/oa/reserveIp";
import building from '../../components/building'
export default {
@@ -178,15 +189,23 @@
// 琛ㄥ崟鏍￠獙
rules: {
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鍦板潃", trigger: "blur" }
+ {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鍦板潃锛屾枃鏈寖鍥� 0~9銆�.",
+ trigger: "blur"
+ }
],
mac: [
- { required: true, message: "MAC鍦板潃涓嶈兘涓虹┖", 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: "璇疯緭鍏ユ纭殑MAC鍦板潃", trigger: "blur" }
+ {required: true, message: "MAC鍦板潃涓嶈兘涓虹┖", 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: "璇疯緭鍏ユ纭殑MAC鍦板潃锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
+ trigger: "blur"
+ }
],
buildingId: [
- { required: true, message: "寤虹瓚鍗曞厓涓嶈兘涓虹┖", trigger: "change" }
+ {required: true, message: "寤虹瓚鍗曞厓涓嶈兘涓虹┖", trigger: "change"}
],
},
buildOpen: false
@@ -245,7 +264,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 1ff45d3..c05a712 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/index.vue
@@ -81,17 +81,17 @@
<dict-tag :options="dict.type.DICT115" :value="scope.row.operatingSystem"/>
</template>
</el-table-column>
- <!-- <el-table-column label="璐︽埛" align="center" prop="account" />-->
+ <el-table-column label="绯荤粺璐﹀彿" align="center" prop="account"/>
<el-table-column label="閮ㄧ讲浣嶇疆" align="center" min-width="180" prop="buildingId_dictText"/>
<el-table-column label="鏈烘煖鍙�" align="center" prop="cabinetNumber"/>
<el-table-column label="鏈烘灦鍙�" align="center" prop="rackNumber"/>
<el-table-column label="鎵�灞炲崟浣�" align="center" min-width="180" prop="organizationId_dictText"/>
<el-table-column label="鏂藉伐鎵规" align="center" min-width="180" prop="constructionBatchId_dictText"/>
- <!-- <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber" />-->
+ <el-table-column label="搴忓垪鍙�" align="center" prop="serialNumber"/>
<el-table-column label="鍨嬪彿" align="center" min-width="180" prop="model"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" min-width="220" prop="manufacturerId_dictText"/>
- <!-- <el-table-column label="鎬ц兘鎸囨爣" align="center" prop="performanceIndex" />-->
- <!-- <el-table-column label="澶囨敞" align="center" prop="remarks" />-->
+ <el-table-column label="鎬ц兘鎸囨爣" align="center" prop="performanceIndex"/>
+ <el-table-column label="澶囨敞" align="center" prop="remarks"/>
<!-- <el-table-column label="闄勪欢" align="center" prop="filePath" />-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -212,11 +212,11 @@
</el-col>
</el-row>
<el-form-item label="鎬ц兘鎸囨爣" prop="performanceIndex">
- <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="64" show-word-limit
+ <el-input v-model="form.performanceIndex" type="textarea" :rows="8" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="64" show-word-limit
+ <el-input v-model="form.remarks" type="textarea" :rows="8" maxlength="512" show-word-limit
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
@@ -322,7 +322,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"
}
],
@@ -482,7 +482,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鏈嶅姟鍣ㄧ紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delServer(ids);
}).then(() => {
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index c8ef505..7d6f79e 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/index.vue
@@ -144,7 +144,7 @@
</el-col>
</el-row>
<el-form-item label="鍔熻兘鎻忚堪" prop="functionDescription">
- <el-input v-model="form.functionDescription" :rows="8" maxlength="64" show-word-limit type="textarea"
+ <el-input v-model="form.functionDescription" :rows="8" maxlength="512" show-word-limit type="textarea"
placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
<el-row>
@@ -183,7 +183,7 @@
</el-col>
</el-row>
<el-form-item label="澶囨敞" prop="remarks">
- <el-input v-model="form.remarks" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
+ <el-input v-model="form.remarks" :rows="8" maxlength="512" show-word-limit type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -443,7 +443,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎杞欢绯荤粺缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => {
+ this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => {
this.loading = true;
return delSystem(ids);
}).then(() => {
--
Gitblit v1.9.1