Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
3d6516ea by jiaozeping@pashanhoo.com
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

2 parents e36859c6 188400fd
Inline Side-by-side
Showing 25 changed files with 139 additions and 145 deletions
1 <template> 1 <template>
2 <Echart :options="options" id="centreLeft1Chart" height="200px" width="95%"></Echart> 2 <Echart :options="options" id="centreLeft1Chart" height="200px" width="100%"></Echart>
3 </template> 3 </template>
4 <script> 4 <script>
5 import Echart from '@/common/echart' 5 import Echart from '@/common/echart'
...@@ -19,9 +19,8 @@ export default { ...@@ -19,9 +19,8 @@ export default {
19 this.options = { 19 this.options = {
20 grid: { 20 grid: {
21 // 让图表占满容器 21 // 让图表占满容器
22 top: "50%", 22 top: 20,
23 right: '30%', 23 right: 0,
24 bottom: "0%",
25 }, 24 },
26 color: [ 25 color: [
27 "#37a2da", 26 "#37a2da",
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <Chart :cdata="cdata" /> 3 <Chart :cdata="cdata" />
4 <el-carousel height="40px" indicator-position="none">
5 <el-carousel-item v-for="item in 4" :key="item">
4 <div class="rotograph">佛坪县</div> 6 <div class="rotograph">佛坪县</div>
7 </el-carousel-item>
8 </el-carousel>
5 </div> 9 </div>
6 </template> 10 </template>
7 11
...@@ -53,6 +57,5 @@ export default { ...@@ -53,6 +57,5 @@ export default {
53 border-radius: 6px; 57 border-radius: 6px;
54 font-weight: 600; 58 font-weight: 600;
55 color: #02D9FD; 59 color: #02D9FD;
56 margin-top: 20px;
57 } 60 }
58 </style> 61 </style>
......
1 <template> 1 <template>
2 <!-- 柱状图 --> 2 <!-- 柱状图 -->
3 <Echart :options="options" id="bottomLeftChart" height="420px" width="100%"></Echart> 3 <Echart :options="options" id="bottomLeftChart" height="100%" width="100%"></Echart>
4 </template> 4 </template>
5 5
6 <script> 6 <script>
......
...@@ -26,10 +26,10 @@ export default { ...@@ -26,10 +26,10 @@ export default {
26 this.options = { 26 this.options = {
27 grid: { 27 grid: {
28 // 让图表占满容器 28 // 让图表占满容器
29 top: "12%", 29 top: "20%",
30 left: "15%", 30 left: "18%",
31 right: "10%", 31 right: "10%",
32 bottom: "26%", 32 bottom: "16%",
33 }, 33 },
34 xAxis: { 34 xAxis: {
35 data: newData.category, 35 data: newData.category,
......
1 <template> 1 <template>
2 <!-- 地图 --> 2 <!-- 地图 -->
3 <Echart id="centreLeft2Chart" class="centreLeft2Chart" ref="centreLeft2ChartRef" width="100%" height="470px" 3 <Echart id="centreLeft2Chart" class="centreLeft2Chart" ref="centreLeft2ChartRef" width="100%" height="505px"
4 :options="options"></Echart> 4 :options="options"></Echart>
5 </template> 5 </template>
6 6
...@@ -109,7 +109,7 @@ export default { ...@@ -109,7 +109,7 @@ export default {
109 visualMap: { 109 visualMap: {
110 min: 0, 110 min: 0,
111 max: _this.max, 111 max: _this.max,
112 bottom: '2%', 112 bottom: '0%',
113 right: 30, 113 right: 30,
114 splitNumber: 6, 114 splitNumber: 6,
115 seriesIndex: [0], 115 seriesIndex: [0],
......
1 <template> 1 <template>
2 <el-menu router :default-active="activeMenu" mode="horizontal"> 2 <el-menu router :default-active="activeMenu" mode="horizontal">
3 <!-- 权限菜单 --> 3 <!-- 权限菜单 -->
4 <sidebar-item v-for="route in permission_routes.slice(2, 5)" :key="route.path" :item="route" 4 <sidebar-item v-for="route in permission_routes.slice(1, 4)" :key="route.path" :item="route"
5 :base-path="route.path" /> 5 :base-path="route.path" />
6 <!-- 菜单全部展示 --> 6 <!-- 菜单全部展示 -->
7 <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> --> 7 <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->
......
1 <template> 1 <template>
2 <el-menu router :default-active="activeMenu" mode="horizontal"> 2 <el-menu router :default-active="activeMenu" mode="horizontal">
3 <!-- 权限菜单 --> 3 <!-- 权限菜单 -->
4 <sidebar-item v-for="route in permission_routes.slice(5, 8)" :key="route.path" :item="route" 4 <sidebar-item v-for="route in permission_routes.slice(4, 7)" :key="route.path" :item="route"
5 :base-path="route.path" /> 5 :base-path="route.path" />
6 <!-- 菜单全部展示 --> 6 <!-- 菜单全部展示 -->
7 <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> --> 7 <!-- <sidebar-item v-for="route in asyncRoutes" :key="route.path" :item="route" :base-path="route.path" /> -->
......
...@@ -27,7 +27,7 @@ router.beforeEach(async (to, from, next) => { ...@@ -27,7 +27,7 @@ router.beforeEach(async (to, from, next) => {
27 if (routeTo && routeTo !== '/') { 27 if (routeTo && routeTo !== '/') {
28 next({ ...to, replace: true }) 28 next({ ...to, replace: true })
29 } else { 29 } else {
30 next('/jgHome') 30 next('/home')
31 } 31 }
32 } 32 }
33 NProgress.done() 33 NProgress.done()
......
...@@ -20,22 +20,17 @@ export const constantRoutes = [ ...@@ -20,22 +20,17 @@ export const constantRoutes = [
20 } 20 }
21 ] 21 ]
22 }, 22 },
23 {
24 path: '/dataView',
25 name: 'dataView',
26 component: () => import('@/views/dataView/index')
27 },
28 // 监管首页 23 // 监管首页
29 { 24 {
30 path: '/', 25 path: '/',
31 component: Layout, 26 component: Layout,
32 redirect: '/jgHome', 27 redirect: '/home',
33 meta: { title: '首页' }, 28 meta: { title: '首页' },
34 children: [ 29 children: [
35 { 30 {
36 path: 'jgHome', 31 path: 'home',
37 component: () => import('@/views/home/index'), 32 component: () => import('@/views/home/index'),
38 name: 'jgHome', 33 name: 'home',
39 meta: { title: '工作台', icon: 'workbench', affix: true } 34 meta: { title: '工作台', icon: 'workbench', affix: true }
40 } 35 }
41 ] 36 ]
......
...@@ -173,33 +173,35 @@ ...@@ -173,33 +173,35 @@
173 // element table 样式修改 173 // element table 样式修改
174 //去掉表格内的线 174 //去掉表格内的线
175 table th { 175 table th {
176 border-bottom: 1px solid #29409D !important; 176 border-bottom: none !important;
177 }
178
179 .el-table__body {
180 -webkit-border-vertical-spacing: 6px !important; // 垂直间距
177 } 181 }
178 182
179 table td { 183 table td {
180 border-bottom: 1px solid #29409D !important; 184 box-sizing: border-box;
185 border-bottom: none !important;
186 ;
181 } 187 }
182 188
183 //去掉最下面的那一条线 189 //去掉最下面的那一条线
184 .el-table::before { 190 .el-table::before {
185 height: 1px !important; 191 height: 0;
186 background-color: #29409D !important;
187 } 192 }
188 193
189 .lb-table { 194 .el-table__body tr {
190 background-color: $containerbg; 195 box-sizing: content-box !important;
191 } 196 cursor: pointer;
192
193 .el-table__body-wrapper {
194 background-color: $containerbg !important;
195 } 197 }
196 198
197 .el-table__body tr:hover { 199 .el-table__body tr:hover {
198 background: rgba(2, 160, 253, 0.1) !important; 200 background: rgba(2, 160, 253, 0.3) !important;
199 box-shadow: inset 0px 0px 18px 0px #02A0FD !important; 201 box-shadow: inset 0px 0px 18px 0px #02A0FD !important;
200 } 202 }
201 203
202 .el-table__body tr:hover>td.el-table__cell { 204 .el-table__body tr:hover>td {
203 background: none !important; 205 background: none !important;
204 } 206 }
205 207
...@@ -211,17 +213,12 @@ table td { ...@@ -211,17 +213,12 @@ table td {
211 } 213 }
212 214
213 215
214 .el-table tr:nth-child(even) {
215 background: #FCFDFD !important;
216 }
217
218 .el-table tr td { 216 .el-table tr td {
219 font-size: 14px; 217 font-size: 14px;
220 color: #7A7A7A; 218 color: #7A7A7A;
221 } 219 }
222 220
223 .lb-table .el-table { 221 .lb-table .el-table {
224 border: 1px solid #E4EBF4;
225 border-bottom: none; 222 border-bottom: none;
226 border-radius: 4px 4px 0 0; 223 border-radius: 4px 4px 0 0;
227 } 224 }
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
2 /deep/.el-table { 2 /deep/.el-table {
3 border: none !important; 3 border: none !important;
4 border-radius: 0 !important; 4 border-radius: 0 !important;
5 background-color: rgba(0, 0, 0, 0);
5 6
6 .el-table__header-wrapper { 7 .el-table__header-wrapper {
7 border-right: 1px solid #103E99; 8 border-right: 1px solid #103E99;
9
8 } 10 }
9 11
10 .cell { 12 .cell {
...@@ -12,7 +14,7 @@ ...@@ -12,7 +14,7 @@
12 } 14 }
13 15
14 .el-table__row { 16 .el-table__row {
15 background-color: $containerbg !important; 17 background: #0F56A3 !important;
16 } 18 }
17 19
18 thead { 20 thead {
...@@ -113,22 +115,34 @@ ...@@ -113,22 +115,34 @@
113 color: #FFFFFF; 115 color: #FFFFFF;
114 } 116 }
115 117
118 .bgc {
119 box-shadow: inset 0px 0px 8px 0px rgba(255, 255, 255, 0.5);
120 background-color: rgba(0, 0, 0, 0);
121 }
122
116 /deep/ .el-pagination { 123 /deep/ .el-pagination {
117 .el-input__inner { 124 .el-input__inner {
118 background: #1F357A !important;
119 color: #FFFFFF; 125 color: #FFFFFF;
120 border: none; 126 border: none;
127 @extend .bgc;
128 }
129
130 .el-pager li:not(.disabled).active {
131 box-shadow: inset 0px 0px 12px 0px #02D9FD;
132 border-radius: 1px;
133 border: 1px solid #02D9FD;
134 background-color: rgba(0, 0, 0, 0);
121 } 135 }
122 136
123 .el-pager li { 137 .el-pager li {
124 background: #1F357A; 138 @extend .bgc;
125 color: #FFFFFF; 139 color: #FFFFFF;
126 } 140 }
127 } 141 }
128 142
129 /deep/.btn-next, 143 /deep/.btn-next,
130 /deep/.btn-prev { 144 /deep/.btn-prev {
131 background: #1F357A !important; 145 @extend .bgc;
132 color: #FFFFFF; 146 color: #FFFFFF;
133 } 147 }
134 148
......
...@@ -2,24 +2,24 @@ import store from '@/store' ...@@ -2,24 +2,24 @@ import store from '@/store'
2 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器 2 // table 内部过滤器 由于过滤器只能在模板中使用 所以 就有了 jsx内部方法过滤器
3 export default class filter { 3 export default class filter {
4 // 业务来源 4 // 业务来源
5 busSource (val) { 5 busSource(val) {
6 let status = { 1: '办事大厅', 2: '微信小程序' } 6 let status = { 1: '办事大厅', 2: '微信小程序' }
7 return status[val] 7 return status[val]
8 } 8 }
9 9
10 //申请分类（1：正常申请，2：一并申请，3：补录申请） 10 //申请分类（1：正常申请，2：一并申请，3：补录申请）
11 sqfls (val) { 11 sqfls(val) {
12 let status = { 1: '正常申请', 2: '一并申请', 3: '补录申请' } 12 let status = { 1: '正常申请', 2: '一并申请', 3: '补录申请' }
13 return status[val] 13 return status[val]
14 } 14 }
15 // 字典 15 // 字典
16 dicStatus (val, code) { 16 dicStatus(val, code) {
17 let data = store.getters.dicData[code], 17 let data = store.getters.dicData[code],
18 name = '暂无' 18 name = '暂无'
19 if (data) { 19 if (data) {
20 data.map((item) => { 20 data.map((item) => {
21 if (item.dcode == val) { 21 if (item.DCODE == val) {
22 name = item.dname 22 name = item.DNAME
23 } 23 }
24 }) 24 })
25 return name 25 return name
......
...@@ -159,5 +159,6 @@ export default { ...@@ -159,5 +159,6 @@ export default {
159 } 159 }
160 </script> 160 </script>
161 <style scoped lang="scss"> 161 <style scoped lang="scss">
162 @import "~@/styles/public.scss";
162 @import "./index.scss"; 163 @import "./index.scss";
163 </style> 164 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -20,22 +20,22 @@ class data extends filter { ...@@ -20,22 +20,22 @@ class data extends filter {
20 render: (h, scope) => { 20 render: (h, scope) => {
21 return ( 21 return (
22 <div> 22 <div>
23 <span>{ this.dicStatus(scope.row.dybdclx, 'A27')}</span> 23 <span>{this.dicStatus(scope.row.dybdclx, 'A27')}</span>
24 </div> 24 </div>
25 ) 25 )
26 }, 26 },
27 }, 27 },
28 // { 28 {
29 // label: "登记类型", 29 label: "登记类型",
30 // width: 70, 30 width: 70,
31 // render: (h, scope) => { 31 render: (h, scope) => {
32 // return ( 32 return (
33 // <div> 33 <div>
34 // <span>{this.djlxStatus(scope.row.DJLX)}</span> 34 <span>{this.dicStatus(scope.row.djlx, 'A21')}</span>
35 // </div> 35 </div>
36 // ) 36 )
37 // } 37 }
38 // }, 38 },
39 { 39 {
40 label: "不动产单元号", 40 label: "不动产单元号",
41 prop: "bdcdyh" 41 prop: "bdcdyh"
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
29 </el-form> 29 </el-form>
30 </div> 30 </div>
31 <div class="from-clues-content"> 31 <div class="from-clues-content">
32 <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current" 32 <lb-table v-loading="loading" :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current"
33 :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange" 33 :total="pageData.total" @selection-change="handleSelectionChange" @size-change="handleSizeChange"
34 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data"> 34 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
35 </lb-table> 35 </lb-table>
...@@ -150,3 +150,8 @@ export default { ...@@ -150,3 +150,8 @@ export default {
150 } 150 }
151 } 151 }
152 </script> 152 </script>
153 <style scoped lang="scss">
154 // 引入表单整体样式
155 @import "~@/styles/public.scss";
156 </style>
157
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
38 </el-form> 38 </el-form>
39 </div> 39 </div>
40 <div class="from-clues-content"> 40 <div class="from-clues-content">
41 <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current" 41 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
42 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 42 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
43 :column="tableData.columns" :data="tableData.data"> 43 :data="tableData.data">
44 </lb-table> 44 </lb-table>
45 <message-tips ref="msg" :message="message" /> 45 <message-tips ref="msg" :message="message" />
46 </div> 46 </div>
...@@ -68,7 +68,6 @@ export default { ...@@ -68,7 +68,6 @@ export default {
68 }, 68 },
69 data () { 69 data () {
70 return { 70 return {
71 loading: false,
72 form: { 71 form: {
73 YWH: '', 72 YWH: '',
74 YGDJZL: '', 73 YGDJZL: '',
...@@ -148,7 +147,6 @@ export default { ...@@ -148,7 +147,6 @@ export default {
148 }, 147 },
149 async featchData () { 148 async featchData () {
150 try { 149 try {
151 this.loading = true
152 this.form = Object.assign(this.form, this.formData) 150 this.form = Object.assign(this.form, this.formData)
153 let { result: { list, total, pages: pageSize, pageNum: current } 151 let { result: { list, total, pages: pageSize, pageNum: current }
154 } = await business.getQlfQlYgdjByCondition(this.form) 152 } = await business.getQlfQlYgdjByCondition(this.form)
...@@ -162,7 +160,6 @@ export default { ...@@ -162,7 +160,6 @@ export default {
162 this.message = error 160 this.message = error
163 this.$refs.msg.messageShow() 161 this.$refs.msg.messageShow()
164 } 162 }
165 this.loading = false
166 }, 163 },
167 async handlDatadetails (index, row) { 164 async handlDatadetails (index, row) {
168 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB) 165 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
...@@ -177,3 +174,7 @@ export default { ...@@ -177,3 +174,7 @@ export default {
177 } 174 }
178 } 175 }
179 </script> 176 </script>
177 <style scoped lang="scss">
178 // 引入表单整体样式
179 @import "~@/styles/public.scss";
180 </style>
......
...@@ -38,9 +38,9 @@ ...@@ -38,9 +38,9 @@
38 </el-form> 38 </el-form>
39 </div> 39 </div>
40 <div class="from-clues-content"> 40 <div class="from-clues-content">
41 <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current" 41 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
42 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 42 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
43 :column="tableData.columns" :data="tableData.data"> 43 :data="tableData.data">
44 </lb-table> 44 </lb-table>
45 <message-tips ref="msg" :message="message" /> 45 <message-tips ref="msg" :message="message" />
46 </div> 46 </div>
...@@ -68,7 +68,6 @@ export default { ...@@ -68,7 +68,6 @@ export default {
68 }, 68 },
69 data () { 69 data () {
70 return { 70 return {
71 loading: false,
72 form: { 71 form: {
73 YWH: '', 72 YWH: '',
74 QLLX: '', 73 QLLX: '',
...@@ -131,7 +130,6 @@ export default { ...@@ -131,7 +130,6 @@ export default {
131 }, 130 },
132 async featchData () { 131 async featchData () {
133 try { 132 try {
134 this.loading = true
135 this.form = Object.assign(this.form, this.formData) 133 this.form = Object.assign(this.form, this.formData)
136 let { result: { list, total, pages: pageSize, pageNum: current } 134 let { result: { list, total, pages: pageSize, pageNum: current }
137 } = await business.getQlfQlYydjByCondition(this.form) 135 } = await business.getQlfQlYydjByCondition(this.form)
...@@ -145,7 +143,6 @@ export default { ...@@ -145,7 +143,6 @@ export default {
145 this.message = error 143 this.message = error
146 this.$refs.msg.messageShow() 144 this.$refs.msg.messageShow()
147 } 145 }
148 this.loading = false
149 }, 146 },
150 async handlDatadetails (index, row) { 147 async handlDatadetails (index, row) {
151 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB) 148 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
...@@ -160,3 +157,6 @@ export default { ...@@ -160,3 +157,6 @@ export default {
160 } 157 }
161 } 158 }
162 </script> 159 </script>
160 <style scoped lang="scss">
161 @import "~@/styles/public.scss";
162 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
34 </el-form> 34 </el-form>
35 </div> 35 </div>
36 <div class="from-clues-content"> 36 <div class="from-clues-content">
37 <lb-table v-loading="loading" :page-size="pageData.size" :current-page.sync="pageData.current" 37 <lb-table :page-size="pageData.size" :current-page.sync="pageData.current" :total="pageData.total"
38 :total="pageData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 38 @size-change="handleSizeChange" @p-current-change="handleCurrentChange" :column="tableData.columns"
39 :column="tableData.columns" :data="tableData.data"> 39 :data="tableData.data">
40 </lb-table> 40 </lb-table>
41 <message-tips ref="msg" :message="message" /> 41 <message-tips ref="msg" :message="message" />
42 </div> 42 </div>
...@@ -62,7 +62,6 @@ export default { ...@@ -62,7 +62,6 @@ export default {
62 }, 62 },
63 data () { 63 data () {
64 return { 64 return {
65 loading: false,
66 form: { 65 form: {
67 YWH: '', 66 YWH: '',
68 BDCDYH: '', 67 BDCDYH: '',
...@@ -124,7 +123,6 @@ export default { ...@@ -124,7 +123,6 @@ export default {
124 }, 123 },
125 async featchData () { 124 async featchData () {
126 try { 125 try {
127 this.loading = true
128 let { result: { list, total, pages: pageSize, pageNum: current } 126 let { result: { list, total, pages: pageSize, pageNum: current }
129 } = await business.getQlfQlCfdjByCondtion(this.form) 127 } = await business.getQlfQlCfdjByCondtion(this.form)
130 this.tableData.data = list 128 this.tableData.data = list
...@@ -137,7 +135,6 @@ export default { ...@@ -137,7 +135,6 @@ export default {
137 this.message = error 135 this.message = error
138 this.$refs.msg.messageShow() 136 this.$refs.msg.messageShow()
139 } 137 }
140 this.loading = false
141 }, 138 },
142 async handlDatadetails (index, row) { 139 async handlDatadetails (index, row) {
143 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB) 140 let { result: res, message } = await dataReporting.getQltFwFdcqYzByCondition(row.BSM_SJSB)
...@@ -152,3 +149,6 @@ export default { ...@@ -152,3 +149,6 @@ export default {
152 } 149 }
153 } 150 }
154 </script> 151 </script>
152 <style scoped lang="scss">
153 @import "~@/styles/public.scss";
154 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -39,7 +39,7 @@ export default { ...@@ -39,7 +39,7 @@ export default {
39 background: url("~@/image/mapcenter.png") no-repeat; 39 background: url("~@/image/mapcenter.png") no-repeat;
40 background-size: 100% 100%; 40 background-size: 100% 100%;
41 position: relative; 41 position: relative;
42 height: 470px; 42 height: 510px;
43 43
44 .title { 44 .title {
45 position: absolute; 45 position: absolute;
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
74 position: absolute; 74 position: absolute;
75 left: 0; 75 left: 0;
76 right: 0; 76 right: 0;
77 top: 9px; 77 top: 3px;
78 text-align: center; 78 text-align: center;
79 margin-bottom: 10px; 79 margin-bottom: 10px;
80 } 80 }
......
...@@ -77,16 +77,16 @@ export default { ...@@ -77,16 +77,16 @@ export default {
77 <style lang="scss" scoped> 77 <style lang="scss" scoped>
78 .leftcard { 78 .leftcard {
79 width: 30%; 79 width: 30%;
80 height: 100%; 80 height: calc(100% -94px);
81 display: flex; 81 display: flex;
82 flex-direction: column; 82 flex-direction: column;
83
83 .card { 84 .card {
84 background: url("~@/image/homeLeftBg.png") no-repeat; 85 background: url("~@/image/homeLeftBg.png") no-repeat;
85 background-size: 100% 100%; 86 background-size: 100% 100%;
86 position: relative; 87 position: relative;
87 flex: 1;
88 height: 100%;
89 padding: 8px 0; 88 padding: 8px 0;
89 height: 170px;
90 } 90 }
91 91
92 .card1 { 92 .card1 {
...@@ -94,6 +94,9 @@ export default { ...@@ -94,6 +94,9 @@ export default {
94 background-size: 100% 100%; 94 background-size: 100% 100%;
95 position: relative; 95 position: relative;
96 padding: 10px 0; 96 padding: 10px 0;
97 box-sizing: border-box;
98 flex: 1;
99 height: 100%;
97 } 100 }
98 101
99 .cardhead { 102 .cardhead {
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="rightcard"> 2 <div class="rightcard">
3 <div class="card1 cardCon d-center"> 3 <div class="card1 cardCon d-center">
4 <div class="cardhead">房屋情况统计表</div> 4 <div class="cardhead">房屋情况统计表</div>
5 <div class="cardcontent" style="margin-top: 50px"> 5 <div class="cardcontent" style="margin-top: 70px">
6 <dv-scroll-board :config="config" class="board" /> 6 <dv-scroll-board :config="config" class="board" />
7 </div> 7 </div>
8 </div> 8 </div>
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
27 headerBGC: '#016AC5', 27 headerBGC: '#016AC5',
28 oddRowBGC: '#154295', 28 oddRowBGC: '#154295',
29 evenRowBGC: '#154295', 29 evenRowBGC: '#154295',
30 header: ['序号', '行政区名称', '行政区总数', '接入量'], 30 header: ['序号', '用途', '性质', '面积'],
31 data: [ 31 data: [
32 ['1', '咸阳市', '6', '998'], 32 ['1', '咸阳市', '6', '998'],
33 ['1', '咸阳市', '6', '998'], 33 ['1', '咸阳市', '6', '998'],
...@@ -51,7 +51,9 @@ export default { ...@@ -51,7 +51,9 @@ export default {
51 } 51 }
52 52
53 .rightcard { 53 .rightcard {
54 width: 30%;
54 display: flex; 55 display: flex;
56 height: calc(100% -94px);
55 flex-direction: column; 57 flex-direction: column;
56 58
57 .cardhead { 59 .cardhead {
...@@ -62,7 +64,7 @@ export default { ...@@ -62,7 +64,7 @@ export default {
62 position: absolute; 64 position: absolute;
63 left: 0; 65 left: 0;
64 right: 0; 66 right: 0;
65 top: 15px; 67 top: 12px;
66 text-align: center; 68 text-align: center;
67 } 69 }
68 70
...@@ -72,21 +74,21 @@ export default { ...@@ -72,21 +74,21 @@ export default {
72 } 74 }
73 75
74 .cardCon { 76 .cardCon {
75 padding: 20px 10px; 77 padding: 20px 5px;
76 position: relative; 78 position: relative;
77 text-align: center; 79 text-align: center;
78 width: 100%; 80 width: 100%;
79 } 81 }
80 82
81 .card1 { 83 .card1 {
82 height: 240px; 84 height: 200px;
83 background: url("~@/image/homeLeftBg.png") no-repeat; 85 background: url("~@/image/homeLeftBg.png") no-repeat;
84 background-size: 100% 100%; 86 background-size: 100% 100%;
85 87
86 .board { 88 .board {
87 width: 90%; 89 width: 90%;
88 margin: 0 auto; 90 margin: 0 auto;
89 height: 165px; 91 height: 135px;
90 margin-top: 40px; 92 margin-top: 40px;
91 } 93 }
92 } 94 }
...@@ -94,13 +96,18 @@ export default { ...@@ -94,13 +96,18 @@ export default {
94 .card2 { 96 .card2 {
95 background: url("~@/image/djywl.png") no-repeat; 97 background: url("~@/image/djywl.png") no-repeat;
96 background-size: 100% 100%; 98 background-size: 100% 100%;
97 padding: 70px 0 20px 0; 99 padding: 60px 0 0 0;
98 } 100 }
99 101
100 .card3 { 102 .card3 {
101 height: 170px; 103 flex: 1;
104 height: 100%;
102 background: url("~@/image/lxzl.png") no-repeat; 105 background: url("~@/image/lxzl.png") no-repeat;
103 background-size: 100% 100%; 106 background-size: 100% 100%;
107 padding-bottom: 0;
108 .cardhead {
109 top: 8px;
110 }
104 } 111 }
105 112
106 .cardhead { 113 .cardhead {
......
...@@ -46,43 +46,6 @@ export default { ...@@ -46,43 +46,6 @@ export default {
46 margin: auto; 46 margin: auto;
47 display: flex; 47 display: flex;
48 justify-content: space-between; 48 justify-content: space-between;
49 .centercard { 49 margin-top: 15px;
50 width: 40%;
51
52 .card1 {
53 width: 100%;
54 box-sizing: border-box;
55 background-size: 100% 100%;
56 }
57
58 .card2 {
59 width: 100%;
60 box-sizing: border-box;
61 background-size: 100% 100%;
62 }
63 }
64
65 .rightcard {
66 width: 30%;
67 height: 100%;
68
69 .card1 {
70 width: 100%;
71 box-sizing: border-box;
72 background-size: 100% 100%;
73 }
74
75 .card2 {
76 width: 100%;
77 box-sizing: border-box;
78 background-size: 100% 100%;
79 }
80
81 .card3 {
82 width: 100%;
83 box-sizing: border-box;
84 background-size: 100% 100%;
85 }
86 }
87 } 50 }
88 </style> 51 </style>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <!-- 列表区域 --> 36 <!-- 列表区域 -->
37 <div class="from-clues-content"> 37 <div class="from-clues-content">
38 <!-- table组件 --> 38 <!-- table组件 -->
39 <lb-table :page-size="pageData.size" :heightNum="225" :current-page.sync="pageData.current" 39 <lb-table :page-size="pageData.size" :heightNum="300" :current-page.sync="pageData.current"
40 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange" 40 :total="tableData.total" @size-change="handleSizeChange" @p-current-change="handleCurrentChange"
41 :column="tableData.columns" :data="tableData.data"> 41 :column="tableData.columns" :data="tableData.data">
42 </lb-table> 42 </lb-table>
......
...@@ -87,7 +87,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js"; ...@@ -87,7 +87,7 @@ import { getDataReportPage } from "@/api/sbbwcx.js";
87 export default { 87 export default {
88 name: "jsbwcx", 88 name: "jsbwcx",
89 mixins: [tableMixin], 89 mixins: [tableMixin],
90 data() { 90 data () {
91 return { 91 return {
92 // 开始结束日期限制 92 // 开始结束日期限制
93 pickerOptionsStart: { 93 pickerOptionsStart: {
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
172 // 分页 172 // 分页
173 pageData: { 173 pageData: {
174 total: 0, 174 total: 0,
175 pageSize: 15, 175 pageSize: 10,
176 current: 1, 176 current: 1,
177 }, 177 },
178 // 业务名称 178 // 业务名称
...@@ -200,7 +200,7 @@ export default { ...@@ -200,7 +200,7 @@ export default {
200 }, 200 },
201 methods: { 201 methods: {
202 // 初始化数据 202 // 初始化数据
203 queryClick() { 203 queryClick () {
204 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { 204 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
205 if (res.code === 200) { 205 if (res.code === 200) {
206 let { total, records } = res.result; 206 let { total, records } = res.result;
...@@ -210,14 +210,14 @@ export default { ...@@ -210,14 +210,14 @@ export default {
210 }); 210 });
211 }, 211 },
212 // 重置 212 // 重置
213 resetForm() { 213 resetForm () {
214 this.$refs.ruleForm.resetFields(); 214 this.$refs.ruleForm.resetFields();
215 }, 215 },
216 featchData() { 216 featchData () {
217 this.queryClick(); 217 this.queryClick();
218 }, 218 },
219 // 详情 219 // 详情
220 handleEdit() { 220 handleEdit () {
221 this.$popupDialog( 221 this.$popupDialog(
222 "业务报文", 222 "业务报文",
223 "components/JsonEditor/index", 223 "components/JsonEditor/index",
......
...@@ -13,12 +13,18 @@ ...@@ -13,12 +13,18 @@
13 </el-select> 13 </el-select>
14 </el-form-item> 14 </el-form-item>
15 </el-col> 15 </el-col>
16 <el-col :span="6"> 16 <el-col :span="12">
17 <el-form-item label="汇交时间" prop="reportStartTime"> 17 <el-form-item label="汇交时间" prop="reportStartTime">
18 <el-row :gutter="20">
19 <el-col :span="12">
18 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" 20 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
19 clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker> 21 clearable v-model="form.reportStartTime" value-format="yyyy-MM-dd"></el-date-picker>
22 </el-col>
23 <el-col :span="12">
20 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" 24 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
21 clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker> 25 clearable v-model="form.reportEndTime" value-format="yyyy-MM-dd"></el-date-picker>
26 </el-col>
27 </el-row>
22 </el-form-item> 28 </el-form-item>
23 </el-col> 29 </el-col>
24 <el-col :span="6"> 30 <el-col :span="6">
...@@ -32,7 +38,7 @@ ...@@ -32,7 +38,7 @@
32 </el-row> 38 </el-row>
33 <el-row class="mt-10"> 39 <el-row class="mt-10">
34 <!-- 操作按钮 --> 40 <!-- 操作按钮 -->
35 <el-col :span="12" class="btnColRight"> 41 <el-col :span="24" class="btnColRight">
36 <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn> 42 <btn nativeType="cz" @click="resetForm('ruleForm')">重置</btn>
37 <btn nativeType="cx" @click="queryClick">查询</btn> 43 <btn nativeType="cx" @click="queryClick">查询</btn>
38 </el-col> 44 </el-col>
...@@ -68,7 +74,7 @@ export default { ...@@ -68,7 +74,7 @@ export default {
68 components: { 74 components: {
69 dataDetails, 75 dataDetails,
70 }, 76 },
71 data() { 77 data () {
72 return { 78 return {
73 isShow: false, 79 isShow: false,
74 // 开始结束日期限制 80 // 开始结束日期限制
...@@ -159,11 +165,11 @@ export default { ...@@ -159,11 +165,11 @@ export default {
159 }, 165 },
160 methods: { 166 methods: {
161 // 重置表单 167 // 重置表单
162 resetForm() { 168 resetForm () {
163 this.$refs.ruleForm.resetFields(); 169 this.$refs.ruleForm.resetFields();
164 }, 170 },
165 // 初始化数据 171 // 初始化数据
166 queryClick() { 172 queryClick () {
167 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { 173 getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
168 if (res.code === 200) { 174 if (res.code === 200) {
169 let { total, records } = res.result; 175 let { total, records } = res.result;
...@@ -173,11 +179,11 @@ export default { ...@@ -173,11 +179,11 @@ export default {
173 }); 179 });
174 }, 180 },
175 // 多选 181 // 多选
176 handleSelectionChange(val) {}, 182 handleSelectionChange (val) { },
177 // 上报 183 // 上报
178 handleEscalation() {}, 184 handleEscalation () { },
179 // 详情 185 // 详情
180 handleDetail(row) { 186 handleDetail (row) {
181 this.$refs.editLog.isShow(row); 187 this.$refs.editLog.isShow(row);
182 }, 188 },
183 }, 189 },
......