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 {
</script>
<style>
.ace-jsoneditor .ace_gutter {
background-color: #08346F !important;
color: #FFFFFF !important;
}
.ace_content {
background-color: #05275B !important;
}
.ace_marker-layer .ace_active-line {
background-color: #4e8ae2 !important;
}
.ace-jsoneditor .ace_variable {
color: #FFFFFF !important;
}
.jsoneditor-menu {
background-color: #074487 !important;
}
/* jsoneditor右上角默认有一个链接,加css去掉了 */
.jsoneditor-poweredBy {
display: none;
......
.itemForm {
margin-top: 5px;
position: relative;
padding: 10px;
......@@ -26,27 +25,19 @@
width: 100%;
}
/deep/.el-form-item__label {
line-height: 16px;
font-size: 12px;
position: relative;
}
/deep/ .el-form-item__content {
display: flex;
}
// table 样式
/deep/.el-form-item__label {
border: 1px solid #DCDFE6;
border-right: none;
background-color: #F2F6FC;
text-align: center;
padding: 0;
line-height: 16px;
font-size: 12px;
color: #CEF8FF;
margin-top: 8px !important;
}
/deep/.el-form-item__content {
border: 1px solid #DCDFE6;
display: flex;
margin-right: -1px;
}
......@@ -54,11 +45,18 @@
/deep/.el-textarea__inner {
margin: 5px;
width: 96%;
background: #05275B;
color: #FFFFFF;
border-radius: 2px;
border: 1px solid #6BC1FC;
}
/deep/.el-input__inner {
margin: 5px;
width: 96%;
background: #05275B;
border-radius: 2px;
border: 1px solid #6BC1FC;
}
/deep/.el-form-item {
......
......@@ -128,6 +128,7 @@ export default {
type: "line",
smooth: true, //是否平滑
showSymbol: false,
symbol: 'circle',
symbolSize: 6,
zlevel: 3,
lineStyle: {
......@@ -144,6 +145,7 @@ export default {
type: "line",
smooth: true,
showSymbol: false,
symbol: 'circle',
symbolSize: 8,
zlevel: 3,
lineStyle: {
......@@ -161,6 +163,7 @@ export default {
type: "line",
smooth: true,
showSymbol: false,
symbol: 'circle',
symbolSize: 8,
zlevel: 3,
lineStyle: {
......
......@@ -88,4 +88,4 @@ export default {
Chart
}
}
</script>
\ No newline at end of file
</script>
......
......@@ -212,9 +212,9 @@ export const asyncRoutes = [
meta: { title: '建筑物区分所有权业主共有部分' }
},
{
path: 'seaArea',
component: () => import('@/views/business-info/sea-area/index'),
name: 'seaArea',
path: 'hysyq',
component: () => import('@/views/business-info/hysyq/index'),
name: 'hysyq',
meta: { title: '海域(含无居民海岛)使用权' }
},
{
......
.dialogBox {
border-radius: 8px;
overflow: hidden;
background: #FFFFFF;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.10);
background: url("~@/image/dialogBg.png") no-repeat;
background-size: 100% 100%;
.dialog_title {
display: flex;
......@@ -45,10 +44,12 @@
}
.el-dialog__header {
margin-bottom: 10px;
color: #4A4A4A;
background-color: #FCFDFD;
border-bottom: 1px solid #E4EBF4;
color: #FFFFFF;
// background: #074487;
height: 46px !important;
width: 97%;
margin: 0 auto;
margin-top: 2px;
}
.el-dialog__body {
......@@ -57,9 +58,10 @@
}
.el-dialog__headerbtn .el-dialog__close {
color: #6B7A99 !important;
color: #FFFFFF !important;
position: relative;
top: -2px;
right: 15px
}
......
......@@ -12,6 +12,7 @@
//input
.el-input__inner {
color: #FFFFFF!important;
padding: 0 7px !important;
}
......@@ -63,7 +64,7 @@
// to fixed https://github.com/ElemeFE/element/issues/2461
// refine element ui upload
.el-input.is-disabled .el-input__inner {
color: #909399;
color: #FFFFFF !important;
}
.upload-container {
......@@ -256,13 +257,38 @@ table td {
}
.el-popper[x-placement^="bottom"] .popper__arrow::after {
border-bottom-color: #074487 !important;
display: none;
}
.el-popper[x-placement^="bottom"] .popper__arrow {
border-bottom-color: #074487 !important;
display: none;
}
.el-date-picker{
background-color: #031a46;
.el-date-picker__header-label{
color: #A6CFD6;
}
.el-picker-panel__icon-btn{
color: #A6CFD6;
}
.el-date-table th{
color: #02D9FD;
}
.el-date-table td span{
color: #A6CFD6;
}
.el-date-table td.current:not(.disabled) span{
background-color: #074487;
// border:1px solid saddlebrown;
box-shadow: inset 0 0 7px #02D9FD;
border: 1px solid #02D9FD;
}
}
.el-picker-panel__content{
background-color:#074487;
}
.el-menu--horizontal .el-menu .el-menu-item,
......@@ -281,4 +307,4 @@ table td {
border: 1px solid #02D9FD;
color: #FFFFFF !important;
font-weight: 700;
}
\ No newline at end of file
}
......
......@@ -383,7 +383,7 @@ aside {
width: 0;
height: 8px;
left: -10px;
top: 1px;
top: 2px;
background: #00FAA8;
color: #00FAA8;
}
......@@ -400,7 +400,7 @@ aside {
width: 0;
height: 8px;
left: -10px;
top: 1px;
top: 2px;
background: #FF7962;
color: #FF7962;
}
\ No newline at end of file
......
......@@ -27,6 +27,7 @@ span:focus {
}
.process-design {
.el-table td,
.el-table th {
color: #333;
......@@ -37,27 +38,32 @@ span:focus {
box-sizing: border-box;
border-bottom: 1px solid #e8e8e8;
}
.el-dialog__body {
padding: 16px;
max-height: 80vh;
box-sizing: border-box;
overflow-y: auto;
}
.el-dialog__footer {
padding: 16px;
box-sizing: border-box;
border-top: 1px solid #e8e8e8;
}
.el-dialog__close {
font-weight: 600;
}
.el-select {
width: 100%;
}
.el-divider:not(.el-divider--horizontal) {
margin: 0 8px ;
margin: 0 8px;
}
.el-divider.el-divider--horizontal {
margin: 16px 0;
}
}
}
\ No newline at end of file
......
<template>
<div class="buildingOwnership from-clues">
<div class="gzwsyq from-clues">
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
......@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/treeSelect/index.vue'
import editDialog from '@/components/dataDetails/edit-dialog.vue'
export default {
name: "buildingOwnership",
name: "gzwsyq",
mixins: [tableMixin],
components: {
treeSelect,
......@@ -162,5 +162,6 @@ export default {
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "./index.scss";
</style>
\ No newline at end of file
......
<template>
<div class="seaArea from-clues">
<div class="hysyq from-clues">
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
......@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/treeSelect/index.vue'
import editDialog from '@/components/dataDetails/edit-dialog.vue'
export default {
name: "seaArea",
name: "hysyq",
mixins: [tableMixin],
components: {
treeSelect,
......@@ -159,4 +159,8 @@ export default {
},
}
}
</script>
\ No newline at end of file
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
</style>
......
<template>
<div class="agriculturalLand from-clues">
<div class="nydsyq from-clues">
<div class="from-clues-header">
<el-form ref="form" :model="form" label-width="80px">
<el-row>
......@@ -60,7 +60,7 @@ import tableMixin from '@/mixins/tableMixin.js'
import treeSelect from '@/components/treeSelect/index.vue'
import editDialog from '@/components/dataDetails/edit-dialog.vue'
export default {
name: "agriculturalLand",
name: "nydsyq",
mixins: [tableMixin],
components: {
treeSelect,
......
......@@ -29,19 +29,23 @@ export default {
evenRowBGC: '#154295',
header: ['序号', '用途', '性质', '面积'],
data: [
['1', '咸阳市', '6', '998'],
['1', '咸阳市', '6', '998'],
['1', '咸阳市', '6', '998'],
['1', '咸阳市', '6', '998'],
['1', '咸阳市', '6', '998'],
['1', '咸阳市', '6', '998'],
['住宅', '自建房', '转移登记', '73.94'],
['商业服务', '市场化商品房', '转移登记', '1067.14'],
['住宅', '成本售价房', '转移登记', '601.47'],
['住宅', '市场化商品房', '转移登记', '38111.37'],
['住宅', '移民搬迁安置房', '转移登记', '104.16'],
['办公', '自建房', '转移登记', '14913.86'],
['柴房', '市场化商品房', '转移登记', '615.55'],
['住宅', '经济适用住房', '转移登记', '173.17'],
['车库/车位', '市场化商品房', '转移登记', '105.27'],
['住宅', '房改房', '转移登记', '372.4']
]
}
}
},
components: { columnarsmat, Rose },
mounted () {
scroll(tableref.value.$refs.bodyWrapper);//设置滚动
// scroll(tableref.value.$refs.bodyWrapper);//设置滚动
}
}
</script>
......