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 166 additions and 50 deletions
......@@ -68,7 +68,7 @@ export default {
}
/deep/.el-calendar__body {
padding: 12px !important;
padding: 8px;
}
/deep/.el-calendar-table .el-calendar-day {
......@@ -82,6 +82,18 @@ export default {
text-align: center;
}
/deep/.el-calendar-table thead th {
padding: 0 0 6px 0 !important;
}
/deep/.el-calendar-day {
padding: 3px !important;
}
/deep/.el-calendar__header {
padding: 8px 15px;
}
/**日期div的样式*/
.el-calendar-table tr td:first-child {
border-left: 0px;
......@@ -108,14 +120,16 @@ export default {
/**日期div的样式-公历*/
.el-calendar-table .el-calendar-day>div .solar {
text-align: center
text-align: center;
margin-top: 3px;
}
/**日期div的样式-农历*/
.el-calendar-table .el-calendar-day>div .lunar {
padding-top: 5px;
font-size: 12px;
text-align: center
text-align: center;
margin-bottom: 5px;
}
/**日期div的样式-选中*/
......
<template>
<transition name="msgbox-fade">
<div class="el-message-box__wrapper" tabindex="-1" v-show="visible" @click.self="handleWrapperClick" role="dialog"
<div class="el-message-box__wrapper" tabindex="-1"
v-show="visible" @click.self="handleWrapperClick" role="dialog"
aria-modal="true" :aria-label="title || 'dialog'">
<div class="el-message-box" :class="[customClass, center && 'el-message-box--center']">
<div class="el-message-box__header" v-if="title !== null">
<div class="el-message-box__title">
<div :class="['el-message-box__status', icon]" v-if="icon && center">
</div>
<span>{{ title }}</span>
</div>
<button type="button" class="el-message-box__headerbtn" aria-label="Close" v-if="showClose"
@click="handleAction(distinguishCancelAndClose ? 'close' : 'cancel')"
@keydown.enter="handleAction(distinguishCancelAndClose ? 'close' : 'cancel')">
<i class="el-message-box__close el-icon-close"></i>
</button>
</div>
<div class="el-message-box__content">
<div class="el-message-box__message" v-if="message !== ''">
<slot>
<p>{{ message }}</p>
</slot>
</div>
<div class="el-message-box__btns">
<el-button :loading="cancelButtonLoading" :class="[cancelButtonClasses]" :round="roundButton" size="small"
@click.native="handleAction('cancel')" @keydown.enter="handleAction('cancel')">
{{ cancelButtonText || t('el.messagebox.cancel') }}
</el-button>
</div>
</div>
</div>
......@@ -44,7 +37,6 @@ let typeMap = {
export default {
mixins: [Popup, Locale],
props: {
modal: {
default: true
......@@ -271,3 +263,15 @@ export default {
}
};
</script>
<style scoped lang="scss">
.el-message-box__wrapper {
background: none;
}
.el-message-box {
border: none;
}
.el-message-box__content {
min-height: 150px;
padding-top: 30px;
}
</style>
......
......@@ -6,10 +6,11 @@
<svg-icon icon-class='notice' />
<div style="margin-right:5px"></div>
<div ref="back" class="back">
<span ref="text" @mouseover="mouseOver" @mouseleave="mouseLeave" :style="{ fontSize: '14px', color: '#fff' }"
class="text">{{ data.text ? data.text :
'通知内容'
}}</span>
<div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave">
<p v-for="(item, index) in noticeList" :key="index">
{{ item.title }}
</p>
</div>
</div>
</div>
</transition>
......@@ -17,13 +18,9 @@
<script>
export default {
props: {
options: {
type: Object,
default () {
return {
text: '默认'
}
}
noticeList: {
type: Array,
default: []
}
},
data () {
......@@ -35,7 +32,6 @@ export default {
state: 1,
firstAnimationTime: '', // 状态一动画效果
secondAnimationTime: '', // 状态二动画效果
data: this.options
};
},
methods: {
......@@ -57,7 +53,7 @@ export default {
);
setTimeout(res => {
this.changeState();
}, this.data.delay);
}, 1000);
},
// 用速度计算时间（想要保持速度一样，2种状态时间不同需算出）
ComputationTime () {
......@@ -126,11 +122,18 @@ export default {
width: 100%;
cursor: pointer;
position: relative;
font-size: 14px;
color: #fff;
.text {
position: absolute;
display: inline-block;
padding: 2px 0;
display: flex;
p {
margin-right: 10px;
}
}
}
}
......
......@@ -68,7 +68,7 @@ export default {
}
/deep/.el-calendar__body {
padding: 12px !important;
padding: 8px;
}
/deep/.el-calendar-table .el-calendar-day {
......@@ -82,6 +82,18 @@ export default {
text-align: center;
}
/deep/.el-calendar-table thead th {
padding: 0 0 6px 0 !important;
}
/deep/.el-calendar-day {
padding: 3px !important;
}
/deep/.el-calendar__header {
padding: 8px 15px;
}
/**日期div的样式*/
.el-calendar-table tr td:first-child {
border-left: 0px;
......@@ -108,14 +120,16 @@ export default {
/**日期div的样式-公历*/
.el-calendar-table .el-calendar-day>div .solar {
text-align: center
text-align: center;
margin-top: 3px;
}
/**日期div的样式-农历*/
.el-calendar-table .el-calendar-day>div .lunar {
padding-top: 5px;
font-size: 12px;
text-align: center
text-align: center;
margin-bottom: 5px;
}
/**日期div的样式-选中*/
......
......@@ -20,7 +20,7 @@
</el-dropdown>
</div>
</div>
<NoticeBar class="NoticeBar" :options="options" />
<NoticeBar class="NoticeBar" :noticeList="noticeList" />
</div>
</template>
<script>
......@@ -36,10 +36,17 @@ export default {
data () {
return {
logo: require('../../image/logo.png'),
options: {
text: '关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解关于新年假期的调整希望大家可以理解',
delay: '1000', // 动画延迟时间(默认一秒后开始滚动，单位毫秒)
noticeList: [
{
title: '6666666666666666666'
},
{
title: '3333333333333333333'
},
{
title: '6666666666666666666'
}
]
}
},
methods: {
......
.home {
display: flex;
justify-content: space-between;
height: 100%;
.flexst {
display: flex;
......@@ -48,6 +49,7 @@
.home-left {
width: 70%;
padding-right: 3px;
height: 100%;
.list-title {
overflow: hidden;
......@@ -66,6 +68,11 @@
}
}
.box-mountNode {
flex: 1;
height: calc(100% - 500px);
}
.home-right {
padding-left: 4px;
width: 30%;
......
......@@ -20,7 +20,7 @@
<i class="el-icon-s-unfold pointer"></i>
</div>
<ul>
<li v-for="(item, index) in notice" :key="index" class="flexst pointer">
<li v-for="(item, index) in notice" :key="index" @click="handleNotice" class="flexst pointer">
<p class="list-title">{{ item.title }}</p>
<p class="marginZL15">{{ item.date }}</p>
<p>{{ item.state }}</p>
......@@ -59,7 +59,8 @@
</el-card>
</el-col>
</el-row>
<el-card shadow="hover" class="marginTop10" :body-style="{ paddingRight: '6px' }">
<el-card shadow="hover" class="marginTop10 box-mountNode" id="mountNodeCon"
:body-style="{ padding: '8px 6px 0 6px' }">
<div id="mountNode"></div>
</el-card>
</div>
......@@ -208,13 +209,11 @@ export default {
window.open(href, '_blank');
},
buildChart () {
let height = document.getElementById("mountNodeCon").offsetHeight - 20
var chart = new G2.Chart({
container: 'mountNode',
height: 205
height: height
});
const e = document.createEvent('Event')
e.initEvent('resize', true, true)
window.dispatchEvent(e)
chart.source(this.chartData);
chart.scale({
value: {
......@@ -238,6 +237,9 @@ export default {
chart.area().position('year*value').shape('smooth');
chart.line().position('year*value').size(2).shape('smooth');
chart.render();
},
handleNotice () {
this.$alertMes('9999999999')
}
}
}
......
......@@ -10,7 +10,7 @@ export default {
this.isSearch = true
},
getSearch (val) {
let obj = { ywlymc: '业务来源', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' }
let obj = { ywlymc: '业务来源', qllxmc: '权利类型', djlxmc: '登记类型', ywh: '业务号', sqywmc: '申请业务名称', qlrmc: '权利人', ywrmc: '义务人', slsj: '受理时间' }
this.searchList = Object.entries(val).map((item) => {
const [name, value] = item
if (value) return { name: obj[name], value }
......
......@@ -42,7 +42,7 @@
</el-col>
</el-row>
<el-row class="advanced-search">
<span>高级搜索条件：</span>
<span>搜索条件：</span>
<ul>
<li v-for="(item, index) in searchList" :key="index">
{{ item.name }}:{{ item.value }}
......
......@@ -10,7 +10,10 @@
label-width="120px"
>
<div class="slxx_con">
<div class="slxx_title title-block">受理信息</div>
<div class="slxx_title title-block">
受理信息
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="业务号：">
......@@ -57,7 +60,69 @@
</el-form-item>
</el-col>
</el-row>
<div class="slxx_title title-block">抵押不动产情况</div>
<div class="slxx_title title-block">
抵押不动产情况
<div class="triangle"></div>
</div>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item
:class="flag ? 'marginBot0' : ''"
label="权利人："
prop="qlxx.qlrmc"
>
<el-input disabled v-model="ruleForm.qlxxold.qlrmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件号：">
<el-input disabled v-model="ruleForm.qlxxold.qlrzjhm"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="证件种类：">
<el-input disabled v-model="ruleForm.qlxxold.qlrzjzl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item
:class="flag ? 'marginBot0' : ''"
label="不动产权证号："
prop="qlxx.bdcqzh"
>
<el-input disabled v-model="ruleForm.slywxx.ybdcqzsh"></el-input>
</el-form-item>
</el-col>
<el-col :span="16">
<el-form-item :class="flag ? 'marginBot0' : ''" label="坐落：">
<el-input disabled v-model="ruleForm.qlxxold.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="用途：">
<el-input disabled v-model="ruleForm.qlxxold.ytmc"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item
:class="flag ? 'marginBot0' : ''"
label="不动产单元号："
prop="qlxx.bdcdyh"
>
<el-input disabled v-model="ruleForm.qlxxold.bdcdyh"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :class="flag ? 'marginBot0' : ''" label="面积：">
<el-input disabled v-model="ruleForm.qlxxold.mj"></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
<el-row class="btn" v-if="!$route.query.viewtype">
<el-form-item :class="flag ? 'marginBot0' : ''">
......@@ -92,8 +157,8 @@ export default {
return {
disabled: true,
ruleForm: {
slywxx:{}
slywxx: {},
qlxxold:{},
},
//传递参数
propsParam: {},
......