Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web
Showing
67 changed files
with
1078 additions
and
627 deletions
1 | import dialogBox from '@/components/DialogBox' | 1 | import dialogBox from '@/components/DialogBox' |
2 | import LbTable from '@/components/LbTable' | 2 | import LbTable from '@/components/LbTable' |
3 | import Theme from '@/components/Theme.vue' | 3 | import Theme from '@/components/Theme.vue' |
4 | import Breadcrumb from "@/components/Breadcrumb.vue"; | ||
4 | // 引入按钮 | 5 | // 引入按钮 |
5 | import btn from '@/components/Button.vue' | 6 | import btn from '@/components/Button.vue' |
6 | import Popup from '@/components/Popup/index' | 7 | import Popup from '@/components/Popup/index' |
... | @@ -8,6 +9,7 @@ import MessageBox from '@/components/MessageBox/index.js' | ... | @@ -8,6 +9,7 @@ import MessageBox from '@/components/MessageBox/index.js' |
8 | export default { | 9 | export default { |
9 | install: (Vue) => { | 10 | install: (Vue) => { |
10 | Vue.component('dialogBox', dialogBox); | 11 | Vue.component('dialogBox', dialogBox); |
12 | Vue.component('Breadcrumb', Breadcrumb); | ||
11 | Vue.component('btn', btn); | 13 | Vue.component('btn', btn); |
12 | Vue.component('lbTable', LbTable); | 14 | Vue.component('lbTable', LbTable); |
13 | Vue.component('Theme', Theme); | 15 | Vue.component('Theme', Theme); | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="breadcrumb"> | 2 | <el-breadcrumb class="breadcrumb" separator-class="el-icon-arrow-right"> |
3 | <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right"> | 3 | <span class="fl">当前页面:</span> |
4 | <transition-group name="breadcrumb"> | 4 | <transition-group name="breadcrumb"> |
5 | <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path"> | 5 | <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path"> |
6 | <span | 6 | <span @click.prevent="handleLink(item)">{{ item.meta.title }}</span> |
7 | v-if=" | 7 | </el-breadcrumb-item> |
8 | item.redirect === 'noRedirect' || index == levelList.length - 1 | 8 | </transition-group> |
9 | " | 9 | </el-breadcrumb> |
10 | class="no-redirect" | ||
11 | >{{ item.meta.title }}</span | ||
12 | > | ||
13 | <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a> | ||
14 | </el-breadcrumb-item> | ||
15 | </transition-group> | ||
16 | </el-breadcrumb> | ||
17 | </div> | ||
18 | </template> | 10 | </template> |
19 | 11 | ||
20 | <script> | 12 | <script> |
21 | import pathToRegexp from "path-to-regexp"; | 13 | import pathToRegexp from "path-to-regexp"; |
22 | 14 | ||
23 | export default { | 15 | export default { |
24 | data() { | 16 | data () { |
25 | return { | 17 | return { |
26 | levelList: null, | 18 | levelList: null, |
27 | }; | 19 | }; |
28 | }, | 20 | }, |
29 | watch: { | 21 | watch: { |
30 | $route() { | 22 | $route () { |
31 | this.getBreadcrumb(); | 23 | this.getBreadcrumb(); |
32 | }, | 24 | }, |
33 | }, | 25 | }, |
34 | created() { | 26 | created () { |
35 | this.getBreadcrumb(); | 27 | this.getBreadcrumb(); |
36 | }, | 28 | }, |
37 | methods: { | 29 | methods: { |
38 | getBreadcrumb() { | 30 | getBreadcrumb () { |
39 | // only show routes with meta.title | 31 | // only show routes with meta.title |
40 | let matched = this.$route.matched.filter( | 32 | this.levelList = this.$route.matched.filter( |
41 | (item) => item.meta && item.meta.title | 33 | (item) => item.meta && item.meta.title |
42 | ); | 34 | ) |
43 | this.levelList = matched.filter( | 35 | if (this.$route.matched[0].path == '/jsbwcx') { |
44 | (item) => item.meta && item.meta.title | 36 | this.levelList = this.levelList.slice(-1) |
45 | ); | 37 | } |
46 | }, | 38 | }, |
47 | isDashboard(route) { | 39 | isDashboard (route) { |
48 | const name = route && route.name; | 40 | const name = route && route.name; |
49 | if (!name) { | 41 | if (!name) { |
50 | return false; | 42 | return false; |
... | @@ -53,65 +45,62 @@ export default { | ... | @@ -53,65 +45,62 @@ export default { |
53 | name.trim().toLocaleLowerCase() === "Dashboard".toLocaleLowerCase() | 45 | name.trim().toLocaleLowerCase() === "Dashboard".toLocaleLowerCase() |
54 | ); | 46 | ); |
55 | }, | 47 | }, |
56 | pathCompile(path) { | 48 | pathCompile (path) { |
57 | const { params } = this.$route; | 49 | const { params } = this.$route; |
58 | var toPath = pathToRegexp.compile(path); | 50 | var toPath = pathToRegexp.compile(path); |
59 | return toPath(params); | 51 | return toPath(params); |
60 | }, | 52 | } |
61 | handleLink(item) { | 53 | } |
62 | // const { redirect, path } = item; | 54 | } |
63 | // if (redirect) { | ||
64 | // this.$router.push(redirect); | ||
65 | // return; | ||
66 | // } | ||
67 | // this.$router.push(path); | ||
68 | }, | ||
69 | }, | ||
70 | }; | ||
71 | </script> | 55 | </script> |
72 | 56 | ||
73 | <style lang="scss" scoped> | 57 | <style lang="scss" scoped> |
74 | .breadcrumb { | 58 | .breadcrumb { |
75 | margin: 15px auto 0; | ||
76 | box-sizing: border-box; | 59 | box-sizing: border-box; |
77 | text-indent: 16px; | 60 | text-indent: 10px; |
61 | background: linear-gradient(90deg, #0047B8 0%, rgba(0, 26, 95, 0.1) 100%); | ||
62 | line-height: 32px; | ||
63 | color: #FFFFFF; | ||
64 | } | ||
65 | |||
66 | /deep/.el-icon-arrow-right { | ||
67 | width: 2px; | ||
68 | position: relative; | ||
69 | left: -10px; | ||
70 | color: #FFFFFF; | ||
71 | } | ||
72 | |||
73 | /deep/.el-breadcrumb__inner { | ||
74 | color: #FFFFFF !important; | ||
78 | } | 75 | } |
76 | |||
79 | .breadcrumb1366 { | 77 | .breadcrumb1366 { |
80 | padding: 10px 0 !important; | 78 | padding: 10px 0 !important; |
81 | } | 79 | } |
82 | .isFullScreen{ | 80 | |
81 | .isFullScreen { | ||
83 | width: calc(100% - 20px); | 82 | width: calc(100% - 20px); |
84 | margin: 0 auto; | 83 | margin: 0 auto; |
85 | padding: 10px!important; | 84 | padding: 10px !important; |
86 | } | 85 | } |
86 | |||
87 | .cur-location { | 87 | .cur-location { |
88 | font-size: 16px; | 88 | font-size: 16px; |
89 | color: white; | 89 | color: white; |
90 | line-height: 40px; | 90 | line-height: 40px; |
91 | float: left; | 91 | float: left; |
92 | |||
92 | img { | 93 | img { |
93 | position: relative; | 94 | position: relative; |
94 | top: 3px; | 95 | top: 3px; |
95 | margin-right: 4px; | 96 | margin-right: 4px; |
96 | } | 97 | } |
97 | } | 98 | } |
98 | .app-breadcrumb.el-breadcrumb { | 99 | |
99 | display: inline-block; | ||
100 | font-size: 14px; | ||
101 | // line-height: 40px; | ||
102 | .no-redirect { | ||
103 | color: white; | ||
104 | cursor: text; | ||
105 | } | ||
106 | } | ||
107 | .el-breadcrumb__inner a, | 100 | .el-breadcrumb__inner a, |
108 | .el-breadcrumb__inner.is-link { | 101 | .el-breadcrumb__inner.is-link { |
109 | color: white; | 102 | color: white; |
110 | cursor: text; | 103 | cursor: text; |
111 | font-weight: normal; | 104 | font-weight: normal; |
112 | } | 105 | } |
113 | // .el-breadcrumb__inner a:hover, | ||
114 | // .el-breadcrumb__inner.is-link:hover { | ||
115 | // text-decoration: underline; | ||
116 | // } | ||
117 | </style> | 106 | </style> | ... | ... |
... | @@ -5,6 +5,7 @@ | ... | @@ -5,6 +5,7 @@ |
5 | /deep/.el-select { | 5 | /deep/.el-select { |
6 | width: 100%; | 6 | width: 100%; |
7 | } | 7 | } |
8 | |||
8 | /deep/.el-form-item__error { | 9 | /deep/.el-form-item__error { |
9 | right: 25px; | 10 | right: 25px; |
10 | top: 15px; | 11 | top: 15px; |
... | @@ -40,32 +41,43 @@ | ... | @@ -40,32 +41,43 @@ |
40 | margin-right: -1px; | 41 | margin-right: -1px; |
41 | } | 42 | } |
42 | 43 | ||
44 | .obligee-item-name, | ||
45 | .receivingInfo-item-name, | ||
46 | .auditInfo-item-name { | ||
47 | background: url("~@/image/itembg.png") no-repeat; | ||
48 | background-size: 100% 100%; | ||
49 | color: #FFFFFF; | ||
50 | } | ||
43 | 51 | ||
44 | /deep/.el-textarea__inner { | 52 | /deep/.el-textarea__inner { |
45 | margin: 5px; | 53 | margin: 5px; |
46 | width: 96%; | 54 | width: 96%; |
47 | background: #05275B; | 55 | background: none; |
48 | color: #FFFFFF; | 56 | color: #FFFFFF; |
49 | border-radius: 2px; | 57 | border-radius: 2px; |
50 | border: 1px solid #6BC1FC; | 58 | border: 1px solid #6BC1FC; |
51 | } | 59 | } |
52 | /deep/.el-input-number{ | 60 | |
61 | /deep/.el-input-number { | ||
53 | width: 100%; | 62 | width: 100%; |
54 | } | 63 | } |
55 | /deep/.el-input-number__increase{ | 64 | |
65 | /deep/.el-input-number__increase { | ||
56 | background: #05275B; | 66 | background: #05275B; |
57 | color: #FFFFFF; | 67 | color: #FFFFFF; |
58 | border:none; | 68 | border: none; |
59 | right: 12px; | 69 | right: 7px; |
60 | top: 6px; | 70 | top: 2px; |
61 | } | 71 | } |
62 | /deep/.el-input-number__decrease{ | 72 | |
73 | /deep/.el-input-number__decrease { | ||
63 | background: #05275B; | 74 | background: #05275B; |
64 | color: #FFFFFF; | 75 | color: #FFFFFF; |
65 | border:none; | 76 | border: none; |
66 | right: 12px; | 77 | right: 7px; |
67 | bottom:6px; | 78 | bottom: 10px; |
68 | } | 79 | } |
80 | |||
69 | /deep/.el-input__inner { | 81 | /deep/.el-input__inner { |
70 | margin: 5px; | 82 | margin: 5px; |
71 | width: 96%; | 83 | width: 96%; |
... | @@ -100,4 +112,4 @@ | ... | @@ -100,4 +112,4 @@ |
100 | right: 5px; | 112 | right: 5px; |
101 | } | 113 | } |
102 | } | 114 | } |
103 | } | 115 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -21,23 +21,21 @@ export default { | ... | @@ -21,23 +21,21 @@ export default { |
21 | </script> | 21 | </script> |
22 | <style scoped lang="scss"> | 22 | <style scoped lang="scss"> |
23 | .button { | 23 | .button { |
24 | width: 80px; //适配4字按钮样式 | 24 | width: 76px; |
25 | height: 32px; | 25 | height: 32px; |
26 | color: #ffffff; | 26 | color: #ffffff; |
27 | margin: 0 5px; | 27 | margin: 0 5px; |
28 | cursor: pointer; | ||
29 | border: 0 | ||
28 | } | 30 | } |
29 | 31 | ||
30 | .cx { | 32 | .cx { |
31 | background: url('../image/btn.png') no-repeat -4px -40px; | 33 | background: url('../image/btn.png') no-repeat 0 -34px; |
32 | cursor: pointer; | 34 | background-size: cover; |
33 | } | 35 | } |
34 | 36 | ||
35 | .cz { | 37 | .cz { |
36 | background: url('../image/btn.png') no-repeat -4px -4px; | 38 | background: url('../image/btn.png') no-repeat 0 0; |
37 | cursor: pointer; | 39 | background-size: cover; |
38 | } | ||
39 | |||
40 | .sb { | ||
41 | background: url('../image/btn.png') no-repeat -4px -112px; | ||
42 | } | 40 | } |
43 | </style> | 41 | </style> | ... | ... |
1 | <template> | 1 | <template> |
2 | <el-dialog | 2 | <el-dialog :title="title" :visible.sync="visible" :width="width" :append-to-body="appendToBody" :modal="modal" |
3 | :title="title" | 3 | :close-on-click-modal="false" :fullscreen="fullscreen" :destroy-on-close="destroyOnClose" |
4 | :visible.sync="visible" | 4 | :modal-append-to-body="modalAppendToBody" :class="customClass" @close="close" class="dialog"> |
5 | :width="width" | ||
6 | :append-to-body="appendToBody" | ||
7 | :modal="modal" | ||
8 | :close-on-click-modal="false" | ||
9 | :fullscreen="fullscreen" | ||
10 | :destroy-on-close="destroyOnClose" | ||
11 | :modal-append-to-body="modalAppendToBody" | ||
12 | :class="customClass" | ||
13 | @close="close" | ||
14 | class="dialog" | ||
15 | > | ||
16 | <slot name="content" /> | 5 | <slot name="content" /> |
17 | <span slot="footer" class="dialog-footer"> | 6 | <span slot="footer" class="dialog-footer"> |
18 | <slot name="footer" /> | 7 | <slot name="footer" /> |
... | @@ -66,21 +55,21 @@ export default { | ... | @@ -66,21 +55,21 @@ export default { |
66 | default: '30%' | 55 | default: '30%' |
67 | } | 56 | } |
68 | }, | 57 | }, |
69 | data() { | 58 | data () { |
70 | return {} | 59 | return {} |
71 | }, | 60 | }, |
72 | computed: { | 61 | computed: { |
73 | visible: { | 62 | visible: { |
74 | get() { | 63 | get () { |
75 | return this.show | 64 | return this.show |
76 | }, | 65 | }, |
77 | set(val) { | 66 | set (val) { |
78 | this.$emit('update:show', val) // visible 改变的时候通知父组件 | 67 | this.$emit('update:show', val) // visible 改变的时候通知父组件 |
79 | } | 68 | } |
80 | } | 69 | } |
81 | }, | 70 | }, |
82 | methods: { | 71 | methods: { |
83 | close() { | 72 | close () { |
84 | this.$emit('close') | 73 | this.$emit('close') |
85 | } | 74 | } |
86 | } | 75 | } |
... | @@ -88,21 +77,23 @@ export default { | ... | @@ -88,21 +77,23 @@ export default { |
88 | </script> | 77 | </script> |
89 | 78 | ||
90 | <style lang="scss" scoped> | 79 | <style lang="scss" scoped> |
91 | |||
92 | .dialog { | 80 | .dialog { |
93 | /deep/.el-dialog{ | 81 | /deep/.el-dialog { |
94 | overflow: hidden; | 82 | overflow: hidden; |
95 | background: url("~@/image/dialogBg.png") no-repeat !important; | 83 | background: url("~@/image/dialogBg.png") no-repeat !important; |
96 | background-size: 100% 100% !important; | 84 | background-size: 100% 100% !important; |
97 | } | 85 | } |
86 | |||
98 | .el-dialog__header { | 87 | .el-dialog__header { |
99 | padding: 0; | 88 | padding: 0; |
100 | height: 56px; | 89 | height: 56px; |
101 | line-height: 56px; | 90 | line-height: 56px; |
102 | border-bottom: none; | 91 | border-bottom: none; |
92 | |||
103 | .el-dialog__title { | 93 | .el-dialog__title { |
104 | font-weight: 400; | 94 | font-weight: 400; |
105 | } | 95 | } |
96 | |||
106 | .el-dialog__title:before { | 97 | .el-dialog__title:before { |
107 | display: inline-block; | 98 | display: inline-block; |
108 | content: ''; | 99 | content: ''; |
... | @@ -114,31 +105,38 @@ overflow: hidden; | ... | @@ -114,31 +105,38 @@ overflow: hidden; |
114 | position: relative; | 105 | position: relative; |
115 | top: 2px; | 106 | top: 2px; |
116 | } | 107 | } |
108 | |||
117 | .el-dialog__headerbtn { | 109 | .el-dialog__headerbtn { |
118 | position: absolute; | 110 | position: absolute; |
119 | // top: 2%; | 111 | // top: 2%; |
120 | right: 12px; | 112 | right: 12px; |
121 | } | 113 | } |
122 | } | 114 | } |
115 | |||
123 | .el-dialog__body { | 116 | .el-dialog__body { |
124 | margin: 0px 12px; | 117 | margin: 0px 12px; |
125 | padding: 48px 24px; | 118 | padding: 48px 24px; |
126 | background: #fff; | 119 | background: #fff; |
127 | border: 1px solid #dfe7f3; | 120 | border: 1px solid #dfe7f3; |
121 | |||
128 | .el-button { | 122 | .el-button { |
129 | padding: 8px 16px; | 123 | padding: 8px 16px; |
130 | border: none; | 124 | border: none; |
131 | } | 125 | } |
126 | |||
132 | .el-form { | 127 | .el-form { |
133 | .el-checkbox { | 128 | .el-checkbox { |
134 | line-height: 32px; | 129 | line-height: 32px; |
135 | height: 32px; | 130 | height: 32px; |
136 | } | 131 | } |
132 | |||
137 | .form-item-mb0 { | 133 | .form-item-mb0 { |
138 | margin-bottom: 0 !important; | 134 | margin-bottom: 0 !important; |
139 | } | 135 | } |
136 | |||
140 | .el-form-item { | 137 | .el-form-item { |
141 | margin-bottom: 24px; | 138 | margin-bottom: 24px; |
139 | |||
142 | .el-form-item__label { | 140 | .el-form-item__label { |
143 | height: 32px; | 141 | height: 32px; |
144 | line-height: 32px; | 142 | line-height: 32px; |
... | @@ -148,21 +146,25 @@ overflow: hidden; | ... | @@ -148,21 +146,25 @@ overflow: hidden; |
148 | .el-form-item__content { | 146 | .el-form-item__content { |
149 | // height: 32px; | 147 | // height: 32px; |
150 | line-height: 32px; | 148 | line-height: 32px; |
149 | |||
151 | // date 组件有图标 | 150 | // date 组件有图标 |
152 | .has-icon.el-date-editor { | 151 | .has-icon.el-date-editor { |
153 | .el-input__inner { | 152 | .el-input__inner { |
154 | padding-left: 32px; | 153 | padding-left: 32px; |
155 | } | 154 | } |
156 | } | 155 | } |
156 | |||
157 | .el-input__inner { | 157 | .el-input__inner { |
158 | padding: 0 8px; | 158 | padding: 0 8px; |
159 | height: 32px; | 159 | height: 32px; |
160 | line-height: 32px; | 160 | line-height: 32px; |
161 | text-align: left; | 161 | text-align: left; |
162 | } | 162 | } |
163 | |||
163 | .el-textarea__inner { | 164 | .el-textarea__inner { |
164 | padding: 8px 8px; | 165 | padding: 8px 8px; |
165 | } | 166 | } |
167 | |||
166 | .el-input .el-input__icon { | 168 | .el-input .el-input__icon { |
167 | font-size: 14px; | 169 | font-size: 14px; |
168 | color: #747e8c; | 170 | color: #747e8c; |
... | @@ -170,6 +172,7 @@ overflow: hidden; | ... | @@ -170,6 +172,7 @@ overflow: hidden; |
170 | } | 172 | } |
171 | } | 173 | } |
172 | } | 174 | } |
175 | |||
173 | .el-select, | 176 | .el-select, |
174 | .el-cascader, | 177 | .el-cascader, |
175 | .el-date-editor { | 178 | .el-date-editor { |
... | @@ -183,11 +186,13 @@ overflow: hidden; | ... | @@ -183,11 +186,13 @@ overflow: hidden; |
183 | height: 56px; | 186 | height: 56px; |
184 | line-height: 56px; | 187 | line-height: 56px; |
185 | border: none; | 188 | border: none; |
189 | |||
186 | .el-button { | 190 | .el-button { |
187 | padding: 8px 16px; | 191 | padding: 8px 16px; |
188 | border: none; | 192 | border: none; |
189 | } | 193 | } |
190 | .el-button + .el-button { | 194 | |
195 | .el-button+.el-button { | ||
191 | margin-left: 12px; | 196 | margin-left: 12px; |
192 | } | 197 | } |
193 | } | 198 | } | ... | ... |
... | @@ -25,7 +25,7 @@ export default { | ... | @@ -25,7 +25,7 @@ export default { |
25 | async submitViews () { | 25 | async submitViews () { |
26 | try { | 26 | try { |
27 | let { result: res } = await work.submitViews("A20"); | 27 | let { result: res } = await work.submitViews("A20"); |
28 | res.filter((item) => { | 28 | res.map((item) => { |
29 | return ( | 29 | return ( |
30 | this.cdata.category.push(item.areaName), | 30 | this.cdata.category.push(item.areaName), |
31 | this.cdata.barData.push(item.successCount), | 31 | this.cdata.barData.push(item.successCount), | ... | ... |
... | @@ -30,7 +30,7 @@ export default { | ... | @@ -30,7 +30,7 @@ export default { |
30 | XZQDM: "", | 30 | XZQDM: "", |
31 | }; | 31 | }; |
32 | let res = await work.getDjlxtotal(p); | 32 | let res = await work.getDjlxtotal(p); |
33 | res.result.filter((item) => { | 33 | res.result.map((item) => { |
34 | return ( | 34 | return ( |
35 | this.cdata.category.push(item.AREACODE), | 35 | this.cdata.category.push(item.AREACODE), |
36 | this.cdata.lineData.push(item.ywtotal) | 36 | this.cdata.lineData.push(item.ywtotal) | ... | ... |
... | @@ -90,6 +90,7 @@ export default { | ... | @@ -90,6 +90,7 @@ export default { |
90 | return scatterData; | 90 | return scatterData; |
91 | }; | 91 | }; |
92 | this.options = { | 92 | this.options = { |
93 | |||
93 | showLegendSymbol: true, | 94 | showLegendSymbol: true, |
94 | tooltip: { | 95 | tooltip: { |
95 | trigger: 'item', | 96 | trigger: 'item', |
... | @@ -103,7 +104,7 @@ export default { | ... | @@ -103,7 +104,7 @@ export default { |
103 | }, | 104 | }, |
104 | // 如果需要自定义 tooltip样式,需要使用formatter | 105 | // 如果需要自定义 tooltip样式,需要使用formatter |
105 | formatter: params => { | 106 | formatter: params => { |
106 | return `<div style="">${params.name}:${params.value}</div>` | 107 | return `<div style="">${params.name}:${params.value+"个"}</div>` |
107 | } | 108 | } |
108 | }, | 109 | }, |
109 | visualMap: { | 110 | visualMap: { |
... | @@ -125,6 +126,7 @@ export default { | ... | @@ -125,6 +126,7 @@ export default { |
125 | color: '#737373' | 126 | color: '#737373' |
126 | } | 127 | } |
127 | }, | 128 | }, |
129 | |||
128 | series: [ | 130 | series: [ |
129 | { | 131 | { |
130 | type: 'map', | 132 | type: 'map', | ... | ... |
... | @@ -22,9 +22,9 @@ export default { | ... | @@ -22,9 +22,9 @@ export default { |
22 | async mapViews () { | 22 | async mapViews () { |
23 | try { | 23 | try { |
24 | let { result: res } = await work.mapViews("A20"); | 24 | let { result: res } = await work.mapViews("A20"); |
25 | res.filter((item) => { | 25 | res.map((item) => { |
26 | return ( | 26 | return ( |
27 | this.cdata.push({ "name": item.areaName, "value": item.areaCode }) | 27 | this.cdata.push({ "name": item.areaName, "value": item.ywtotal }) |
28 | ) | 28 | ) |
29 | 29 | ||
30 | }); | 30 | }); | ... | ... |
1 | <template> | 1 | <template> |
2 | <Echart :options="options" id="centreLeft1Chart" height="200px" width="100%"></Echart> | 2 | <Echart :options="options" id="centreLeft1Chart" :key="key" height="225px" width="80%"></Echart> |
3 | </template> | 3 | </template> |
4 | <script> | 4 | <script> |
5 | import Echart from '@/common/echart' | 5 | import Echart from '@/common/echart' |
... | @@ -7,6 +7,11 @@ export default { | ... | @@ -7,6 +7,11 @@ export default { |
7 | components: { | 7 | components: { |
8 | Echart, | 8 | Echart, |
9 | }, | 9 | }, |
10 | data() { | ||
11 | return { | ||
12 | key:0 | ||
13 | } | ||
14 | }, | ||
10 | props: { | 15 | props: { |
11 | cdata: { | 16 | cdata: { |
12 | type: Object, | 17 | type: Object, |
... | @@ -16,11 +21,11 @@ export default { | ... | @@ -16,11 +21,11 @@ export default { |
16 | watch: { | 21 | watch: { |
17 | cdata: { | 22 | cdata: { |
18 | handler (newData) { | 23 | handler (newData) { |
24 | console.log("newData",newData); | ||
19 | this.options = { | 25 | this.options = { |
20 | grid: { | 26 | grid: { |
21 | // 让图表占满容器 | 27 | right:"1%", |
22 | top: 20, | 28 | bottom:"4%" |
23 | right: 0, | ||
24 | }, | 29 | }, |
25 | color: [ | 30 | color: [ |
26 | "#37a2da", | 31 | "#37a2da", |
... | @@ -44,12 +49,14 @@ export default { | ... | @@ -44,12 +49,14 @@ export default { |
44 | { | 49 | { |
45 | name: "业务量", | 50 | name: "业务量", |
46 | type: "pie", | 51 | type: "pie", |
47 | radius: [0, 80], | 52 | radius: [40,100], |
48 | roseType: "area", | 53 | roseType: "area", |
49 | data: newData.seriesData | 54 | data: newData.seriesData |
50 | } | 55 | } |
51 | ] | 56 | ], |
57 | |||
52 | } | 58 | } |
59 | this.key++ | ||
53 | }, | 60 | }, |
54 | immediate: true, | 61 | immediate: true, |
55 | deep: true | 62 | deep: true |
... | @@ -60,6 +67,7 @@ export default { | ... | @@ -60,6 +67,7 @@ export default { |
60 | 67 | ||
61 | <style lang="scss" scoped> | 68 | <style lang="scss" scoped> |
62 | #centreLeft1Chart { | 69 | #centreLeft1Chart { |
63 | margin-left: -20px; | 70 | margin-bottom: 10px; |
71 | margin-left: 60px; | ||
64 | } | 72 | } |
65 | </style> | 73 | </style> | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <Chart :cdata="cdata" /> | 3 | <Chart :cdata="cdata" /> |
4 | <el-carousel height="40px" indicator-position="none"> | ||
5 | <el-carousel-item v-for="item in 4" :key="item"> | ||
6 | <div class="rotograph">佛坪县</div> | ||
7 | </el-carousel-item> | ||
8 | </el-carousel> | ||
9 | </div> | 4 | </div> |
10 | </template> | 5 | </template> |
11 | 6 | ||
... | @@ -29,6 +24,7 @@ export default { | ... | @@ -29,6 +24,7 @@ export default { |
29 | 24 | ||
30 | }, | 25 | }, |
31 | methods: { | 26 | methods: { |
27 | // 获取登记业务量玫瑰图数据 | ||
32 | async getdjywltotal () { | 28 | async getdjywltotal () { |
33 | try { | 29 | try { |
34 | let p = { | 30 | let p = { |
... | @@ -38,14 +34,14 @@ export default { | ... | @@ -38,14 +34,14 @@ export default { |
38 | }; | 34 | }; |
39 | let res = await work.getdjywltotal(p); | 35 | let res = await work.getdjywltotal(p); |
40 | console.log("res",res); | 36 | console.log("res",res); |
41 | res.result.filter((item) => { | 37 | // 遍历修改数组键,作为echars图表的参数 |
38 | res.result.map((item) => { | ||
42 | return ( | 39 | return ( |
43 | this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal }) | 40 | this.cdata.seriesData.push({ "name": item.AREACODE, "value": item.ywtotal }) |
44 | ) | 41 | ) |
45 | }); | 42 | }); |
46 | console.log("this.cdata.seriesData",this.cdata.seriesData); | ||
47 | } catch (error) { | 43 | } catch (error) { |
48 | this.$refs.msg.messageShow(); | 44 | console.log(error); |
49 | } | 45 | } |
50 | 46 | ||
51 | 47 | ||
... | @@ -55,16 +51,4 @@ export default { | ... | @@ -55,16 +51,4 @@ export default { |
55 | </script> | 51 | </script> |
56 | 52 | ||
57 | <style lang="scss" scoped> | 53 | <style lang="scss" scoped> |
58 | .rotograph { | ||
59 | margin: auto; | ||
60 | width: 200px; | ||
61 | height: 30px; | ||
62 | background-color: rgb(6, 121, 167); | ||
63 | font-size: 20px; | ||
64 | line-height: 30px; | ||
65 | text-align: center; | ||
66 | border-radius: 6px; | ||
67 | font-weight: 600; | ||
68 | color: #02d9fd; | ||
69 | } | ||
70 | </style> | 54 | </style> | ... | ... |
1 | <template> | 1 | <template> |
2 | <!-- 编辑 --> | 2 | <!-- 编辑 --> |
3 | <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox editDialogBox mainCenter" | 3 | <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" |
4 | :visible.sync="dialogVisible" width="85%"> | 4 | custom-class="dialogBox editDialogBox mainCenter" :visible.sync="dialogVisible" width="85%"> |
5 | <div slot="title" class="dialog_title" ref="dialogTitle"> | 5 | <div slot="title" class="dialog_title" ref="dialogTitle"> |
6 | <b>{{ title || '标题' }}</b> | 6 | {{ title || '标题' }} |
7 | </div> | 7 | </div> |
8 | <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab"> | 8 | <div class="editDialogBox-box"> |
9 | <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane> | 9 | <el-tabs v-model="titleName" type="card" @tab-click="handleTitleTab"> |
10 | <el-tab-pane v-if="visiableXml" label="xml报文" name="xml"></el-tab-pane> | 10 | <el-tab-pane label="数据模型" name="sjmx"></el-tab-pane> |
11 | <el-tab-pane v-if="visiableXml" label="响应结果" name="xyjg"></el-tab-pane> | 11 | <el-tab-pane v-if="visiableXml" label="xml报文" name="xml"></el-tab-pane> |
12 | </el-tabs> | 12 | <el-tab-pane v-if="visiableXml" label="响应结果" name="xyjg"></el-tab-pane> |
13 | <div v-if="titleName == 'sjmx'" class="sjmx"> | 13 | </el-tabs> |
14 | <div class="dialog-from"> | 14 | <div class="dialog-from" v-if="titleName == 'sjmx'"> |
15 | <el-row> | 15 | <el-row> |
16 | <el-col :span="5"> | 16 | <el-col :span="5"> |
17 | <span>业务报文ID:</span> | 17 | <span>业务报文ID:</span> |
18 | <div>{{ dataReport.BizMsgId }}</div> | 18 | <p>{{ dataReport.BizMsgId }}</p> |
19 | </el-col> | 19 | </el-col> |
20 | <el-col :span="7"> | 20 | <el-col :span="7"> |
21 | <span>接入报文ID:</span> | 21 | <span>接入报文ID:</span> |
22 | <div>{{ dataReport.ASID }}</div> | 22 | <p>{{ dataReport.ASID }}</p> |
23 | </el-col> | 23 | </el-col> |
24 | <el-col :span="5"> | 24 | <el-col :span="5"> |
25 | <span>行政区划编码:</span> | 25 | <span>行政区划编码:</span> |
26 | <div>{{ dataReport.AreaCode }}</div> | 26 | <p>{{ dataReport.AreaCode }}</p> |
27 | </el-col> | 27 | </el-col> |
28 | <el-col :span="7"> | 28 | <el-col :span="7"> |
29 | <span>上次不动产单元号:</span> | 29 | <span>上次不动产单元号:</span> |
30 | <div>{{ dataReport.PreEstateNum }}</div> | 30 | <p>{{ dataReport.PreEstateNum }}</p> |
31 | </el-col> | 31 | </el-col> |
32 | </el-row> | 32 | </el-row> |
33 | <el-row> | 33 | <el-row> |
34 | <el-col :span="5"> | 34 | <el-col :span="5"> |
35 | <span>业务编码:</span> | 35 | <span>业务编码:</span> |
36 | <div>{{ dataReport.RecType }}</div> | 36 | <p>{{ dataReport.RecType }}</p> |
37 | </el-col> | 37 | </el-col> |
38 | <el-col :span="7"> | 38 | <el-col :span="7"> |
39 | <span>权利类型:</span> | 39 | <span>权利类型:</span> |
40 | <div>{{ dataReport.RightType }}</div> | 40 | <p>{{ dataReport.RightType }}</p> |
41 | </el-col> | 41 | </el-col> |
42 | <el-col :span="5"> | 42 | <el-col :span="5"> |
43 | <span>登记类型:</span> | 43 | <span>登记类型:</span> |
44 | <div>{{ dataReport.RegType }}</div> | 44 | <p>{{ dataReport.RegType }}</p> |
45 | </el-col> | 45 | </el-col> |
46 | <el-col :span="7"> | 46 | <el-col :span="7"> |
47 | <span>不动产权证书数量:</span> | 47 | <span>不动产权证书数量:</span> |
48 | <div>{{ dataReport.CertCount }}</div> | 48 | <p>{{ dataReport.CertCount }}</p> |
49 | </el-col> | 49 | </el-col> |
50 | </el-row> | 50 | </el-row> |
51 | <el-row> | 51 | <el-row> |
52 | <el-col :span="5"> | 52 | <el-col :span="5"> |
53 | <span>创建时间:</span> | 53 | <span>创建时间:</span> |
54 | <div>{{ dataReport.createDate }}</div> | 54 | <p>{{ dataReport.createDate }}</p> |
55 | </el-col> | 55 | </el-col> |
56 | <el-col :span="7"> | 56 | <el-col :span="7"> |
57 | <span>业务流水号:</span> | 57 | <span>业务流水号:</span> |
58 | <div>{{ dataReport.RecFlowID }}</div> | 58 | <p>{{ dataReport.RecFlowID }}</p> |
59 | </el-col> | 59 | </el-col> |
60 | <el-col :span="5"> | 60 | <el-col :span="5"> |
61 | <span>登记机构:</span> | 61 | <span>登记机构:</span> |
62 | <div>{{ dataReport.RegOrgID }}</div> | 62 | <p>{{ dataReport.RegOrgID }}</p> |
63 | </el-col> | 63 | </el-col> |
64 | <el-col :span="7"> | 64 | <el-col :span="7"> |
65 | <span>证明数量:</span> | 65 | <span>证明数量:</span> |
66 | <div>{{ dataReport.ProofCount }}</div> | 66 | <p>{{ dataReport.ProofCount }}</p> |
67 | </el-col> | 67 | </el-col> |
68 | </el-row> | 68 | </el-row> |
69 | <el-row> | 69 | <el-row> |
70 | <el-col :span="5"> | 70 | <el-col :span="5"> |
71 | <span>宗地/宗海代码:</span> | 71 | <span>宗地/宗海代码:</span> |
72 | <div>{{ dataReport.ParcelID }}</div> | 72 | <p>{{ dataReport.ParcelID }}</p> |
73 | </el-col> | 73 | </el-col> |
74 | <el-col :span="7"> | 74 | <el-col :span="7"> |
75 | <span>不动产单元号:</span> | 75 | <span>不动产单元号:</span> |
76 | <div>{{ dataReport.EstateNum }}</div> | 76 | <p>{{ dataReport.EstateNum }}</p> |
77 | </el-col> | 77 | </el-col> |
78 | <el-col :span="10"> | 78 | <el-col :span="11"> |
79 | <span>上次不动产权证号/不动产登记证明:</span> | 79 | <span>上次不动产权证号/不动产登记证明:</span> |
80 | <div>{{ dataReport.PreCertID }}</div> | 80 | <p>{{ dataReport.PreCertID }}</p> |
81 | </el-col> | 81 | </el-col> |
82 | </el-row> | 82 | </el-row> |
83 | <!-- <el-row> | ||
84 | <el-col :span="24"> | ||
85 | <span>数字签名:</span> | ||
86 | <div>{{ dataReport.digitalsign }}</div> | ||
87 | </el-col> | ||
88 | </el-row> --> | ||
89 | </div> | ||
90 | <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList"> | ||
91 | <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl"> | ||
92 | <div slot="label" class="tab-pane-item"> | ||
93 | <p class="name">{{ item.chinesetable }}</p> | ||
94 | <p class="soleurl" :data-name="item.soleurl">({{ item.datatable }})</p> | ||
95 | </div> | ||
96 | </el-tab-pane> | ||
97 | </el-tabs> | ||
98 | <div class="edit-content"> | ||
99 | <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" | ||
100 | :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" /> | ||
101 | </div> | 83 | </div> |
102 | </div> | 84 | </div> |
103 | <div v-if="titleName == 'xyjg'"> | 85 | <div class="editDialogBox-box"> |
104 | <Xyjg :form-data='dataReport'></Xyjg> | 86 | <div v-if="titleName == 'sjmx'" class="sjmx"> |
87 | <el-tabs v-model="activeName" ref="elTabs" type="card" @tab-click="changeList"> | ||
88 | <el-tab-pane :name="item.soleurl" v-for="item in headerList" :key="item.soleurl"> | ||
89 | <div slot="label" class="tab-pane-item"> | ||
90 | <p class="name">{{ item.chinesetable }}</p> | ||
91 | <p class="soleurl" :data-name="item.soleurl">({{ item.datatable }})</p> | ||
92 | </div> | ||
93 | </el-tab-pane> | ||
94 | </el-tabs> | ||
95 | <div class="edit-content"> | ||
96 | <component :is="editItem" ref="editItem" :class="{ 'editForm': $store.state.business.Edit }" | ||
97 | :bsmYwsjb="bsmYwsjb" :bsmSjsb="dataReport.bsmReport || dataReport.bsmSjsb" /> | ||
98 | </div> | ||
99 | </div> | ||
100 | <div v-if="titleName == 'xyjg'"> | ||
101 | <Xyjg :form-data='dataReport'></Xyjg> | ||
102 | </div> | ||
103 | <JsonEditor :resultInfo="resultInfo" v-if="titleName == 'xml'" /> | ||
105 | </div> | 104 | </div> |
106 | <JsonEditor :resultInfo="resultInfo" v-if="titleName == 'xml'" /> | ||
107 | </el-dialog> | 105 | </el-dialog> |
108 | </template> | 106 | </template> |
109 | 107 | ||
... | @@ -111,7 +109,7 @@ | ... | @@ -111,7 +109,7 @@ |
111 | import { mapGetters } from "vuex"; | 109 | import { mapGetters } from "vuex"; |
112 | import JsonEditor from "@/components/JsonEditor.vue"; | 110 | import JsonEditor from "@/components/JsonEditor.vue"; |
113 | import Xyjg from "./Result"; | 111 | import Xyjg from "./Result"; |
114 | import { getTabsDetail, getXml,getReportDetail } from "@/api/dataReport.js"; | 112 | import { getTabsDetail, getXml, getReportDetail } from "@/api/dataReport.js"; |
115 | import { MessageBox } from "element-ui"; | 113 | import { MessageBox } from "element-ui"; |
116 | export default { | 114 | export default { |
117 | components: { JsonEditor, Xyjg }, | 115 | components: { JsonEditor, Xyjg }, |
... | @@ -187,7 +185,7 @@ export default { | ... | @@ -187,7 +185,7 @@ export default { |
187 | } | 185 | } |
188 | }); | 186 | }); |
189 | //不动产数据查询上报详情 | 187 | //不动产数据查询上报详情 |
190 | getReportDetail({bsmReport:item.bsmSjsb || item.bsmReport}).then((res) => { | 188 | getReportDetail({ bsmReport: item.bsmSjsb || item.bsmReport }).then((res) => { |
191 | if (res.code == 200) { | 189 | if (res.code == 200) { |
192 | this.dataReport = res.result; | 190 | this.dataReport = res.result; |
193 | } | 191 | } |
... | @@ -278,15 +276,17 @@ export default { | ... | @@ -278,15 +276,17 @@ export default { |
278 | 276 | ||
279 | .editForm { | 277 | .editForm { |
280 | /deep/.el-textarea__inner { | 278 | /deep/.el-textarea__inner { |
281 | border: none !important; | 279 | border: 1px solid #224C7C !important; |
282 | margin: 0 !important; | 280 | margin: 0 0 10px 0 !important; |
283 | width: 100% !important; | 281 | width: 100% !important; |
282 | background: transparent !important; | ||
284 | } | 283 | } |
285 | 284 | ||
286 | /deep/.el-input__inner { | 285 | /deep/.el-input__inner { |
287 | border: none !important; | 286 | border: 1px solid #224C7C !important; |
288 | margin: 0 !important; | 287 | margin: 0 !important; |
289 | width: 100% !important; | 288 | width: 100% !important; |
289 | background: transparent !important; | ||
290 | } | 290 | } |
291 | } | 291 | } |
292 | 292 | ||
... | @@ -296,7 +296,6 @@ export default { | ... | @@ -296,7 +296,6 @@ export default { |
296 | } | 296 | } |
297 | 297 | ||
298 | /deep/ .el-tabs { | 298 | /deep/ .el-tabs { |
299 | margin: 0 15px 0 15px; | ||
300 | color: #CEF8FF; | 299 | color: #CEF8FF; |
301 | } | 300 | } |
302 | 301 | ||
... | @@ -321,7 +320,8 @@ export default { | ... | @@ -321,7 +320,8 @@ export default { |
321 | .obligee-item-name { | 320 | .obligee-item-name { |
322 | background: #05275B; | 321 | background: #05275B; |
323 | color: #FFFFFF; | 322 | color: #FFFFFF; |
324 | border: 1px solid #6BC1FC; | 323 | background: url("~@/image/itembg.png") no-repeat; |
324 | background-size: 100% 100%; | ||
325 | } | 325 | } |
326 | 326 | ||
327 | /deep/.el-tabs__nav-scroll { | 327 | /deep/.el-tabs__nav-scroll { |
... | @@ -341,6 +341,7 @@ export default { | ... | @@ -341,6 +341,7 @@ export default { |
341 | 341 | ||
342 | /deep/.el-tabs__header { | 342 | /deep/.el-tabs__header { |
343 | border: none; | 343 | border: none; |
344 | margin-bottom: 0; | ||
344 | } | 345 | } |
345 | 346 | ||
346 | /deep/.el-tabs__item.is-top:not(:last-child) { | 347 | /deep/.el-tabs__item.is-top:not(:last-child) { |
... | @@ -388,11 +389,14 @@ export default { | ... | @@ -388,11 +389,14 @@ export default { |
388 | height: 825px !important; | 389 | height: 825px !important; |
389 | 390 | ||
390 | .dialog-from { | 391 | .dialog-from { |
391 | padding: 15px; | 392 | padding: 13px; |
392 | background: #08346F; | ||
393 | border-radius: 2px; | 393 | border-radius: 2px; |
394 | box-sizing: border-box; | 394 | box-sizing: border-box; |
395 | margin: -3px 15px 15px 15px; | 395 | |
396 | .el-row { | ||
397 | display: flex; | ||
398 | flex-wrap: nowrap; | ||
399 | } | ||
396 | 400 | ||
397 | .el-col { | 401 | .el-col { |
398 | line-height: 18px; | 402 | line-height: 18px; |
... | @@ -400,19 +404,22 @@ export default { | ... | @@ -400,19 +404,22 @@ export default { |
400 | align-items: center; | 404 | align-items: center; |
401 | margin-bottom: 3px; | 405 | margin-bottom: 3px; |
402 | color: #B5D6DC; | 406 | color: #B5D6DC; |
407 | border-radius: 2px; | ||
408 | border: 1px solid #224C7C; | ||
409 | margin: 5px; | ||
403 | 410 | ||
404 | span { | 411 | span { |
405 | display: inline-block; | 412 | display: inline-block; |
406 | padding: 3px; | 413 | padding: 3px; |
407 | border-radius: 3px; | 414 | border-radius: 3px; |
408 | overflow: hidden; | 415 | overflow: hidden; |
409 | min-width: 140px; | 416 | width: 100px; |
410 | text-align: right; | 417 | white-space: nowrap; |
411 | margin-right: 5px; | 418 | text-align: left; |
412 | color: #02D9FD; | 419 | color: #02D9FD; |
413 | } | 420 | } |
414 | 421 | ||
415 | div { | 422 | p { |
416 | flex: 1; | 423 | flex: 1; |
417 | width: 100%; | 424 | width: 100%; |
418 | padding-left: 5px; | 425 | padding-left: 5px; |
... | @@ -420,6 +427,7 @@ export default { | ... | @@ -420,6 +427,7 @@ export default { |
420 | color: #c0c4cc; | 427 | color: #c0c4cc; |
421 | cursor: not-allowed; | 428 | cursor: not-allowed; |
422 | margin-right: 5px; | 429 | margin-right: 5px; |
430 | text-align: right; | ||
423 | } | 431 | } |
424 | } | 432 | } |
425 | } | 433 | } |
... | @@ -427,17 +435,17 @@ export default { | ... | @@ -427,17 +435,17 @@ export default { |
427 | .dialog_title { | 435 | .dialog_title { |
428 | display: flex; | 436 | display: flex; |
429 | position: relative; | 437 | position: relative; |
430 | top: -2px; | 438 | font-size: 24px; |
431 | 439 | top: -11px; | |
432 | b { | 440 | width: 38%; |
433 | flex: 1; | 441 | height: 40px; |
434 | width: 100%; | 442 | margin-left: 28px; |
435 | @flex-center(); | 443 | justify-content: center; |
436 | } | ||
437 | } | 444 | } |
438 | 445 | ||
439 | .el-dialog__header { | 446 | .el-dialog__header { |
440 | height: 50px; | 447 | display: flex; |
448 | margin-bottom: 15px; | ||
441 | } | 449 | } |
442 | 450 | ||
443 | .dialog_footer { | 451 | .dialog_footer { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div> | 2 | <div> |
3 | <i class="icon-tubiao-242 iconfont" :title="title" @click="openDialog" /> | 3 | <i class="icon-tubiao-242 iconfont" :title="title" @click="openDialog" /> |
4 | <el-dialog | 4 | <el-dialog :key="key" :title="title" :inner-dialog="true" :visible.sync="dialogVisible" width="600px" |
5 | :key="key" | 5 | :close-on-click-modal="false" append-to-body @cancel="cancel"> |
6 | :title="title" | 6 | <vue-json-editor id="minejson" v-model="resultInfo" :mode="'code'" lang="zh" @json-change="onJsonChange" |
7 | :inner-dialog="true" | 7 | @json-save="onJsonSave" @has-error="onError" /> |
8 | :visible.sync="dialogVisible" | 8 | <el-tooltip content="全屏缩放" effect="dark" placement="bottom" fullscreen class="fullScreen"> |
9 | width="600px" | ||
10 | :close-on-click-modal="false" | ||
11 | append-to-body | ||
12 | @cancel="cancel" | ||
13 | > | ||
14 | <vue-json-editor | ||
15 | id="minejson" | ||
16 | v-model="resultInfo" | ||
17 | :mode="'code'" | ||
18 | lang="zh" | ||
19 | @json-change="onJsonChange" | ||
20 | @json-save="onJsonSave" | ||
21 | @has-error="onError" | ||
22 | /> | ||
23 | <el-tooltip | ||
24 | content="全屏缩放" | ||
25 | effect="dark" | ||
26 | placement="bottom" | ||
27 | fullscreen | ||
28 | class="fullScreen" | ||
29 | > | ||
30 | <i class="el-icon-full-screen" @click="enLarge" /> | 9 | <i class="el-icon-full-screen" @click="enLarge" /> |
31 | </el-tooltip> | 10 | </el-tooltip> |
32 | <template slot="footer"> | 11 | <template slot="footer"> |
33 | <div class="dialog-footer flex flex-pack-center"> | 12 | <div class="dialog-footer flex flex-pack-center"> |
34 | <el-button | 13 | <el-button type="primary" class="confirmBtn" @click="onJsonSave">保存</el-button> |
35 | type="primary" | 14 | <el-button type="primary" class="cancelBtn" @click="cancel">关闭</el-button> |
36 | class="confirmBtn" | ||
37 | @click="onJsonSave" | ||
38 | >保存</el-button> | ||
39 | <el-button | ||
40 | type="primary" | ||
41 | class="cancelBtn" | ||
42 | @click="cancel" | ||
43 | >关闭</el-button> | ||
44 | </div> | 15 | </div> |
45 | </template> | 16 | </template> |
46 | </el-dialog> | 17 | </el-dialog> |
... | @@ -62,7 +33,7 @@ export default { | ... | @@ -62,7 +33,7 @@ export default { |
62 | default: '' | 33 | default: '' |
63 | } | 34 | } |
64 | }, | 35 | }, |
65 | data() { | 36 | data () { |
66 | return { | 37 | return { |
67 | activeNames: [], | 38 | activeNames: [], |
68 | resultInfo: {}, | 39 | resultInfo: {}, |
... | @@ -75,7 +46,7 @@ export default { | ... | @@ -75,7 +46,7 @@ export default { |
75 | }, | 46 | }, |
76 | watch: { | 47 | watch: { |
77 | resultInfos: { | 48 | resultInfos: { |
78 | handler: function(val) { | 49 | handler: function (val) { |
79 | ++this.key | 50 | ++this.key |
80 | this.resultInfo = | 51 | this.resultInfo = |
81 | this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) | 52 | this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) |
... | @@ -86,17 +57,17 @@ export default { | ... | @@ -86,17 +57,17 @@ export default { |
86 | } | 57 | } |
87 | }, | 58 | }, |
88 | 59 | ||
89 | mounted() { | 60 | mounted () { |
90 | this.resultInfo = | 61 | this.resultInfo = |
91 | this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) | 62 | this.resultInfos === '' ? {} : JSON.parse(this.resultInfos) |
92 | }, | 63 | }, |
93 | 64 | ||
94 | methods: { | 65 | methods: { |
95 | onJsonChange(value) { | 66 | onJsonChange (value) { |
96 | // 只有在格式正确的时候进入此事件 | 67 | // 只有在格式正确的时候进入此事件 |
97 | this.hasJsonFlag = true | 68 | this.hasJsonFlag = true |
98 | }, | 69 | }, |
99 | onJsonSave() { | 70 | onJsonSave () { |
100 | const value = this.resultInfo | 71 | const value = this.resultInfo |
101 | console.log(this.resultInfo, 'resultInfo') | 72 | console.log(this.resultInfo, 'resultInfo') |
102 | if (this.hasJsonFlag === false) { | 73 | if (this.hasJsonFlag === false) { |
... | @@ -109,19 +80,19 @@ export default { | ... | @@ -109,19 +80,19 @@ export default { |
109 | return true | 80 | return true |
110 | } | 81 | } |
111 | }, | 82 | }, |
112 | onError(value) { | 83 | onError (value) { |
113 | this.hasJsonFlag = false | 84 | this.hasJsonFlag = false |
114 | }, | 85 | }, |
115 | openDialog() { | 86 | openDialog () { |
116 | this.dialogVisible = true | 87 | this.dialogVisible = true |
117 | }, | 88 | }, |
118 | cancel() { | 89 | cancel () { |
119 | console.log(this.tmpResultInfo, 'tmpResultInfo') | 90 | console.log(this.tmpResultInfo, 'tmpResultInfo') |
120 | this.resultInfo = this.tmpResultInfo | 91 | this.resultInfo = this.tmpResultInfo |
121 | this.dialogVisible = false | 92 | this.dialogVisible = false |
122 | }, | 93 | }, |
123 | // 放大 | 94 | // 放大 |
124 | enLarge() { | 95 | enLarge () { |
125 | const fullarea = document.getElementById('minejson') | 96 | const fullarea = document.getElementById('minejson') |
126 | if (fullarea.requestFullscreen) { | 97 | if (fullarea.requestFullscreen) { |
127 | fullarea.requestFullscreen() | 98 | fullarea.requestFullscreen() |
... | @@ -146,9 +117,11 @@ export default { | ... | @@ -146,9 +117,11 @@ export default { |
146 | top: 1px; | 117 | top: 1px; |
147 | color: #349af3; | 118 | color: #349af3; |
148 | } | 119 | } |
120 | |||
149 | ::v-deep .jsoneditor-vue { | 121 | ::v-deep .jsoneditor-vue { |
150 | height: 100%; | 122 | height: 100%; |
151 | } | 123 | } |
124 | |||
152 | .fullScreen { | 125 | .fullScreen { |
153 | position: absolute; | 126 | position: absolute; |
154 | right: 5%; | 127 | right: 5%; |
... | @@ -156,22 +129,28 @@ export default { | ... | @@ -156,22 +129,28 @@ export default { |
156 | cursor: pointer; | 129 | cursor: pointer; |
157 | color: #fff; | 130 | color: #fff; |
158 | } | 131 | } |
132 | |||
159 | ::v-deep .jsoneditor-modes { | 133 | ::v-deep .jsoneditor-modes { |
160 | display: none !important; | 134 | display: none !important; |
161 | } | 135 | } |
136 | |||
162 | .jsoneditor-poweredBy { | 137 | .jsoneditor-poweredBy { |
163 | display: none !important; | 138 | display: none !important; |
164 | } | 139 | } |
140 | |||
165 | .jsoneditor-menu { | 141 | .jsoneditor-menu { |
166 | background-color: #9c9e9f !important; | 142 | background-color: #9c9e9f !important; |
167 | border-bottom: 1px solid #9c9e9f !important; | 143 | border-bottom: 1px solid #9c9e9f !important; |
168 | } | 144 | } |
145 | |||
169 | .jsoneditor { | 146 | .jsoneditor { |
170 | border: 1px solid #9c9e9f !important; | 147 | border: 1px solid #9c9e9f !important; |
171 | } | 148 | } |
149 | |||
172 | .el-collapse { | 150 | .el-collapse { |
173 | border: 0; | 151 | border: 0; |
174 | } | 152 | } |
153 | |||
175 | .el-collapse-item__header { | 154 | .el-collapse-item__header { |
176 | height: 44px; | 155 | height: 44px; |
177 | } | 156 | } | ... | ... |
... | @@ -74,7 +74,7 @@ export default { | ... | @@ -74,7 +74,7 @@ export default { |
74 | }, | 74 | }, |
75 | heightNum: { | 75 | heightNum: { |
76 | type: Number, | 76 | type: Number, |
77 | default: 345, | 77 | default: 355, |
78 | }, | 78 | }, |
79 | maxHeight: { | 79 | maxHeight: { |
80 | type: Number, | 80 | type: Number, |
... | @@ -99,7 +99,7 @@ export default { | ... | @@ -99,7 +99,7 @@ export default { |
99 | }, | 99 | }, |
100 | data () { | 100 | data () { |
101 | return { | 101 | return { |
102 | tableHeight: '', | 102 | tableHeight: 'auto', |
103 | mergeLine: {}, | 103 | mergeLine: {}, |
104 | mergeIndex: {}, | 104 | mergeIndex: {}, |
105 | selected: '' | 105 | selected: '' |
... | @@ -115,7 +115,6 @@ export default { | ... | @@ -115,7 +115,6 @@ export default { |
115 | }, | 115 | }, |
116 | }, | 116 | }, |
117 | methods: { | 117 | methods: { |
118 | |||
119 | // 单选 | 118 | // 单选 |
120 | singleElection (row) { | 119 | singleElection (row) { |
121 | this.selected = this.data.indexOf(row); | 120 | this.selected = this.data.indexOf(row); |
... | @@ -128,8 +127,37 @@ export default { | ... | @@ -128,8 +127,37 @@ export default { |
128 | }, | 127 | }, |
129 | getHeight () { | 128 | getHeight () { |
130 | if (!this.heightNumSetting) { | 129 | if (!this.heightNumSetting) { |
131 | this.tableHeight = window.innerHeight - this.heightNum | 130 | let _this = this |
131 | if (this.heightNum) { | ||
132 | _this.$nextTick(() => { | ||
133 | window.addEventListener('resize', () => { | ||
134 | _this.tableHeight = _this.calcHeightx(230) | ||
135 | }); | ||
136 | _this.tableHeight = _this.calcHeightx(230) | ||
137 | }) | ||
138 | } else { | ||
139 | _this.tableHeight = window.innerHeight - _this.heightNum | ||
140 | } | ||
141 | } | ||
142 | }, | ||
143 | calcHeightx (value, wappered = true) { | ||
144 | //项目自定义的公共header部分的高度,可忽略 | ||
145 | let header = document.querySelector(".from-clues-header").offsetHeight; | ||
146 | //value为动态计算table界面高度时,减去的其他空白部分,需自行在调试找到临界值,剩下的就是table表格的高度(包含header+body部分) | ||
147 | value = value == undefined ? 100 : value; | ||
148 | let res = window.innerHeight - parseInt(header) - value; | ||
149 | if (wappered) { | ||
150 | //通过原生方法,获取dom节点的高度------获取element-ui table表格body的元素 | ||
151 | let wapper = window.document.getElementsByClassName('el-table__body-wrapper'); | ||
152 | //通过原生方法,获取dom节点的高度------获取element-ui table表格header的元素 | ||
153 | let header = window.document.getElementsByClassName('el-table__header-wrapper'); | ||
154 | //必须加延时,要不然赋不上去值 | ||
155 | setTimeout(() => { | ||
156 | //通过上边计算得到的table高度的value值,减去table表格的header高度,剩下的通过dom节点直接强行赋给table表格的body | ||
157 | wapper[0].style.height = (value - header[0].clientHeight) | ||
158 | }, 100) | ||
132 | } | 159 | } |
160 | return res; | ||
133 | }, | 161 | }, |
134 | clearSelection () { | 162 | clearSelection () { |
135 | this.$refs.elTable.clearSelection() | 163 | this.$refs.elTable.clearSelection() | ... | ... |
src/image/closebg.png
0 → 100644
493 Bytes
src/image/itembg.png
0 → 100644
529 Bytes
1 | <template> | 1 | <template> |
2 | <section class="app-main"> | 2 | <section class="app-main"> |
3 | <!-- <Breadcrumb v-if="judgeRoute()" /> --> | ||
4 | <transition name="fade-transform" mode="out-in"> | 3 | <transition name="fade-transform" mode="out-in"> |
5 | <router-view /> | 4 | <router-view /> |
6 | </transition> | 5 | </transition> |
7 | </section> | 6 | </section> |
8 | </template> | 7 | </template> |
9 | <script> | 8 | <script> |
10 | import Breadcrumb from "@/components/Breadcrumb.vue"; | 9 | |
11 | export default { | 10 | export default { |
12 | name: 'AppMain', | 11 | name: 'AppMain', |
13 | components: { | ||
14 | Breadcrumb | ||
15 | }, | ||
16 | methods: { | ||
17 | judgeRoute(){ | ||
18 | if (this.$route.path == '/home' || this.$route.path.indexOf('jsbwcx') > -1) { | ||
19 | return false | ||
20 | }else{ | ||
21 | return true | ||
22 | } | ||
23 | } | ||
24 | }, | ||
25 | computed: { | 12 | computed: { |
26 | key () { | 13 | key () { |
27 | return this.$route.path | 14 | return this.$route.path | ... | ... |
... | @@ -79,7 +79,8 @@ export default { | ... | @@ -79,7 +79,8 @@ export default { |
79 | .xuanzhong { | 79 | .xuanzhong { |
80 | background: url('~@/image/selNavbar.png') no-repeat; | 80 | background: url('~@/image/selNavbar.png') no-repeat; |
81 | background-size: 100% 100%; | 81 | background-size: 100% 100%; |
82 | color: #09C39A !important; | 82 | color: #FFFFFF !important; |
83 | font-weight: 700; | ||
83 | } | 84 | } |
84 | 85 | ||
85 | /deep/.el-menu-item:hover { | 86 | /deep/.el-menu-item:hover { | ... | ... |
... | @@ -36,6 +36,7 @@ export default { | ... | @@ -36,6 +36,7 @@ export default { |
36 | position: relative; | 36 | position: relative; |
37 | height: 100%; | 37 | height: 100%; |
38 | width: 100%; | 38 | width: 100%; |
39 | min-width: 1280px; | ||
39 | background: url('~@/image/bg.png') no-repeat; | 40 | background: url('~@/image/bg.png') no-repeat; |
40 | background-size: 100% 100%; | 41 | background-size: 100% 100%; |
41 | padding: 12px; | 42 | padding: 12px; |
... | @@ -48,6 +49,7 @@ export default { | ... | @@ -48,6 +49,7 @@ export default { |
48 | } | 49 | } |
49 | 50 | ||
50 | .appMain { | 51 | .appMain { |
52 | min-width: 1290px; | ||
51 | height: calc(100vh - 101px) !important; | 53 | height: calc(100vh - 101px) !important; |
52 | box-sizing: border-box; | 54 | box-sizing: border-box; |
53 | 55 | ... | ... |
... | @@ -2,7 +2,7 @@ const state = { | ... | @@ -2,7 +2,7 @@ const state = { |
2 | rules: {}, | 2 | rules: {}, |
3 | initRules: {}, | 3 | initRules: {}, |
4 | subRules: {}, | 4 | subRules: {}, |
5 | Edit: false | 5 | Edit: true |
6 | } | 6 | } |
7 | 7 | ||
8 | const mutations = { | 8 | const mutations = { |
... | @@ -30,13 +30,13 @@ const actions = { | ... | @@ -30,13 +30,13 @@ const actions = { |
30 | setInitRules ({ commit }, data) { | 30 | setInitRules ({ commit }, data) { |
31 | commit('SET_INITRULES', data) | 31 | commit('SET_INITRULES', data) |
32 | }, | 32 | }, |
33 | setSubRules({ commit }, data) { | 33 | setSubRules ({ commit }, data) { |
34 | commit('SET_SUBRULES', data) | 34 | commit('SET_SUBRULES', data) |
35 | }, | 35 | }, |
36 | setEdit({ commit }) { | 36 | setEdit ({ commit }) { |
37 | commit('SET_EDIT') | 37 | commit('SET_EDIT') |
38 | }, | 38 | }, |
39 | setReportLogEdit({ commit }) { | 39 | setReportLogEdit ({ commit }) { |
40 | commit('SET_REPORTEDIT') | 40 | commit('SET_REPORTEDIT') |
41 | } | 41 | } |
42 | } | 42 | } | ... | ... |
... | @@ -35,6 +35,14 @@ | ... | @@ -35,6 +35,14 @@ |
35 | .dialogBox-content { | 35 | .dialogBox-content { |
36 | height: auto | 36 | height: auto |
37 | } | 37 | } |
38 | |||
39 | .editDialogBox-box { | ||
40 | background: #031A46; | ||
41 | box-shadow: inset 0px 0px 12px 0px #02D9FD; | ||
42 | border-radius: 2px; | ||
43 | border: 1px solid #6BC1FC; | ||
44 | margin: 0 18px 15px 18px; | ||
45 | } | ||
38 | } | 46 | } |
39 | 47 | ||
40 | .dialog_title { | 48 | .dialog_title { |
... | @@ -57,13 +65,18 @@ | ... | @@ -57,13 +65,18 @@ |
57 | padding-bottom: 0; | 65 | padding-bottom: 0; |
58 | } | 66 | } |
59 | 67 | ||
60 | .el-dialog__headerbtn .el-dialog__close { | 68 | .el-dialog__headerbtn { |
61 | color: #FFFFFF !important; | 69 | width: 42px; |
62 | position: relative; | 70 | height: 20px; |
63 | top: -2px; | 71 | background: url("~@/image/closebg.png") no-repeat; |
64 | right: 15px | 72 | background-size: 100% 100%; |
73 | right: 40px; | ||
74 | top: 33px; | ||
65 | } | 75 | } |
66 | 76 | ||
77 | .el-dialog__close { | ||
78 | font-size: 0; | ||
79 | } | ||
67 | 80 | ||
68 | .el-form-item { | 81 | .el-form-item { |
69 | @include flex; | 82 | @include flex; |
... | @@ -88,8 +101,9 @@ | ... | @@ -88,8 +101,9 @@ |
88 | top: 50%; | 101 | top: 50%; |
89 | left: 50%; | 102 | left: 50%; |
90 | transform: translate(-50%, -50%); | 103 | transform: translate(-50%, -50%); |
104 | |||
91 | // 展开收起按钮位置 | 105 | // 展开收起按钮位置 |
92 | .el-input__suffix{ | 106 | .el-input__suffix { |
93 | right: 10px; | 107 | right: 10px; |
94 | } | 108 | } |
95 | } | 109 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -66,7 +66,8 @@ | ... | @@ -66,7 +66,8 @@ |
66 | // refine element ui upload | 66 | // refine element ui upload |
67 | .el-input.is-disabled .el-input__inner { | 67 | .el-input.is-disabled .el-input__inner { |
68 | color: #FFFFFF !important; | 68 | color: #FFFFFF !important; |
69 | background-color: transparent !important; | 69 | // background-color: transparent !important; |
70 | border: 1px solid #224C7C !important; | ||
70 | } | 71 | } |
71 | 72 | ||
72 | .upload-container { | 73 | .upload-container { |
... | @@ -179,13 +180,13 @@ table th { | ... | @@ -179,13 +180,13 @@ table th { |
179 | border-bottom: none !important; | 180 | border-bottom: none !important; |
180 | } | 181 | } |
181 | 182 | ||
182 | .el-table__body { | 183 | // .el-table__body { |
183 | -webkit-border-vertical-spacing: 6px !important; // 垂直间距 | 184 | // -webkit-border-vertical-spacing: 6px !important; // 垂直间距 |
184 | } | 185 | // } |
185 | 186 | ||
186 | table td { | 187 | table td { |
187 | box-sizing: border-box; | 188 | box-sizing: border-box; |
188 | border-bottom: none !important; | 189 | border-bottom: 1px solid #458ACF !important; |
189 | } | 190 | } |
190 | 191 | ||
191 | //去掉最下面的那一条线 | 192 | //去掉最下面的那一条线 |
... | @@ -214,6 +215,15 @@ table td { | ... | @@ -214,6 +215,15 @@ table td { |
214 | color: #4A4A4A; | 215 | color: #4A4A4A; |
215 | } | 216 | } |
216 | 217 | ||
218 | .twoLineCls { | ||
219 | text-overflow: -o-ellipsis-lastline; | ||
220 | overflow: hidden; | ||
221 | text-overflow: ellipsis; | ||
222 | display: -webkit-box; | ||
223 | -webkit-line-clamp: 2; | ||
224 | line-clamp: 2; | ||
225 | -webkit-box-orient: vertical; | ||
226 | } | ||
217 | 227 | ||
218 | .el-table tr td { | 228 | .el-table tr td { |
219 | font-size: 14px; | 229 | font-size: 14px; |
... | @@ -426,11 +436,17 @@ table td { | ... | @@ -426,11 +436,17 @@ table td { |
426 | .el-select-dropdown__item, | 436 | .el-select-dropdown__item, |
427 | .el-menu--horizontal .el-menu .el-submenu__title { | 437 | .el-menu--horizontal .el-menu .el-submenu__title { |
428 | background: url("~@/image/slitembg.png") no-repeat; | 438 | background: url("~@/image/slitembg.png") no-repeat; |
439 | height: 26px; | ||
440 | line-height: 26px; | ||
429 | background-size: 100% 100%; | 441 | background-size: 100% 100%; |
430 | margin: 5px 0; | 442 | margin-bottom: 7px; |
431 | color: #02D9FD !important; | 443 | color: #02D9FD !important; |
432 | } | 444 | } |
433 | 445 | ||
446 | .el-select-dropdown { | ||
447 | top: 203px !important; | ||
448 | } | ||
449 | |||
434 | .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover, | 450 | .el-menu--horizontal .el-menu--popup .el-menu-item:not(.is-disabled):hover, |
435 | .el-select-dropdown__item:hover, | 451 | .el-select-dropdown__item:hover, |
436 | .el-select-dropdown__item.selected, | 452 | .el-select-dropdown__item.selected, |
... | @@ -439,4 +455,9 @@ table td { | ... | @@ -439,4 +455,9 @@ table td { |
439 | background-size: 100% 100%; | 455 | background-size: 100% 100%; |
440 | color: #FFFFFF !important; | 456 | color: #FFFFFF !important; |
441 | font-weight: 700; | 457 | font-weight: 700; |
458 | } | ||
459 | |||
460 | .el-select-dropdown__item.hover, | ||
461 | .el-select-dropdown__item:hover { | ||
462 | background-color: transparent !important; | ||
442 | } | 463 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -7,36 +7,43 @@ | ... | @@ -7,36 +7,43 @@ |
7 | max-height: 100%; | 7 | max-height: 100%; |
8 | overflow-y: scroll; | 8 | overflow-y: scroll; |
9 | } | 9 | } |
10 | |||
10 | .panel-tab__title { | 11 | .panel-tab__title { |
11 | font-weight: 600; | 12 | font-weight: 600; |
12 | padding: 0 8px; | 13 | padding: 0 8px; |
13 | font-size: 1.1em; | 14 | font-size: 1.1em; |
14 | line-height: 1.2em; | 15 | line-height: 1.2em; |
16 | |||
15 | i { | 17 | i { |
16 | margin-right: 8px; | 18 | margin-right: 8px; |
17 | font-size: 1.2em; | 19 | font-size: 1.2em; |
18 | } | 20 | } |
19 | } | 21 | } |
22 | |||
20 | .panel-tab__content { | 23 | .panel-tab__content { |
21 | width: 100%; | 24 | width: 100%; |
22 | box-sizing: border-box; | 25 | box-sizing: border-box; |
23 | border-top: 1px solid #eeeeee; | 26 | border-top: 1px solid #eeeeee; |
24 | padding: 8px 16px; | 27 | padding: 8px 16px; |
28 | |||
25 | .panel-tab__content--title { | 29 | .panel-tab__content--title { |
26 | display: flex; | 30 | display: flex; |
27 | justify-content: space-between; | 31 | justify-content: space-between; |
28 | padding-bottom: 8px; | 32 | padding-bottom: 8px; |
33 | |||
29 | span { | 34 | span { |
30 | flex: 1; | 35 | flex: 1; |
31 | text-align: left; | 36 | text-align: left; |
32 | } | 37 | } |
33 | } | 38 | } |
34 | } | 39 | } |
40 | |||
35 | .element-property { | 41 | .element-property { |
36 | width: 100%; | 42 | width: 100%; |
37 | display: flex; | 43 | display: flex; |
38 | align-items: flex-start; | 44 | align-items: flex-start; |
39 | margin: 8px 0; | 45 | margin: 8px 0; |
46 | |||
40 | .element-property__label { | 47 | .element-property__label { |
41 | display: block; | 48 | display: block; |
42 | width: 90px; | 49 | width: 90px; |
... | @@ -47,64 +54,72 @@ | ... | @@ -47,64 +54,72 @@ |
47 | font-size: 14px; | 54 | font-size: 14px; |
48 | box-sizing: border-box; | 55 | box-sizing: border-box; |
49 | } | 56 | } |
57 | |||
50 | .element-property__value { | 58 | .element-property__value { |
51 | flex: 1; | 59 | flex: 1; |
52 | line-height: 32px; | 60 | line-height: 32px; |
53 | } | 61 | } |
62 | |||
54 | .el-form-item { | 63 | .el-form-item { |
55 | width: 100%; | 64 | width: 100%; |
56 | margin-bottom: 0; | 65 | margin-bottom: 0; |
57 | padding-bottom: 18px; | 66 | padding-bottom: 18px; |
58 | } | 67 | } |
59 | } | 68 | } |
69 | |||
60 | .list-property { | 70 | .list-property { |
61 | flex-direction: column; | 71 | flex-direction: column; |
72 | |||
62 | .element-listener-item { | 73 | .element-listener-item { |
63 | width: 100%; | 74 | width: 100%; |
64 | display: inline-grid; | 75 | display: inline-grid; |
65 | grid-template-columns: 16px auto 32px 32px; | 76 | grid-template-columns: 16px auto 32px 32px; |
66 | grid-column-gap: 8px; | 77 | grid-column-gap: 8px; |
67 | } | 78 | } |
68 | .element-listener-item + .element-listener-item { | 79 | |
80 | .element-listener-item+.element-listener-item { | ||
69 | margin-top: 8px; | 81 | margin-top: 8px; |
70 | } | 82 | } |
71 | } | 83 | } |
84 | |||
72 | .listener-filed__title { | 85 | .listener-filed__title { |
73 | display: inline-flex; | 86 | display: inline-flex; |
74 | width: 100%; | 87 | width: 100%; |
75 | justify-content: space-between; | 88 | justify-content: space-between; |
76 | align-items: center; | 89 | align-items: center; |
77 | margin-top: 0; | 90 | margin-top: 0; |
91 | |||
78 | span { | 92 | span { |
79 | width: 200px; | 93 | width: 200px; |
80 | text-align: left; | 94 | text-align: left; |
81 | font-size: 14px; | 95 | font-size: 14px; |
82 | } | 96 | } |
97 | |||
83 | i { | 98 | i { |
84 | margin-right: 8px; | 99 | margin-right: 8px; |
85 | } | 100 | } |
86 | } | 101 | } |
102 | |||
87 | .element-drawer__button { | 103 | .element-drawer__button { |
88 | margin-top: 8px; | 104 | margin-top: 8px; |
89 | width: 100%; | 105 | width: 100%; |
90 | display: inline-flex; | 106 | display: inline-flex; |
91 | justify-content: space-around; | 107 | justify-content: space-around; |
92 | } | 108 | } |
93 | .element-drawer__button > .el-button { | 109 | |
110 | .element-drawer__button>.el-button { | ||
94 | width: 100%; | 111 | width: 100%; |
95 | } | 112 | } |
96 | 113 | ||
97 | .el-collapse-item__content { | 114 | .el-collapse-item__content { |
98 | padding-bottom: 0; | 115 | padding-bottom: 0; |
99 | } | 116 | } |
100 | .el-input.is-disabled .el-input__inner { | 117 | |
101 | color: #999999; | ||
102 | } | ||
103 | .el-form-item.el-form-item--mini { | 118 | .el-form-item.el-form-item--mini { |
104 | margin-bottom: 0; | 119 | margin-bottom: 0; |
105 | & + .el-form-item { | 120 | |
121 | &+.el-form-item { | ||
106 | margin-top: 16px; | 122 | margin-top: 16px; |
107 | } | 123 | } |
108 | } | 124 | } |
109 | } | 125 | } |
110 | |||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -5,16 +5,16 @@ | ... | @@ -5,16 +5,16 @@ |
5 | background-color: rgba(0, 0, 0, 0); | 5 | background-color: rgba(0, 0, 0, 0); |
6 | 6 | ||
7 | .el-table__header-wrapper { | 7 | .el-table__header-wrapper { |
8 | border-right: 1px solid #103E99; | 8 | border-right: none; |
9 | 9 | ||
10 | } | 10 | } |
11 | 11 | ||
12 | .el-table__row .cell { | 12 | .el-table__row .cell { |
13 | color: #DBFAFF !important; | 13 | color: #CEF8FF !important; |
14 | } | 14 | } |
15 | 15 | ||
16 | .el-table__row { | 16 | .el-table__row { |
17 | background: #0F56A3 !important; | 17 | background: rgba(0, 0, 0, 0) !important; |
18 | } | 18 | } |
19 | 19 | ||
20 | thead { | 20 | thead { |
... | @@ -40,16 +40,16 @@ | ... | @@ -40,16 +40,16 @@ |
40 | 40 | ||
41 | //*****start*通用表单查询条件,列表样式******// | 41 | //*****start*通用表单查询条件,列表样式******// |
42 | .from-clues { | 42 | .from-clues { |
43 | min-width: 1280px; | ||
44 | height: 100%; | 43 | height: 100%; |
45 | width: 100%; | 44 | width: 100%; |
45 | min-width: 1280px; | ||
46 | box-sizing: border-box; | 46 | box-sizing: border-box; |
47 | overflow-x: hidden; | 47 | overflow-x: hidden; |
48 | padding: 2px; | 48 | padding: 2px; |
49 | 49 | ||
50 | &-header { | 50 | &-header { |
51 | width: 100%; | 51 | width: 100%; |
52 | padding: 20px 30px 20px 20px; | 52 | padding: 5px 30px 20px 20px; |
53 | box-sizing: border-box; | 53 | box-sizing: border-box; |
54 | background: url("~@/image/formHeader.png") no-repeat; | 54 | background: url("~@/image/formHeader.png") no-repeat; |
55 | background-size: 100% 100%; | 55 | background-size: 100% 100%; |
... | @@ -196,4 +196,4 @@ | ... | @@ -196,4 +196,4 @@ |
196 | .btnColRight { | 196 | .btnColRight { |
197 | box-sizing: border-box; | 197 | box-sizing: border-box; |
198 | text-align: right; | 198 | text-align: right; |
199 | } | 199 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
src/utils/operation copy.js
0 → 100644
1 | import { Message } from "element-ui"; | ||
2 | export function removeTreeListItem (treeList, dictId, idName = 'bsmDict') { | ||
3 | if (!treeList || !treeList.length) { | ||
4 | return | ||
5 | } | ||
6 | for (let i = 0; i < treeList.length; i++) { | ||
7 | if (treeList[i][idName] === dictId) { | ||
8 | treeList.splice(i, 1); | ||
9 | break; | ||
10 | } | ||
11 | removeTreeListItem(treeList[i].children, dictId) | ||
12 | } | ||
13 | } | ||
14 | // 创造id | ||
15 | export function getUuid (len, radix) { | ||
16 | var chars = "0123456789abcdefghijklmnopqrstuvwxyz".split( | ||
17 | "" | ||
18 | ); | ||
19 | var uuid = [], | ||
20 | i; | ||
21 | radix = radix || chars.length; | ||
22 | if (len) { | ||
23 | for (i = 0; i < len; i++) uuid[i] = chars[0 | (Math.random() * radix)]; | ||
24 | } else { | ||
25 | var r; | ||
26 | uuid[8] = uuid[13] = uuid[18] = uuid[23] = "-"; | ||
27 | uuid[14] = "4"; | ||
28 | for (i = 0; i < 36; i++) { | ||
29 | if (!uuid[i]) { | ||
30 | r = 0 | (Math.random() * 16); | ||
31 | uuid[i] = chars[i == 19 ? (r & 0x3) | 0x8 : r]; | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | return uuid.join(""); | ||
36 | } | ||
37 | export function judgeSort (arr) { | ||
38 | if (arr.length) { | ||
39 | for (let i in arr) { | ||
40 | arr[i]["isTop"] = false; | ||
41 | arr[i]["isBottom"] = false; | ||
42 | arr[i] == arr[0] && (arr[i].isTop = true); | ||
43 | arr[i] == arr[arr.length - 1] && (arr[i].isBottom = true); | ||
44 | arr[i].children && arr[i].children.length && judgeSort(arr[i].children) | ||
45 | } | ||
46 | } | ||
47 | return arr | ||
48 | } | ||
49 | // 上下移动 | ||
50 | export function realMove (bsmDict, operate, data) { | ||
51 | function changeSort (arr, bsmDict) { | ||
52 | if (arr.length) { | ||
53 | let flag = false; | ||
54 | for (let i in arr) { | ||
55 | if (arr[i].bsmDict == bsmDict) { | ||
56 | if (operate === "UP") { | ||
57 | arr[i] = arr.splice(i - 1, 1, arr[i])[0]; | ||
58 | } else if (operate === "DOWN") { | ||
59 | let temp = arr.splice(i - 0 + 1, 1, arr[i]) | ||
60 | arr[i] = temp[0]; | ||
61 | } | ||
62 | flag = true; | ||
63 | break; | ||
64 | } | ||
65 | if (!flag && arr[i].children && arr[i].children.length) { | ||
66 | arr[i].children = changeSort(arr[i].children, bsmDict); | ||
67 | } | ||
68 | } | ||
69 | } | ||
70 | return arr; | ||
71 | } | ||
72 | data = judgeSort(changeSort(data, bsmDict)); | ||
73 | } | ||
74 | // 获取所有父节点 | ||
75 | export function findParents (treeData, bsmDict) { | ||
76 | if (treeData.length == 0) return | ||
77 | for (let i = 0; i < treeData.length; i++) { | ||
78 | if (treeData[i].bsmDict == bsmDict) { | ||
79 | return [] | ||
80 | } else { | ||
81 | if (treeData[i].children) { | ||
82 | let res = findParents(treeData[i].children, bsmDict) | ||
83 | if (res !== undefined) { | ||
84 | return res.concat(treeData[i].bsmDict) | ||
85 | } | ||
86 | } | ||
87 | } | ||
88 | } | ||
89 | } | ||
90 | // 上移下移 | ||
91 | export function upward (index, data) { | ||
92 | if (index > 0) { | ||
93 | let upData = data[index - 1]; | ||
94 | data.splice(index - 1, 1); | ||
95 | data.splice(index, 0, upData); | ||
96 | } else { | ||
97 | Message({ | ||
98 | message: '已经是第一条,上移失败' | ||
99 | }); | ||
100 | } | ||
101 | } | ||
102 | export function down (index, data) { | ||
103 | if ((index + 1) == data.length) { | ||
104 | Message({ | ||
105 | message: '已经是最后一条,下移失败' | ||
106 | }); | ||
107 | } else { | ||
108 | let downData = data[index + 1]; | ||
109 | data.splice(index + 1, 1); | ||
110 | data.splice(index, 0, downData); | ||
111 | } | ||
112 | } |
... | @@ -7,6 +7,7 @@ class data extends filter { | ... | @@ -7,6 +7,7 @@ class data extends filter { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | label: "行政区", | 9 | label: "行政区", |
10 | width: 80, | ||
10 | render: (h, scope) => { | 11 | render: (h, scope) => { |
11 | return ( | 12 | return ( |
12 | <div> | 13 | <div> |
... | @@ -17,6 +18,7 @@ class data extends filter { | ... | @@ -17,6 +18,7 @@ class data extends filter { |
17 | }, | 18 | }, |
18 | { | 19 | { |
19 | label: "权属状态", | 20 | label: "权属状态", |
21 | width: 80, | ||
20 | render: (h, scope) => { | 22 | render: (h, scope) => { |
21 | return ( | 23 | return ( |
22 | <div> | 24 | <div> |
... | @@ -33,10 +35,10 @@ class data extends filter { | ... | @@ -33,10 +35,10 @@ class data extends filter { |
33 | label: "不动产单元号", | 35 | label: "不动产单元号", |
34 | prop: "bdcdyh" | 36 | prop: "bdcdyh" |
35 | }, | 37 | }, |
36 | { | 38 | // { |
37 | label: "不动产产权证号", | 39 | // label: "不动产产权证号", |
38 | prop: "bdcqzh" | 40 | // prop: "bdcqzh" |
39 | }, | 41 | // }, |
40 | { | 42 | { |
41 | label: "查封机关", | 43 | label: "查封机关", |
42 | prop: "cfjg" | 44 | prop: "cfjg" | ... | ... |
... | @@ -19,18 +19,16 @@ | ... | @@ -19,18 +19,16 @@ |
19 | </el-select> | 19 | </el-select> |
20 | </el-form-item> | 20 | </el-form-item> |
21 | </el-col> | 21 | </el-col> |
22 | <el-col :span="5"> | 22 | <!-- <el-col :span="5"> |
23 | <el-form-item label="坐落"> | 23 | <el-form-item label="坐落"> |
24 | <el-input v-model="form.ZL" placeholder="坐落"></el-input> | 24 | <el-input v-model="form.ZL" placeholder="坐落"></el-input> |
25 | </el-form-item> | 25 | </el-form-item> |
26 | </el-col> | 26 | </el-col> --> |
27 | <el-col :span="5"> | 27 | <!-- <el-col :span="5"> |
28 | <el-form-item label="不动产权证号"> | 28 | <el-form-item label="不动产权证号"> |
29 | <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> | 29 | <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> |
30 | </el-form-item> | 30 | </el-form-item> |
31 | </el-col> | 31 | </el-col> --> |
32 | </el-row> | ||
33 | <el-row class="mt-10"> | ||
34 | <el-col :span="5"> | 32 | <el-col :span="5"> |
35 | <el-form-item label="权利人" label-width="80px"> | 33 | <el-form-item label="权利人" label-width="80px"> |
36 | <el-input v-model="form.QLR" placeholder="权利人"></el-input> | 34 | <el-input v-model="form.QLR" placeholder="权利人"></el-input> |
... | @@ -41,16 +39,30 @@ | ... | @@ -41,16 +39,30 @@ |
41 | <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> | 39 | <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> |
42 | </el-form-item> | 40 | </el-form-item> |
43 | </el-col> | 41 | </el-col> |
42 | |||
43 | </el-row> | ||
44 | <el-row class="mt-10"> | ||
45 | <el-col :span="5"> | ||
46 | <el-form-item label="查封机关" label-width="80px"> | ||
47 | <el-input v-model="form.CFJG" placeholder="查封机关"></el-input> | ||
48 | </el-form-item> | ||
49 | </el-col> | ||
50 | <el-col :span="5"> | ||
51 | <el-form-item label="查封文号"> | ||
52 | <el-input v-model="form.CFWH" placeholder="查封文号"></el-input> | ||
53 | </el-form-item> | ||
54 | </el-col> | ||
44 | <el-col :span="5"> | 55 | <el-col :span="5"> |
45 | <el-form-item label="查封(解封)机关"> | 56 | <el-form-item label="解封机关" label-width="80px"> |
46 | <el-input v-model="form.xxx" placeholder="查封(解封)机关"></el-input> | 57 | <el-input v-model="form.JFJG" placeholder="解封机关"></el-input> |
47 | </el-form-item> | 58 | </el-form-item> |
48 | </el-col> | 59 | </el-col> |
49 | <el-col :span="5"> | 60 | <el-col :span="5"> |
50 | <el-form-item label="查封(解封)文号"> | 61 | <el-form-item label="解封文号"> |
51 | <el-input v-model="form.xxx1" placeholder="查封(解封)文号"></el-input> | 62 | <el-input v-model="form.JFWH" placeholder="解封文号"></el-input> |
52 | </el-form-item> | 63 | </el-form-item> |
53 | </el-col> | 64 | </el-col> |
65 | |||
54 | <el-col :span="4" class="btnColRight"> | 66 | <el-col :span="4" class="btnColRight"> |
55 | <btn nativeType="cz" @click="resetForm">重置</btn> | 67 | <btn nativeType="cz" @click="resetForm">重置</btn> |
56 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 68 | <btn nativeType="cx" @click="handleSubmit">查询</btn> |
... | @@ -85,8 +97,10 @@ export default { | ... | @@ -85,8 +97,10 @@ export default { |
85 | BDCQZH: '', | 97 | BDCQZH: '', |
86 | QLR: '', | 98 | QLR: '', |
87 | BDCDYH: '', | 99 | BDCDYH: '', |
88 | xxx: '', | 100 | JFJG: '', |
89 | xxx1: '', | 101 | JFWH: '', |
102 | CFJG: '', | ||
103 | CFWH: '', | ||
90 | currentPage: 1 | 104 | currentPage: 1 |
91 | }, | 105 | }, |
92 | tableData: { | 106 | tableData: { |
... | @@ -98,7 +112,7 @@ export default { | ... | @@ -98,7 +112,7 @@ export default { |
98 | }].concat(data.columns()).concat([ | 112 | }].concat(data.columns()).concat([ |
99 | { | 113 | { |
100 | label: "操作", | 114 | label: "操作", |
101 | width: 170, | 115 | width: 80, |
102 | render: (h, scope) => { | 116 | render: (h, scope) => { |
103 | return ( | 117 | return ( |
104 | <div> | 118 | <div> | ... | ... |
... | @@ -7,6 +7,7 @@ class data extends filter { | ... | @@ -7,6 +7,7 @@ class data extends filter { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | label: "行政区", | 9 | label: "行政区", |
10 | width: 80, | ||
10 | render: (h, scope) => { | 11 | render: (h, scope) => { |
11 | return ( | 12 | return ( |
12 | <div> | 13 | <div> |
... | @@ -17,6 +18,7 @@ class data extends filter { | ... | @@ -17,6 +18,7 @@ class data extends filter { |
17 | }, | 18 | }, |
18 | { | 19 | { |
19 | label: "权属状态", | 20 | label: "权属状态", |
21 | width: 80, | ||
20 | render: (h, scope) => { | 22 | render: (h, scope) => { |
21 | return ( | 23 | return ( |
22 | <div> | 24 | <div> |
... | @@ -31,11 +33,13 @@ class data extends filter { | ... | @@ -31,11 +33,13 @@ class data extends filter { |
31 | }, | 33 | }, |
32 | { | 34 | { |
33 | label: "不动产单元号", | 35 | label: "不动产单元号", |
34 | prop: "bdcdyh" | 36 | prop: "bdcdyh", |
37 | width: 150, | ||
35 | }, | 38 | }, |
36 | { | 39 | { |
37 | label: "不动产权证号", | 40 | label: "不动产权证号", |
38 | prop: "bdcdjzmh" | 41 | prop: "bdcdjzmh", |
42 | width: 150, | ||
39 | }, | 43 | }, |
40 | { | 44 | { |
41 | label: "抵押类型", | 45 | label: "抵押类型", |
... | @@ -63,7 +67,8 @@ class data extends filter { | ... | @@ -63,7 +67,8 @@ class data extends filter { |
63 | }, | 67 | }, |
64 | { | 68 | { |
65 | label: "被担保主债权数额", | 69 | label: "被担保主债权数额", |
66 | prop: "bdbzzqse" | 70 | prop: "bdbzzqse", |
71 | width: 135, | ||
67 | }, | 72 | }, |
68 | { | 73 | { |
69 | label: "最高债权额", | 74 | label: "最高债权额", |
... | @@ -71,11 +76,13 @@ class data extends filter { | ... | @@ -71,11 +76,13 @@ class data extends filter { |
71 | }, | 76 | }, |
72 | { | 77 | { |
73 | label: "登记时间", | 78 | label: "登记时间", |
74 | prop: "djsj" | 79 | prop: "djsj", |
80 | width: 140, | ||
75 | }, | 81 | }, |
76 | { | 82 | { |
77 | label: "登记机构", | 83 | label: "登记机构", |
78 | prop: "djjg" | 84 | prop: "djjg", |
85 | width: 140, | ||
79 | } | 86 | } |
80 | ] | 87 | ] |
81 | } | 88 | } | ... | ... |
... | @@ -19,23 +19,23 @@ | ... | @@ -19,23 +19,23 @@ |
19 | </el-select> | 19 | </el-select> |
20 | </el-form-item> | 20 | </el-form-item> |
21 | </el-col> | 21 | </el-col> |
22 | <el-col :span="5"> | 22 | <!-- <el-col :span="5"> |
23 | <el-form-item label="坐落"> | 23 | <el-form-item label="坐落"> |
24 | <el-input v-model="form.ZL" placeholder="坐落"></el-input> | 24 | <el-input v-model="form.ZL" placeholder="坐落"></el-input> |
25 | </el-form-item> | 25 | </el-form-item> |
26 | </el-col> | 26 | </el-col> --> |
27 | <el-col :span="5"> | 27 | <el-col :span="5"> |
28 | <el-form-item label="不动产权证号"> | 28 | <el-form-item label="不动产权证号"> |
29 | <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> | 29 | <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> |
30 | </el-form-item> | 30 | </el-form-item> |
31 | </el-col> | 31 | </el-col> |
32 | </el-row> | ||
33 | <el-row class="mt-10"> | ||
34 | <el-col :span="5"> | 32 | <el-col :span="5"> |
35 | <el-form-item label="抵押人" label-width="80px"> | 33 | <el-form-item label="抵押人" label-width="80px"> |
36 | <el-input v-model="form.dyr" placeholder="抵押人"></el-input> | 34 | <el-input v-model="form.dyr" placeholder="抵押人"></el-input> |
37 | </el-form-item> | 35 | </el-form-item> |
38 | </el-col> | 36 | </el-col> |
37 | </el-row> | ||
38 | <el-row class="mt-10"> | ||
39 | <el-col :span="5"> | 39 | <el-col :span="5"> |
40 | <el-form-item label="不动产单元号"> | 40 | <el-form-item label="不动产单元号"> |
41 | <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> | 41 | <el-input v-model="form.BDCDYH" placeholder="不动产单元号"></el-input> |
... | @@ -57,7 +57,8 @@ | ... | @@ -57,7 +57,8 @@ |
57 | </el-select> | 57 | </el-select> |
58 | </el-form-item> | 58 | </el-form-item> |
59 | </el-col> | 59 | </el-col> |
60 | <el-col :span="4" class="btnColRight"> | 60 | |
61 | <el-col :span="9" class="btnColRight"> | ||
61 | <btn nativeType="cz" @click="resetForm">重置</btn> | 62 | <btn nativeType="cz" @click="resetForm">重置</btn> |
62 | <btn nativeType="cx" @click="handleSubmit">查询</btn> | 63 | <btn nativeType="cx" @click="handleSubmit">查询</btn> |
63 | </el-col> | 64 | </el-col> |
... | @@ -109,7 +110,7 @@ export default { | ... | @@ -109,7 +110,7 @@ export default { |
109 | }].concat(data.columns()).concat([ | 110 | }].concat(data.columns()).concat([ |
110 | { | 111 | { |
111 | label: "操作", | 112 | label: "操作", |
112 | width: 170, | 113 | width: 80, |
113 | render: (h, scope) => { | 114 | render: (h, scope) => { |
114 | return ( | 115 | return ( |
115 | <div> | 116 | <div> | ... | ... |
... | @@ -7,7 +7,7 @@ class data extends filter { | ... | @@ -7,7 +7,7 @@ class data extends filter { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | label: "行政区", | 9 | label: "行政区", |
10 | width: 150, | 10 | width: 80, |
11 | render: (h, scope) => { | 11 | render: (h, scope) => { |
12 | return ( | 12 | return ( |
13 | <div> | 13 | <div> |
... | @@ -18,7 +18,7 @@ class data extends filter { | ... | @@ -18,7 +18,7 @@ class data extends filter { |
18 | }, | 18 | }, |
19 | { | 19 | { |
20 | label: "权属状态", | 20 | label: "权属状态", |
21 | width: 100, | 21 | width: 80, |
22 | render: (h, scope) => { | 22 | render: (h, scope) => { |
23 | return ( | 23 | return ( |
24 | <div> | 24 | <div> |
... | @@ -29,8 +29,7 @@ class data extends filter { | ... | @@ -29,8 +29,7 @@ class data extends filter { |
29 | }, | 29 | }, |
30 | { | 30 | { |
31 | label: "业务号", | 31 | label: "业务号", |
32 | prop: "ywh", | 32 | prop: "ywh" |
33 | width: 150 | ||
34 | }, | 33 | }, |
35 | { | 34 | { |
36 | label: "不动产单元号", | 35 | label: "不动产单元号", |
... | @@ -42,7 +41,8 @@ class data extends filter { | ... | @@ -42,7 +41,8 @@ class data extends filter { |
42 | }, | 41 | }, |
43 | { | 42 | { |
44 | label: "权利人", | 43 | label: "权利人", |
45 | prop: "qlrmc" | 44 | prop: "qlrmc", |
45 | width: 150 | ||
46 | }, | 46 | }, |
47 | { | 47 | { |
48 | label: "用途", | 48 | label: "用途", |
... | @@ -50,6 +50,7 @@ class data extends filter { | ... | @@ -50,6 +50,7 @@ class data extends filter { |
50 | }, | 50 | }, |
51 | { | 51 | { |
52 | label: "权利类型", | 52 | label: "权利类型", |
53 | width: 150, | ||
53 | render: (h, scope) => { | 54 | render: (h, scope) => { |
54 | return ( | 55 | return ( |
55 | <div> | 56 | <div> |
... | @@ -73,7 +74,7 @@ class data extends filter { | ... | @@ -73,7 +74,7 @@ class data extends filter { |
73 | render: (h, scope) => { | 74 | render: (h, scope) => { |
74 | return ( | 75 | return ( |
75 | <div> | 76 | <div> |
76 | <span>{this.dicStatus(scope.row.djlx, 'A21')}</span> | 77 | <span>{this.dicStatus(scope.row.djlx, 'A21')}</span> |
77 | </div> | 78 | </div> |
78 | ) | 79 | ) |
79 | } | 80 | } | ... | ... |
... | @@ -101,7 +101,7 @@ export default { | ... | @@ -101,7 +101,7 @@ export default { |
101 | }].concat(data.columns()).concat([ | 101 | }].concat(data.columns()).concat([ |
102 | { | 102 | { |
103 | label: "操作", | 103 | label: "操作", |
104 | width: 170, | 104 | width: 90, |
105 | render: (h, scope) => { | 105 | render: (h, scope) => { |
106 | return ( | 106 | return ( |
107 | <div> | 107 | <div> | ... | ... |
... | @@ -69,7 +69,7 @@ export default { | ... | @@ -69,7 +69,7 @@ export default { |
69 | }].concat(data.columns()).concat([ | 69 | }].concat(data.columns()).concat([ |
70 | { | 70 | { |
71 | label: "操作", | 71 | label: "操作", |
72 | width: 170, | 72 | width: 80, |
73 | render: (h, scope) => { | 73 | render: (h, scope) => { |
74 | return ( | 74 | return ( |
75 | <div> | 75 | <div> | ... | ... |
... | @@ -7,7 +7,7 @@ class data extends filter { | ... | @@ -7,7 +7,7 @@ class data extends filter { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | label: "行政区", | 9 | label: "行政区", |
10 | width: 150, | 10 | width: 80, |
11 | render: (h, scope) => { | 11 | render: (h, scope) => { |
12 | return ( | 12 | return ( |
13 | <div> | 13 | <div> |
... | @@ -18,7 +18,7 @@ class data extends filter { | ... | @@ -18,7 +18,7 @@ class data extends filter { |
18 | }, | 18 | }, |
19 | { | 19 | { |
20 | label: "权属状态", | 20 | label: "权属状态", |
21 | width: 100, | 21 | width: 80, |
22 | render: (h, scope) => { | 22 | render: (h, scope) => { |
23 | return ( | 23 | return ( |
24 | <div> | 24 | <div> |
... | @@ -30,19 +30,21 @@ class data extends filter { | ... | @@ -30,19 +30,21 @@ class data extends filter { |
30 | { | 30 | { |
31 | label: "业务号", | 31 | label: "业务号", |
32 | prop: "ywh", | 32 | prop: "ywh", |
33 | width: 150 | ||
34 | }, | 33 | }, |
35 | { | 34 | { |
36 | label: "不动产单元号", | 35 | label: "不动产单元号", |
37 | prop: "bdcdyh" | 36 | prop: "bdcdyh", |
37 | width: 150 | ||
38 | }, | 38 | }, |
39 | { | 39 | { |
40 | label: "不动产权证号", | 40 | label: "不动产权证号", |
41 | prop: "bdcqzh" | 41 | prop: "bdcqzh", |
42 | width: 150 | ||
42 | }, | 43 | }, |
43 | { | 44 | { |
44 | label: "权利人", | 45 | label: "权利人", |
45 | prop: "qlrmc" | 46 | prop: "qlrmc", |
47 | width: 150 | ||
46 | }, | 48 | }, |
47 | { | 49 | { |
48 | label: "用途", | 50 | label: "用途", |
... | @@ -67,7 +69,7 @@ class data extends filter { | ... | @@ -67,7 +69,7 @@ class data extends filter { |
67 | render: (h, scope) => { | 69 | render: (h, scope) => { |
68 | return ( | 70 | return ( |
69 | <div> | 71 | <div> |
70 | <span>{this.dicStatus(scope.row.djlx, 'A21')}</span> | 72 | <span>{this.dicStatus(scope.row.djlx, 'A21')}</span> |
71 | </div> | 73 | </div> |
72 | ) | 74 | ) |
73 | } | 75 | } | ... | ... |
... | @@ -101,7 +101,7 @@ export default { | ... | @@ -101,7 +101,7 @@ export default { |
101 | }].concat(data.columns()).concat([ | 101 | }].concat(data.columns()).concat([ |
102 | { | 102 | { |
103 | label: "操作", | 103 | label: "操作", |
104 | width: 170, | 104 | width: 80, |
105 | render: (h, scope) => { | 105 | render: (h, scope) => { |
106 | return ( | 106 | return ( |
107 | <div> | 107 | <div> | ... | ... |
... | @@ -29,7 +29,7 @@ class data extends filter { | ... | @@ -29,7 +29,7 @@ class data extends filter { |
29 | }, | 29 | }, |
30 | { | 30 | { |
31 | label: "权利类型", | 31 | label: "权利类型", |
32 | width: 200, | 32 | width: 80, |
33 | render: (h, scope) => { | 33 | render: (h, scope) => { |
34 | return ( | 34 | return ( |
35 | <div> | 35 | <div> |
... | @@ -40,7 +40,7 @@ class data extends filter { | ... | @@ -40,7 +40,7 @@ class data extends filter { |
40 | }, | 40 | }, |
41 | { | 41 | { |
42 | label: "登记类型", | 42 | label: "登记类型", |
43 | width: 100, | 43 | width: 80, |
44 | render: (h, scope) => { | 44 | render: (h, scope) => { |
45 | return ( | 45 | return ( |
46 | <div> | 46 | <div> |
... | @@ -52,12 +52,12 @@ class data extends filter { | ... | @@ -52,12 +52,12 @@ class data extends filter { |
52 | { | 52 | { |
53 | label: "业务号", | 53 | label: "业务号", |
54 | prop: "YWH", | 54 | prop: "YWH", |
55 | width: 150 | 55 | width: 95 |
56 | }, | 56 | }, |
57 | { | 57 | { |
58 | label: "不动产单元号", | 58 | label: "不动产单元号", |
59 | prop: "BDCDYH", | 59 | prop: "BDCDYH", |
60 | width: 240, | 60 | width: 150, |
61 | }, | 61 | }, |
62 | { | 62 | { |
63 | label: "不动产权证号", | 63 | label: "不动产权证号", |
... | @@ -73,7 +73,8 @@ class data extends filter { | ... | @@ -73,7 +73,8 @@ class data extends filter { |
73 | }, | 73 | }, |
74 | { | 74 | { |
75 | label: "使用权面积", | 75 | label: "使用权面积", |
76 | prop: "SYQMJ" | 76 | prop: "SYQMJ", |
77 | width: 90, | ||
77 | }, | 78 | }, |
78 | { | 79 | { |
79 | label: "坐落", | 80 | label: "坐落", | ... | ... |
... | @@ -95,7 +95,7 @@ export default { | ... | @@ -95,7 +95,7 @@ export default { |
95 | }].concat(data.columns()).concat([ | 95 | }].concat(data.columns()).concat([ |
96 | { | 96 | { |
97 | label: "操作", | 97 | label: "操作", |
98 | width: 170, | 98 | width: 80, |
99 | render: (h, scope) => { | 99 | render: (h, scope) => { |
100 | return ( | 100 | return ( |
101 | <div> | 101 | <div> | ... | ... |
... | @@ -7,7 +7,7 @@ class data extends filter { | ... | @@ -7,7 +7,7 @@ class data extends filter { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | label: "行政区", | 9 | label: "行政区", |
10 | width: 150, | 10 | width: 80, |
11 | render: (h, scope) => { | 11 | render: (h, scope) => { |
12 | return ( | 12 | return ( |
13 | <div> | 13 | <div> |
... | @@ -18,7 +18,7 @@ class data extends filter { | ... | @@ -18,7 +18,7 @@ class data extends filter { |
18 | }, | 18 | }, |
19 | { | 19 | { |
20 | label: "权属状态", | 20 | label: "权属状态", |
21 | width: 100, | 21 | width: 80, |
22 | render: (h, scope) => { | 22 | render: (h, scope) => { |
23 | return ( | 23 | return ( |
24 | <div> | 24 | <div> |
... | @@ -30,7 +30,7 @@ class data extends filter { | ... | @@ -30,7 +30,7 @@ class data extends filter { |
30 | { | 30 | { |
31 | label: "业务号", | 31 | label: "业务号", |
32 | prop: "ywh", | 32 | prop: "ywh", |
33 | width: 150 | 33 | width: 80, |
34 | }, | 34 | }, |
35 | { | 35 | { |
36 | label: "不动产单元号", | 36 | label: "不动产单元号", |
... | @@ -46,11 +46,13 @@ class data extends filter { | ... | @@ -46,11 +46,13 @@ class data extends filter { |
46 | }, | 46 | }, |
47 | { | 47 | { |
48 | label: "用途", | 48 | label: "用途", |
49 | prop: "yt" | 49 | prop: "yt", |
50 | width: 80, | ||
50 | }, | 51 | }, |
51 | { | 52 | { |
52 | label: "土地面积", | 53 | label: "土地面积", |
53 | prop: "nydmj" | 54 | prop: "nydmj", |
55 | width: 80, | ||
54 | }, | 56 | }, |
55 | { | 57 | { |
56 | label: "坐落", | 58 | label: "坐落", |
... | @@ -58,10 +60,11 @@ class data extends filter { | ... | @@ -58,10 +60,11 @@ class data extends filter { |
58 | }, | 60 | }, |
59 | { | 61 | { |
60 | label: "登记类型", | 62 | label: "登记类型", |
63 | width: 80, | ||
61 | render: (h, scope) => { | 64 | render: (h, scope) => { |
62 | return ( | 65 | return ( |
63 | <div> | 66 | <div> |
64 | <span>{this.dicStatus(scope.row.djlx, 'A21')}</span> | 67 | <span>{this.dicStatus(scope.row.djlx, 'A21')}</span> |
65 | </div> | 68 | </div> |
66 | ) | 69 | ) |
67 | } | 70 | } | ... | ... |
... | @@ -94,7 +94,7 @@ export default { | ... | @@ -94,7 +94,7 @@ export default { |
94 | }].concat(data.columns()).concat([ | 94 | }].concat(data.columns()).concat([ |
95 | { | 95 | { |
96 | label: "操作", | 96 | label: "操作", |
97 | width: 170, | 97 | width: 80, |
98 | render: (h, scope) => { | 98 | render: (h, scope) => { |
99 | return ( | 99 | return ( |
100 | <div> | 100 | <div> | ... | ... |
... | @@ -11,14 +11,14 @@ | ... | @@ -11,14 +11,14 @@ |
11 | </el-select> | 11 | </el-select> |
12 | </el-form-item> | 12 | </el-form-item> |
13 | </el-col> | 13 | </el-col> |
14 | <el-col :span="6"> | 14 | <!-- <el-col :span="6"> |
15 | <el-form-item label="权属状态"> | 15 | <el-form-item label="权属状态"> |
16 | <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态"> | 16 | <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态"> |
17 | <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 17 | <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
18 | </el-option> | 18 | </el-option> |
19 | </el-select> | 19 | </el-select> |
20 | </el-form-item> | 20 | </el-form-item> |
21 | </el-col> | 21 | </el-col> --> |
22 | <el-col :span="6"> | 22 | <el-col :span="6"> |
23 | <el-form-item label="不动产权证号"> | 23 | <el-form-item label="不动产权证号"> |
24 | <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> | 24 | <el-input v-model="form.BDCQZH" placeholder="不动产权证号"></el-input> | ... | ... |
... | @@ -93,7 +93,7 @@ export default { | ... | @@ -93,7 +93,7 @@ export default { |
93 | }].concat(data.columns()).concat([ | 93 | }].concat(data.columns()).concat([ |
94 | { | 94 | { |
95 | label: "操作", | 95 | label: "操作", |
96 | width: 170, | 96 | width: 80, |
97 | render: (h, scope) => { | 97 | render: (h, scope) => { |
98 | return ( | 98 | return ( |
99 | <div> | 99 | <div> | ... | ... |
... | @@ -16,16 +16,16 @@ class data extends filter { | ... | @@ -16,16 +16,16 @@ class data extends filter { |
16 | ) | 16 | ) |
17 | }, | 17 | }, |
18 | }, | 18 | }, |
19 | { | 19 | // { |
20 | label: "权属状态", | 20 | // label: "权属状态", |
21 | render: (h, scope) => { | 21 | // render: (h, scope) => { |
22 | return ( | 22 | // return ( |
23 | <div> | 23 | // <div> |
24 | <span>{this.dicStatus(scope.row.qszt, 'A22')}</span> | 24 | // <span>{this.dicStatus(scope.row.qszt, 'A22')}</span> |
25 | </div> | 25 | // </div> |
26 | ) | 26 | // ) |
27 | }, | 27 | // }, |
28 | }, | 28 | // }, |
29 | { | 29 | { |
30 | label: "业务号", | 30 | label: "业务号", |
31 | prop: "YWH" | 31 | prop: "YWH" |
... | @@ -43,10 +43,10 @@ class data extends filter { | ... | @@ -43,10 +43,10 @@ class data extends filter { |
43 | label: "权利人", | 43 | label: "权利人", |
44 | prop: "qlrmc" | 44 | prop: "qlrmc" |
45 | }, | 45 | }, |
46 | { | 46 | // { |
47 | label: "用途", | 47 | // label: "用途", |
48 | prop: "yt" | 48 | // prop: "yt" |
49 | }, | 49 | // }, |
50 | { | 50 | { |
51 | label: "权利类型", | 51 | label: "权利类型", |
52 | render: (h, scope) => { | 52 | render: (h, scope) => { |
... | @@ -57,16 +57,16 @@ class data extends filter { | ... | @@ -57,16 +57,16 @@ class data extends filter { |
57 | ) | 57 | ) |
58 | }, | 58 | }, |
59 | }, | 59 | }, |
60 | { | 60 | // { |
61 | label: "权利性质", | 61 | // label: "权利性质", |
62 | render: (h, scope) => { | 62 | // render: (h, scope) => { |
63 | return ( | 63 | // return ( |
64 | <div> | 64 | // <div> |
65 | <span>{this.dicStatus(scope.row.BDCQZH, 'A9')}</span> | 65 | // <span>{this.dicStatus(scope.row.BDCQZH, 'A9')}</span> |
66 | </div> | 66 | // </div> |
67 | ) | 67 | // ) |
68 | }, | 68 | // }, |
69 | }, | 69 | // }, |
70 | { | 70 | { |
71 | label: "登记时间", | 71 | label: "登记时间", |
72 | width: 140, | 72 | width: 140, | ... | ... |
... | @@ -11,19 +11,19 @@ | ... | @@ -11,19 +11,19 @@ |
11 | </el-select> | 11 | </el-select> |
12 | </el-form-item> | 12 | </el-form-item> |
13 | </el-col> | 13 | </el-col> |
14 | <el-col :span="6"> | 14 | <!-- <el-col :span="6"> |
15 | <el-form-item label="权属状态" label-width="105px"> | 15 | <el-form-item label="权属状态" label-width="105px"> |
16 | <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态"> | 16 | <el-select v-model="form.QSZT" class="width100" clearable placeholder="权属状态"> |
17 | <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 17 | <el-option v-for="item in dicData['A22']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
18 | </el-option> | 18 | </el-option> |
19 | </el-select> | 19 | </el-select> |
20 | </el-form-item> | 20 | </el-form-item> |
21 | </el-col> | 21 | </el-col> --> |
22 | <el-col :span="6"> | 22 | <!-- <el-col :span="6"> |
23 | <el-form-item label="坐落"> | 23 | <el-form-item label="坐落"> |
24 | <el-input v-model="form.ZL" placeholder="请输入坐落"></el-input> | 24 | <el-input v-model="form.ZL" placeholder="请输入坐落"></el-input> |
25 | </el-form-item> | 25 | </el-form-item> |
26 | </el-col> | 26 | </el-col> --> |
27 | <el-col :span="6"> | 27 | <el-col :span="6"> |
28 | <el-form-item label="不动产权证号" label-width="105px"> | 28 | <el-form-item label="不动产权证号" label-width="105px"> |
29 | <el-input v-model="form.BDCQZH" placeholder="请输入不动产权证号"></el-input> | 29 | <el-input v-model="form.BDCQZH" placeholder="请输入不动产权证号"></el-input> |
... | @@ -94,7 +94,7 @@ export default { | ... | @@ -94,7 +94,7 @@ export default { |
94 | }].concat(data.columns()).concat([ | 94 | }].concat(data.columns()).concat([ |
95 | { | 95 | { |
96 | label: "操作", | 96 | label: "操作", |
97 | width: 170, | 97 | width: 80, |
98 | render: (h, scope) => { | 98 | render: (h, scope) => { |
99 | return ( | 99 | return ( |
100 | <div> | 100 | <div> | ... | ... |
... | @@ -87,21 +87,24 @@ export default { | ... | @@ -87,21 +87,24 @@ export default { |
87 | return new Promise(async (resolve) => { | 87 | return new Promise(async (resolve) => { |
88 | try { | 88 | try { |
89 | let p = { | 89 | let p = { |
90 | DJLX: "A21", | 90 | DJLX: "", |
91 | QLLX: "A8", | 91 | QLLX: "", |
92 | XZQDM: "A20", | 92 | XZQDM: "", |
93 | }; | 93 | }; |
94 | let res = await work.getsthjqxjrtotal(p); | 94 | let res = await work.getsthjqxjrtotal(p); |
95 | this.stjrl=Number(res.result.sum) | 95 | console.log("res",res); |
96 | this.qxjrl=Number(res.result.sum) | 96 | this.stjrl=res.result.stsum |
97 | this.qxjrl=res.result.qxsum | ||
97 | this.qxerrer=Number(res.result.qxjrerrer) | 98 | this.qxerrer=Number(res.result.qxjrerrer) |
98 | this.sterrer=Number(res.result.sthjerrer) | 99 | this.sterrer=Number(res.result.sthjerrer) |
99 | if(res.result.sum=="0"){ | 100 | if(res.result.sum=="0"){ |
100 | this.qxcgl="100%" | 101 | this.qxcgl="100%" |
101 | this.stcgl="100%" | 102 | this.stcgl="100%" |
102 | }else{ | 103 | }else{ |
103 | this.qxcgl=Number(res.result.qxjrsuccess)/this.qxjrl*100+"%" | 104 | let qxcglnum=Number(res.result.qxjrsuccess)/this.qxjrl*100 |
104 | this.stcgl=Number(res.result.sthjsuccess)/Number(res.result.sum)*100+"%" | 105 | let stcgl=Number(res.result.sthjsuccess)/this.qxjrl*100 |
106 | this.qxcgl=qxcglnum.toFixed(2)+"%"; | ||
107 | this.stcgl=stcgl.toFixed(2)+"%"; | ||
105 | } | 108 | } |
106 | 109 | ||
107 | } catch (error) { | 110 | } catch (error) { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="rightcard"> | 2 | <div class="rightcard"> |
3 | <div class="card1 cardCon d-center"> | 3 | <div class="card1 cardCon d-center"> |
4 | <div class="cardhead">房屋情况统计表</div> | 4 | <div class="cardhead">新建商品房登记</div> |
5 | <div class="cardcontent" style="margin-top: 70px"> | 5 | <div class="cardcontent" style="margin-top: 70px"> |
6 | <dv-scroll-board :config="config" class="board" /> | 6 | <dv-scroll-board :config="config" class="board" /> |
7 | </div> | 7 | </div> | ... | ... |
... | @@ -24,6 +24,7 @@ class data { | ... | @@ -24,6 +24,7 @@ class data { |
24 | { | 24 | { |
25 | prop: "UPLOADTIME", | 25 | prop: "UPLOADTIME", |
26 | label: "日期", | 26 | label: "日期", |
27 | width: '150', | ||
27 | }, | 28 | }, |
28 | { | 29 | { |
29 | prop: "type", | 30 | prop: "type", |
... | @@ -50,6 +51,7 @@ class data { | ... | @@ -50,6 +51,7 @@ class data { |
50 | }, | 51 | }, |
51 | { | 52 | { |
52 | label: "业务类型数量", | 53 | label: "业务类型数量", |
54 | width: '120', | ||
53 | render: (h, scope) => { | 55 | render: (h, scope) => { |
54 | return ( | 56 | return ( |
55 | <div class={'difference'}> | 57 | <div class={'difference'}> | ... | ... |
... | @@ -4,9 +4,12 @@ | ... | @@ -4,9 +4,12 @@ |
4 | <!-- 头部搜索 --> | 4 | <!-- 头部搜索 --> |
5 | <div class="from-clues-header"> | 5 | <div class="from-clues-header"> |
6 | <el-form ref="ruleForm" :model="form" label-width="80px"> | 6 | <el-form ref="ruleForm" :model="form" label-width="80px"> |
7 | <el-form-item> | ||
8 | <Breadcrumb /> | ||
9 | </el-form-item> | ||
7 | <el-row> | 10 | <el-row> |
8 | <el-col :span="6"> | 11 | <el-col :span="6"> |
9 | <el-form-item label="行政区" label-width="60px"> | 12 | <el-form-item label="行政区"> |
10 | <el-select v-model="form.areacode" class="width100" filterable placeholder="请选择行政区"> | 13 | <el-select v-model="form.areacode" class="width100" filterable placeholder="请选择行政区"> |
11 | <el-option v-for="item in dicData['XZQ']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 14 | <el-option v-for="item in dicData['XZQ']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
12 | </el-option> | 15 | </el-option> | ... | ... |
... | @@ -8,7 +8,7 @@ class data extends filter { | ... | @@ -8,7 +8,7 @@ class data extends filter { |
8 | { | 8 | { |
9 | prop: 'jcjg', | 9 | prop: 'jcjg', |
10 | label: '检查结果', | 10 | label: '检查结果', |
11 | width: 100, | 11 | width: 90, |
12 | render: (h, scope) => { | 12 | render: (h, scope) => { |
13 | return ( | 13 | return ( |
14 | <div> | 14 | <div> |
... | @@ -22,7 +22,7 @@ class data extends filter { | ... | @@ -22,7 +22,7 @@ class data extends filter { |
22 | { | 22 | { |
23 | prop: 'rkjg', | 23 | prop: 'rkjg', |
24 | label: '入库结果', | 24 | label: '入库结果', |
25 | width: 100, | 25 | width: 80, |
26 | render: (h, scope) => { | 26 | render: (h, scope) => { |
27 | return ( | 27 | return ( |
28 | <div> | 28 | <div> |
... | @@ -36,24 +36,27 @@ class data extends filter { | ... | @@ -36,24 +36,27 @@ class data extends filter { |
36 | { | 36 | { |
37 | prop: "areacode", | 37 | prop: "areacode", |
38 | label: "行政区代码", | 38 | label: "行政区代码", |
39 | width: 100, | 39 | width: 90, |
40 | }, | 40 | }, |
41 | { | 41 | { |
42 | prop: "areaName", | 42 | prop: "areaName", |
43 | label: "行政区名称", | 43 | label: "行政区名称", |
44 | width: 100, | 44 | width: 90, |
45 | }, | 45 | }, |
46 | { | 46 | { |
47 | prop: "bizMsgid", | 47 | prop: "bizMsgid", |
48 | label: "业务报文ID", | 48 | label: "业务报文ID", |
49 | width: 90, | ||
49 | }, | 50 | }, |
50 | { | 51 | { |
51 | prop: "createdate", | 52 | prop: "createdate", |
52 | label: "创建时间", | 53 | label: "创建时间", |
54 | width: 140, | ||
53 | }, | 55 | }, |
54 | { | 56 | { |
55 | prop: "recflowid", | 57 | prop: "recflowid", |
56 | label: "业务流水号", | 58 | label: "业务流水号", |
59 | width: 95, | ||
57 | }, | 60 | }, |
58 | { | 61 | { |
59 | prop: "estatenum", | 62 | prop: "estatenum", |
... | @@ -63,14 +66,23 @@ class data extends filter { | ... | @@ -63,14 +66,23 @@ class data extends filter { |
63 | { | 66 | { |
64 | prop: "rectype", | 67 | prop: "rectype", |
65 | label: "业务编码", | 68 | label: "业务编码", |
69 | width: 80, | ||
66 | }, | 70 | }, |
67 | { | 71 | { |
68 | prop: "rectypeName", | 72 | prop: "rectypeName", |
69 | label: "业务名称", | 73 | label: "业务名称", |
74 | render: (h, scope) => { | ||
75 | return ( | ||
76 | <div> | ||
77 | {scope.row.rectypeName} | ||
78 | </div> | ||
79 | ) | ||
80 | } | ||
70 | }, | 81 | }, |
71 | { | 82 | { |
72 | prop: "receiveDate", | 83 | prop: "receiveDate", |
73 | label: "接收时间", | 84 | label: "接收时间", |
85 | width: 140 | ||
74 | } | 86 | } |
75 | ] | 87 | ] |
76 | } | 88 | } | ... | ... |
... | @@ -4,6 +4,9 @@ | ... | @@ -4,6 +4,9 @@ |
4 | <!-- 头部搜索 --> | 4 | <!-- 头部搜索 --> |
5 | <div class="from-clues-header"> | 5 | <div class="from-clues-header"> |
6 | <el-form ref="ruleForm" :model="form" label-width="100px"> | 6 | <el-form ref="ruleForm" :model="form" label-width="100px"> |
7 | <el-form-item> | ||
8 | <Breadcrumb /> | ||
9 | </el-form-item> | ||
7 | <el-row class="mb-5"> | 10 | <el-row class="mb-5"> |
8 | <el-col :span="6"> | 11 | <el-col :span="6"> |
9 | <el-form-item label="行政区" prop="qxdm"> | 12 | <el-form-item label="行政区" prop="qxdm"> |
... | @@ -14,13 +17,13 @@ | ... | @@ -14,13 +17,13 @@ |
14 | </el-form-item> | 17 | </el-form-item> |
15 | </el-col> | 18 | </el-col> |
16 | <el-col :span="6"> | 19 | <el-col :span="6"> |
17 | <el-form-item label="接收开始日期" prop="startTime"> | 20 | <el-form-item label="接收日期" prop="receiveStartTime"> |
18 | <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" | 21 | <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" |
19 | clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd"></el-date-picker> | 22 | clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd"></el-date-picker> |
20 | </el-form-item> | 23 | </el-form-item> |
21 | </el-col> | 24 | </el-col> |
22 | <el-col :span="6"> | 25 | <el-col :span="6"> |
23 | <el-form-item label="接收结束日期" prop="endTime"> | 26 | <el-form-item label="至" prop="receiveEndTime" label-width="35px"> |
24 | <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" | 27 | <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" |
25 | clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd"></el-date-picker> | 28 | clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd"></el-date-picker> |
26 | </el-form-item> | 29 | </el-form-item> |
... | @@ -77,7 +80,7 @@ | ... | @@ -77,7 +80,7 @@ |
77 | <el-form-item> | 80 | <el-form-item> |
78 | <btn nativeType="cz" @click="resetForm">重置</btn> | 81 | <btn nativeType="cz" @click="resetForm">重置</btn> |
79 | <btn nativeType="cx" @click="featchData">查询</btn> | 82 | <btn nativeType="cx" @click="featchData">查询</btn> |
80 | <btn nativeType="sb">入库</btn> | 83 | <btn nativeType="cx">入库</btn> |
81 | </el-form-item> | 84 | </el-form-item> |
82 | </el-col> | 85 | </el-col> |
83 | </el-row> | 86 | </el-row> |
... | @@ -113,19 +116,25 @@ export default { | ... | @@ -113,19 +116,25 @@ export default { |
113 | }, | 116 | }, |
114 | data () { | 117 | data () { |
115 | return { | 118 | return { |
116 | // 开始结束日期限制 | ||
117 | pickerOptionsStart: { | 119 | pickerOptionsStart: { |
118 | disabledDate: (time) => { | 120 | disabledDate: (time) => { |
119 | if (this.form.endTime) { | 121 | let endDateVal = this.form.receiveEndTime; |
120 | return time.getTime() >= new Date(this.form.endTime).getTime(); | 122 | if (endDateVal) { |
123 | return ( | ||
124 | time.getTime() > | ||
125 | new Date(endDateVal).getTime() - 1 * 24 * 60 * 60 * 1000 | ||
126 | ); | ||
121 | } | 127 | } |
122 | }, | 128 | }, |
123 | }, | 129 | }, |
124 | // 结束日期限制 | ||
125 | pickerOptionsEnd: { | 130 | pickerOptionsEnd: { |
126 | disabledDate: (time) => { | 131 | disabledDate: (time) => { |
127 | if (this.form.startTime) { | 132 | let beginDateVal = this.form.receiveStartTime; |
128 | return time.getTime() <= new Date(this.form.startTime).getTime(); | 133 | if (beginDateVal) { |
134 | return ( | ||
135 | time.getTime() < | ||
136 | new Date(beginDateVal).getTime() + 1 * 24 * 60 * 60 * 1000 | ||
137 | ); | ||
129 | } | 138 | } |
130 | }, | 139 | }, |
131 | }, | 140 | }, |
... | @@ -173,7 +182,7 @@ export default { | ... | @@ -173,7 +182,7 @@ export default { |
173 | .concat([ | 182 | .concat([ |
174 | { | 183 | { |
175 | label: "操作", | 184 | label: "操作", |
176 | width: "160", | 185 | width: "90", |
177 | render: (h, scope) => { | 186 | render: (h, scope) => { |
178 | return ( | 187 | return ( |
179 | <div> | 188 | <div> | ... | ... |
... | @@ -23,6 +23,7 @@ class data extends filter { | ... | @@ -23,6 +23,7 @@ class data extends filter { |
23 | }, | 23 | }, |
24 | { | 24 | { |
25 | label: '汇交状态', | 25 | label: '汇交状态', |
26 | width: '110', | ||
26 | render: (h, scope) => { | 27 | render: (h, scope) => { |
27 | return ( | 28 | return ( |
28 | <div> | 29 | <div> |
... | @@ -38,33 +39,36 @@ class data extends filter { | ... | @@ -38,33 +39,36 @@ class data extends filter { |
38 | { | 39 | { |
39 | prop: "areacode", | 40 | prop: "areacode", |
40 | label: "行政区代码", | 41 | label: "行政区代码", |
41 | width: 100, | 42 | width: 90, |
42 | }, | 43 | }, |
43 | { | 44 | { |
44 | prop: "areaName", | 45 | prop: "areaName", |
45 | label: "行政区名称", | 46 | label: "行政区名称", |
46 | width: 100, | 47 | width: 90, |
47 | }, | 48 | }, |
48 | { | 49 | { |
49 | prop: "bizMsgid", | 50 | prop: "bizMsgid", |
50 | label: "业务报文ID", | 51 | label: "业务报文ID", |
52 | width: 150, | ||
51 | }, | 53 | }, |
52 | { | 54 | { |
53 | prop: "createdate", | 55 | prop: "createdate", |
54 | label: "创建时间", | 56 | label: "创建时间", |
57 | width: 140, | ||
55 | }, | 58 | }, |
56 | { | 59 | { |
57 | prop: "recflowid", | 60 | prop: "recflowid", |
58 | label: "业务流水号", | 61 | label: "业务流水号", |
62 | width: 100, | ||
59 | }, | 63 | }, |
60 | { | 64 | { |
61 | prop: "estatenum", | 65 | prop: "estatenum", |
62 | label: "不动产单元号", | 66 | label: "不动产单元号", |
63 | width: 240, | ||
64 | }, | 67 | }, |
65 | { | 68 | { |
66 | prop: "rectype", | 69 | prop: "rectype", |
67 | label: "业务编码", | 70 | label: "业务编码", |
71 | width: 90, | ||
68 | }, | 72 | }, |
69 | { | 73 | { |
70 | prop: "rectypeName", | 74 | prop: "rectypeName", |
... | @@ -73,6 +77,7 @@ class data extends filter { | ... | @@ -73,6 +77,7 @@ class data extends filter { |
73 | { | 77 | { |
74 | prop: "uploadtime", | 78 | prop: "uploadtime", |
75 | label: "汇交时间", | 79 | label: "汇交时间", |
80 | width: 140, | ||
76 | } | 81 | } |
77 | ] | 82 | ] |
78 | } | 83 | } | ... | ... |
... | @@ -4,6 +4,9 @@ | ... | @@ -4,6 +4,9 @@ |
4 | <!-- 头部搜索 --> | 4 | <!-- 头部搜索 --> |
5 | <div class="from-clues-header"> | 5 | <div class="from-clues-header"> |
6 | <el-form ref="ruleForm" :model="form" label-width="100px"> | 6 | <el-form ref="ruleForm" :model="form" label-width="100px"> |
7 | <el-form-item> | ||
8 | <Breadcrumb /> | ||
9 | </el-form-item> | ||
7 | <el-row class="mb-5"> | 10 | <el-row class="mb-5"> |
8 | <el-col :span="6"> | 11 | <el-col :span="6"> |
9 | <el-form-item label="行政区" prop="qxdm"> | 12 | <el-form-item label="行政区" prop="qxdm"> |
... | @@ -13,18 +16,16 @@ | ... | @@ -13,18 +16,16 @@ |
13 | </el-select> | 16 | </el-select> |
14 | </el-form-item> | 17 | </el-form-item> |
15 | </el-col> | 18 | </el-col> |
16 | <el-col :span="12"> | 19 | <el-col :span="6"> |
17 | <el-form-item label="汇交时间" prop="startTime"> | 20 | <el-form-item label="汇交时间" prop="exchangeStartTime"> |
18 | <el-row :gutter="20"> | 21 | <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" |
19 | <el-col :span="12"> | 22 | clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker> |
20 | <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart" | 23 | </el-form-item> |
21 | clearable v-model="form.exchangeStartTime" value-format="yyyy-MM-dd"></el-date-picker> | 24 | </el-col> |
22 | </el-col> | 25 | <el-col :span="6"> |
23 | <el-col :span="12"> | 26 | <el-form-item label="至" prop="exchangeStartTime" label-width="35px"> |
24 | <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" | 27 | <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" |
25 | clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker> | 28 | clearable v-model="form.exchangeEndTime" value-format="yyyy-MM-dd"></el-date-picker> |
26 | </el-col> | ||
27 | </el-row> | ||
28 | </el-form-item> | 29 | </el-form-item> |
29 | </el-col> | 30 | </el-col> |
30 | <el-col :span="6"> | 31 | <el-col :span="6"> |
... | @@ -42,17 +43,17 @@ | ... | @@ -42,17 +43,17 @@ |
42 | <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input> | 43 | <el-input v-model="form.ywh" class="width100" placeholder="业务号"></el-input> |
43 | </el-form-item> | 44 | </el-form-item> |
44 | </el-col> | 45 | </el-col> |
45 | <el-col :span="3"> | 46 | <el-col :span="6"> |
46 | <el-form-item label="权利类型" prop="qllx"> | 47 | <el-form-item label="权利类型" prop="qllx"> |
47 | <el-select v-model="form.ywmc" class="width100" clearable placeholder="权利类型"> | 48 | <el-select v-model="form.qllx" class="width100" clearable placeholder="权利类型"> |
48 | <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 49 | <el-option v-for="item in dicData['A8']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
49 | </el-option> | 50 | </el-option> |
50 | </el-select> | 51 | </el-select> |
51 | </el-form-item> | 52 | </el-form-item> |
52 | </el-col> | 53 | </el-col> |
53 | <el-col :span="3"> | 54 | <el-col :span="6"> |
54 | <el-form-item label="登记类型" prop="djlx"> | 55 | <el-form-item label="登记类型" prop="djlx"> |
55 | <el-select v-model="form.ywmc" class="width100" clearable placeholder="登记类型"> | 56 | <el-select v-model="form.djlx" class="width100" clearable placeholder="登记类型"> |
56 | <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> | 57 | <el-option v-for="item in dicData['A21']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE"> |
57 | </el-option> | 58 | </el-option> |
58 | </el-select> | 59 | </el-select> |
... | @@ -95,26 +96,22 @@ export default { | ... | @@ -95,26 +96,22 @@ export default { |
95 | components: { | 96 | components: { |
96 | dataDetails, | 97 | dataDetails, |
97 | }, | 98 | }, |
98 | data() { | 99 | data () { |
99 | return { | 100 | return { |
100 | isShow: false, | 101 | isShow: false, |
101 | // 开始结束日期限制 | 102 | // 开始结束日期限制 |
102 | pickerOptionsStart: { | 103 | pickerOptionsStart: { |
103 | disabledDate: (time) => { | 104 | disabledDate: (time) => { |
104 | if (this.form.reportEndTime) { | 105 | if (this.form.exchangeEndTime) { |
105 | return ( | 106 | return time.getTime() >= new Date(this.form.exchangeEndTime).getTime(); |
106 | time.getTime() >= new Date(this.form.reportEndTime).getTime() | ||
107 | ); | ||
108 | } | 107 | } |
109 | }, | 108 | }, |
110 | }, | 109 | }, |
111 | // 结束日期限制 | 110 | // 结束日期限制 |
112 | pickerOptionsEnd: { | 111 | pickerOptionsEnd: { |
113 | disabledDate: (time) => { | 112 | disabledDate: (time) => { |
114 | if (this.form.reportStartTime) { | 113 | if (this.form.exchangeStartTime) { |
115 | return ( | 114 | return time.getTime() <= new Date(this.form.exchangeStartTime).getTime(); |
116 | time.getTime() <= new Date(this.form.reportStartTime).getTime() | ||
117 | ); | ||
118 | } | 115 | } |
119 | }, | 116 | }, |
120 | }, | 117 | }, |
... | @@ -157,20 +154,20 @@ export default { | ... | @@ -157,20 +154,20 @@ export default { |
157 | ]), | 154 | ]), |
158 | total: 0, | 155 | total: 0, |
159 | data: [{}], | 156 | data: [{}], |
160 | }, | 157 | }, |
161 | title: "", | 158 | title: "", |
162 | }; | 159 | }; |
163 | }, | 160 | }, |
164 | mounted() { | 161 | mounted () { |
165 | sendThis(this); | 162 | sendThis(this); |
166 | }, | 163 | }, |
167 | methods: { | 164 | methods: { |
168 | // 重置表单 | 165 | // 重置表单 |
169 | resetForm() { | 166 | resetForm () { |
170 | this.$refs.ruleForm.resetFields(); | 167 | this.$refs.ruleForm.resetFields(); |
171 | }, | 168 | }, |
172 | // 初始化数据 | 169 | // 初始化数据 |
173 | queryClick() { | 170 | queryClick () { |
174 | getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { | 171 | getDataReportPage({ ...this.form, ...this.pageData }).then((res) => { |
175 | if (res.code === 200) { | 172 | if (res.code === 200) { |
176 | let { total, records } = res.result; | 173 | let { total, records } = res.result; |
... | @@ -180,11 +177,11 @@ export default { | ... | @@ -180,11 +177,11 @@ export default { |
180 | }); | 177 | }); |
181 | }, | 178 | }, |
182 | // 多选 | 179 | // 多选 |
183 | handleSelectionChange(val) {}, | 180 | handleSelectionChange (val) { }, |
184 | // 上报 | 181 | // 上报 |
185 | handleEscalation() {}, | 182 | handleEscalation () { }, |
186 | // 详情 | 183 | // 详情 |
187 | handleDetail(row) { | 184 | handleDetail (row) { |
188 | this.title = row.rectypeName; | 185 | this.title = row.rectypeName; |
189 | this.$refs.editLog.isShow(row); | 186 | this.$refs.editLog.isShow(row); |
190 | }, | 187 | }, | ... | ... |
1 | <template> | ||
2 | <Dialog :title="title" class="tableClass" :show.sync="visible" :width="'715px'" @close="close()"> | ||
3 | <template slot="content"> | ||
4 | <lb-table ref="multipleTable" | ||
5 | :pagination="false" | ||
6 | :column="tableData.column" | ||
7 | :data="tableData.data" | ||
8 | @selection-change="handleSelectionChange"> | ||
9 | </lb-table> | ||
10 | </template> | ||
11 | <template slot="footer"> | ||
12 | <el-button type="primary" class="save" @click="handleSaveMember()" | ||
13 | >保存</el-button | ||
14 | > | ||
15 | <el-button class="cancel-button" @click="close()">取消</el-button> | ||
16 | </template> | ||
17 | </Dialog> | ||
18 | </template> | ||
19 | |||
20 | <script> | ||
21 | import Dialog from "@/components/Dialog/"; | ||
22 | export default { | ||
23 | name: "", | ||
24 | components: { Dialog }, | ||
25 | props: {}, | ||
26 | data() { | ||
27 | return { | ||
28 | title: "人员配置", | ||
29 | visible: false, | ||
30 | tableData: { | ||
31 | column: [ | ||
32 | { | ||
33 | type: 'selection' | ||
34 | }, | ||
35 | { | ||
36 | prop: 'name', | ||
37 | label: '角色名称' | ||
38 | }, | ||
39 | { | ||
40 | prop: 'type', | ||
41 | label: '角色类型' | ||
42 | }, | ||
43 | { | ||
44 | prop: 'departmentName', | ||
45 | label: '角色描述' | ||
46 | }, | ||
47 | ], | ||
48 | data: [ | ||
49 | { | ||
50 | id: "3127e455-43ba-45ff-9326-0e02ef89485e", | ||
51 | createdAt: null, | ||
52 | updatedAt: "2022-08-04T03:38:27.626+0000", | ||
53 | createdBy: null, | ||
54 | updatedBy: "3127e455-43ba-45ff-9326-0e02ef89485e", | ||
55 | sort: 1, | ||
56 | name: "超级管理员", | ||
57 | loginName: "admin", | ||
58 | password: "05eb15777e8fd1d61c840472e7267f61d432f63340d86b59", | ||
59 | passwordSalt: "5178114777136485", | ||
60 | email: null, | ||
61 | lastLoginTime: null, | ||
62 | mobilePhone: "18291003568", | ||
63 | status: "ACTIVE", | ||
64 | passwordChangeTime: "2021-12-10T08:01:01.569+0000", | ||
65 | idCard: "612725202111021521", | ||
66 | departmentId: "2eae5304-544f-4f5b-b354-8f5d47433c9b", | ||
67 | organizationId: "0bca67ae-1d9e-4b41-b057-f165586d24aa", | ||
68 | sex: "0", | ||
69 | isDuty: true, | ||
70 | type:"", | ||
71 | code: "123324", | ||
72 | jobLevel: null, | ||
73 | telephone: "028-87720898", | ||
74 | address: "办公地点修改测试", | ||
75 | isLocked: false, | ||
76 | departmentName: "研发部", | ||
77 | _X_ROW_KEY: "row_276", | ||
78 | }, | ||
79 | { | ||
80 | name: '数据管理员', | ||
81 | type:"1", | ||
82 | }, | ||
83 | { | ||
84 | name: '数据管理员2', | ||
85 | type:"d", | ||
86 | } | ||
87 | ] | ||
88 | }, | ||
89 | multipleSelection: [] | ||
90 | |||
91 | } | ||
92 | }, | ||
93 | computed: {}, | ||
94 | watch: {}, | ||
95 | created() {}, | ||
96 | mounted() {}, | ||
97 | methods: { | ||
98 | authorization() { | ||
99 | this.visible = true; | ||
100 | }, | ||
101 | close() { | ||
102 | // this.resetForm() | ||
103 | this.visible = false; | ||
104 | }, | ||
105 | // 保存事件 | ||
106 | handleSaveMember() { | ||
107 | // if (this.memberList.length === 0) { | ||
108 | // this.$message.warning("请添加待选人员"); | ||
109 | // return false; | ||
110 | // } | ||
111 | // const idList = this.memberList.map(item => item.id) | ||
112 | // updateUser(this.roleId, idList).then(res => { | ||
113 | // if (res.status === 1) { | ||
114 | // this.$message.success({ message: '保存成功', showClose: true }) | ||
115 | // this.showMemberConfigDialog = false | ||
116 | // this.$emit('setUsers', this.roleId) | ||
117 | // this.resetMemberConfig() | ||
118 | // } else this.$message.error({ message: res.message, showClose: true }) | ||
119 | // }) | ||
120 | }, | ||
121 | handleSelectionChange (val) { | ||
122 | console.log("vadddl",val); | ||
123 | this.multipleSelection = val | ||
124 | } | ||
125 | } | ||
126 | }; | ||
127 | </script> | ||
128 | <style scoped lang="scss"> | ||
129 | /deep/.el-dialog__header{ | ||
130 | text-align: center; | ||
131 | margin-bottom: 10px; | ||
132 | .el-dialog__title{ | ||
133 | color: white; | ||
134 | } | ||
135 | } | ||
136 | </style> |
... | @@ -204,22 +204,14 @@ export default { | ... | @@ -204,22 +204,14 @@ export default { |
204 | // this.form.jumpMode = 1 | 204 | // this.form.jumpMode = 1 |
205 | }, | 205 | }, |
206 | edit(record) { | 206 | edit(record) { |
207 | // this.type = 1 | 207 | // 若有id为编辑 |
208 | // // 若有id为编辑 | 208 | if (record.id) { |
209 | // if (record.id) { | 209 | this.$nextTick(() => { |
210 | // this.$nextTick(() => { | 210 | this.form = Object.assign({}, record) |
211 | // this.form = Object.assign({}, record) | 211 | // this.getParentMenuList(this.productId) |
212 | // this.getParentMenuList(this.productId) | 212 | }) |
213 | // }) | 213 | } |
214 | // } | ||
215 | this.visible = true; | ||
216 | }, | ||
217 | addChild(record) { | ||
218 | // this.getParentMenuList(this.productId) | ||
219 | this.visible = true; | 214 | this.visible = true; |
220 | // this.type = 2 | ||
221 | // this.form.jumpMode = 1 | ||
222 | // this.form.parentId = record.id | ||
223 | }, | 215 | }, |
224 | handleChange(value) { | 216 | handleChange(value) { |
225 | // this.form.parentId = value | 217 | // this.form.parentId = value |
... | @@ -289,12 +281,16 @@ export default { | ... | @@ -289,12 +281,16 @@ export default { |
289 | }; | 281 | }; |
290 | </script> | 282 | </script> |
291 | <style scoped lang="scss"> | 283 | <style scoped lang="scss"> |
292 | .el-form { | 284 | /deep/.el-input__inner { |
293 | .el-input { | 285 | background: #07388B; |
294 | .el-input__icon { | 286 | border-radius: 2px; |
295 | font-size: 14px; | 287 | border: 1px solid #6BC1FC; |
296 | // color: #3AA3F8 !important; | 288 | } |
297 | } | 289 | /deep/.el-textarea__inner{ |
298 | } | 290 | background: #07388B; |
291 | color: #fff; | ||
292 | } | ||
293 | /deep/.el-form-item__label{ | ||
294 | color:#fff; | ||
299 | } | 295 | } |
300 | </style> | 296 | </style> | ... | ... |
... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
12 | <div class="from-clues-content"> | 12 | <div class="from-clues-content"> |
13 | <lb-table | 13 | <lb-table |
14 | :column="tableData.columns" | 14 | :column="tableData.columns" |
15 | :data="tabledata11" | 15 | :data="tabledata" |
16 | row-key="id" | 16 | row-key="id" |
17 | default-expand-all | 17 | default-expand-all |
18 | :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" | 18 | :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" |
... | @@ -20,27 +20,30 @@ | ... | @@ -20,27 +20,30 @@ |
20 | </lb-table> | 20 | </lb-table> |
21 | </div> | 21 | </div> |
22 | <edit-dialog ref="dialogForm" /> | 22 | <edit-dialog ref="dialogForm" /> |
23 | <authorizationdiglog ref="rolesForm" /> | ||
23 | </div> | 24 | </div> |
24 | </template> | 25 | </template> |
25 | <script> | 26 | <script> |
26 | // 定时任务 | 27 | // 定时任务 |
27 | import data from "./data"; | 28 | import data from "./data"; |
28 | import EditDialog from "./edit-dialog.vue"; | 29 | import EditDialog from "./edit-dialog.vue"; |
30 | import authorizationdiglog from "./authorizationdiglog.vue"; | ||
29 | export default { | 31 | export default { |
30 | name: "menus", | 32 | name: "menus", |
31 | components: { | 33 | components: { |
32 | EditDialog, | 34 | EditDialog, |
35 | authorizationdiglog, | ||
33 | }, | 36 | }, |
34 | data() { | 37 | data() { |
35 | return { | 38 | return { |
36 | tabledata11: [ | 39 | tabledata: [ |
37 | { | 40 | { |
38 | id: "c6221838-187b-4a7a-b173-b0543022f560", | 41 | id: "c6221838-187b-4a7a-b173-b0543022f560", |
39 | createdAt: "2021-08-26T07:00:07.101+0000", | 42 | createdAt: "2021-08-26T07:00:07.101+0000", |
40 | updatedAt: "2021-08-26T07:00:07.101+0000", | 43 | updatedAt: "2021-08-26T07:00:07.101+0000", |
41 | createdBy: "3127e455-43ba-45ff-9326-0e02ef89485e", | 44 | createdBy: "3127e455-43ba-45ff-9326-0e02ef89485e", |
42 | updatedBy: "3127e455-43ba-45ff-9326-0e02ef89485e", | 45 | updatedBy: "3127e455-43ba-45ff-9326-0e02ef89485e", |
43 | sort: 135, | 46 | sort: 35, |
44 | name: "概览", | 47 | name: "概览", |
45 | code: "GL", | 48 | code: "GL", |
46 | description: null, | 49 | description: null, |
... | @@ -293,14 +296,14 @@ export default { | ... | @@ -293,14 +296,14 @@ export default { |
293 | 296 | ||
294 | // 修改 | 297 | // 修改 |
295 | handleEdit(record) { | 298 | handleEdit(record) { |
296 | localStorage.setItem("record", JSON.stringify(record)); | ||
297 | this.$refs.dialogForm.edit(record); | 299 | this.$refs.dialogForm.edit(record); |
298 | this.$refs.dialogForm.title = "修改"; | 300 | this.$refs.dialogForm.title = "修改"; |
299 | }, | 301 | }, |
300 | // 授权 | 302 | // 授权 |
301 | authorizationQuery(record) { | 303 | authorizationQuery(record) { |
302 | this.$refs.authorizationList.open(record, 'menu') | 304 | this.$refs.rolesForm.authorization(record); |
303 | this.$refs.authorizationList.emptyJudge = true | 305 | this.$refs.rolesForm.title = "授权查询"; |
306 | |||
304 | }, | 307 | }, |
305 | // 删除 | 308 | // 删除 |
306 | handleDelete(row, id) { | 309 | handleDelete(row, id) { |
... | @@ -340,4 +343,7 @@ export default { | ... | @@ -340,4 +343,7 @@ export default { |
340 | <style scoped lang="scss"> | 343 | <style scoped lang="scss"> |
341 | @import "~@/styles/mixin.scss"; | 344 | @import "~@/styles/mixin.scss"; |
342 | @import "~@/styles/public.scss"; | 345 | @import "~@/styles/public.scss"; |
346 | /deep/.el-table__expand-icon{ | ||
347 | color: #fff; | ||
348 | } | ||
343 | </style> | 349 | </style> | ... | ... |
... | @@ -6,17 +6,17 @@ class data extends filter { | ... | @@ -6,17 +6,17 @@ class data extends filter { |
6 | columns () { | 6 | columns () { |
7 | return [ | 7 | return [ |
8 | { | 8 | { |
9 | prop: "job_name", | 9 | prop: "name", |
10 | label: "角色名称", | 10 | label: "角色名称", |
11 | width: 330 | 11 | width: 330 |
12 | }, | 12 | }, |
13 | { | 13 | { |
14 | prop: "description", | 14 | prop: "type", |
15 | label: "类别", | 15 | label: "类别", |
16 | width: 400 | 16 | width: 400 |
17 | }, | 17 | }, |
18 | { | 18 | { |
19 | prop: "cron_expression", | 19 | prop: "description", |
20 | label: "备注" | 20 | label: "备注" |
21 | } | 21 | } |
22 | ] | 22 | ] | ... | ... |
src/views/system/roles/data/roles.js
0 → 100644
1 | import filter from '@/utils/filter.js' | ||
2 | class data extends filter { | ||
3 | constructor() { | ||
4 | super() | ||
5 | } | ||
6 | columns () { | ||
7 | return [ | ||
8 | { | ||
9 | prop: "name", | ||
10 | label: "角色名称", | ||
11 | width: 330 | ||
12 | }, | ||
13 | { | ||
14 | prop: "type", | ||
15 | label: "类别", | ||
16 | width: 400 | ||
17 | }, | ||
18 | { | ||
19 | prop: "address", | ||
20 | label: "备注" | ||
21 | } | ||
22 | ] | ||
23 | } | ||
24 | } | ||
25 | export default new data() |
... | @@ -171,4 +171,17 @@ export default { | ... | @@ -171,4 +171,17 @@ export default { |
171 | } | 171 | } |
172 | } | 172 | } |
173 | </script> | 173 | </script> |
174 | <style scoped lang="scss"></style> | 174 | <style scoped lang="scss"> |
175 | /deep/.el-input__inner { | ||
176 | background: #07388B; | ||
177 | border-radius: 2px; | ||
178 | border: 1px solid #6BC1FC; | ||
179 | } | ||
180 | /deep/.el-textarea__inner{ | ||
181 | background: #07388B; | ||
182 | color: #fff; | ||
183 | } | ||
184 | /deep/.el-form-item__label{ | ||
185 | color:#fff; | ||
186 | } | ||
187 | </style> | ... | ... |
This diff is collapsed.
Click to expand it.
1 | <template> | 1 | <template> |
2 | <Dialog :title="title" :show.sync="visible" :width="'715px'" @close="close()"> | 2 | <Dialog |
3 | :title="title" | ||
4 | class="tableClass" | ||
5 | :show.sync="visible" | ||
6 | :width="'715px'" | ||
7 | @close="close()" | ||
8 | > | ||
3 | <template slot="content"> | 9 | <template slot="content"> |
4 | <vxe-table | 10 | <lb-table |
5 | show-overflow | 11 | ref="multipleTable" |
6 | :data="memberList" | 12 | :pagination="false" |
7 | border | 13 | :column="tableData.column" |
8 | class="header-bg-type1" | 14 | :data="tableData.data" |
9 | auto-resize | 15 | @selection-change="handleSelectionChange" |
10 | :checkbox-config="{ highlight: true, range: true }" | ||
11 | highlight-hover-row | ||
12 | max-height="500px" | ||
13 | :empty-render="{ name: 'NotData' }" | ||
14 | > | 16 | > |
15 | <template #empty> | 17 | </lb-table> |
16 | <table-empty /> | ||
17 | </template> | ||
18 | <vxe-table-column | ||
19 | type="checkbox" | ||
20 | width="60" | ||
21 | align="left" | ||
22 | fixed="left" | ||
23 | /> | ||
24 | <vxe-table-column | ||
25 | field="code" | ||
26 | title="工号" | ||
27 | fixed="left" | ||
28 | min-width="100" | ||
29 | show-header-overflow="tooltip" | ||
30 | show-overflow="tooltip" | ||
31 | align="left" | ||
32 | /> | ||
33 | <vxe-table-column | ||
34 | title="姓名" | ||
35 | fixed="left" | ||
36 | show-header-overflow="tooltip" | ||
37 | show-overflow="tooltip" | ||
38 | > | ||
39 | <template slot-scope="scope"> | ||
40 | <svg-icon | ||
41 | :icon-class=" | ||
42 | scope.row.sex === '0' | ||
43 | ? 'male' | ||
44 | : scope.row.sex === '1' | ||
45 | ? 'female' | ||
46 | : 'secrecy' | ||
47 | " | ||
48 | /> | ||
49 | {{ scope.row.name }} | ||
50 | </template> | ||
51 | </vxe-table-column> | ||
52 | <vxe-table-column | ||
53 | field="loginName" | ||
54 | title="用户名" | ||
55 | fixed="left" | ||
56 | show-header-overflow="tooltip" | ||
57 | show-overflow="tooltip" | ||
58 | /> | ||
59 | <vxe-table-column | ||
60 | field="departmentName" | ||
61 | title="部门" | ||
62 | show-header-overflow="tooltip" | ||
63 | show-overflow="tooltip" | ||
64 | /> | ||
65 | </vxe-table> | ||
66 | </template> | 18 | </template> |
67 | <template slot="footer"> | 19 | <template slot="footer"> |
68 | <el-button type="primary" class="save" @click="submitForm(1)" | 20 | <el-button type="primary" class="save" @click="handleSaveMember()" |
69 | >保存</el-button | 21 | >保存</el-button |
70 | > | 22 | > |
71 | <el-button class="cancel-button" @click="close()">取消</el-button> | 23 | <el-button class="cancel-button" @click="close()">取消</el-button> |
... | @@ -81,57 +33,92 @@ export default { | ... | @@ -81,57 +33,92 @@ export default { |
81 | props: {}, | 33 | props: {}, |
82 | data() { | 34 | data() { |
83 | return { | 35 | return { |
84 | form: { | 36 | title: "人员配置", |
85 | sex: "0", | 37 | visible: false, |
86 | }, | 38 | |
87 | memberList: [ | 39 | hasSelectList: [ |
88 | { | 40 | { |
89 | id: "3127e455-43ba-45ff-9326-0e02ef89485e", | 41 | name: "管理员", |
90 | createdAt: null, | 42 | loginName: "admin1", |
91 | updatedAt: "2022-08-04T03:38:27.626+0000", | 43 | departmentName: "研发部", |
92 | createdBy: null, | ||
93 | updatedBy: "3127e455-43ba-45ff-9326-0e02ef89485e", | ||
94 | sort: 1, | ||
95 | name: "超级管理员", | ||
96 | loginName: "admin", | ||
97 | password: "05eb15777e8fd1d61c840472e7267f61d432f63340d86b59", | ||
98 | passwordSalt: "5178114777136485", | ||
99 | email: null, | ||
100 | lastLoginTime: null, | ||
101 | mobilePhone: "18291003568", | ||
102 | status: "ACTIVE", | ||
103 | passwordChangeTime: "2021-12-10T08:01:01.569+0000", | ||
104 | idCard: "612725202111021521", | ||
105 | departmentId: "2eae5304-544f-4f5b-b354-8f5d47433c9b", | ||
106 | organizationId: "0bca67ae-1d9e-4b41-b057-f165586d24aa", | ||
107 | sex: "0", | ||
108 | isDuty: true, | ||
109 | code: "123324", | ||
110 | jobLevel: null, | 44 | jobLevel: null, |
111 | telephone: "028-87720898", | 45 | }, |
112 | address: "办公地点修改测试", | 46 | { |
113 | isLocked: false, | 47 | name: "测试账号", |
48 | loginName: "admin2", | ||
114 | departmentName: "研发部", | 49 | departmentName: "研发部", |
115 | _X_ROW_KEY: "row_276", | 50 | jobLevel: null, |
116 | }, | 51 | }, |
117 | ], | 52 | ], //已经选择的id组成的数组 |
118 | title: "", | 53 | tableData: { |
119 | type: "", | 54 | column: [ |
120 | visible: false, | 55 | { |
121 | showLoginName: false, | 56 | type: "selection", |
122 | options: [], | 57 | }, |
123 | setProps: { | 58 | { |
124 | value: "id", | 59 | prop: "name", |
125 | label: "name", | 60 | label: "姓名", |
126 | children: "children", | 61 | }, |
127 | expandTrigger: "hover", | 62 | { |
128 | checkStrictly: true, // 可取消关联,选择任意一级选项 | 63 | prop: "loginName", |
129 | emitPath: false, | 64 | label: "用户名", |
65 | }, | ||
66 | { | ||
67 | prop: "departmentName", | ||
68 | label: "部门", | ||
69 | }, | ||
70 | { | ||
71 | prop: "jobLevel", | ||
72 | label: "职务", | ||
73 | }, | ||
74 | ], | ||
75 | data: [ | ||
76 | { | ||
77 | id: "3127e455-43ba-45ff-9326-0e02ef89485e", | ||
78 | createdAt: null, | ||
79 | updatedAt: "2022-08-04T03:38:27.626+0000", | ||
80 | createdBy: null, | ||
81 | updatedBy: "3127e455-43ba-45ff-9326-0e02ef89485e", | ||
82 | sort: 1, | ||
83 | name: "超级管理员", | ||
84 | loginName: "admin", | ||
85 | password: "05eb15777e8fd1d61c840472e7267f61d432f63340d86b59", | ||
86 | passwordSalt: "5178114777136485", | ||
87 | email: null, | ||
88 | lastLoginTime: null, | ||
89 | mobilePhone: "18291003568", | ||
90 | status: "ACTIVE", | ||
91 | passwordChangeTime: "2021-12-10T08:01:01.569+0000", | ||
92 | idCard: "612725202111021521", | ||
93 | departmentId: "2eae5304-544f-4f5b-b354-8f5d47433c9b", | ||
94 | organizationId: "0bca67ae-1d9e-4b41-b057-f165586d24aa", | ||
95 | sex: "0", | ||
96 | isDuty: true, | ||
97 | code: "123324", | ||
98 | jobLevel: null, | ||
99 | telephone: "028-87720898", | ||
100 | address: "办公地点修改测试", | ||
101 | isLocked: false, | ||
102 | departmentName: "研发部", | ||
103 | _X_ROW_KEY: "row_276", | ||
104 | }, | ||
105 | { | ||
106 | name: "管理员", | ||
107 | loginName: "admin1", | ||
108 | departmentName: "研发部", | ||
109 | jobLevel: null, | ||
110 | selectStatus: 0, | ||
111 | }, | ||
112 | { | ||
113 | name: "测试账号", | ||
114 | loginName: "admin2", | ||
115 | departmentName: "研发部", | ||
116 | jobLevel: null, | ||
117 | selectStatus: 0, | ||
118 | }, | ||
119 | ], | ||
130 | }, | 120 | }, |
131 | sexList: [], | 121 | multipleSelection: [], |
132 | levelList: [], | ||
133 | organizationId: "", // 组织机构ID | ||
134 | departmentId: "", // 部门ID | ||
135 | }; | 122 | }; |
136 | }, | 123 | }, |
137 | computed: {}, | 124 | computed: {}, |
... | @@ -141,33 +128,49 @@ export default { | ... | @@ -141,33 +128,49 @@ export default { |
141 | methods: { | 128 | methods: { |
142 | adds() { | 129 | adds() { |
143 | this.visible = true; | 130 | this.visible = true; |
131 | this.tableData.data.forEach((item, index) => { | ||
132 | if (item.selectStatus === 0) { | ||
133 | this.$nextTick(() => { | ||
134 | this.$refs.multipleTable.toggleRowSelection( | ||
135 | this.tableData.data[index], | ||
136 | true | ||
137 | ); | ||
138 | }); | ||
139 | } | ||
140 | }); | ||
144 | }, | 141 | }, |
145 | edit(record) { | ||
146 | this.visible = true; | ||
147 | }, | ||
148 | handleChange(value) { | ||
149 | this.form.departmentId = value; | ||
150 | }, | ||
151 | |||
152 | close() { | 142 | close() { |
153 | // this.resetForm() | ||
154 | this.visible = false; | 143 | this.visible = false; |
155 | }, | 144 | }, |
145 | // 保存事件 | ||
146 | handleSaveMember() { | ||
147 | // if (this.memberList.length === 0) { | ||
148 | // this.$message.warning("请添加待选人员"); | ||
149 | // return false; | ||
150 | // } | ||
151 | // const idList = this.memberList.map(item => item.id) | ||
152 | // updateUser(this.roleId, idList).then(res => { | ||
153 | // if (res.status === 1) { | ||
154 | // this.$message.success({ message: '保存成功', showClose: true }) | ||
155 | // this.showMemberConfigDialog = false | ||
156 | // this.$emit('setUsers', this.roleId) | ||
157 | // this.resetMemberConfig() | ||
158 | // } else this.$message.error({ message: res.message, showClose: true }) | ||
159 | // }) | ||
160 | }, | ||
161 | handleSelectionChange(val) { | ||
162 | this.multipleSelection = val; | ||
163 | }, | ||
156 | }, | 164 | }, |
157 | }; | 165 | }; |
158 | </script> | 166 | </script> |
159 | <style scoped lang="scss"> | 167 | <style scoped lang="scss"> |
160 | .el-form { | 168 | /deep/.el-dialog__header{ |
161 | .el-form-item__content { | 169 | text-align: center; |
162 | .el-radio { | 170 | margin-bottom: 10px; |
163 | margin-right: 6px; | 171 | .el-dialog__title{ |
164 | } | 172 | color: white; |
165 | } | ||
166 | .el-checkbox { | ||
167 | line-height: 40px; | ||
168 | } | ||
169 | .col-pd0 { | ||
170 | padding: 0 !important; | ||
171 | } | ||
172 | } | 173 | } |
174 | } | ||
175 | |||
173 | </style> | 176 | </style> | ... | ... |
... | @@ -222,17 +222,16 @@ export default { | ... | @@ -222,17 +222,16 @@ export default { |
222 | }; | 222 | }; |
223 | </script> | 223 | </script> |
224 | <style scoped lang="scss"> | 224 | <style scoped lang="scss"> |
225 | .el-form { | 225 | /deep/.el-input__inner { |
226 | .el-form-item__content { | 226 | background: #07388B; |
227 | .el-radio { | 227 | border-radius: 2px; |
228 | margin-right: 6px; | 228 | border: 1px solid #6BC1FC; |
229 | } | 229 | } |
230 | } | 230 | /deep/.el-textarea__inner{ |
231 | .el-checkbox { | 231 | background: #07388B; |
232 | line-height: 40px; | 232 | color: #fff; |
233 | } | 233 | } |
234 | .col-pd0 { | 234 | /deep/.el-form-item__label{ |
235 | padding: 0 !important; | 235 | color:#fff; |
236 | } | ||
237 | } | 236 | } |
238 | </style> | 237 | </style> | ... | ... |
... | @@ -7,10 +7,6 @@ | ... | @@ -7,10 +7,6 @@ |
7 | <el-col :span="2" class="btnColRight"> | 7 | <el-col :span="2" class="btnColRight"> |
8 | <el-form-item> | 8 | <el-form-item> |
9 | <btn nativeType="cx" @click="handleAdd">添加人员</btn> | 9 | <btn nativeType="cx" @click="handleAdd">添加人员</btn> |
10 | <!-- <btn nativeType="cx" @click="resetPassword(selectionRows)" | ||
11 | >重置密码</btn | ||
12 | > | ||
13 | <btn nativeType="cx" @click="resetSearch()">重置</btn> --> | ||
14 | </el-form-item> | 10 | </el-form-item> |
15 | </el-col> | 11 | </el-col> |
16 | </el-row> | 12 | </el-row> |
... | @@ -33,6 +29,13 @@ | ... | @@ -33,6 +29,13 @@ |
33 | </template> | 29 | </template> |
34 | <script> | 30 | <script> |
35 | // 定时任务 | 31 | // 定时任务 |
32 | import { | ||
33 | getUuid, | ||
34 | judgeSort, | ||
35 | realMove, | ||
36 | findParents, | ||
37 | removeTreeListItem, | ||
38 | } from "@/utils/operation"; | ||
36 | import data from "./data"; | 39 | import data from "./data"; |
37 | import sjsbTask from "@/api/sjsbTask.js"; | 40 | import sjsbTask from "@/api/sjsbTask.js"; |
38 | import tableMixin from "@/mixins/tableMixin.js"; | 41 | import tableMixin from "@/mixins/tableMixin.js"; |
... | @@ -94,7 +97,28 @@ export default { | ... | @@ -94,7 +97,28 @@ export default { |
94 | label: "排序", | 97 | label: "排序", |
95 | width: 380, | 98 | width: 380, |
96 | render: (h, scope) => { | 99 | render: (h, scope) => { |
97 | return <div></div>; | 100 | return ( |
101 | <div> | ||
102 | <el-button | ||
103 | type="text" | ||
104 | disabled={scope.row.isTop} | ||
105 | onClick={() => { | ||
106 | this.moveUpward(scope.$index, scope.row); | ||
107 | }} | ||
108 | > | ||
109 | 上移 | ||
110 | </el-button> | ||
111 | <el-button | ||
112 | type="text" | ||
113 | disabled={scope.row.isBottom} | ||
114 | onClick={() => { | ||
115 | this.moveDown(scope.$index, scope.row); | ||
116 | }} | ||
117 | > | ||
118 | 下移 | ||
119 | </el-button> | ||
120 | </div> | ||
121 | ); | ||
98 | }, | 122 | }, |
99 | }, | 123 | }, |
100 | { | 124 | { |
... | @@ -213,7 +237,7 @@ export default { | ... | @@ -213,7 +237,7 @@ export default { |
213 | address: null, | 237 | address: null, |
214 | _X_ROW_KEY: "row_43", | 238 | _X_ROW_KEY: "row_43", |
215 | switch: true, | 239 | switch: true, |
216 | } | 240 | }, |
217 | ]; | 241 | ]; |
218 | }, | 242 | }, |
219 | // 重置搜索 | 243 | // 重置搜索 |
... | @@ -256,6 +280,21 @@ export default { | ... | @@ -256,6 +280,21 @@ export default { |
256 | }) | 280 | }) |
257 | .catch(() => {}); | 281 | .catch(() => {}); |
258 | }, | 282 | }, |
283 | // 上移下移 | ||
284 | moveUpward(index, row) { | ||
285 | console.log("index",index); | ||
286 | console.log("row",row); | ||
287 | realMove(row.bsmDict, "UP", this.tableData); | ||
288 | this.key++; | ||
289 | let id = findParents(this.tableData, row.bsmDict); | ||
290 | this.keyList = id; | ||
291 | }, | ||
292 | moveDown(index, row) { | ||
293 | realMove(row.bsmDict, "DOWN", this.tableData); | ||
294 | this.key++; | ||
295 | let id = findParents(this.tableData, row.bsmDict); | ||
296 | this.keyList = id; | ||
297 | }, | ||
259 | // 重置用户密码 | 298 | // 重置用户密码 |
260 | resetPassword(data) { | 299 | resetPassword(data) { |
261 | const ids = []; | 300 | const ids = []; | ... | ... |
1 | <template> | 1 | <template> |
2 | <!-- 编辑 --> | 2 | <!-- 编辑 --> |
3 | <dialogBox title="操作内容" @closeDialog="closeDialog" @submitForm="handleSubmit" v-model="myValue"> | 3 | <dialogBox title="操作内容" @closeDialog="closeDialog" @submitForm="handleSubmit" v-model="myValue"> |
4 | <p>2222222222222222222222</p> | 4 | <p>2</p> |
5 | </dialogBox> | 5 | </dialogBox> |
6 | </template> | 6 | </template> |
7 | 7 | ||
... | @@ -29,4 +29,4 @@ export default { | ... | @@ -29,4 +29,4 @@ export default { |
29 | } | 29 | } |
30 | } | 30 | } |
31 | } | 31 | } |
32 | </script> | ||
... | \ No newline at end of file | ... | \ No newline at end of file |
32 | </script> | ... | ... |
-
Please register or sign in to post a comment