Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
334e3273 by 蔡俊立
Options

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

2 parents ddb95828 5cdcc043
Inline Side-by-side
Showing 24 changed files with 390 additions and 185 deletions
...@@ -41,6 +41,16 @@ export function getCertificateList (data) { ...@@ -41,6 +41,16 @@ export function getCertificateList (data) {
41 data 41 data
42 }) 42 })
43 } 43 }
44
45 //获取未领取的证书信息
46 export function getUnclaimedBdcqz (data) {
47 return request({
48 url: SERVER.SERVERAPI + '/rest/ywbl/bdcqz/getUnclaimedBdcqz',
49 method: 'post',
50 params: data
51 })
52 }
53
44 // 发证 54 // 发证
45 export function issueCertificate (data) { 55 export function issueCertificate (data) {
46 return request({ 56 return request({
......
...@@ -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 !== ''">
20 <slot> 8 <slot>
21 <p>{{ message }}</p> 9 <p>{{ message }}</p>
22 </slot> 10 </slot>
23 </div> 11 </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>
......
1 <template> 1 <template>
2 <div class="my-outbox"> 2 <transition name="fade">
3 <div class="my-inbox" ref='box'> 3 <!--主要内容-->
4 <div class="my-list" :style="note" v-for="(item,index) in sendVal" :key='index' ref='list'> 4 <div class="noticebar">
5 <span class="my-uname">{{ item }}</span> 5 <div style="margin-left:5px"></div>
6 <svg-icon icon-class='notice' />
7 <div style="margin-right:5px"></div>
8 <div ref="back" class="back">
9 <div ref="text" class="text" @mouseover="mouseOver" @mouseleave="mouseLeave">
10 <p v-for="(item, index) in noticeList" :key="index">
11 {{ item.title }}
12 </p>
6 </div> 13 </div>
7 </div> 14 </div>
8 </div> 15 </div>
16 </transition>
9 </template> 17 </template>
10
11 <script> 18 <script>
12 export default { 19 export default {
13 name: 'my-marquee-left',
14 props: { 20 props: {
15 sendVal: { 21 noticeList: {
16 type: Array, 22 type: Array,
17 default: [] 23 default: []
18 } 24 }
19 }, 25 },
20 data () { 26 data () {
21 return { 27 return {
22 note: { 28 speed: 50, // 速度（单位px/s）
23 backgroundSize: "20px 20px", 29 backWidth: '', // 父级宽度
24 backgroundRepeat: "no-repeat", 30 backHeight: '', // 父级高度
25 backgroundPosition: "1% 50%" 31 wordLength: '', // 文本长度
32 state: 1,
33 firstAnimationTime: '', // 状态一动画效果
34 secondAnimationTime: '', // 状态二动画效果
35 };
26 }, 36 },
27 // 定时器标识 37 methods: {
28 nowTime: null, 38 // 获取数据
29 // 每一个内容的宽度 39 getData () {
30 disArr: [] 40 let style = document.styleSheets[0];
31 } 41 let text = this.$refs.text;
42 let back = this.$refs.back;
43 this.backWidth = back.offsetWidth;
44 this.backHeight = back.offsetHeight;
45 text.style.lineHeight = this.backHeight + 'px';
46 this.wordLength = text.offsetWidth;
47 this.ComputationTime(); // 计算时间
48 style.insertRule(
49 `@keyframes firstAnimation {0% {left:0px;}100% {left:-${this.wordLength}px;}}`
50 );
51 style.insertRule(
52 `@keyframes secondAnimation {0% {left:${this.backWidth}px;}100% {left:-${this.wordLength}px;}}`
53 );
54 setTimeout(res => {
55 this.changeState();
56 }, 1000);
32 }, 57 },
33 mounted () { 58 // 用速度计算时间（想要保持速度一样，2种状态时间不同需算出）
34 // var that = this 59 ComputationTime () {
35 var item = this.$refs.list 60 this.firstAnimationTime = this.wordLength / this.speed;
36 var len = this.sendVal.length 61 this.secondAnimationTime =
37 var arr = [] 62 (this.wordLength + this.backWidth) / this.speed;
38 // 因为设置的margin值一样，所以取第一个就行。 63 },
39 var margin = this.getMargin(item[0]) 64 // 根据状态切换动画
40 for (var i = 0; i < len; i++) { 65 changeState () {
41 arr.push(item[i].clientWidth + margin) // 把宽度和 margin 加起来就是每一个元素需要移动的距离 66 let text = this.$refs.text;
67 if (this.state == 1) {
68 text.style.animation = `firstAnimation ${this.firstAnimationTime}s linear`;
69 this.state = 2;
70 } else {
71 text.style.animation = `secondAnimation ${this.secondAnimationTime}s linear infinite`;
42 } 72 }
43 this.disArr = arr
44 this.moveLeft()
45 }, 73 },
46 beforeDestroy () { 74 Listener () {
47 // 页面关闭清除定时器 75 let text = this.$refs.text;
48 clearInterval(this.nowTime) 76 text.addEventListener(
49 // 清除定时器标识 77 'animationend',
50 this.nowTime = null 78 res => {
79 this.changeState();
51 }, 80 },
52 methods: { 81 false
53 // 获取margin属性 82 )
54 getMargin (obj) {
55 var marg = window.getComputedStyle(obj, null)['margin-right']
56 marg = marg.replace('px', '')
57 return Number(marg) // 强制转化成数字
58 }, 83 },
59 // 移动的方法 84 mouseOver () {
60 moveLeft () { 85 let text = this.$refs.text;
61 var that = this 86 text.style.animationPlayState = 'paused'
62 var outbox = this.$refs.box 87 },
63 // 初始位置 88 mouseLeave () {
64 var startDis = 0 89 let text = this.$refs.text;
65 // console.log('that.disArr: ', that.disArr) 90 text.style.animationPlayState = ''
66 this.nowTime = setInterval(function () {
67 startDis -= 0.5
68 // console.log('初始化移动：', startDis)
69 if (Math.abs(startDis) > Math.abs(that.disArr[0])) {
70 // 每次移动完一个元素的距离，就把这个元素的宽度
71 that.disArr.push(that.disArr.shift())
72 // 每次移动完一个元素的距离，就把列表数据的第一项放到最后一项
73 // console.log('that.sendVal: ', that.sendVal)
74 // console.log('that.sendVal: ', that.sendVal.shift())
75 that.sendVal.push(that.sendVal.shift())
76 startDis = 0
77 // console.log('移动')
78 } else {
79 // console.log('不来不来就不来...')
80 }
81 // 每次都让盒子移动指定的距离，在我自己做的项目中，这种字符串拼接的方法并没有生效
82 // outbox.style = 'transform: translateX3d(' + startDis + 'px)'
83 // 后面换了es6的模板字符串就可以了
84 outbox.style = `transform: translateX(${startDis}px)`
85 // outbox.style = 'transform: translateX(\' + startDis + \' px)'
86 // outbox.style.marginLeft = 'startDis'
87 // console.log('这里:', startDis)
88 }, 1000 / 60)
89 } 91 }
92 },
93 mounted () {
94 this.Listener();
95 setTimeout(res => {
96 this.getData();
97 }, 100);
90 } 98 }
91 } 99 };
92 </script> 100 </script>
93
94 <style lang="scss" scoped> 101 <style lang="scss" scoped>
95 .my-outbox { 102 .noticebar {
96 color: #fff; 103 display: flex;
97 overflow: hidden; 104 align-items: center;
98 line-height: 28px; 105 width: 100%;
106 line-height: 32px;
107 height: 32px;
99 background: rgba(0, 0, 0, 0.1); 108 background: rgba(0, 0, 0, 0.1);
109
110 .icon {
111 img {
112 height: 100%;
100 width: 100%; 113 width: 100%;
114 }
115 }
101 116
102 .my-inbox { 117 .back {
118 overflow: hidden;
103 white-space: nowrap; 119 white-space: nowrap;
120 margin: 0 auto;
121 height: 100%;
122 width: 100%;
123 cursor: pointer;
124 position: relative;
125 font-size: 14px;
126 color: #fff;
104 127
105 .my-list { 128 .text {
106 margin-right: 15px; 129 position: absolute;
107 display: inline-block; 130 display: inline-block;
108 font-size: 14px; 131 padding: 2px 0;
109 text-indent: 30px; 132 display: flex;
110 133
111 .my-uname { 134 p {
112 color: red; 135 margin-right: 10px;
113 } 136 }
114 } 137 }
115 } 138 }
......
...@@ -16,4 +16,5 @@ Popup.install = function (title, editItem, data, formData) { ...@@ -16,4 +16,5 @@ Popup.install = function (title, editItem, data, formData) {
16 instance.isShow = true 16 instance.isShow = true
17 }) 17 })
18 } 18 }
19
19 export default Popup 20 export default Popup
......
1 <template> 1 <template>
2 <transition name="dialog-fade" mode="out-in" v-if="isShow"> 2 <transition name="dialog-fade" mode="out-in" v-if="isShow">
3 <div class="ls-mask" v-loading="loading"> 3 <div class="ls-mask" v-loading="loading">
4 <div class="ls-mask-window" :style="{ 'width': width, 'height': height }"> 4 <div class="ls-mask-window" :style="{ 'width': width }">
5 <div class="ls-head"> 5 <div class="ls-head">
6 <div class="ls-title" :style="{ 'text-align': titleStyle }"> 6 <div class="ls-title" :style="{ 'text-align': titleStyle }">
7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' /> 7 <svg-icon v-if="iconClass != ''" :icon-class='iconClass' />
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
9 </div> 9 </div>
10 <svg-icon icon-class='close' class="closeStyle" @click="onCancel" /> 10 <svg-icon icon-class='close' class="closeStyle" @click="onCancel" />
11 </div> 11 </div>
12 <div class="ls-mask-content" ref='contentRef' :style="{ 'height': contentHeight }"> 12 <div class="mask-content" ref='contentRef' :style="{ 'height': contentHeight }">
13 <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' /> 13 <component :is="editItem" ref='childRef' @loading='loadingFn' :key="key" :formData='formData' />
14 </div> 14 </div>
15 <div class="ls-mask-footer" v-if='btnShow'> 15 <div class="ls-mask-footer" v-if='btnShow'>
...@@ -58,13 +58,13 @@ export default { ...@@ -58,13 +58,13 @@ export default {
58 setTimeout(() => { 58 setTimeout(() => {
59 if (this.btnShow) { 59 if (this.btnShow) {
60 if (this.height == 'auto') { 60 if (this.height == 'auto') {
61 this.contentHeight = (this.$refs.contentRef.offsetHeight - 200) + 'px' 61 this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
62 } else { 62 } else {
63 this.contentHeight = this.height 63 this.contentHeight = this.height
64 } 64 }
65 } else { 65 } else {
66 if (this.height == 'auto') { 66 if (this.height == 'auto') {
67 this.contentHeight = this.$refs.contentRef.offsetHeight 67 this.contentHeight = (this.$refs.contentRef.offsetHeight) + 'px'
68 } else { 68 } else {
69 this.contentHeight = this.height 69 this.contentHeight = this.height
70 } 70 }
...@@ -122,7 +122,8 @@ export default { ...@@ -122,7 +122,8 @@ export default {
122 top: 50%; 122 top: 50%;
123 min-height: 200px; 123 min-height: 200px;
124 transform: translate(-50%, -50%); 124 transform: translate(-50%, -50%);
125 border-radius: 10px; 125 border-radius: 5px;
126 overflow: hidden;
126 } 127 }
127 128
128 .ls-mask-window b { 129 .ls-mask-window b {
...@@ -133,21 +134,18 @@ export default { ...@@ -133,21 +134,18 @@ export default {
133 padding: 16px; 134 padding: 16px;
134 color: #ffffff; 135 color: #ffffff;
135 background: linear-gradient(3deg, #409EFF, #a7cbee); 136 background: linear-gradient(3deg, #409EFF, #a7cbee);
136 border-top-left-radius: 5px;
137 border-top-right-radius: 5px;
138 overflow: hidden;
139 } 137 }
140 138
141 .ls-title .svg-icon { 139 .ls-title .svg-icon {
142 font-size: 18px; 140 font-size: 18px;
143 } 141 }
144 142
145 .ls-mask-content { 143 .mask-content {
146 padding: 20px; 144 padding: 20px;
147 width: 100%; 145 width: 100%;
148 min-height: 30%; 146 min-height: 30%;
149 max-height: 95%; 147 max-height: 95%;
150 overflow: scroll; 148 overflow-y: scroll;
151 } 149 }
152 150
153 .ls-mask-footer { 151 .ls-mask-footer {
......
...@@ -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 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668560086395" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2762" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M448 282.4v459.2L301.6 594.4 282.4 576H192V448h90.4l18.4-18.4L448 282.4M512 128L256 384H128v256h128l256 256V128z m64 5.6v64.8c145.6 29.6 256 159.2 256 313.6s-110.4 284-256 313.6v64.8c181.6-30.4 320-188 320-378.4S757.6 164 576 133.6z m0 188.8v65.6c55.2 14.4 96 64 96 124s-40.8 109.6-96 124v65.6C666.4 686.4 736 607.2 736 512s-69.6-174.4-160-189.6z" fill="#ffffff" p-id="2763"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -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" :sendVal="sendVal" /> 23 <NoticeBar class="NoticeBar" :noticeList="noticeList" />
24 </div> 24 </div>
25 </template> 25 </template>
26 <script> 26 <script>
...@@ -36,9 +36,16 @@ export default { ...@@ -36,9 +36,16 @@ export default {
36 data () { 36 data () {
37 return { 37 return {
38 logo: require('../../image/logo.png'), 38 logo: require('../../image/logo.png'),
39 sendVal: [ 39 noticeList: [
40 '222222222222222222222222222222222', 40 {
41 '222222233333333333333333333333' 41 title: '6666666666666666666'
42 },
43 {
44 title: '3333333333333333333'
45 },
46 {
47 title: '6666666666666666666'
48 }
42 ] 49 ]
43 } 50 }
44 }, 51 },
......
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;
...@@ -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 noticeList" :key="index" class="flexst pointer"> 23 <li v-for="(item, index) in noticeList" :key="index" @click="handleNotice" class="flexst pointer">
24 <p class="list-title">{{ item.noticeTitle }}</p> 24 <p class="list-title">{{ item.noticeTitle }}</p>
25 <p class="marginZL15">{{ item.createtime }}</p> 25 <p class="marginZL15">{{ item.createtime }}</p>
26 <p v-if="item.userBrowse == '1'" style="color:red">未读</p> 26 <p v-if="item.userBrowse == '1'" style="color:red">未读</p>
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
60 </el-card> 60 </el-card>
61 </el-col> 61 </el-col>
62 </el-row> 62 </el-row>
63 <el-card shadow="hover" class="marginTop10" :body-style="{ paddingRight: '6px' }"> 63 <el-card shadow="hover" class="marginTop10 box-mountNode" id="mountNodeCon"
64 :body-style="{ padding: '8px 6px 0 6px' }">
64 <div id="mountNode"></div> 65 <div id="mountNode"></div>
65 </el-card> 66 </el-card>
66 </div> 67 </div>
...@@ -190,18 +191,12 @@ export default { ...@@ -190,18 +191,12 @@ export default {
190 } 191 }
191 }) 192 })
192 }, 193 },
193 //点击通知调取已读接口
194 toSetRead(bsmNotice){
195 setReadStatus({'bsmNotice':bsmNotice})
196 },
197 buildChart () { 194 buildChart () {
195 let height = document.getElementById("mountNodeCon").offsetHeight - 20
198 var chart = new G2.Chart({ 196 var chart = new G2.Chart({
199 container: 'mountNode', 197 container: 'mountNode',
200 height: 205 198 height: height
201 }); 199 });
202 const e = document.createEvent('Event')
203 e.initEvent('resize', true, true)
204 window.dispatchEvent(e)
205 chart.source(this.chartData); 200 chart.source(this.chartData);
206 chart.scale({ 201 chart.scale({
207 value: { 202 value: {
...@@ -225,6 +220,10 @@ export default { ...@@ -225,6 +220,10 @@ export default {
225 chart.area().position('year*value').shape('smooth'); 220 chart.area().position('year*value').shape('smooth');
226 chart.line().position('year*value').size(2).shape('smooth'); 221 chart.line().position('year*value').size(2).shape('smooth');
227 chart.render(); 222 chart.render();
223 },
224 handleNotice () {
225 this.$alertMes('9999999999')
226 //setReadStatus({'bsmNotice':bsmNotice})
228 } 227 }
229 } 228 }
230 } 229 }
......
...@@ -138,7 +138,8 @@ export default { ...@@ -138,7 +138,8 @@ export default {
138 }, 138 },
139 methods: { 139 methods: {
140 updateDetail (value) { 140 updateDetail (value) {
141 this.tableDataList[this.dataIndex] = value 141 this.tableDataList[this.dataIndex] = value;
142 console.log(this.tableDataList);
142 this.key++ 143 this.key++
143 this.$emit('upDateQlrxxList', this.tableDataList) 144 this.$emit('upDateQlrxxList', this.tableDataList)
144 }, 145 },
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px"> 4 <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="120px">
5 <el-row> 5 <el-row>
6 <el-col :span="8"> 6 <el-col :span="8">
7 <el-form-item label="权利人类型" prop="qlrlx"> 7 <el-form-item label="权利人类型" prop="sqrlx">
8 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择"> 8 <el-select clearable v-model="ruleForm.sqrlx" class="width100" placeholder="请选择">
9 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode"> 9 <el-option v-for="item in dictData['A36']" :key="item.dcode" :label="item.dname" :value="item.dcode">
10 </el-option> 10 </el-option>
...@@ -151,7 +151,7 @@ export default { ...@@ -151,7 +151,7 @@ export default {
151 return { 151 return {
152 myValue: this.value, 152 myValue: this.value,
153 ruleForm: { 153 ruleForm: {
154 qlrlx: '', 154 sqrlx: '',
155 sqrmc: '', 155 sqrmc: '',
156 zjzl: '', 156 zjzl: '',
157 zjh: '', 157 zjh: '',
...@@ -172,7 +172,7 @@ export default { ...@@ -172,7 +172,7 @@ export default {
172 dlrzjh: '' 172 dlrzjh: ''
173 }, 173 },
174 rules: { 174 rules: {
175 qlrlx: [ 175 sqrlx: [
176 { required: true, message: '权利人类型', trigger: 'change' } 176 { required: true, message: '权利人类型', trigger: 'change' }
177 ], 177 ],
178 sqrmc: [ 178 sqrmc: [
......
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
52 }, 52 },
53 tableData: { 53 tableData: {
54 total: 0, 54 total: 0,
55 columns: datas.columns(), 55 columns: datas.columns().fzgrid,
56 data: [], 56 data: [],
57 } 57 }
58 } 58 }
......
...@@ -46,6 +46,10 @@ ...@@ -46,6 +46,10 @@
46 </el-form-item> 46 </el-form-item>
47 </el-col> 47 </el-col>
48 </el-row> 48 </el-row>
49 <el-row style="text-align:center">
50 <el-button type="primary" @click="onSubmit">确定</el-button>
51 <el-button>取消</el-button>
52 </el-row>
49 </el-form> 53 </el-form>
50 </div> 54 </div>
51 </template> 55 </template>
...@@ -53,7 +57,7 @@ ...@@ -53,7 +57,7 @@
53 <script> 57 <script>
54 import store from '@/store/index.js' 58 import store from '@/store/index.js'
55 import table from "@/utils/mixin/table"; 59 import table from "@/utils/mixin/table";
56 import { getCertificateList, issueCertificate } from "@/api/fqsq.js"; 60 import { getUnclaimedBdcqz, issueCertificate } from "@/api/bdcqz.js";
57 import { datas } from "../javascript/fzxxdata"; 61 import { datas } from "../javascript/fzxxdata";
58 export default { 62 export default {
59 mixins: [table], 63 mixins: [table],
...@@ -86,27 +90,26 @@ export default { ...@@ -86,27 +90,26 @@ export default {
86 }, 90 },
87 tableData: { 91 tableData: {
88 total: 0, 92 total: 0,
89 columns: datas.columns(), 93 columns: datas.columns().lzgrid,
90 data: [], 94 data: [],
91 }, 95 },
92 } 96 }
93 }, 97 },
98 props: ["formData"],
94 created () { 99 created () {
95 this.zslqList = store.getters.dictData['A30'] 100 this.zslqList = store.getters.dictData['A30'];
101 this.loadGrid();
96 }, 102 },
97 methods: { 103 methods: {
104 onSubmit () {
105
106 },
98 fetchData () { }, 107 fetchData () { },
99 //列表初始化 108 //列表初始化
100 tablelistFn () { 109 loadGrid () {
101 var bsmSldy = this.$parent._data.unitData[0].bsmSldy 110 getUnclaimedBdcqz({ bsmSlsq: this.formData.bsmSlsq }).then(res => {
102 getCertificateList({ "bsmSldy": bsmSldy }).then(res => {
103 if (res.code === 200) { 111 if (res.code === 200) {
104 this.tableData.data = res.result 112 this.tableData.data = res.result;
105 if (res.result) {
106 res.result.forEach((item, index) => {
107 this.ruleForm.bsmBdcqz.push(item.bsmBdcqz)
108 })
109 }
110 } 113 }
111 }) 114 })
112 }, 115 },
......
...@@ -9,19 +9,33 @@ class data extends filter { ...@@ -9,19 +9,33 @@ class data extends filter {
9 super() 9 super()
10 } 10 }
11 columns() { 11 columns() {
12 return [ 12 return {
13 //发证列表
14 fzgrid: [
13 { 15 {
14 label: '序号', 16 label: '序号',
15 type: 'index', 17 type: 'index',
16 width: '50' 18 width: '50'
17 }, 19 },
18 { 20 {
21 prop: "bdcqzlx",
22 label: "不动产权证类型",
23 render: (h, scope) => {
24 if (scope.row.bdcqzlx == "1") {
25 return (<div>不动产权证书</div>)
26 } else {
27 return (<div>不动产登记证明</div>)
28 }
29 }
30 },
31 {
19 prop: "qllxmc", 32 prop: "qllxmc",
20 label: "权利类型" 33 label: "权利类型"
21 }, 34 },
22 { 35 {
23 prop: "ysxlh", 36 prop: "ysxlh",
24 label: "印刷序列号" 37 label: "印刷序列号",
38 width: '100',
25 }, 39 },
26 { 40 {
27 prop: "bdcqzh", 41 prop: "bdcqzh",
...@@ -32,15 +46,8 @@ class data extends filter { ...@@ -32,15 +46,8 @@ class data extends filter {
32 label: "权利人" 46 label: "权利人"
33 }, 47 },
34 { 48 {
35 prop: "ywrmc", 49 prop: "ywr",
36 label: "义务人", 50 label: "义务人"
37 render: (h, scope) => {
38 if (scope.row.bdcqzh=="") {
39 return <div>{scope.row.ywrmc}</div>
40 } else{
41 return <div>{scope.row.ywrmc}</div>
42 }
43 }
44 }, 51 },
45 { 52 {
46 prop: "mj", 53 prop: "mj",
...@@ -63,8 +70,59 @@ class data extends filter { ...@@ -63,8 +70,59 @@ class data extends filter {
63 return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>添加领取材料</el-button> 70 return <el-button type="text" icon="el-icon-delete" onClick={() => { vm.del(scope.row) }}>添加领取材料</el-button>
64 } 71 }
65 } 72 }
73 ],
74 //领证证列表
75 lzgrid: [
76 {
77 label: '序号',
78 type: 'index',
79 width: '50'
80 },
81 {
82 prop: "bdcqzlx",
83 label: "不动产权证类型",
84 width: '120',
85 render: (h, scope) => {
86 if (scope.row.bdcqzlx == "1") {
87 return (<div>不动产权证书</div>)
88 } else {
89 return (<div>不动产登记证明</div>)
90 }
91 }
92 },
93 {
94 prop: "qllx",
95 label: "权利类型"
96 },
97 {
98 prop: "ysxlh",
99 label: "印刷序列号",
100 width: '100',
101 },
102 {
103 prop: "bdcqzh",
104 label: "不动产权证号"
105 },
106 {
107 prop: "qlr",
108 label: "权利人"
109 },
110 {
111 prop: "ywr",
112 label: "义务人"
113 },
114 {
115 prop: "mj",
116 label: "面积（㎡）",
117 width: '100',
118 },
119 {
120 prop: "zl",
121 label: "坐落"
122 }
66 ] 123 ]
67 } 124 }
125 }
68 126
69 127
70 } 128 }
......
...@@ -81,7 +81,7 @@ import { ...@@ -81,7 +81,7 @@ import {
81 getStepFormInfo, 81 getStepFormInfo,
82 } from "@/api/fqsq.js"; 82 } from "@/api/fqsq.js";
83 import { mapGetters } from "vuex" 83 import { mapGetters } from "vuex"
84 import { deleteFlow,unClaimTask} from "@/api/ywbl.js"; 84 import { deleteFlow, unClaimTask } from "@/api/ywbl.js";
85 import ProcessViewer from './components/processViewer.vue' 85 import ProcessViewer from './components/processViewer.vue'
86 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js"; 86 import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
87 import { getForm } from "./flowform.js"; 87 import { getForm } from "./flowform.js";
...@@ -143,7 +143,7 @@ export default { ...@@ -143,7 +143,7 @@ export default {
143 window.addEventListener('beforeunload', e => this.beforeunloadHandler(e)) 143 window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
144 window.addEventListener('unload', e => this.unloadHandler(e)) 144 window.addEventListener('unload', e => this.unloadHandler(e))
145 }, 145 },
146 destroyed() { 146 destroyed () {
147 window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e)) 147 window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
148 window.removeEventListener('unload', e => this.unloadHandler(e)) 148 window.removeEventListener('unload', e => this.unloadHandler(e))
149 }, 149 },
...@@ -151,16 +151,16 @@ export default { ...@@ -151,16 +151,16 @@ export default {
151 ...mapGetters(["oldDetail", "newDetail"]) 151 ...mapGetters(["oldDetail", "newDetail"])
152 }, 152 },
153 methods: { 153 methods: {
154 beforeunloadHandler() { 154 beforeunloadHandler () {
155 this._beforeUnload_time = new Date().getTime() 155 this._beforeUnload_time = new Date().getTime()
156 }, 156 },
157 unloadHandler(e) { 157 unloadHandler (e) {
158 thsi.$alert("234234"); 158 thsi.$alert("234234");
159 this._gap_time = new Date().getTime() - this._beforeUnload_time 159 this._gap_time = new Date().getTime() - this._beforeUnload_time
160 //判断是窗口关闭还是刷新 160 //判断是窗口关闭还是刷新
161 if (this._gap_time <= 10) { 161 if (this._gap_time <= 10) {
162 //取消认领 162 //取消认领
163 unClaimTask(this.bsmSlsq,this.bestepid) 163 unClaimTask(this.bsmSlsq, this.bestepid)
164 } 164 }
165 }, 165 },
166 changeLoadIndex () { 166 changeLoadIndex () {
...@@ -287,12 +287,10 @@ export default { ...@@ -287,12 +287,10 @@ export default {
287 } 287 }
288 break; 288 break;
289 case "B4": 289 case "B4":
290 this.$popup("登记簿详情","registerBook/djbFrame",{ 290 this.$popup("登记簿详情", "registerBook/djbFrame", {
291 formData: this.currentSelectProps, 291 formData: this.currentSelectProps,
292 width: "1220px", 292 width: "1220px",
293 height: "790px", 293 height: "790px",
294 // cancelText: '取消摆烂', // 右边按钮文本
295 // confirmText: '确定点击', //左边按钮文本
296 cancel: () => { 294 cancel: () => {
297 console.log("取消回调"); 295 console.log("取消回调");
298 }, 296 },
...@@ -302,7 +300,7 @@ export default { ...@@ -302,7 +300,7 @@ export default {
302 }); 300 });
303 break; 301 break;
304 case "B5": 302 case "B5":
305 this.$popup( "证书预览","workflow/components/zsyl",{ 303 this.$popup("证书预览", "workflow/components/zsyl", {
306 height: "600px", 304 height: "600px",
307 width: "800px", 305 width: "800px",
308 formData: { 306 formData: {
...@@ -318,16 +316,9 @@ export default { ...@@ -318,16 +316,9 @@ export default {
318 }) 316 })
319 break; 317 break;
320 case "B7": 318 case "B7":
321 this.$popup("证书领取", "workflow/components/zslq",{ 319 this.$popup("证书领取", "workflow/components/zslq", {
322 height: "700px", 320 width: '900px',
323 formData: {}, 321 formData: { bsmSlsq: this.$route.query.bsmSlsq },
324 btnShow: true,
325 cancel: () => {
326 console.log("取消回调");
327 },
328 confirm: () => {
329 console.log("确认回调");
330 },
331 }) 322 })
332 break; 323 break;
333 case "back": //退回按钮 324 case "back": //退回按钮
...@@ -381,7 +372,7 @@ export default { ...@@ -381,7 +372,7 @@ export default {
381 case "signout": 372 case "signout":
382 window.close(); 373 window.close();
383 //取消认领 374 //取消认领
384 unClaimTask(this.bsmSlsq,this.bestepid) 375 unClaimTask(this.bsmSlsq, this.bestepid)
385 break; 376 break;
386 case "B9": 377 case "B9":
387 var formdata = new FormData(); 378 var formdata = new FormData();
......
...@@ -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: {},
......
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 </el-form-item> 145 </el-form-item>
146 </el-col> 146 </el-col>
147 </el-row> 147 </el-row>
148 <InformationTable :tableData="ruleForm.qlrList" :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 148 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList='upDateQlrxxList' :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
149 <div class="slxx_title title-block"> 149 <div class="slxx_title title-block">
150 登记原因 150 登记原因
151 <div class="triangle"></div> 151 <div class="triangle"></div>
......
...@@ -205,7 +205,14 @@ ...@@ -205,7 +205,14 @@
205 padding: 3px; 205 padding: 3px;
206 padding-left: 30px; 206 padding-left: 30px;
207 display: flex; 207 display: flex;
208 align-items: center; 208 // align-items: center;
209 flex-direction: column;
210 }
211
212 dt {
213 flex: 1;
214 width: 100%;
215 @include flex-center;
209 } 216 }
210 217
211 p:nth-child(2) { 218 p:nth-child(2) {
......
...@@ -33,12 +33,13 @@ ...@@ -33,12 +33,13 @@
33 <div class="right-situation el-card box-card is-always-shadow"> 33 <div class="right-situation el-card box-card is-always-shadow">
34 <div class="right-title">{{ obj[n] }}</div> 34 <div class="right-title">{{ obj[n] }}</div>
35 <ul> 35 <ul>
36 <li v-for="(item, index) in itemList" :key="index" @click="handleSelectYw(item, ywList)" 36 <li v-for="(item, index) in itemList" :key="index" @click="handleSelectYw(item, itemList)"
37 :class="item.cselect ? 'cactive' : ''"> 37 :class="item.cselect ? 'cactive' : ''">
38 <p> 38 <p v-if="n == 0">
39 {{ item.djywmc }}<br> 39 {{ item.djywmc }}<br>
40 {{ item.nodename }} 40 {{ item.nodename }}
41 </p> 41 </p>
42 <dt v-else>{{ item.nodename }}</dt>
42 43
43 <p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)"> 44 <p :class="item.userCollect == 1 ? 'active' : ''" @click.stop="handleCollection(item)">
44 <i class="el-icon-star-off" :class="item.userCollect == 1 ? 'active' : ''"></i> 45 <i class="el-icon-star-off" :class="item.userCollect == 1 ? 'active' : ''"></i>
...@@ -145,6 +146,7 @@ export default { ...@@ -145,6 +146,7 @@ export default {
145 this.$set(obj, 'check', true) 146 this.$set(obj, 'check', true)
146 this.getNextNode(obj.bsmSqyw) 147 this.getNextNode(obj.bsmSqyw)
147 this.djqxList = [] 148 this.djqxList = []
149 this.djlxList = []
148 this.itemList = [] 150 this.itemList = []
149 }, 151 },
150 // 获取下个节点类型 152 // 获取下个节点类型
...@@ -228,7 +230,7 @@ export default { ...@@ -228,7 +230,7 @@ export default {
228 }, 230 },
229 loadView (view) { 231 loadView (view) {
230 return r => require.ensure([], () => r(require(`./components/${view}/${view}.vue`))) 232 return r => require.ensure([], () => r(require(`./components/${view}/${view}.vue`)))
231 }, 233 }
232 } 234 }
233 } 235 }
234 </script> 236 </script>
......