From 76df3b345cf7f266a28ae40d2e663b3fc673c1b8 Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期二, 17 五月 2022 19:13:46 +0800
Subject: [PATCH] 样式修改
---
src/views/construction/ipc/index.vue | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index fe7c503..fa14c89 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>
@@ -71,19 +71,23 @@
<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="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="瀹夎浣嶇疆" 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="瀹夎浣嶇疆" 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" 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"
@@ -122,21 +126,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" :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-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-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>
@@ -195,6 +199,14 @@
<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>
@@ -205,6 +217,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",
@@ -214,7 +227,8 @@
organization,
constructionBatch,
manufacturer,
- nvr
+ nvr,
+ nvrForm
},
props: {
schoolId: {
@@ -294,7 +308,9 @@
],
passageway: []
},
- disabled: false
+ disabled: false,
+ nvrOpen: false,
+ nvrId: undefined
};
},
computed: {
@@ -471,11 +487,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