From b05640960d38a08def00a44b44aa11ef216f911f Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@163.com>
Date: 星期二, 17 五月 2022 16:13:09 +0800
Subject: [PATCH] 样式修改
---
src/views/components/school/index.vue | 41 ++++++++
src/views/index.vue | 9 +
src/assets/styles/index.scss | 15 ++
src/assets/images/ip-icon.png | 0
src/views/construction/server/index.vue | 20 ++--
src/views/construction/system/index.vue | 18 +-
src/views/construction/exchange/index.vue | 16 +-
src/views/construction/ipc/index.vue | 18 +-
src/views/construction/iot/index.vue | 26 ++--
src/views/construction/constructionList/index.vue | 31 ++++-
src/views/construction/ai/index.vue | 26 ++--
src/assets/images/batch-icon.png | 0
src/views/construction/nvr/index.vue | 24 ++--
src/assets/images/login-background.jpg | 0
14 files changed, 156 insertions(+), 88 deletions(-)
diff --git a/src/assets/images/batch-icon.png b/src/assets/images/batch-icon.png
new file mode 100644
index 0000000..5337b8a
--- /dev/null
+++ b/src/assets/images/batch-icon.png
Binary files differ
diff --git a/src/assets/images/ip-icon.png b/src/assets/images/ip-icon.png
new file mode 100644
index 0000000..6ee762e
--- /dev/null
+++ b/src/assets/images/ip-icon.png
Binary files differ
diff --git a/src/assets/images/login-background.jpg b/src/assets/images/login-background.jpg
index fffb70f..b5b0576 100644
--- a/src/assets/images/login-background.jpg
+++ b/src/assets/images/login-background.jpg
Binary files differ
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index c799ce6..993c68e 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -121,7 +121,8 @@
//main-container鍏ㄥ眬鏍峰紡
.app-container {
- padding: 20px;
+ padding: 15px;
+ box-sizing: border-box;
}
.components-container {
@@ -193,3 +194,15 @@
.del-btn {
color: #ff0000;
}
+
+input {
+ outline: none!important;
+}
+.custom-el-tabs .el-tabs {
+ width: 100%!important;
+ flex: none;
+}
+.construction-view {
+ //padding: 0 10px;
+ box-sizing: border-box;
+}
diff --git a/src/views/components/school/index.vue b/src/views/components/school/index.vue
index d8fe39d..88aea1b 100644
--- a/src/views/components/school/index.vue
+++ b/src/views/components/school/index.vue
@@ -59,6 +59,47 @@
};
</script>
<style scoped lang="scss">
+.tree-list-main {
+ display: flex;
+ flex-direction: column;
+ width: 270px;
+ height: 100%;
+ box-sizing: border-box;
+ .main-search {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ height: 32px;
+ border: 1px solid #EEEEF1;
+ border-radius: 3px;
+ padding: 0 10px;
+ margin-bottom: 10px;
+ width: 100%;
+ .search-input {
+ display: flex;
+ flex: 1;
+ background: none;
+ border: none;
+ font-size: 14px;
+ color: #000000;
+ }
+ .search-btn {
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ }
+ }
+ .main-tree {
+ display: flex;
+ flex-direction: column;
+ border: 1px solid #EEEEF1;
+ //height: 718px;
+ flex: 1;
+ border-radius: 3px;
+ padding: 10px 5px;
+ overflow: auto;
+ }
+}
.tree-search {
display: flex;
flex-direction: row;
diff --git a/src/views/construction/ai/index.vue b/src/views/construction/ai/index.vue
index 144ba80..5ee7c02 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>
@@ -79,18 +79,18 @@
<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="LAN1" min-width="150" align="center" prop="lanOne"/>
+ <el-table-column label="IP" width="120" align="center" prop="ipOne"/>
+ <el-table-column label="LAN2" min-width="150" align="center" prop="lanTwo"/>
+ <el-table-column label="IP" width="120" align="center" prop="ipTwo"/>
+ <el-table-column label="鐧诲綍璐︽埛" min-width="180" align="center" prop="loginAccount"/>
+ <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="180" align="center" prop="constructionBatchId_dictText"/>
+ <el-table-column label="搴忓垪鍙�" min-width="150" align="center" prop="serialNumber"/>
+ <el-table-column label="鍨嬪彿" min-width="120" 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="180" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/construction/constructionList/index.vue b/src/views/construction/constructionList/index.vue
index 10a2808..97929f0 100644
--- a/src/views/construction/constructionList/index.vue
+++ b/src/views/construction/constructionList/index.vue
@@ -4,9 +4,11 @@
<div class="tree-list">
<school ref="schoolRef" @schoolChange="schoolChange"></school>
</div>
- <div class="right-view" v-loading="loading">
- <el-tabs v-model="activeName" @tab-click="handleClick">
- <el-tab-pane label="鏂藉伐姒傚喌" name="first">鏂藉伐姒傚喌</el-tab-pane>
+ <div class="right-view custom-el-tabs" v-loading="loading">
+ <el-tabs v-model="activeName" style="flex: 1;" @tab-click="handleClick">
+ <el-tab-pane label="鏂藉伐姒傚喌" name="first">
+ <el-empty description="姝ｅ湪寮�鍙戜腑..."></el-empty>
+ </el-tab-pane>
<el-tab-pane label="IPC璁惧" name="second">
<ipc v-if="activeName === 'second'" :schoolId="schoolId"></ipc>
</el-tab-pane>
@@ -30,8 +32,8 @@
</el-tab-pane>
</el-tabs>
<div class="right-view-title-icon">
- <i class="el-icon-search" @click="batchOpen = true"></i>
- <i class="el-icon-search" @click="ipOpen = true"></i>
+ <img alt="" title="鏂藉伐鎵规" src="@/assets/images/batch-icon.png" @click="batchOpen = true" class="right-view-title-icon-item" />
+ <img alt="" title="棰勭暀IP" src="@/assets/images/ip-icon.png" @click="ipOpen = true" class="right-view-title-icon-item" />
</div>
</div>
</div>
@@ -84,7 +86,7 @@
// 閫夋嫨楂樻牎
schoolChange(v) {
this.schoolId = v;
- this.activeName = 'first';
+ this.activeName = 'second';
this.loading = false;
},
handleClick(tab, event) {
@@ -98,7 +100,7 @@
.tree-view {
display: flex;
flex-direction: row;
- flex: 1;
+ width: 100%;
}
.tree-list {
@@ -109,7 +111,9 @@
display: flex;
flex-direction: row;
justify-content: space-between;
- flex: 1;
+ width: calc(100% - 280px);
+ position: relative;
+ box-sizing: border-box;
}
.right-view-title-icon {
@@ -117,5 +121,14 @@
flex-direction: row;
height: 40px;
align-items: center;
+ position: absolute;
+ top: 0;
+ right: 0;
}
-</style>
\ No newline at end of file
+.right-view-title-icon-item {
+ width: 20px;
+ height: 20px;
+ margin-left: 15px;
+ cursor: pointer;
+}
+</style>
diff --git a/src/views/construction/exchange/index.vue b/src/views/construction/exchange/index.vue
index 2849e98..1e98493 100644
--- a/src/views/construction/exchange/index.vue
+++ b/src/views/construction/exchange/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>
@@ -133,13 +133,13 @@
<dict-tag :options="dict.type.DICT114" :value="scope.row.indexB"/>
</template>
</el-table-column>
- <el-table-column label="瀹夎浣嶇疆" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鍏蜂綋浣嶇疆" align="center" prop="address"/>
- <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="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="180" align="center" prop="buildingId_dictText"/>
+ <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="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">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/construction/iot/index.vue b/src/views/construction/iot/index.vue
index 7d63c1e..7c2ebc4 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
@@ -111,20 +111,20 @@
<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="LAN" align="center" min-width="150" prop="lan"/>
+ <el-table-column label="IP" align="center" min-width="120" prop="ip"/>
+ <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="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="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" 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">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/construction/ipc/index.vue b/src/views/construction/ipc/index.vue
index 82937e9..752a527 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,23 +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="MAC" min-width="150" align="center" prop="mac"/>
+ <el-table-column label="IP" width="120" 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"
diff --git a/src/views/construction/nvr/index.vue b/src/views/construction/nvr/index.vue
index e010a33..eae504e 100644
--- a/src/views/construction/nvr/index.vue
+++ b/src/views/construction/nvr/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="88px">
<el-form-item label="閫氶亾锛堣矾锛�" prop="passageway">
<el-select v-model="queryParams.passageway" placeholder="璇烽�夋嫨閫氶亾锛堣矾锛�">
@@ -80,21 +80,21 @@
<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="passageway_dictText"/>
- <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="hardDisk"/>
- <el-table-column label="瀹夎浣嶇疆" align="center" prop="buildingId_dictText"/>
- <el-table-column label="鎵�灞炲崟浣�" align="center" prop="organizationId_dictText"/>
+ <el-table-column label="閮ㄧ讲鍚嶇О" min-width="150" align="center" prop="deploymentName"/>
+ <el-table-column label="閫氶亾锛堣矾锛�" width="120" align="center" prop="passageway_dictText"/>
+ <el-table-column label="LAN1" align="center" width="150" prop="lanOne"/>
+ <el-table-column label="IP" align="center" width="120" prop="ipOne"/>
+ <el-table-column label="LAN2" align="center" min-width="150" prop="lanTwo"/>
+ <el-table-column label="IP" align="center" width="120" prop="ipTwo"/>
+ <el-table-column label="鐧诲綍璐︽埛" align="center" min-width="120" prop="loginAccount"/>
+ <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" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/construction/server/index.vue b/src/views/construction/server/index.vue
index 28dccd1..71d434c 100644
--- a/src/views/construction/server/index.vue
+++ b/src/views/construction/server/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>
@@ -74,26 +74,26 @@
</template>
</el-table-column>
<el-table-column label="閮ㄧ讲鍚嶇О" align="center" prop="deploymentName"/>
- <el-table-column label="LAN" align="center" prop="lan"/>
- <el-table-column label="IP" align="center" prop="ip"/>
- <el-table-column label="鎿嶄綔绯荤粺" align="center" prop="operatingSystem">
+ <el-table-column label="LAN" align="center" min-width="150" prop="lan"/>
+ <el-table-column label="IP" align="center" prop="ip" min-width="120"/>
+ <el-table-column label="鎿嶄綔绯荤粺" align="center" min-width="180" prop="operatingSystem">
<template slot-scope="scope">
<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="buildingId_dictText"/>
+ <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" prop="organizationId_dictText"/>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
+ <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="model"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId_dictText"/>
+ <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="filePath" />-->
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/construction/system/index.vue b/src/views/construction/system/index.vue
index f378477..c8ef505 100644
--- a/src/views/construction/system/index.vue
+++ b/src/views/construction/system/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="90px">
<el-form-item label="杞欢鍚嶇О" prop="name">
<el-input
@@ -71,19 +71,19 @@
</template>
</el-table-column>
<el-table-column label="杞欢鍚嶇О" align="center" prop="name"/>
- <el-table-column label="鐗堟湰" align="center" prop="edition"/>
- <el-table-column label="鍔熻兘鎻忚堪" align="center" prop="functionDescription"/>
- <el-table-column label="鎺堟潈鏂瑰紡" align="center" prop="authorizationMethod_dictText"/>
- <el-table-column label="鎺堟潈鏁伴噺" align="center" prop="authorizedQuantity"/>
+ <el-table-column label="鐗堟湰" min-width="180" align="center" prop="edition"/>
+ <el-table-column label="鍔熻兘鎻忚堪" min-width="180" align="center" prop="functionDescription"/>
+ <el-table-column label="鎺堟潈鏂瑰紡" min-width="180" align="center" prop="authorizationMethod_dictText"/>
+ <el-table-column label="鎺堟潈鏁伴噺" min-width="180" align="center" prop="authorizedQuantity"/>
<el-table-column label="杞戒綋鏈嶅姟鍣�" align="center" prop="serverId_dictText">
<template slot-scope="scope">
<el-link type="primary" @click="serverClick(scope.row)">{{scope.row.serverId_dictText}}</el-link>
</template>
</el-table-column>
- <el-table-column label="鏂藉伐鎵规" align="center" prop="constructionBatchId_dictText"/>
- <el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturerId_dictText"/>
- <el-table-column label="澶囨敞" align="center" prop="remarks"/>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鏂藉伐鎵规" min-width="180" align="center" prop="constructionBatchId_dictText"/>
+ <el-table-column label="鐢熶骇鍘傚晢" min-width="220" align="center" prop="manufacturerId_dictText"/>
+ <el-table-column label="澶囨敞" align="center" min-width="180" prop="remarks"/>
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
diff --git a/src/views/index.vue b/src/views/index.vue
index c8fb00c..a039367 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,7 +1,6 @@
<template>
<div class="app-container home index-bg">
- <!--<img src="@/assets/logo/login-logo.png">-->
- <!--浜戦�歄A鍔炲叕绯荤粺,娆㈣繋鎮紒-->
+ 娆㈣繋璁块棶浜戦�氭暟閾綩A鍔炲叕绯荤粺
</div>
</template>
@@ -22,12 +21,14 @@
<style scoped lang="scss">
.index-bg {
display: flex;
- justify-content: center;
+ padding-left: 42%;
align-items: center;
- /*background-image: url('../assets/images/login-background.jpg');*/
+ background-image: url('../assets/images/login-background.jpg');
background-repeat: no-repeat;
background-size: cover;
height: calc(100vh - 84px);
+ font-size: 2.5rem;
+ box-sizing: border-box;
}
</style>
--
Gitblit v1.9.1