Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
f7b243e4 by 任超
Options

style:整体风格修改

1 parent a1ee88a9
Inline Side-by-side
Showing 16 changed files with 281 additions and 84 deletions
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
12 <div :class="['lb-table', customClass]"> 12 <div :class="['lb-table', customClass]">
13 <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable" 13 <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable"
14 :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" 14 :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection"
15 :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :height="tableHeight" v-on="$listeners" 15 v-bind="$attrs" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
16 :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod"> 16 :span-method="this.merge ? this.mergeMethod : this.spanMethod">
17 <el-table-column width="45" align="center" v-if="isRadio"> 17 <el-table-column width="45" align="center" v-if="isRadio">
18 <template slot-scope="scope"> 18 <template slot-scope="scope">
19 <el-radio v-model="selected" :label="scope.$index"></el-radio> 19 <el-radio v-model="selected" :label="scope.$index"></el-radio>
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
25 </el-table> 25 </el-table>
26 26
27 <el-table v-else ref="elTable" class="table-fixed" :row-style="{ height: '50px' }" :border='border' 27 <el-table v-else ref="elTable" class="table-fixed" :row-style="{ height: '50px' }" :border='border'
28 :row-class-name="tableRowClassName" :show-header='showHeader' 28 :row-class-name="tableRowClassName" :show-header='showHeader' v-bind="$attrs" :max-height="maxHeight"
29 :header-cell-style="{ background: 'rgb(236, 245, 255)' }" v-bind="$attrs" :max-height="maxHeight"
30 v-on="$listeners" :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod"> 29 v-on="$listeners" :data="data" style="width: 100%" :span-method="this.merge ? this.mergeMethod : this.spanMethod">
31 30
32 <el-table-column width="45" align="center" v-if="isRadio"> 31 <el-table-column width="45" align="center" v-if="isRadio">
...@@ -63,7 +62,7 @@ export default { ...@@ -63,7 +62,7 @@ export default {
63 }, 62 },
64 border: { 63 border: {
65 type: Boolean, 64 type: Boolean,
66 default: true, 65 default: false,
67 }, 66 },
68 showHeader: { 67 showHeader: {
69 type: Boolean, 68 type: Boolean,
...@@ -75,7 +74,7 @@ export default { ...@@ -75,7 +74,7 @@ export default {
75 }, 74 },
76 heightNum: { 75 heightNum: {
77 type: Number, 76 type: Number,
78 default: 265, 77 default: 240,
79 }, 78 },
80 maxHeight: { 79 maxHeight: {
81 type: Number, 80 type: Number,
......
...@@ -16,15 +16,11 @@ export default { ...@@ -16,15 +16,11 @@ export default {
16 } 16 }
17 </script> 17 </script>
18 <style lang="scss" scoped> 18 <style lang="scss" scoped>
19 .hasTagsView { 19 .app-main {
20 .app-main { 20 height: calc(100vh - 70px);
21 height: calc(100% - 41px); 21 overflow-x: auto;
22 overflow-x: auto; 22 box-sizing: border-box;
23 padding: 5px; 23 background-color: #EDF1F7;
24 box-sizing: border-box; 24 box-sizing: border-box;
25 background-color: #EDF1F7;
26 box-sizing: border-box;
27
28 }
29 } 25 }
30 </style> 26 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <!--面包屑 -->
2 <template>
3 <el-breadcrumb class="app-breadcrumb" separator="/">
4 <transition-group name="breadcrumb">
5 <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
6 <span class="no-redirect">当前位置></span>
7 <!-- <svg-icon v-if="item.meta.icon" :icon-class="item.meta.icon" class="breadcrumbIcon" /> -->
8 <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{
9 item.meta.title
10 }}</span>
11 <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
12 </el-breadcrumb-item>
13 </transition-group>
14 </el-breadcrumb>
15 </template>
16
17 <script>
18 import pathToRegexp from 'path-to-regexp'
19
20 export default {
21 data () {
22 return {
23 levelList: null
24 }
25 },
26 watch: {
27 $route (route) {
28 // if you go to the redirect page, do not update the breadcrumbs
29 if (route.path.startsWith('/redirect/')) {
30 return
31 }
32 this.getBreadcrumb()
33 }
34 },
35 created () {
36 this.getBreadcrumb()
37 },
38 methods: {
39 getBreadcrumb () {
40 // only show routes with meta.title
41 let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
42 const first = matched[0]
43
44 if (!this.isDashboard(first)) {
45 matched = matched
46 }
47
48 this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
49 console.log(this.levelList)
50 },
51 isDashboard (route) {
52 const name = route && route.name
53 if (!name) {
54 return false
55 }
56 return name.trim().toLocaleLowerCase() === 'Dashboard'.toLocaleLowerCase()
57 },
58 pathCompile (path) {
59 const { params } = this.$route
60 var toPath = pathToRegexp.compile(path)
61 return toPath(params)
62 },
63 handleLink (item) {
64 const { redirect, path } = item
65 if (redirect) {
66 this.$router.push(redirect)
67 return
68 }
69 this.$router.push(this.pathCompile(path))
70 }
71 }
72 }
73 </script>
74
75 <style lang="scss" scoped>
76 .app-breadcrumb.el-breadcrumb {
77 display: inline-block;
78 font-size: 14px;
79 line-height: 50px;
80 margin-left: 8px;
81
82 .no-redirect {
83 color: #ffffff;
84 cursor: text;
85 font-size: 16px;
86 }
87
88 .breadcrumbIcon {
89 color: #ffffff;
90 margin-right: 5px;
91 width: 16px;
92 height: 16px;
93 }
94 }
95 </style>
1 <template> 1 <template>
2 <div class="navbar-con"> 2 <div class="navbar-con">
3 <div class="navbar"> 3 <div class="navbar">
4 <div class="logo">
5 {{ title }}
6 </div>
7 <div class="backdrop"> 4 <div class="backdrop">
8 <!-- <theme style="float: right;height: 26px;width: 26px;margin-top: 26px;" @change="themeChange" /> --> 5 <Breadcrumb />
9 </div> 6 </div>
10 <div class="right-menu"> 7 <div class="right-menu">
11 <div class="dataView pointer" @click="handleDataView">大屏展示</div> 8 <div class="dataView pointer" @click="handleDataView">大屏展示</div>
...@@ -25,9 +22,13 @@ ...@@ -25,9 +22,13 @@
25 </div> 22 </div>
26 </template> 23 </template>
27 <script> 24 <script>
28 import defaultSettings from '@/settings'
29 import { mapGetters } from 'vuex' 25 import { mapGetters } from 'vuex'
26 import Breadcrumb from './Breadcrumb'
27 import defaultSettings from '@/settings'
30 export default { 28 export default {
29 components: {
30 Breadcrumb
31 },
31 computed: { 32 computed: {
32 ...mapGetters(['sidebar', 'avatar', 'name']) 33 ...mapGetters(['sidebar', 'avatar', 'name'])
33 }, 34 },
...@@ -112,12 +113,14 @@ export default { ...@@ -112,12 +113,14 @@ export default {
112 height: $headerHeight; 113 height: $headerHeight;
113 overflow: hidden; 114 overflow: hidden;
114 position: relative; 115 position: relative;
115 background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色 116 // background: linear-gradient(270deg, #148CEE 0%, #1870E3 100%); //默认颜色
116 box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08); 117 // box-shadow: 0 1px 0px rgba(0, 21, 41, 0.08);
118 background: #0D1230;
117 display: flex; 119 display: flex;
118 align-items: center; 120 align-items: center;
119 padding: 0 20px; 121 padding: 0 20px;
120 justify-content: space-between; 122 justify-content: space-between;
123 margin-bottom: 10px;
121 124
122 .header-logo { 125 .header-logo {
123 width: 300px; 126 width: 300px;
...@@ -126,9 +129,10 @@ export default { ...@@ -126,9 +129,10 @@ export default {
126 .backdrop { 129 .backdrop {
127 flex: 1; 130 flex: 1;
128 width: 60%; 131 width: 60%;
129 background: url('../../image/backdrop.png');
130 background-size: 100% 100%; 132 background-size: 100% 100%;
131 height: $headerHeight; 133 height: $headerHeight;
134 display: flex;
135 align-items: center;
132 } 136 }
133 137
134 .hamburger-container { 138 .hamburger-container {
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <div class="logo">{{ title }}</div>
3 <el-scrollbar wrap-class="scrollbar-wrapper"> 4 <el-scrollbar wrap-class="scrollbar-wrapper">
4 <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText" 5 <el-menu router :default-active="activeMenu" :background-color="variables.menuBg" :text-color="variables.menuText"
5 :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false" 6 :unique-opened="true" :active-text-color="variables.menuActiveText" :collapse-transition="false"
...@@ -16,11 +17,17 @@ ...@@ -16,11 +17,17 @@
16 <script> 17 <script>
17 import { mapGetters } from 'vuex' 18 import { mapGetters } from 'vuex'
18 import Logo from './Logo' 19 import Logo from './Logo'
20 import defaultSettings from '@/settings'
19 import SidebarItem from './SidebarItem' 21 import SidebarItem from './SidebarItem'
20 import variables from '@/styles/variables.scss' 22 import variables from '@/styles/variables.scss'
21 import { asyncRoutes } from '@/router' 23 import { asyncRoutes } from '@/router'
22 export default { 24 export default {
23 components: { SidebarItem, Logo }, 25 components: { SidebarItem, Logo },
26 data () {
27 return {
28 title: defaultSettings.title
29 }
30 },
24 computed: { 31 computed: {
25 ...mapGetters(['permission_routes', 'sidebar']), 32 ...mapGetters(['permission_routes', 'sidebar']),
26 activeMenu () { 33 activeMenu () {
...@@ -41,5 +48,13 @@ export default { ...@@ -41,5 +48,13 @@ export default {
41 } 48 }
42 </script> 49 </script>
43 <style scoped lang="scss"> 50 <style scoped lang="scss">
44 51 .logo {
52 width: 100%;
53 height: 80px;
54 color: #ffffff;
55 font-size: 20px;
56 display: flex;
57 align-items: center;
58 padding-left: 20px;
59 }
45 </style> 60 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="app-wrapper"> 2 <div class="app-wrapper">
3 <navbar /> 3 <sidebar class="sidebar-container" />
4 <div class="main-container">
5 <navbar />
6 <app-main />
7 </div>
8 <!-- <navbar />
4 <div :class="{ hasTagsView: needTagsView }" class="main-container"> 9 <div :class="{ hasTagsView: needTagsView }" class="main-container">
5 <div :class="{ 'fixed-header': fixedHeader }"> 10 <div :class="{ 'fixed-header': fixedHeader }">
6 <sidebar class="sidebar-container" /> 11 <sidebar class="sidebar-container" />
7 <tags-view v-if="needTagsView" /> 12 <tags-view v-if="needTagsView" />
8 </div> 13 </div>
9 <app-main /> 14 <app-main />
10 </div> 15 </div> -->
11 </div> 16 </div>
12 </template> 17 </template>
13 <script> 18 <script>
...@@ -40,6 +45,7 @@ export default { ...@@ -40,6 +45,7 @@ export default {
40 position: relative; 45 position: relative;
41 height: 100%; 46 height: 100%;
42 width: 100%; 47 width: 100%;
48 background-color: #000;
43 49
44 &.mobile.openSidebar { 50 &.mobile.openSidebar {
45 position: fixed; 51 position: fixed;
......
...@@ -36,7 +36,7 @@ export default { ...@@ -36,7 +36,7 @@ export default {
36 position: relative; 36 position: relative;
37 height: 100%; 37 height: 100%;
38 width: 100%; 38 width: 100%;
39 background-color: #F2F6FC; 39
40 40
41 &.mobile.openSidebar { 41 &.mobile.openSidebar {
42 position: fixed; 42 position: fixed;
......
...@@ -38,7 +38,6 @@ export const asyncRoutes = [ ...@@ -38,7 +38,6 @@ export const asyncRoutes = [
38 path: '/', 38 path: '/',
39 component: Layout, 39 component: Layout,
40 redirect: '/home', 40 redirect: '/home',
41 meta: { title: '首页' },
42 children: [ 41 children: [
43 { 42 {
44 path: 'home', 43 path: 'home',
......
...@@ -171,18 +171,17 @@ ...@@ -171,18 +171,17 @@
171 } 171 }
172 172
173 // element table 选中 颜色 173 // element table 选中 颜色
174 .el-table--enable-row-hover .el-table__body tr:hover>td { 174 // .el-table--enable-row-hover .el-table__body tr:hover>td {
175 background-color: #FCFDFD; 175 // background-color: #FCFDFD;
176 } 176 // }
177
178 .el-table__body .el-table__row.hover-row td {
179 background-color: #FCFDFD;
180 }
181 177
182 .el-table tbody tr:hover>td { 178 // .el-table__body .el-table__row.hover-row td {
183 background-color: #FCFDFD; 179 // background-color: #FCFDFD;
184 } 180 // }
185 181
182 // .el-table tbody tr:hover>td {
183 // background-color: #FCFDFD;
184 // }
186 // 表格样式 185 // 表格样式
187 .el-table th { 186 .el-table th {
188 height: 48px !important; 187 height: 48px !important;
......
...@@ -151,6 +151,7 @@ div:focus { ...@@ -151,6 +151,7 @@ div:focus {
151 .d-flex { 151 .d-flex {
152 display: flex; 152 display: flex;
153 } 153 }
154
154 .d-flex-center { 155 .d-flex-center {
155 display: flex; 156 display: flex;
156 align-items: center; 157 align-items: center;
...@@ -338,18 +339,6 @@ aside { ...@@ -338,18 +339,6 @@ aside {
338 cursor: not-allowed 339 cursor: not-allowed
339 } 340 }
340 341
341 .bad {
342 color: #f00;
343 background-color: #fff;
344 cursor: not-allowed
345 }
346
347 .allow,
348 .prohibit .suspend {
349 position: relative;
350 margin: 0 auto;
351 text-align: center;
352 }
353 342
354 .allow { 343 .allow {
355 color: $green; 344 color: $green;
...@@ -363,6 +352,21 @@ aside { ...@@ -363,6 +352,21 @@ aside {
363 color: $yellow; 352 color: $yellow;
364 } 353 }
365 354
355 // 通过 入库
356 .adopt {
357 color: #00FAA8;
358 }
359
360 .adopt::before {
361 content: '';
362 display: block;
363 width: 5px;
364 height: 5px;
365 background: #999999;
366 border-radius: 50%;
367 margin-right: 6px;
368 }
369
366 //错误日志样式 后期超优化 370 //错误日志样式 后期超优化
367 .item-cwnr { 371 .item-cwnr {
368 white-space: pre-wrap; 372 white-space: pre-wrap;
......
...@@ -4,14 +4,24 @@ ...@@ -4,14 +4,24 @@
4 height: 100%; 4 height: 100%;
5 width: 100%; 5 width: 100%;
6 box-sizing: border-box; 6 box-sizing: border-box;
7 background-color: #000637;
7 8
8 &-header { 9 &-header {
9 width: 100%; 10 width: 100%;
10 padding: 10px; 11 padding: 10px;
11 box-sizing: border-box; 12 box-sizing: border-box;
12 background: #FFFFFF; 13 background: #061858;
13 border-radius: 2px; 14 box-shadow: inset 0px 0px 14px 0px #1D66DC;
14 border: 1px solid #e8edf3; 15 border: 2px solid #1A3F81;
16
17 /deep/.el-form-item__label {
18 color: #E3F1FF;
19 }
20
21 /deep/.el-input__inner {
22 background-color: #04103D !important;
23 border: none;
24 }
15 } 25 }
16 26
17 .advanced-search { 27 .advanced-search {
...@@ -52,12 +62,76 @@ ...@@ -52,12 +62,76 @@
52 62
53 &-content { 63 &-content {
54 width: 100%; 64 width: 100%;
55 padding: 10px;
56 box-sizing: border-box; 65 box-sizing: border-box;
57 background: #FFFFFF; 66 background: #FFFFFF;
58 border-radius: 2px; 67 margin-top: 10px;
59 margin-top: 5px; 68
60 border: 1px solid #e8edf3; 69 //去掉表格内的线
70 /deep/ table th {
71 border-bottom: 5px solid #000637 !important;
72 }
73
74 /deep/ table td {
75 border-bottom: 5px solid #000637 !important;
76 }
77
78 //去掉最下面的那一条线
79 /deep/.el-table::before {
80 height: 5px !important;
81 background-color: #000637 !important;
82 }
83
84
85 /deep/.lb-table {
86 background-color: #000637 !important;
87 }
88
89 /deep/.el-table__body-wrapper {
90 background-color: #000637 !important;
91 }
92
93 /deep/.el-table--enable-row-hover .el-table__body tr:hover>td {
94 background-color: #103E99 !important;
95 }
96
97 /deep/.el-table__body .el-table__row.hover-row td {
98 background-color: #103E99 !important;
99 }
100
101 /deep/.el-table tbody tr:hover>td {
102 background-color: #103E99 !important;
103 }
104
105 //修改表头的背景颜色横向渐变色
106
107 /deep/.el-table {
108 border: none !important;
109
110 .cell {
111 color: #FFFFFF !important;
112 }
113
114 .el-table__row {
115 background-color: #00275F !important;
116 margin-top: 5px;
117 }
118
119 thead {
120 background: #103E99 !important;
121
122 & th {
123 //inherit：规定应该从父元素继承 background-color 属性的设置。
124 //transparent：默认。背景颜色为透明。
125 // background-color: inherit !important;
126 background-color: transparent;
127 }
128
129 & tr {
130 // background-color: inherit !important;
131 background-color: transparent;
132 }
133 }
134 }
61 } 135 }
62 136
63 .el-form--inline .el-form-item { 137 .el-form--inline .el-form-item {
...@@ -76,6 +150,8 @@ ...@@ -76,6 +150,8 @@
76 } 150 }
77 } 151 }
78 152
153
154
79 //*****end*通用表单查询条件，列表样式******// 155 //*****end*通用表单查询条件，列表样式******//
80 /deep/.el-range-separator { 156 /deep/.el-range-separator {
81 line-height: 28px !important; 157 line-height: 28px !important;
......
1 #app { 1 #app {
2 .main-container { 2 .main-container {
3 height: calc(100% - 80px); 3 height: 100%;
4 transition: margin-left 0.28s; 4 transition: margin-left 0.28s;
5 margin-left: $sideBarWidth; 5 margin-left: 220px;
6 } 6 }
7 7
8 .sidebar-container { 8 .sidebar-container {
9 transition: width 0.28s; 9 transition: width 0.28s;
10 width: $sideBarWidth !important; 10 width: $sideBarWidth !important;
11 height: calc(100% - #{$headerHeight}); 11 height: 100%;
12 // height: calc(100% - #{$headerHeight});
12 position: fixed; 13 position: fixed;
13 font-size: 0px; 14 font-size: 0px;
14 top: $headerHeight; 15 // top: $headerHeight;
15 bottom: 0; 16 bottom: 0;
16 left: 0; 17 left: 0;
17 z-index: 80; 18 z-index: 80;
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
27 overflow-x: hidden !important; 28 overflow-x: hidden !important;
28 // overflow-y: auto; 29 // overflow-y: auto;
29 margin-right: 0 !important; 30 margin-right: 0 !important;
30 height: 90vh; 31 height: calc(100vh - 80px);
31 32
32 &::-webkit-scrollbar { 33 &::-webkit-scrollbar {
33 display: none; 34 display: none;
...@@ -84,8 +85,8 @@ ...@@ -84,8 +85,8 @@
84 // 没有子级 85 // 没有子级
85 .submenu-title-noDropdown { 86 .submenu-title-noDropdown {
86 color: $menuText; 87 color: $menuText;
87 border-radius: 6px; 88 // border-radius: 6px;
88 padding-left: 10px !important; 89 padding-left: 20px !important;
89 90
90 &:hover { 91 &:hover {
91 color: $menuActiveText !important; 92 color: $menuActiveText !important;
...@@ -119,9 +120,8 @@ ...@@ -119,9 +120,8 @@
119 .el-submenu__title { 120 .el-submenu__title {
120 font-weight: 600; 121 font-weight: 600;
121 font-size: $sideBarFontSize; 122 font-size: $sideBarFontSize;
122 margin: 0 10px;
123 border-radius: 6px;
124 123
124 // margin: 0 10px;
125 >i { 125 >i {
126 color: $subMenuActiveText !important; 126 color: $subMenuActiveText !important;
127 transform: rotate(90deg); 127 transform: rotate(90deg);
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
167 font-weight: 600; 167 font-weight: 600;
168 font-size: $sideBarFontSize; 168 font-size: $sideBarFontSize;
169 margin: 0 10px; 169 margin: 0 10px;
170 border-radius: 6px; 170 // border-radius: 6px;
171 } 171 }
172 } 172 }
173 173
......
...@@ -9,18 +9,18 @@ $yellow:#FEC171; ...@@ -9,18 +9,18 @@ $yellow:#FEC171;
9 $panGreen: #30B08F; 9 $panGreen: #30B08F;
10 10
11 // header 11 // header
12 $headerHeight: 80px; 12 $headerHeight: 60px;
13 13
14 // sidebar 14 // sidebar
15 $menuText:#ffffff; 15 $menuText:#ffffff;
16 $menuActiveText:#ffffff; 16 $menuActiveText:#ffffff;
17 $subMenuActiveText:#ffffff; 17 $subMenuActiveText:#ffffff;
18 18
19 $menuBg:#202B3D; 19 $menuBg:#0D1230;
20 $menuHover:#0794FF; 20 $menuHover:#0794FF;
21 21
22 $subMenuBg:#202B3D; 22 $subMenuBg:#0D1230;
23 $subMenuHover:#0794FF; 23 $subMenuHover:#1D66DC;
24 24
25 $sideBarWidth: 210px; 25 $sideBarWidth: 210px;
26 $sideBarFontSize:15px; 26 $sideBarFontSize:15px;
......
...@@ -4,7 +4,12 @@ ...@@ -4,7 +4,12 @@
4 <!-- 头部搜索 --> 4 <!-- 头部搜索 -->
5 <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px"> 5 <el-form ref="form" :model="form" :inline="true" class="from-clues-header" label-width="100px">
6 <el-row> 6 <el-row>
7 <el-col :span="6"> 7 <el-col :span="8">
8 <el-date-picker v-model="valueTime" type="datetimerange" range-separator="至"
9 start-placeholder="开始日期" end-placeholder="结束日期">
10 </el-date-picker>
11 </el-col>
12 <!-- <el-col :span="6">
8 <el-form-item label="开始时间"> 13 <el-form-item label="开始时间">
9 <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable 14 <el-date-picker type="date" :picker-options="pickerOptionsStart" clearable
10 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker> 15 v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
...@@ -16,7 +21,7 @@ ...@@ -16,7 +21,7 @@
16 value-format="yyyy-MM-dd"> 21 value-format="yyyy-MM-dd">
17 </el-date-picker> 22 </el-date-picker>
18 </el-form-item> 23 </el-form-item>
19 </el-col> 24 </el-col> -->
20 <!-- 按钮操作 --> 25 <!-- 按钮操作 -->
21 <el-col :span="12" class="btnColRight"> 26 <el-col :span="12" class="btnColRight">
22 <el-button type="default" @click="resetForm"> 重置 </el-button> 27 <el-button type="default" @click="resetForm"> 重置 </el-button>
...@@ -57,6 +62,7 @@ export default { ...@@ -57,6 +62,7 @@ export default {
57 } 62 }
58 }, 63 },
59 // 搜索表单 64 // 搜索表单
65 valueTime: '',
60 form: { 66 form: {
61 startTime: "", 67 startTime: "",
62 endTime: "" 68 endTime: ""
......
...@@ -37,8 +37,8 @@ class data extends filter { ...@@ -37,8 +37,8 @@ class data extends filter {
37 <div> 37 <div>
38 { 38 {
39 scope.row.jcjg 39 scope.row.jcjg
40 ? <el-tag type='success'>通过</el-tag> 40 ? <span>通过</span>
41 : <el-tag type='primary'>通过1</el-tag> 41 : <span>通过1</span>
42 } 42 }
43 </div> 43 </div>
44 ) 44 )
......
...@@ -69,9 +69,9 @@ ...@@ -69,9 +69,9 @@
69 </div> 69 </div>
70 <!-- 列表区域 --> 70 <!-- 列表区域 -->
71 <div class="from-clues-content"> 71 <div class="from-clues-content">
72 <lb-table ref="table" :heightNum="300" :page-size="pageData.size" :current-page.sync="pageData.current" 72 <lb-table ref="table" :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
73 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 73 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
74 :column="tableData.columns" :data="tableData.data"> 74 :data="tableData.data">
75 </lb-table> 75 </lb-table>
76 </div> 76 </div>
77 <!-- 编辑 --> 77 <!-- 编辑 -->
...@@ -163,20 +163,18 @@ export default { ...@@ -163,20 +163,18 @@ export default {
163 }].concat(data.columns()).concat([ 163 }].concat(data.columns()).concat([
164 { 164 {
165 label: "操作", 165 label: "操作",
166 width: '80', 166 width: '160',
167 render: (h, scope) => { 167 render: (h, scope) => {
168 return ( 168 return (
169 <div> 169 <div>
170 <el-button 170 <el-button
171 type="text" 171 type="primary"
172 size="mini"
173 onClick={() => { this.handleEdit(scope.row) }} 172 onClick={() => { this.handleEdit(scope.row) }}
174 > 173 >
175 详情 174 详情
176 </el-button> 175 </el-button>
177 <el-button 176 <el-button
178 type="text" 177 type="primary"
179 size="mini"
180 > 178 >
181 结果 179 结果
182 </el-button> 180 </el-button>
......