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/ipc/index.vue | 117 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 43 deletions(-)
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 0b9ad00..1d0aaf0 100644
--- a/src/views/construction/ipc/index.vue
+++ b/src/views/construction/ipc/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="NVR" prop="nvrId">
<nvr v-model="queryParams.nvrId" :schoolId="schoolId"></nvr>
@@ -34,7 +34,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['oa:ipc:add']"
>鏂板
</el-button>
</el-col>
@@ -46,7 +45,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['oa:ipc:edit']"
>淇敼
</el-button>
</el-col>
@@ -58,7 +56,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['oa:ipc:remove']"
>鍒犻櫎
</el-button>
</el-col>
@@ -71,26 +68,36 @@
<span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
</template>
</el-table-column>
- <el-table-column label="MAC" align="center" prop="mac"/>
- <el-table-column label="IP" align="center" prop="ip"/>
- <el-table-column label="绔彛" align="center" prop="port"/>
- <el-table-column label="鐧诲綍璐︽埛" align="center" prop="loginAccount"/>
- <el-table-column label="NVR" align="center" prop="nvrId_dictText"/>
- <el-table-column label="閫氶亾" align="center" prop="passageway_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" class-name="small-padding fixed-width">
+ <el-table-column label="MAC" min-width="150" align="center" prop="mac"/>
+ <el-table-column label="IP" width="130" align="center" prop="ip"/>
+ <el-table-column label="绔彛" width="80" align="center" prop="port"/>
+ <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>
+ </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="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" 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)"
+ >鏌ョ湅
+ </el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['oa:ipc:edit']"
>淇敼
</el-button>
<el-button
@@ -99,7 +106,6 @@
class="del-btn"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['oa:ipc:remove']"
>鍒犻櫎
</el-button>
</template>
@@ -115,21 +121,21 @@
/>
<!-- 娣诲姞鎴栦慨鏀筰pc璁惧瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="700px" :append-to-body="true" :close-on-click-modal="false"
+ <el-dialog :title="title" :visible.sync="open" width="900px" :append-to-body="true" :close-on-click-modal="false"
:destroy-on-close="true">
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" :disabled="disabled">
<el-row>
- <el-col :span="9">
+ <el-col :span="8">
<el-form-item label="MAC" prop="mac">
- <el-input v-model="form.mac" placeholder="璇疯緭鍏AC"/>
+ <el-input v-model="form.mac" maxlength="17" show-word-limit placeholder="璇疯緭鍏AC"/>
</el-form-item>
</el-col>
- <el-col :span="9">
+ <el-col :span="8">
<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-col :span="6">
+ <el-col :span="8">
<el-form-item label="绔彛" prop="port">
<el-input-number v-model="form.port" controls-position="right" :min="0" :max="65535"/>
</el-form-item>
@@ -183,11 +189,19 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="copy">澶嶅埗涓婁竴鏉′俊鎭�</el-button>
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button :loading="buttonLoading" :disabled="disabled" type="primary" @click="copy">澶嶅埗涓婁竴鏉′俊鎭�</el-button>
+ <el-button :loading="buttonLoading" :disabled="disabled" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 鏈嶅姟鍣� -->
+ <Dialog title="鏈嶅姟鍣�" :visible.sync="nvrOpen" width="700px" :append-to-body="true" :destroy-on-close="true">
+ <nvr-form v-if="nvrOpen" :nvrId="nvrId"></nvr-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="nvrOpen = false">鍏� 闂�</el-button>
+ </div>
+ </Dialog>
</div>
</template>
@@ -198,6 +212,7 @@
import constructionBatch from "../../components/constructionBatch";
import manufacturer from "../../components/manufacturer";
import nvr from '../../components/nvr'
+import nvrForm from '../../components/nvr/form'
export default {
name: "Ipc",
@@ -207,7 +222,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ nvrForm
},
props: {
schoolId: {
@@ -257,8 +273,8 @@
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",
+ pattern: /^[0-9a-fA-F:]*$/,
+ message: "璇疯緭鍏ユ纭殑MAC锛屾枃鏈寖鍥� 0~9銆乤~f銆丄~F銆侊細",
trigger: "blur"
}
],
@@ -266,7 +282,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"
}
],
@@ -286,7 +302,10 @@
{required: true, message: "鏂藉伐鎵规涓嶈兘涓虹┖", trigger: "blur"}
],
passageway: []
- }
+ },
+ disabled: false,
+ nvrOpen: false,
+ nvrId: undefined
};
},
computed: {
@@ -367,19 +386,33 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
+ this.disabled = false;
this.open = true;
- this.title = "娣诲姞ipc璁惧";
+ this.title = "娣诲姞IPC璁惧";
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
+ handleInfo(row) {
this.loading = true;
+ this.disabled = true;
this.reset();
const id = row.id || this.ids
getIpc(id).then(response => {
this.loading = false;
this.form = response.data;
this.open = true;
- this.title = "淇敼ipc璁惧";
+ this.title = "IPC璁惧璇︽儏";
+ });
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.loading = true;
+ this.disabled = false;
+ this.reset();
+ const id = row.id || this.ids
+ getIpc(id).then(response => {
+ this.loading = false;
+ this.form = response.data;
+ this.open = true;
+ this.title = "淇敼IPC璁惧";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -438,7 +471,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(() => {
@@ -449,11 +482,9 @@
this.loading = false;
});
},
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- this.download('oa/ipc/export', {
- ...this.queryParams
- }, `ipc_${new Date().getTime()}.xlsx`)
+ nvrClick(row) {
+ this.nvrId = row.nvrId;
+ this.nvrOpen = true;
}
}
};
--
Gitblit v1.9.1