Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
538a2ed0 by 蔡俊立
Options

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

2 parents b4bf564e 0f988045
Expand all
Inline Side-by-side
Showing 25 changed files with 463 additions and 149 deletions
...@@ -8,10 +8,15 @@ ...@@ -8,10 +8,15 @@
8 "build": "vue-cli-service build" 8 "build": "vue-cli-service build"
9 }, 9 },
10 "dependencies": { 10 "dependencies": {
11 "@antv/g2": "^4.2.8",
11 "@babel/polyfill": "^7.12.1", 12 "@babel/polyfill": "^7.12.1",
12 "axios": "^0.21.1", 13 "axios": "^0.21.1",
13 "babel-polyfill": "^6.26.0", 14 "babel-polyfill": "^6.26.0",
15 "bpmn-js": "^7.4.0",
16 "bpmn-js-properties-panel": "^0.37.2",
17 "bpmn-js-token-simulation": "^0.10.0",
14 "core-js": "^3.6.5", 18 "core-js": "^3.6.5",
19 "diagram-js": "^6.8.2",
15 "js-cookie": "2.2.0", 20 "js-cookie": "2.2.0",
16 "lodash": "^4.17.21", 21 "lodash": "^4.17.21",
17 "node-sass": "^4.14.1", 22 "node-sass": "^4.14.1",
...@@ -19,11 +24,7 @@ ...@@ -19,11 +24,7 @@
19 "nprogress": "0.2.0", 24 "nprogress": "0.2.0",
20 "vue": "2.6.10", 25 "vue": "2.6.10",
21 "vue-router": "3.0.2", 26 "vue-router": "3.0.2",
22 "vuex": "3.1.0", 27 "vuex": "3.1.0"
23 "bpmn-js": "^7.4.0",
24 "diagram-js": "^6.8.2",
25 "bpmn-js-properties-panel": "^0.37.2",
26 "bpmn-js-token-simulation": "^0.10.0"
27 }, 28 },
28 "devDependencies": { 29 "devDependencies": {
29 "@vue/cli-plugin-babel": "4.4.4", 30 "@vue/cli-plugin-babel": "4.4.4",
......
1 export default { 1 export default {
2 SERVERAPI: '/service-bdcdj', 2 SERVERAPI: '/service-bdcdj9',
3 // SERVERCAI: '/service-bdcdj-Tian' 3 // SERVERCAI: '/service-bdcdj-Tian'
4 } 4 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -33,7 +33,7 @@ export function Init (data) { ...@@ -33,7 +33,7 @@ export function Init (data) {
33 data 33 data
34 }) 34 })
35 } 35 }
36 // 初始化内容 36 // 受理信息保存
37 export function saveData (data) { 37 export function saveData (data) {
38 return request({ 38 return request({
39 url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/saveData', 39 url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/saveData',
...@@ -42,52 +42,6 @@ export function saveData (data) { ...@@ -42,52 +42,6 @@ export function saveData (data) {
42 }) 42 })
43 } 43 }
44 44
45 // // 初始化内容
46 // export function Init (data) {
47 // return request({
48 // url: SERVER.SERVERAPI +'/rest/ywbl/tdsyqlr/Init',
49 // method: 'post',
50 // data
51 // })
52 // }
53
54 // 首次登记保存
55 export function fristReg (data) {
56 return request({
57 url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/fristReg',
58 method: 'post',
59 data
60 })
61 }
62
63 // 转移登记保存
64 export function transferReg (data) {
65 return request({
66 url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/transferReg',
67 method: 'post',
68 data
69 })
70 }
71
72
73 // 变更登记保存
74 export function changeReg (data) {
75 return request({
76 url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/changeReg',
77 method: 'post',
78 data
79 })
80 }
81
82
83 // 注销登记保存
84 export function logoutReg (data) {
85 return request({
86 url: SERVER.SERVERAPI + '/rest/ywbl/jsydsyqlr/logoutReg',
87 method: 'post',
88 data
89 })
90 }
91 // 流程图 45 // 流程图
92 export function getWorkFlowImage (bsmSlsq, bestepid) { 46 export function getWorkFlowImage (bsmSlsq, bestepid) {
93 return request({ 47 return request({
...@@ -102,7 +56,7 @@ export function getWorkFlowImage (bsmSlsq, bestepid) { ...@@ -102,7 +56,7 @@ export function getWorkFlowImage (bsmSlsq, bestepid) {
102 // 上传单个文件 56 // 上传单个文件
103 export function sjClmxUpload (data) { 57 export function sjClmxUpload (data) {
104 return request({ 58 return request({
105 url: 'zhcx/sjClmx/upload', 59 url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/upload',
106 method: 'post', 60 method: 'post',
107 data 61 data
108 }) 62 })
...@@ -110,7 +64,7 @@ export function sjClmxUpload (data) { ...@@ -110,7 +64,7 @@ export function sjClmxUpload (data) {
110 // 删除上传文件 64 // 删除上传文件
111 export function sjClmxDelete (bsmClmx) { 65 export function sjClmxDelete (bsmClmx) {
112 return request({ 66 return request({
113 url: 'zhcx/sjClmx/delete?bsmClmx=' + bsmClmx, 67 url: SERVER.SERVERAPI + '/rest/zhcx/sjClmx/delete?bsmClmx=' + bsmClmx,
114 method: 'delete' 68 method: 'delete'
115 }) 69 })
116 } 70 }
...\ No newline at end of file ...\ No newline at end of file
......
1 import dialogBox from '@/components/DialogBox/dialogBox.vue' 1 import dialogBox from '@/components/DialogBox/dialogBox.vue'
2 import lbTable from '@/components/lb-table/lb-table.vue' 2 import lbTable from '@/components/lbTable/lb-table.vue'
3 import Theme from '@/components/Theme/theme.vue' 3 import Theme from '@/components/Theme/theme.vue'
4 import Popup from '@/components/Popup/index'
4 export default { 5 export default {
5 install: (Vue) => { 6 install: (Vue) => {
6 Vue.component('dialogBox', dialogBox); 7 Vue.component('dialogBox', dialogBox);
7 Vue.component('lbTable', lbTable); 8 Vue.component('lbTable', lbTable);
8 Vue.component('Theme', Theme); 9 Vue.component('Theme', Theme);
10 Vue.prototype.$popup = Popup.install
9 } 11 }
10 } 12 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -7,36 +7,36 @@ ...@@ -7,36 +7,36 @@
7 </template> 7 </template>
8 8
9 <script> 9 <script>
10 import vuePhotoZoomPro from '@/components/photo-zoom/vue-photo-zoom-pro' 10 import vuePhotoZoomPro from '@/components/PhotoZoom/vue-photo-zoom-pro'
11 export default { 11 export default {
12 name: 'PicZoom', 12 name: 'PicZoom',
13 components: { vuePhotoZoomPro }, 13 components: { vuePhotoZoomPro },
14 data() { 14 data () {
15 return { 15 return {
16 type: "square", 16 type: "square",
17 showType: false, 17 showType: false,
18 } 18 }
19 },
20 props: {
21 url: {
22 type: String,
23 required: true,
24 // default: require('@/assets/vehicle_img/blank_vehicle.jpg')
19 }, 25 },
20 props: { 26 bigWidth: {
21 url: { 27 type: Number,
22 type: String, 28 required: true,
23 required: true, 29 default: 168
24 // default: require('@/assets/vehicle_img/blank_vehicle.jpg')
25 },
26 bigWidth: {
27 type: Number,
28 required: true,
29 default: 168
30 },
31 scale: {
32 type: Number,
33 required: true,
34 default: 2
35 },
36 overlayStyle: {
37 type: String,
38 default: 'width:100%;height:100%'
39 }
40 }, 30 },
41 } 31 scale: {
32 type: Number,
33 required: true,
34 default: 2
35 },
36 overlayStyle: {
37 type: String,
38 default: 'width:100%;height:100%'
39 }
40 },
41 }
42 </script> 42 </script>
...\ No newline at end of file ...\ No newline at end of file
......
1
2 <template>
3 <el-calendar v-model="date">
4 <template slot="dateCell" slot-scope="{date, data}">
5 <div :class="{ selected: isSelected(date, data) }">
6 <div class="solar">{{ data.day.split('-')[2] }}</div>
7 <div class="lunar" :class="{ festival: isFestival(date, data) }">{{ solarToLunar(date, data) }}</div>
8 </div>
9 </template>
10 </el-calendar>
11 </template>
12
13 <script>
14 import calendar from './calendar'
15 export default {
16 name: 'calendar',
17 data () {
18 return {
19 date: new Date(),
20 // 根据selectedDates设置选中日期
21 selectedDates: []
22 }
23 },
24 methods: {
25 // 是否选中日期
26 isSelected: function (slotDate, slotData) {
27 return this.selectedDates.includes(slotData.day)
28 },
29 // 是否节假日
30 isFestival (slotDate, slotData) {
31 let solarDayArr = slotData.day.split('-');
32 let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
33
34 // 公历节日\农历节日\农历节气
35 let festAndTerm = [];
36 festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
37 festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
38 festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
39 festAndTerm = festAndTerm.join('')
40
41 return festAndTerm != ''
42 },
43 // 公历转农历
44 solarToLunar (slotDate, slotData) {
45 let solarDayArr = slotData.day.split('-');
46 let lunarDay = calendar.solar2lunar(solarDayArr[0], solarDayArr[1], solarDayArr[2])
47
48 // 农历日期
49 let lunarMD = lunarDay.IMonthCn + lunarDay.IDayCn
50
51 // 公历节日\农历节日\农历节气
52 let festAndTerm = [];
53 festAndTerm.push(lunarDay.festival == null ? '' : ' ' + lunarDay.festival)
54 festAndTerm.push(lunarDay.lunarFestival == null ? '' : '' + lunarDay.lunarFestival)
55 festAndTerm.push(lunarDay.Term == null ? '' : '' + lunarDay.Term)
56 festAndTerm = festAndTerm.join('')
57
58 return festAndTerm == '' ? lunarMD : festAndTerm
59 }
60 }
61 }
62 </script>
63
64 <style scoped>
65 /**隐藏上一月、本月、下一月*/
66 .el-calendar__button-group {
67 display: none;
68 }
69
70 /deep/.el-calendar__body {
71 padding: 12px !important;
72 }
73
74 /deep/.el-calendar-table .el-calendar-day {
75 height: auto;
76 padding: 5px;
77 }
78
79 /**月份居中*/
80 .el-calendar__title {
81 width: 100%;
82 text-align: center;
83 }
84
85 /**日期div的样式*/
86 .el-calendar-table tr td:first-child {
87 border-left: 0px;
88 }
89
90 .el-calendar-table td {
91 min-height: 110px;
92 min-width: 110px;
93 border-right: 0px;
94 }
95
96 .el-calendar-table td.is-selected {
97 background-color: white;
98 }
99
100 .el-calendar-table .el-calendar-day {
101 padding: 0px;
102 text-align: center;
103 }
104
105 .el-calendar-table .el-calendar-day>div {
106 text-align: center
107 }
108
109 /**日期div的样式-公历*/
110 .el-calendar-table .el-calendar-day>div .solar {
111 text-align: center
112 }
113
114 /**日期div的样式-农历*/
115 .el-calendar-table .el-calendar-day>div .lunar {
116 padding-top: 5px;
117 font-size: 12px;
118 text-align: center
119 }
120
121 /**日期div的样式-选中*/
122 .el-calendar-table .el-calendar-day>div.selected {
123 background-color: #fef2f2;
124 border: 3px solid #fb0;
125 border-radius: 20px;
126 text-align: center
127 }
128
129 /**本月周末设置为红色*/
130 .el-calendar-table .current:nth-last-child(-n+2) .solar {
131 color: red;
132 }
133
134 /**本月农历设置为灰色*/
135 .el-calendar-table .current .lunar {
136 color: #606266;
137 font-size: 12px;
138 }
139
140 /**本月农历节日设置为红色*/
141 .el-calendar-table .current .lunar.festival {
142 color: red;
143 }
144
145 .el-calendar-table td {
146 border-right: none !important;
147 }
148
149 /**禁用点击效果*/
150 /*.el-calendar-table td {*/
151 /*pointer-events: none;*/
152 /*}*/
153 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -4,9 +4,9 @@ import Vue from 'vue' ...@@ -4,9 +4,9 @@ import Vue from 'vue'
4 import App from './App' 4 import App from './App'
5 import 'normalize.css/normalize.css' // a modern alternative to CSS resets 5 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
6 import Element from 'element-ui' 6 import Element from 'element-ui'
7 import './styles/element-variables.scss' 7 import '@/styles/element-variables.scss'
8 import '@/styles/index.scss' 8 import '@/styles/index.scss'
9 import Base from './components/Base/base' // 全局组件引入 9 import Base from '@/components/Base/base' // 全局组件引入
10 import mixin from '@/utils/mixin/theme.js' 10 import mixin from '@/utils/mixin/theme.js'
11 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading' 11 import { startLoadingAddCount, endLoadingSubCount } from './utils/requestLoading'
12 Vue.mixin(mixin); 12 Vue.mixin(mixin);
...@@ -17,19 +17,13 @@ Vue.prototype.$rules = rules ...@@ -17,19 +17,13 @@ Vue.prototype.$rules = rules
17 // 全局加载 17 // 全局加载
18 Vue.prototype.$startLoading = startLoadingAddCount 18 Vue.prototype.$startLoading = startLoadingAddCount
19 Vue.prototype.$endLoading = endLoadingSubCount 19 Vue.prototype.$endLoading = endLoadingSubCount
20
21 import Popup from './components/tanchuang/index'
22 Vue.prototype.$popup = Popup.install
23
24 import { theme } from "@/directive/theme.js" 20 import { theme } from "@/directive/theme.js"
25 Vue.directive("theme", theme) 21 Vue.directive("theme", theme)
26
27 Vue.directive('fo', { 22 Vue.directive('fo', {
28 inserted (el, binding, vnode) { 23 inserted (el, binding, vnode) {
29 el.querySelector('input').focus() 24 el.querySelector('input').focus()
30 } 25 }
31 }) 26 })
32
33 import './image/icons' // icon 27 import './image/icons' // icon
34 import store from './store' 28 import store from './store'
35 import router from './router' 29 import router from './router'
......
...@@ -10,17 +10,6 @@ import Layout from '@/layout' ...@@ -10,17 +10,6 @@ import Layout from '@/layout'
10 10
11 export const constantRoutes = [ 11 export const constantRoutes = [
12 { 12 {
13 path: '/redirect',
14 component: Layout,
15 hidden: true,
16 children: [
17 {
18 path: '/redirect/:path(.*)',
19 component: () => import('@/views/redirect/index')
20 }
21 ]
22 },
23 {
24 path: '/404', 13 path: '/404',
25 component: Layout, 14 component: Layout,
26 hidden: true, 15 hidden: true,
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete">删除</el-button> 24 <el-button type="primary" icon="el-icon-delete-solid" @click="handleDelete">删除</el-button>
25 </div> 25 </div>
26 <ul> 26 <ul>
27 <li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active:previewImg.index === index}" 27 <li v-for="(img, index) in thumbnailImages" :key="index" :class="{ active: previewImg.index === index }"
28 @click="showCurrent(index)"> 28 @click="showCurrent(index)">
29 <img :src="img.fjurl"> 29 <img :src="img.fjurl">
30 </li> 30 </li>
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 </div> 36 </div>
37 </template> 37 </template>
38 <script> 38 <script>
39 import PhotoZoom from '@/components/photo-zoom' 39 import PhotoZoom from '@/components/PhotoZoom'
40 import { sjClmxUpload, sjClmxDelete } from '@/api/jsydsyqFlow' 40 import { sjClmxUpload, sjClmxDelete } from '@/api/jsydsyqFlow'
41 import publicPicture from '@/components/publicPicture/index.vue' 41 import publicPicture from '@/components/publicPicture/index.vue'
42 export default { 42 export default {
......
1 .home {
2 display: flex;
3 justify-content: space-between;
4
5 .flexst {
6 display: flex;
7 justify-content: space-between;
8 }
9
10 .marginZL15 {
11 margin: 0 15px;
12 }
13
14 .right15 {
15 margin-right: 15px;
16 }
17
18 .title {
19 font-size: 18px;
20 }
21
22 .marginTop10 {
23 margin-top: 7px;
24 }
25
26 .home-left {
27 width: 70%;
28 padding-right: 3px;
29
30 .list-title {
31 overflow: hidden;
32 text-overflow: ellipsis;
33 white-space: nowrap;
34 }
35
36 ul {
37 li {
38 line-height: 36px;
39
40 p {
41 white-space: nowrap;
42 }
43 }
44 }
45 }
46
47 .home-right {
48 padding-left: 4px;
49 width: 30%;
50 }
51 }
...\ No newline at end of file ...\ No newline at end of file
1 <template> 1 <template>
2 <div class="dashboard-container"> 2 <div class="home">
3 <img src="./home.png" alt=""> 3 <div class="home-left">
4 <el-row :gutter="8">
5 <el-col :span="12">
6 <el-card shadow="hover">
7 鼠标悬浮时显示
8 </el-card>
9 </el-col>
10 <el-col :span="12">
11 <el-card shadow="hover">
12 <div slot="header" class="flexst">
13 <h5 class="title">通知公告</h5>
14 <i class="el-icon-s-unfold pointer"></i>
15 </div>
16 <ul>
17 <li v-for="(item, index) in notice" :key="index" class="flexst">
18 <p class="list-title">{{ item.title }}</p>
19 <p class="marginZL15">{{ item.date }}</p>
20 <p>{{ item.state }}</p>
21 </li>
22 </ul>
23 </el-card>
24 </el-col>
25 </el-row>
26 <el-row :gutter="8" class="marginTop10">
27 <el-col :span="12">
28 <el-card shadow="hover">
29 <div slot="header" class="flexst">
30 <h5 class="title">待办事项</h5>
31 <i class="el-icon-s-unfold pointer"></i>
32 </div>
33 <ul>
34 <li v-for="(item, index) in toList" :key="index" class="flexst">
35 <p class="right15">{{ item.date }}</p>
36 <p class="list-title">{{ item.title }}</p>
37 </li>
38 </ul>
39 </el-card>
40 </el-col>
41 <el-col :span="12">
42 <el-card shadow="hover">
43 <div slot="header" class="flexst">
44 <h5 class="title">公司邮件</h5>
45 <i class="el-icon-s-unfold pointer"></i>
46 </div>
47 <ul>
48 <li v-for="(item, index) in mailList" :key="index" class="flexst">
49 <p class="right15">{{ item.date }}</p>
50 <p class="list-title">{{ item.title }}</p>
51 </li>
52 </ul>
53 </el-card>
54 </el-col>
55 </el-row>
56 <el-card shadow="hover" class="marginTop10" :body-style="{ paddingRight: '6px' }">
57 <div id="mountNode"></div>
58 </el-card>
59 </div>
60 <div class="home-right">
61 <calendar />
62 <el-card shadow="hover" class="marginTop10">
63 鼠标悬浮时显示
64 </el-card>
65 </div>
4 </div> 66 </div>
5 </template> 67 </template>
6
7 <script> 68 <script>
69 import * as G2 from '@antv/g2'
70 import calendar from '@/components/Calendar/index'
8 export default { 71 export default {
9 name: 'Dashboard', 72 name: 'home',
73 components: { calendar },
10 data () { 74 data () {
11 return { 75 return {
12 currentRole: 'adminDashboard' 76 chartData: [{
77 year: '1991',
78 value: 15468
79 }, {
80 year: '1992',
81 value: 16100
82 }, {
83 year: '1993',
84 value: 15900
85 }, {
86 year: '1994',
87 value: 17409
88 }, {
89 year: '1995',
90 value: 17000
91 }, {
92 year: '1996',
93 value: 31056
94 }, {
95 year: '1997',
96 value: 31982
97 }, {
98 year: '1998',
99 value: 32040
100 }, {
101 year: '1999',
102 value: 33233
103 }],
104 notice: [
105 {
106 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
107 date: '2022-12',
108 state: '未读'
109 },
110 {
111 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
112 date: '2022-12',
113 state: '未读'
114 },
115 {
116 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
117 date: '2022-12',
118 state: '未读'
119 },
120 {
121 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
122 date: '2022-12',
123 state: '未读'
124 },
125 ],
126 toList: [
127 {
128 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
129 date: '2022-12',
130 },
131 {
132 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
133 date: '2022-12',
134 }
135 ,
136 {
137 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
138 date: '2022-12',
139 }
140 ,
141 {
142 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
143 date: '2022-12',
144 }
145 ],
146 mailList: [
147 {
148 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
149 date: '2022-12',
150 },
151 {
152 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
153 date: '2022-12',
154 },
155 {
156 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
157 date: '2022-12',
158 }
159 ,
160 {
161 title: '坚持以人民为中心发展推进解决房地产历史遗房地产历史遗',
162 date: '2022-12',
163 }
164 ]
13 } 165 }
14 }, 166 },
15 computed: { 167 mounted () {
16 // ...mapGetters([ 168 this.buildChart();
17 // 'roles'
18 // ])
19 },
20 created () {
21 // 可实现不同角色配置不同首页
22 // if (!this.roles.includes('admin')) {
23 // this.currentRole = 'editorDashboard'
24 // }
25 }, 169 },
26 methods: { 170 methods: {
27 171 buildChart () {
172 var chart = new G2.Chart({
173 container: 'mountNode',
174 height: 205
175 });
176 const e = document.createEvent('Event')
177 e.initEvent('resize', true, true)
178 window.dispatchEvent(e)
179 chart.source(this.chartData);
180 chart.scale({
181 value: {
182 min: 10000
183 },
184 year: {
185 range: [0, 1]
186 }
187 });
188 chart.axis('value', {
189 label: {
190 formatter: function formatter (val) {
191 return (val / 10000).toFixed(1) + 'k';
192 }
193 }
194 });
195 chart.tooltip({
196 crosshairs: true
197 })
198 chart.forceFit();
199 chart.area().position('year*value').shape('smooth');
200 chart.line().position('year*value').size(2).shape('smooth');
201 chart.render();
202 }
28 } 203 }
29 } 204 }
30 </script> 205 </script>
31 <style scoped lang="scss"> 206 <style scoped lang="scss">
32 .dashboard-container { 207 @import "./index.scss";
33 height: 100%;
34
35 img {
36 width: 100%;
37 height: 100%;
38 }
39 }
40 </style> 208 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 .xxTable { 40 .xxTable {
41 //border-spacing: 1px; 41 //border-spacing: 1px;
42 width: 100%; 42 width: 100%;
43 table-layout: fixed; 43 // table-layout: fixed;
44 44
45 tr { 45 tr {
46 box-sizing: border-box; 46 box-sizing: border-box;
...@@ -73,10 +73,11 @@ ...@@ -73,10 +73,11 @@
73 z-index: 3; 73 z-index: 3;
74 } 74 }
75 75
76 tr>td:first-child { 76 tr td:first-child {
77 position: sticky; 77 position: sticky;
78 left: 0; 78 left: 0;
79 z-index: 2; 79 z-index: 2;
80 margin-left: -2px;
80 } 81 }
81 82
82 th.linshi, 83 th.linshi,
...@@ -148,7 +149,7 @@ ...@@ -148,7 +149,7 @@
148 display: flex; 149 display: flex;
149 align-items: center; 150 align-items: center;
150 justify-content: center; 151 justify-content: center;
151 min-width: 344px; 152 min-width: 280px;
152 z-index: 1; 153 z-index: 1;
153 } 154 }
154 155
......
...@@ -155,6 +155,7 @@ export default { ...@@ -155,6 +155,7 @@ export default {
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 this._gap_time = new Date().getTime() - this._beforeUnload_time 159 this._gap_time = new Date().getTime() - this._beforeUnload_time
159 //判断是窗口关闭还是刷新 160 //判断是窗口关闭还是刷新
160 if (this._gap_time <= 10) { 161 if (this._gap_time <= 10) {
...@@ -286,10 +287,7 @@ export default { ...@@ -286,10 +287,7 @@ export default {
286 } 287 }
287 break; 288 break;
288 case "B4": 289 case "B4":
289 this.$popup({ 290 this.$popup("登记簿详情","registerBook/djbFrame",{
290 titleStyle: "left",
291 title: "登记簿详情", // 弹窗标题
292 editItem: "registerBook/djbFrame", // 弹窗内容
293 formData: this.currentSelectProps, 291 formData: this.currentSelectProps,
294 width: "1220px", 292 width: "1220px",
295 height: "790px", 293 height: "790px",
...@@ -304,16 +302,13 @@ export default { ...@@ -304,16 +302,13 @@ export default {
304 }); 302 });
305 break; 303 break;
306 case "B5": 304 case "B5":
307 this.$popup({ 305 this.$popup( "证书预览","workflow/components/zsyl",{
308 title: "证书预览",
309 editItem: "workflow/components/zsyl",
310 height: "600px", 306 height: "600px",
311 width: "800px", 307 width: "800px",
312 formData: { 308 formData: {
313 bsmSlsq: this.bsmSlsq, 309 bsmSlsq: this.bsmSlsq,
314 entryType: '1' 310 entryType: '1'
315 }, 311 },
316 btnShow: false,
317 cancel: () => { 312 cancel: () => {
318 console.log("取消回调"); 313 console.log("取消回调");
319 }, 314 },
......
...@@ -147,6 +147,14 @@ ...@@ -147,6 +147,14 @@
147 </el-row> 147 </el-row>
148 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList" 148 <InformationTable :tableData="ruleForm.qlrList" @upDateQlrxxList="upDateQlrxxList"
149 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" /> 149 :viewtype="$route.query.viewtype" :gyfs="ruleForm.slywxx.gyfs" />
150 <div v-if="ruleForm.ywrList.length>0">
151 <div class="slxx_title title-block">
152 义务人信息
153 <div class="triangle"></div> </div>
154 <InformationTable :tableData="ruleForm.ywrList" @upDateQlrxxList="upDateYwrxxList"
155 :viewtype="$route.query.viewtype" />
156 </div>
157
150 <div class="slxx_title title-block"> 158 <div class="slxx_title title-block">
151 登记原因 159 登记原因
152 <div class="triangle"></div> 160 <div class="triangle"></div>
...@@ -223,13 +231,11 @@ export default { ...@@ -223,13 +231,11 @@ export default {
223 methods: { 231 methods: {
224 // 更新权利人信息 232 // 更新权利人信息
225 upDateQlrxxList (val) { 233 upDateQlrxxList (val) {
226 this.ruleForm.qlrList = _.cloneDeep(val) 234 this.ruleForm.qlrList = _.cloneDeep(val);
227 // this.$store.dispatch('slxx/setQlrxxNew', { 235 },
228 // qlrxx: this.ruleForm.qlrxx, 236 // 更新义务人信息
229 // fj: this.ruleForm.fj, 237 upDateYwrxxList (val) {
230 // gyfs: this.ruleForm.gyfs, 238 this.ruleForm.ywrList = _.cloneDeep(val);
231 // djyy: this.ruleForm.djyy
232 // })
233 }, 239 },
234 onSubmit () { 240 onSubmit () {
235 saveData(this.ruleForm).then((res) => { 241 saveData(this.ruleForm).then((res) => {
......