Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
0b03afa8 by 田浩浩
Options

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

2 parents a4101e71 867e1fa8
Inline Side-by-side
Showing 11 changed files with 173 additions and 57 deletions
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
68 } 68 }
69 69
70 /deep/.el-calendar__body { 70 /deep/.el-calendar__body {
71 padding: 12px !important; 71 padding: 8px;
72 } 72 }
73 73
74 /deep/.el-calendar-table .el-calendar-day { 74 /deep/.el-calendar-table .el-calendar-day {
...@@ -82,6 +82,18 @@ export default { ...@@ -82,6 +82,18 @@ export default {
82 text-align: center; 82 text-align: center;
83 } 83 }
84 84
85 /deep/.el-calendar-table thead th {
86 padding: 0 0 6px 0 !important;
87 }
88
89 /deep/.el-calendar-day {
90 padding: 3px !important;
91 }
92
93 /deep/.el-calendar__header {
94 padding: 8px 15px;
95 }
96
85 /**日期div的样式*/ 97 /**日期div的样式*/
86 .el-calendar-table tr td:first-child { 98 .el-calendar-table tr td:first-child {
87 border-left: 0px; 99 border-left: 0px;
...@@ -108,14 +120,16 @@ export default { ...@@ -108,14 +120,16 @@ export default {
108 120
109 /**日期div的样式-公历*/ 121 /**日期div的样式-公历*/
110 .el-calendar-table .el-calendar-day>div .solar { 122 .el-calendar-table .el-calendar-day>div .solar {
111 text-align: center 123 text-align: center;
124 margin-top: 3px;
112 } 125 }
113 126
114 /**日期div的样式-农历*/ 127 /**日期div的样式-农历*/
115 .el-calendar-table .el-calendar-day>div .lunar { 128 .el-calendar-table .el-calendar-day>div .lunar {
116 padding-top: 5px; 129 padding-top: 5px;
117 font-size: 12px; 130 font-size: 12px;
118 text-align: center 131 text-align: center;
132 margin-bottom: 5px;
119 } 133 }
120 134
121 /**日期div的样式-选中*/ 135 /**日期div的样式-选中*/
......
1 <template> 1 <template>
2 <transition name="msgbox-fade"> 2 <transition name="msgbox-fade">
3 <div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick" role="dialog" 3 <div class="el-message-box__wrapper" tabindex="-1"
4 v-show="visible" @click.self="handleWrapperClick" role="dialog"
4 aria-modal="true" :aria-label="title || 'dialog'"> 5 aria-modal="true" :aria-label="title || 'dialog'">
5 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']"> 6 <div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
6 <div class="el-message-box__header" v-if="title !== null">
7 <div class="el-message-box__title">
8 <div :class="['el-message-box__status', icon]" v-if="icon && center">
9 </div>
10 <span>{{ title }}</span>
11 </div>
12 <button type="button" class="el-message-box__headerbtn" aria-label="Close" v-if="showClose"
13 @click="handleAction(distinguishCancelAndClose ? 'close' : 'cancel')"
14 @keydown.enter="handleAction(distinguishCancelAndClose ? 'close' : 'cancel')">
15 <i class="el-message-box__close el-icon-close"></i>
16 </button>
17 </div>
18 <div class="el-message-box__content"> 7 <div class="el-message-box__content">
19 <div class="el-message-box__message" v-if="message !== ''"> 8 <slot>
20 <slot> 9 <p>{{ message }}</p>
21 <p>{{ message }}</p> 10 </slot>
22 </slot> 11 </div>
23 </div> 12 <div class="el-message-box__btns">
13 <el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small"
14 @click.native="handleAction('cancel')" @keydown.enter="handleAction('cancel')">
15 {{ cancelButtonText || t('el.messagebox.cancel') }}
16 </el-button>
24 </div> 17 </div>
25 </div> 18 </div>
26 </div> 19 </div>
...@@ -44,7 +37,6 @@ let typeMap = { ...@@ -44,7 +37,6 @@ let typeMap = {
44 37
45 export default { 38 export default {
46 mixins: [Popup, Locale], 39 mixins: [Popup, Locale],
47
48 props: { 40 props: {
49 modal: { 41 modal: {
50 default: true 42 default: true
...@@ -271,3 +263,15 @@ export default { ...@@ -271,3 +263,15 @@ export default {
271 } 263 }
272 }; 264 };
273 </script> 265 </script>
266 <style scoped lang="scss">
267 .el-message-box__wrapper {
268 background: none;
269 }
270 .el-message-box {
271 border: none;
272 }
273 .el-message-box__content {
274 min-height: 150px;
275 padding-top: 30px;
276 }
277 </style>
......
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
6 <svg-icon icon-class='notice' /> 6 <svg-icon icon-class='notice' />
7 <div style="margin-right:5px"></div> 7 <div style="margin-right:5px"></div>
8 <div ref="back" class="back"> 8 <div ref="back" class="back">
9 <span ref="text" @mouseover="mouseOver" @mouseleave="mouseLeave" :style="{ fontSize: '14px', color: '#fff' }" 9 <div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave">
10 class="text">{{ data.text ? data.text : 10 <p v-for="(item, index) in noticeList" :key="index">
11 '通知内容' 11 {{ item.title }}
12 }}</span> 12 </p>
13 </div>
13 </div> 14 </div>
14 </div> 15 </div>
15 </transition> 16 </transition>
...@@ -17,13 +18,9 @@ ...@@ -17,13 +18,9 @@
17 <script> 18 <script>
18 export default { 19 export default {
19 props: { 20 props: {
20 options: { 21 noticeList: {
21 type: Object, 22 type: Array,
22 default () { 23 default: []
23 return {
24 text: '默认'
25 }
26 }
27 } 24 }
28 }, 25 },
29 data () { 26 data () {
...@@ -35,7 +32,6 @@ export default { ...@@ -35,7 +32,6 @@ export default {
35 state: 1, 32 state: 1,
36 firstAnimationTime: '', // 状态一动画效果 33 firstAnimationTime: '', // 状态一动画效果
37 secondAnimationTime: '', // 状态二动画效果 34 secondAnimationTime: '', // 状态二动画效果
38 data: this.options
39 }; 35 };
40 }, 36 },
41 methods: { 37 methods: {
...@@ -57,7 +53,7 @@ export default { ...@@ -57,7 +53,7 @@ export default {
57 ); 53 );
58 setTimeout(res => { 54 setTimeout(res => {
59 this.changeState(); 55 this.changeState();
60 }, this.data.delay); 56 }, 1000);
61 }, 57 },
62 // 用速度计算时间（想要保持速度一样，2种状态时间不同需算出） 58 // 用速度计算时间（想要保持速度一样，2种状态时间不同需算出）
63 ComputationTime () { 59 ComputationTime () {
...@@ -126,11 +122,18 @@ export default { ...@@ -126,11 +122,18 @@ export default {
126 width: 100%; 122 width: 100%;
127 cursor: pointer; 123 cursor: pointer;
128 position: relative; 124 position: relative;
125 font-size: 14px;
126 color: #fff;
129 127
130 .text { 128 .text {
131 position: absolute; 129 position: absolute;
132 display: inline-block; 130 display: inline-block;
133 padding: 2px 0; 131 padding: 2px 0;
132 display: flex;
133
134 p {
135 margin-right: 10px;
136 }
134 } 137 }
135 } 138 }
136 } 139 }
......
...@@ -68,7 +68,7 @@ export default { ...@@ -68,7 +68,7 @@ export default {
68 } 68 }
69 69
70 /deep/.el-calendar__body { 70 /deep/.el-calendar__body {
71 padding: 12px !important; 71 padding: 8px;
72 } 72 }
73 73
74 /deep/.el-calendar-table .el-calendar-day { 74 /deep/.el-calendar-table .el-calendar-day {
...@@ -82,6 +82,18 @@ export default { ...@@ -82,6 +82,18 @@ export default {
82 text-align: center; 82 text-align: center;
83 } 83 }
84 84
85 /deep/.el-calendar-table thead th {
86 padding: 0 0 6px 0 !important;
87 }
88
89 /deep/.el-calendar-day {
90 padding: 3px !important;
91 }
92
93 /deep/.el-calendar__header {
94 padding: 8px 15px;
95 }
96
85 /**日期div的样式*/ 97 /**日期div的样式*/
86 .el-calendar-table tr td:first-child { 98 .el-calendar-table tr td:first-child {
87 border-left: 0px; 99 border-left: 0px;
...@@ -108,14 +120,16 @@ export default { ...@@ -108,14 +120,16 @@ export default {
108 120
109 /**日期div的样式-公历*/ 121 /**日期div的样式-公历*/
110 .el-calendar-table .el-calendar-day>div .solar { 122 .el-calendar-table .el-calendar-day>div .solar {
111 text-align: center 123 text-align: center;
124 margin-top: 3px;
112 } 125 }
113 126
114 /**日期div的样式-农历*/ 127 /**日期div的样式-农历*/
115 .el-calendar-table .el-calendar-day>div .lunar { 128 .el-calendar-table .el-calendar-day>div .lunar {
116 padding-top: 5px; 129 padding-top: 5px;
117 font-size: 12px; 130 font-size: 12px;
118 text-align: center 131 text-align: center;
132 margin-bottom: 5px;
119 } 133 }
120 134
121 /**日期div的样式-选中*/ 135 /**日期div的样式-选中*/
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 </el-dropdown> 20 </el-dropdown>
21 </div> 21 </div>
22 </div> 22 </div>
23 <NoticeBar class="NoticeBar" :options="options" /> 23 <NoticeBar class="NoticeBar" :noticeList="noticeList" />
24 </div> 24 </div>
25 </template> 25 </template>
26 <script> 26 <script>
...@@ -36,10 +36,17 @@ export default { ...@@ -36,10 +36,17 @@ export default {
36 data () { 36 data () {
37 return { 37 return {
38 logo: require('../../image/logo.png'), 38 logo: require('../../image/logo.png'),
39 options: { 39 noticeList: [
40 text: '关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解', 40 {
41 delay: '1000', // 动画延迟时间(默认一秒后开始滚动，单位毫秒) 41 title: '6666666666666666666'
42 }, 42 },
43 {
44 title: '3333333333333333333'
45 },
46 {
47 title: '6666666666666666666'
48 }
49 ]
43 } 50 }
44 }, 51 },
45 methods: { 52 methods: {
......
1 .home { 1 .home {
2 display: flex; 2 display: flex;
3 justify-content: space-between; 3 justify-content: space-between;
4 height: 100%;
4 5
5 .flexst { 6 .flexst {
6 display: flex; 7 display: flex;
...@@ -48,6 +49,7 @@ ...@@ -48,6 +49,7 @@
48 .home-left { 49 .home-left {
49 width: 70%; 50 width: 70%;
50 padding-right: 3px; 51 padding-right: 3px;
52 height: 100%;
51 53
52 .list-title { 54 .list-title {
53 overflow: hidden; 55 overflow: hidden;
...@@ -58,7 +60,7 @@ ...@@ -58,7 +60,7 @@
58 ul { 60 ul {
59 li { 61 li {
60 line-height: 36px; 62 line-height: 36px;
61 63
62 p { 64 p {
63 white-space: nowrap; 65 white-space: nowrap;
64 } 66 }
...@@ -66,6 +68,11 @@ ...@@ -66,6 +68,11 @@
66 } 68 }
67 } 69 }
68 70
71 .box-mountNode {
72 flex: 1;
73 height: calc(100% - 500px);
74 }
75
69 .home-right { 76 .home-right {
70 padding-left: 4px; 77 padding-left: 4px;
71 width: 30%; 78 width: 30%;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 <i class="el-icon-s-unfold pointer"></i> 20 <i class="el-icon-s-unfold pointer"></i>
21 </div> 21 </div>
22 <ul> 22 <ul>
23 <li v-for="(item, index) in notice" :key="index" class="flexst pointer"> 23 <li v-for="(item, index) in notice" :key="index" @click="handleNotice" class="flexst pointer">
24 <p class="list-title">{{ item.title }}</p> 24 <p class="list-title">{{ item.title }}</p>
25 <p class="marginZL15">{{ item.date }}</p> 25 <p class="marginZL15">{{ item.date }}</p>
26 <p>{{ item.state }}</p> 26 <p>{{ item.state }}</p>
...@@ -59,7 +59,8 @@ ...@@ -59,7 +59,8 @@
59 </el-card> 59 </el-card>
60 </el-col> 60 </el-col>
61 </el-row> 61 </el-row>
62 <el-card shadow="hover" class="marginTop10" :body-style="{ paddingRight: '6px' }"> 62 <el-card shadow="hover" class="marginTop10 box-mountNode" id="mountNodeCon"
63 :body-style="{ padding: '8px 6px 0 6px' }">
63 <div id="mountNode"></div> 64 <div id="mountNode"></div>
64 </el-card> 65 </el-card>
65 </div> 66 </div>
...@@ -208,13 +209,11 @@ export default { ...@@ -208,13 +209,11 @@ export default {
208 window.open(href, '_blank'); 209 window.open(href, '_blank');
209 }, 210 },
210 buildChart () { 211 buildChart () {
212 let height = document.getElementById("mountNodeCon").offsetHeight - 20
211 var chart = new G2.Chart({ 213 var chart = new G2.Chart({
212 container: 'mountNode', 214 container: 'mountNode',
213 height: 205 215 height: height
214 }); 216 });
215 const e = document.createEvent('Event')
216 e.initEvent('resize', true, true)
217 window.dispatchEvent(e)
218 chart.source(this.chartData); 217 chart.source(this.chartData);
219 chart.scale({ 218 chart.scale({
220 value: { 219 value: {
...@@ -238,6 +237,9 @@ export default { ...@@ -238,6 +237,9 @@ export default {
238 chart.area().position('year*value').shape('smooth'); 237 chart.area().position('year*value').shape('smooth');
239 chart.line().position('year*value').size(2).shape('smooth'); 238 chart.line().position('year*value').size(2).shape('smooth');
240 chart.render(); 239 chart.render();
240 },
241 handleNotice () {
242 this.$alertMes('9999999999')
241 } 243 }
242 } 244 }
243 } 245 }
......
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
10 this.isSearch = true 10 this.isSearch = true
11 }, 11 },
12 getSearch (val) { 12 getSearch (val) {
13 let obj = { ywlymc: '业务来源', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' } 13 let obj = { ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' }
14 this.searchList = Object.entries(val).map((item) => { 14 this.searchList = Object.entries(val).map((item) => {
15 const [name, value] = item 15 const [name, value] = item
16 if (value) return { name: obj[name], value } 16 if (value) return { name: obj[name], value }
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
42 </el-col> 42 </el-col>
43 </el-row> 43 </el-row>
44 <el-row class="advanced-search"> 44 <el-row class="advanced-search">
45 <span>高级搜索条件：</span> 45 <span>搜索条件：</span>
46 <ul> 46 <ul>
47 <li v-for="(item, index) in searchList" :key="index"> 47 <li v-for="(item, index) in searchList" :key="index">
48 {{ item.name }}:{{ item.value }} 48 {{ item.name }}:{{ item.value }}
......
...@@ -10,7 +10,10 @@ ...@@ -10,7 +10,10 @@
10 label-width="120px" 10 label-width="120px"
11 > 11 >
12 <div class="slxx_con"> 12 <div class="slxx_con">
13 <div class="slxx_title title-block">受理信息</div> 13 <div class="slxx_title title-block">
14 受理信息
15 <div class="triangle"></div>
16 </div>
14 <el-row :gutter="10"> 17 <el-row :gutter="10">
15 <el-col :span="8"> 18 <el-col :span="8">
16 <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号："> 19 <el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：">
...@@ -57,7 +60,69 @@ ...@@ -57,7 +60,69 @@
57 </el-form-item> 60 </el-form-item>
58 </el-col> 61 </el-col>
59 </el-row> 62 </el-row>
60 <div class="slxx_title title-block">抵押不动产情况</div> 63 <div class="slxx_title title-block">
64 抵押不动产情况
65 <div class="triangle"></div>
66 </div>
67
68 <el-row :gutter="10">
69 <el-col :span="8">
70 <el-form-item
71 :class="flag ? 'marginBot0' : ''"
72 label="权利人："
73 prop="qlxx.qlrmc"
74 >
75 <el-input disabled v-model="ruleForm.qlxxold.qlrmc"></el-input>
76 </el-form-item>
77 </el-col>
78 <el-col :span="8">
79 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
80 <el-input disabled v-model="ruleForm.qlxxold.qlrzjhm"></el-input>
81 </el-form-item>
82 </el-col>
83 <el-col :span="8">
84 <el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
85 <el-input disabled v-model="ruleForm.qlxxold.qlrzjzl"></el-input>
86 </el-form-item>
87 </el-col>
88 </el-row>
89 <el-row :gutter="10">
90 <el-col :span="8">
91 <el-form-item
92 :class="flag ? 'marginBot0' : ''"
93 label="不动产权证号："
94 prop="qlxx.bdcqzh"
95 >
96 <el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input>
97 </el-form-item>
98 </el-col>
99 <el-col :span="16">
100 <el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
101 <el-input disabled v-model="ruleForm.qlxxold.zl"></el-input>
102 </el-form-item>
103 </el-col>
104 </el-row>
105 <el-row :gutter="10">
106 <el-col :span="8">
107 <el-form-item :class="flag ? 'marginBot0' : ''" label="用途：">
108 <el-input disabled v-model="ruleForm.qlxxold.ytmc"></el-input>
109 </el-form-item>
110 </el-col>
111 <el-col :span="8">
112 <el-form-item
113 :class="flag ? 'marginBot0' : ''"
114 label="不动产单元号："
115 prop="qlxx.bdcdyh"
116 >
117 <el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input>
118 </el-form-item>
119 </el-col>
120 <el-col :span="8">
121 <el-form-item :class="flag ? 'marginBot0' : ''" label="面积：">
122 <el-input disabled v-model="ruleForm.qlxxold.mj"></el-input>
123 </el-form-item>
124 </el-col>
125 </el-row>
61 </div> 126 </div>
62 <el-row class="btn" v-if="!$route.query.viewtype"> 127 <el-row class="btn" v-if="!$route.query.viewtype">
63 <el-form-item :class="flag ? 'marginBot0' : ''"> 128 <el-form-item :class="flag ? 'marginBot0' : ''">
...@@ -92,8 +157,8 @@ export default { ...@@ -92,8 +157,8 @@ export default {
92 return { 157 return {
93 disabled: true, 158 disabled: true,
94 ruleForm: { 159 ruleForm: {
95 slywxx:{} 160 slywxx: {},
96 161 qlxxold:{},
97 }, 162 },
98 //传递参数 163 //传递参数
99 propsParam: {}, 164 propsParam: {},
......