Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
d3c9b58c by 田浩浩
Options

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

2 parents d8756c58 19720eaa
Expand all
Inline Side-by-side
Showing 18 changed files with 114 additions and 49 deletions
...@@ -40,6 +40,27 @@ export default { ...@@ -40,6 +40,27 @@ export default {
40 </script> 40 </script>
41 41
42 <style> 42 <style>
43 .ace-jsoneditor .ace_gutter {
44 background-color: #08346F !important;
45 color: #FFFFFF !important;
46 }
47
48 .ace_content {
49 background-color: #05275B !important;
50 }
51
52 .ace_marker-layer .ace_active-line {
53 background-color: #4e8ae2 !important;
54 }
55
56 .ace-jsoneditor .ace_variable {
57 color: #FFFFFF !important;
58 }
59
60 .jsoneditor-menu {
61 background-color: #074487 !important;
62 }
63
43 /* jsoneditor右上角默认有一个链接,加css去掉了 */ 64 /* jsoneditor右上角默认有一个链接,加css去掉了 */
44 .jsoneditor-poweredBy { 65 .jsoneditor-poweredBy {
45 display: none; 66 display: none;
......
1 .itemForm { 1 .itemForm {
2 margin-top: 5px;
3 position: relative; 2 position: relative;
4 padding: 10px; 3 padding: 10px;
5 4
...@@ -26,27 +25,19 @@ ...@@ -26,27 +25,19 @@
26 width: 100%; 25 width: 100%;
27 } 26 }
28 27
29 /deep/.el-form-item__label {
30 line-height: 16px;
31 font-size: 12px;
32 position: relative;
33 }
34
35 /deep/ .el-form-item__content {
36 display: flex;
37 }
38
39 // table 样式 28 // table 样式
40 /deep/.el-form-item__label { 29 /deep/.el-form-item__label {
41 border: 1px solid #DCDFE6;
42 border-right: none; 30 border-right: none;
43 background-color: #F2F6FC;
44 text-align: center; 31 text-align: center;
45 padding: 0; 32 padding: 0;
33 line-height: 16px;
34 font-size: 12px;
35 color: #CEF8FF;
36 margin-top: 8px !important;
46 } 37 }
47 38
48 /deep/.el-form-item__content { 39 /deep/.el-form-item__content {
49 border: 1px solid #DCDFE6; 40 display: flex;
50 margin-right: -1px; 41 margin-right: -1px;
51 } 42 }
52 43
...@@ -54,11 +45,18 @@ ...@@ -54,11 +45,18 @@
54 /deep/.el-textarea__inner { 45 /deep/.el-textarea__inner {
55 margin: 5px; 46 margin: 5px;
56 width: 96%; 47 width: 96%;
48 background: #05275B;
49 color: #FFFFFF;
50 border-radius: 2px;
51 border: 1px solid #6BC1FC;
57 } 52 }
58 53
59 /deep/.el-input__inner { 54 /deep/.el-input__inner {
60 margin: 5px; 55 margin: 5px;
61 width: 96%; 56 width: 96%;
57 background: #05275B;
58 border-radius: 2px;
59 border: 1px solid #6BC1FC;
62 } 60 }
63 61
64 /deep/.el-form-item { 62 /deep/.el-form-item {
......
...@@ -128,6 +128,7 @@ export default { ...@@ -128,6 +128,7 @@ export default {
128 type: "line", 128 type: "line",
129 smooth: true, //是否平滑 129 smooth: true, //是否平滑
130 showSymbol: false, 130 showSymbol: false,
131 symbol: 'circle',
131 symbolSize: 6, 132 symbolSize: 6,
132 zlevel: 3, 133 zlevel: 3,
133 lineStyle: { 134 lineStyle: {
...@@ -144,6 +145,7 @@ export default { ...@@ -144,6 +145,7 @@ export default {
144 type: "line", 145 type: "line",
145 smooth: true, 146 smooth: true,
146 showSymbol: false, 147 showSymbol: false,
148 symbol: 'circle',
147 symbolSize: 8, 149 symbolSize: 8,
148 zlevel: 3, 150 zlevel: 3,
149 lineStyle: { 151 lineStyle: {
...@@ -161,6 +163,7 @@ export default { ...@@ -161,6 +163,7 @@ export default {
161 type: "line", 163 type: "line",
162 smooth: true, 164 smooth: true,
163 showSymbol: false, 165 showSymbol: false,
166 symbol: 'circle',
164 symbolSize: 8, 167 symbolSize: 8,
165 zlevel: 3, 168 zlevel: 3,
166 lineStyle: { 169 lineStyle: {
......
...@@ -88,4 +88,4 @@ export default { ...@@ -88,4 +88,4 @@ export default {
88 Chart 88 Chart
89 } 89 }
90 } 90 }
91 </script>
...\ No newline at end of file ...\ No newline at end of file
91 </script>
......
...@@ -212,9 +212,9 @@ export const asyncRoutes = [ ...@@ -212,9 +212,9 @@ export const asyncRoutes = [
212 meta: { title: '建筑物区分所有权业主共有部分' } 212 meta: { title: '建筑物区分所有权业主共有部分' }
213 }, 213 },
214 { 214 {
215 path: 'seaArea', 215 path: 'hysyq',
216 component: () => import('@/views/business-info/sea-area/index'), 216 component: () => import('@/views/business-info/hysyq/index'),
217 name: 'seaArea', 217 name: 'hysyq',
218 meta: { title: '海域(含无居民海岛)使用权' } 218 meta: { title: '海域(含无居民海岛)使用权' }
219 }, 219 },
220 { 220 {
......
1 .dialogBox { 1 .dialogBox {
2 border-radius: 8px;
3 overflow: hidden; 2 overflow: hidden;
4 background: #FFFFFF; 3 background: url("~@/image/dialogBg.png") no-repeat;
5 box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10); 4 background-size: 100% 100%;
6 5
7 .dialog_title { 6 .dialog_title {
8 display: flex; 7 display: flex;
...@@ -45,10 +44,12 @@ ...@@ -45,10 +44,12 @@
45 } 44 }
46 45
47 .el-dialog__header { 46 .el-dialog__header {
48 margin-bottom: 10px; 47 color: #FFFFFF;
49 color: #4A4A4A; 48 // background: #074487;
50 background-color: #FCFDFD; 49 height: 46px !important;
51 border-bottom: 1px solid #E4EBF4; 50 width: 97%;
51 margin: 0 auto;
52 margin-top: 2px;
52 } 53 }
53 54
54 .el-dialog__body { 55 .el-dialog__body {
...@@ -57,9 +58,10 @@ ...@@ -57,9 +58,10 @@
57 } 58 }
58 59
59 .el-dialog__headerbtn .el-dialog__close { 60 .el-dialog__headerbtn .el-dialog__close {
60 color: #6B7A99 !important; 61 color: #FFFFFF !important;
61 position: relative; 62 position: relative;
62 top: -2px; 63 top: -2px;
64 right: 15px
63 } 65 }
64 66
65 67
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
12 12
13 //input 13 //input
14 .el-input__inner { 14 .el-input__inner {
15 color: #FFFFFF!important;
15 padding: 0 7px !important; 16 padding: 0 7px !important;
16 } 17 }
17 18
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
63 // to fixed https://github.com/ElemeFE/element/issues/2461 64 // to fixed https://github.com/ElemeFE/element/issues/2461
64 // refine element ui upload 65 // refine element ui upload
65 .el-input.is-disabled .el-input__inner { 66 .el-input.is-disabled .el-input__inner {
66 color: #909399; 67 color: #FFFFFF !important;
67 } 68 }
68 69
69 .upload-container { 70 .upload-container {
...@@ -256,13 +257,38 @@ table td { ...@@ -256,13 +257,38 @@ table td {
256 } 257 }
257 258
258 .el-popper[x-placement^="bottom"] .popper__arrow::after { 259 .el-popper[x-placement^="bottom"] .popper__arrow::after {
259 border-bottom-color: #074487 !important; 260 display: none;
260 } 261 }
261 262
262 .el-popper[x-placement^="bottom"] .popper__arrow { 263 .el-popper[x-placement^="bottom"] .popper__arrow {
263 border-bottom-color: #074487 !important; 264 display: none;
264 } 265 }
266 .el-date-picker{
267 background-color: #031a46;
268 .el-date-picker__header-label{
269 color: #A6CFD6;
270 }
271 .el-picker-panel__icon-btn{
272 color: #A6CFD6;
273 }
274 .el-date-table th{
275 color: #02D9FD;
276 }
277 .el-date-table td span{
278 color: #A6CFD6;
279 }
280 .el-date-table td.current:not(.disabled) span{
281 background-color: #074487;
282 // border:1px solid saddlebrown;
283 box-shadow: inset 0 0 7px #02D9FD;
284 border: 1px solid #02D9FD;
285 }
265 286
287 }
288 .el-picker-panel__content{
289 background-color:#074487;
290
291 }
266 292
267 293
268 .el-menu--horizontal .el-menu .el-menu-item, 294 .el-menu--horizontal .el-menu .el-menu-item,
...@@ -281,4 +307,4 @@ table td { ...@@ -281,4 +307,4 @@ table td {
281 border: 1px solid #02D9FD; 307 border: 1px solid #02D9FD;
282 color: #FFFFFF !important; 308 color: #FFFFFF !important;
283 font-weight: 700; 309 font-weight: 700;
284 }
...\ No newline at end of file ...\ No newline at end of file
310 }
......
...@@ -383,7 +383,7 @@ aside { ...@@ -383,7 +383,7 @@ aside {
383 width: 0; 383 width: 0;
384 height: 8px; 384 height: 8px;
385 left: -10px; 385 left: -10px;
386 top: 1px; 386 top: 2px;
387 background: #00FAA8; 387 background: #00FAA8;
388 color: #00FAA8; 388 color: #00FAA8;
389 } 389 }
...@@ -400,7 +400,7 @@ aside { ...@@ -400,7 +400,7 @@ aside {
400 width: 0; 400 width: 0;
401 height: 8px; 401 height: 8px;
402 left: -10px; 402 left: -10px;
403 top: 1px; 403 top: 2px;
404 background: #FF7962; 404 background: #FF7962;
405 color: #FF7962; 405 color: #FF7962;
406 } 406 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -27,6 +27,7 @@ span:focus { ...@@ -27,6 +27,7 @@ span:focus {
27 } 27 }
28 28
29 .process-design { 29 .process-design {
30
30 .el-table td, 31 .el-table td,
31 .el-table th { 32 .el-table th {
32 color: #333; 33 color: #333;
...@@ -37,27 +38,32 @@ span:focus { ...@@ -37,27 +38,32 @@ span:focus {
37 box-sizing: border-box; 38 box-sizing: border-box;
38 border-bottom: 1px solid #e8e8e8; 39 border-bottom: 1px solid #e8e8e8;
39 } 40 }
41
40 .el-dialog__body { 42 .el-dialog__body {
41 padding: 16px;
42 max-height: 80vh; 43 max-height: 80vh;
43 box-sizing: border-box; 44 box-sizing: border-box;
44 overflow-y: auto; 45 overflow-y: auto;
45 } 46 }
47
46 .el-dialog__footer { 48 .el-dialog__footer {
47 padding: 16px; 49 padding: 16px;
48 box-sizing: border-box; 50 box-sizing: border-box;
49 border-top: 1px solid #e8e8e8; 51 border-top: 1px solid #e8e8e8;
50 } 52 }
53
51 .el-dialog__close { 54 .el-dialog__close {
52 font-weight: 600; 55 font-weight: 600;
53 } 56 }
57
54 .el-select { 58 .el-select {
55 width: 100%; 59 width: 100%;
56 } 60 }
61
57 .el-divider:not(.el-divider--horizontal) { 62 .el-divider:not(.el-divider--horizontal) {
58 margin: 0 8px ; 63 margin: 0 8px;
59 } 64 }
65
60 .el-divider.el-divider--horizontal { 66 .el-divider.el-divider--horizontal {
61 margin: 16px 0; 67 margin: 16px 0;
62 } 68 }
63 } 69 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="buildingOwnership from-clues"> 2 <div class="gzwsyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-row> 5 <el-row>
...@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js' ...@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
60 import treeSelect from '@/components/treeSelect/index.vue' 60 import treeSelect from '@/components/treeSelect/index.vue'
61 import editDialog from '@/components/dataDetails/edit-dialog.vue' 61 import editDialog from '@/components/dataDetails/edit-dialog.vue'
62 export default { 62 export default {
63 name: "buildingOwnership", 63 name: "gzwsyq",
64 mixins: [tableMixin], 64 mixins: [tableMixin],
65 components: { 65 components: {
66 treeSelect, 66 treeSelect,
...@@ -162,5 +162,6 @@ export default { ...@@ -162,5 +162,6 @@ export default {
162 } 162 }
163 </script> 163 </script>
164 <style scoped lang="scss"> 164 <style scoped lang="scss">
165 @import "~@/styles/public.scss";
165 @import "./index.scss"; 166 @import "./index.scss";
166 </style> 167 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="seaArea from-clues"> 2 <div class="hysyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-row> 5 <el-row>
...@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js' ...@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
60 import treeSelect from '@/components/treeSelect/index.vue' 60 import treeSelect from '@/components/treeSelect/index.vue'
61 import editDialog from '@/components/dataDetails/edit-dialog.vue' 61 import editDialog from '@/components/dataDetails/edit-dialog.vue'
62 export default { 62 export default {
63 name: "seaArea", 63 name: "hysyq",
64 mixins: [tableMixin], 64 mixins: [tableMixin],
65 components: { 65 components: {
66 treeSelect, 66 treeSelect,
...@@ -159,4 +159,8 @@ export default { ...@@ -159,4 +159,8 @@ export default {
159 }, 159 },
160 } 160 }
161 } 161 }
162 </script>
...\ No newline at end of file ...\ No newline at end of file
162 </script>
163 <style scoped lang="scss">
164 @import "~@/styles/public.scss";
165 </style>
166
......
1 <template> 1 <template>
2 <div class="agriculturalLand from-clues"> 2 <div class="nydsyq from-clues">
3 <div class="from-clues-header"> 3 <div class="from-clues-header">
4 <el-form ref="form" :model="form" label-width="80px"> 4 <el-form ref="form" :model="form" label-width="80px">
5 <el-row> 5 <el-row>
...@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js' ...@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
60 import treeSelect from '@/components/treeSelect/index.vue' 60 import treeSelect from '@/components/treeSelect/index.vue'
61 import editDialog from '@/components/dataDetails/edit-dialog.vue' 61 import editDialog from '@/components/dataDetails/edit-dialog.vue'
62 export default { 62 export default {
63 name: "agriculturalLand", 63 name: "nydsyq",
64 mixins: [tableMixin], 64 mixins: [tableMixin],
65 components: { 65 components: {
66 treeSelect, 66 treeSelect,
......
...@@ -29,19 +29,23 @@ export default { ...@@ -29,19 +29,23 @@ export default {
29 evenRowBGC: '#154295', 29 evenRowBGC: '#154295',
30 header: ['序号', '用途', '性质', '面积'], 30 header: ['序号', '用途', '性质', '面积'],
31 data: [ 31 data: [
32 ['1', '咸阳市', '6', '998'], 32 ['住宅', '自建房', '转移登记', '73.94'],
33 ['1', '咸阳市', '6', '998'], 33 ['商业服务', '市场化商品房', '转移登记', '1067.14'],
34 ['1', '咸阳市', '6', '998'], 34 ['住宅', '成本售价房', '转移登记', '601.47'],
35 ['1', '咸阳市', '6', '998'], 35 ['住宅', '市场化商品房', '转移登记', '38111.37'],
36 ['1', '咸阳市', '6', '998'], 36 ['住宅', '移民搬迁安置房', '转移登记', '104.16'],
37 ['1', '咸阳市', '6', '998'], 37 ['办公', '自建房', '转移登记', '14913.86'],
38 ['柴房', '市场化商品房', '转移登记', '615.55'],
39 ['住宅', '经济适用住房', '转移登记', '173.17'],
40 ['车库/车位', '市场化商品房', '转移登记', '105.27'],
41 ['住宅', '房改房', '转移登记', '372.4']
38 ] 42 ]
39 } 43 }
40 } 44 }
41 }, 45 },
42 components: { columnarsmat, Rose }, 46 components: { columnarsmat, Rose },
43 mounted () { 47 mounted () {
44 scroll(tableref.value.$refs.bodyWrapper);//设置滚动 48 // scroll(tableref.value.$refs.bodyWrapper);//设置滚动
45 } 49 }
46 } 50 }
47 </script> 51 </script>
......