Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
feec9292 by renchao@pashanhoo.com
Options

Merge branch 'master' into dev

2 parents 37d7db76 97fee2ab
Inline Side-by-side
Showing 21 changed files with 1394 additions and 555 deletions
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
4 "CODE": "BDCJGPT", 4 "CODE": "BDCJGPT",
5 "SERVERAPI": "/bdcsjsb", 5 "SERVERAPI": "/bdcsjsb",
6 "calcHeight": 160, 6 "calcHeight": 160,
7 "echartTextColor": "#FFFFFF", 7 "echartTextColor": "#4A4A4A",
8 "MANAGEMENTAPI": "http://192.168.2.38:8090/management" 8 "MANAGEMENTAPI": "http://192.168.2.38:8090/management"
9 } 9 }
......
1 .itemForm {
2 position: relative;
3 padding: 10px;
4
5 /deep/.el-select {
6 width: 100%;
7 }
8
9 /deep/.el-form-item__error {
10 right: 25px;
11 top: 15px;
12 text-align: right;
13 pointer-events: none;
14 }
15
16 /deep/.el-date-editor {
17 width: 100%;
18 }
19
20 /deep/.el-date-editor--date {
21 width: 100%;
22 }
23
24 /deep/.el-cascader {
25 width: 100%;
26 }
27
28 // table 样式
29 /deep/.el-form-item__label {
30 border-right: none;
31 text-align: center;
32 padding: 0;
33 color: #05bbdb;
34 line-height: 16px;
35 font-size: 12px;
36 margin-top: 8px !important;
37 }
38
39 /deep/.el-form-item__content {
40 display: flex;
41 margin-right: -1px;
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 }
51
52 /deep/.el-textarea__inner {
53 margin: 5px;
54 width: 96%;
55 background: none;
56 color: #FFFFFF;
57 border-radius: 2px;
58 border: 1px solid #6BC1FC;
59 }
60
61 /deep/.el-input-number {
62 width: 100%;
63 }
64
65 /deep/.el-input-number__increase {
66 background: #05275B;
67 color: #FFFFFF;
68 border: none;
69 right: 7px;
70 top: 2px;
71 }
72
73 /deep/.el-input-number__decrease {
74 background: #05275B;
75 color: #FFFFFF;
76 border: none;
77 right: 7px;
78 bottom: 10px;
79 }
80
81 /deep/.el-input__inner {
82 margin: 5px;
83 width: 96%;
84 background: #05275B;
85 border-radius: 2px;
86 border: 1px solid #6BC1FC;
87 text-align: left;
88
89 }
90
91 /deep/.el-form-item {
92 margin-bottom: 0;
93 margin-top: -1px;
94 }
95
96 .item-label {
97 display: flex;
98 align-items: flex-end;
99 flex-direction: column;
100 font-size: 12px;
101 flex: 0 0 90px;
102 margin-right: 3px;
103
104 p {
105 line-height: 16px;
106 white-space: nowrap;
107 text-align: right;
108 }
109
110 p:nth-child(1) {
111 position: relative;
112 right: 5px;
113 }
114 }
115 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 </div> 18 </div>
19 </template> 19 </template>
20 <script> 20 <script>
21 import { getReceiveDataReportResult } from "@/api/dataReport.js"; 21 import { getReceiveDataReportResult } from "@/api/dataReport.js";
22 export default { 22 export default {
23 components: {}, 23 components: {},
24 props: { 24 props: {
25 formData: { 25 formData: {
...@@ -40,43 +40,7 @@ export default { ...@@ -40,43 +40,7 @@ export default {
40 this.ERRORINFO = data.ERRORINFO 40 this.ERRORINFO = data.ERRORINFO
41 }) 41 })
42 } 42 }
43 } 43 }
44 </script> 44 </script>
45 <style scoped lang='scss'> 45 <style scoped lang='scss'>
46 .result {
47 padding: 15px;
48 height: 100%;
49
50 /deep/.el-textarea__inner {
51 height: 50%;
52 color: #ffffff;
53 border: none !important;
54 color: #ffffff;
55 }
56
57 &-con {
58 background: #04275B;
59 border-radius: 2px;
60 padding: 10px;
61 box-sizing: border-box;
62 height: 49%;
63
64 p {
65 color: #2997E8;
66 font-size: 14px;
67 position: relative;
68 padding-left: 10px;
69 }
70
71 p::before {
72 position: absolute;
73 content: '';
74 width: 3px;
75 height: 10px;
76 background-color: #2997E8;
77 left: 0;
78 top: 3px;
79 }
80 }
81 }
82 </style> 46 </style>
......
1 <template> 1 <template>
2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox dataReporting editDialogBox mainCenter" 2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog"
3 :visible.sync="dialogVisible" width="92%"> 3 custom-class="dialogBox dataReporting editDialogBox sbdialog commonDialog mainCenter" :visible.sync="dialogVisible"
4 width="92%">
4 <div slot="title" class="dialog_title" ref="dialogTitle"> 5 <div slot="title" class="dialog_title" ref="dialogTitle">
5 {{ title || '详情' }} 6 {{ title || '详情' }}
6 </div> 7 </div>
...@@ -111,7 +112,7 @@ ...@@ -111,7 +112,7 @@
111 </div> 112 </div>
112 </div> 113 </div>
113 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xml'"> 114 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xml'">
114 <JsonEditor :resultInfo="resultInfo" /> 115 <JsonEditor class="editXML" :resultInfo="resultInfo" />
115 </div> 116 </div>
116 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'"> 117 <div class="editDialogBox-box JsonEditor" v-if="titleName == 'xyjg'">
117 <Xyjg :form-data='dataReport'></Xyjg> 118 <Xyjg :form-data='dataReport'></Xyjg>
...@@ -128,14 +129,14 @@ ...@@ -128,14 +129,14 @@
128 </template> 129 </template>
129 130
130 <script> 131 <script>
131 import axios from "axios"; 132 import axios from "axios";
132 import SERVER from '@/api/config' 133 import SERVER from '@/api/config'
133 const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/' 134 const urlHeader = SERVER.SERVERAPI + '/rest/sjsb/DataReport/'
134 import { mapGetters } from "vuex"; 135 import { mapGetters } from "vuex";
135 import JsonEditor from "@/components/JsonEditor.vue"; 136 import JsonEditor from "@/components/JsonEditor.vue";
136 import Xyjg from "./Result"; 137 import Xyjg from "./Result";
137 import { getTabsDetail, getXml, getReportDetail, restartGenerateXml, edit } from "@/api/dataReport.js"; 138 import { getTabsDetail, getXml, getReportDetail, restartGenerateXml, edit } from "@/api/dataReport.js";
138 export default { 139 export default {
139 components: { JsonEditor, Xyjg }, 140 components: { JsonEditor, Xyjg },
140 props: { 141 props: {
141 title: { 142 title: {
...@@ -332,14 +333,5 @@ ...@@ -332,14 +333,5 @@
332 } 333 }
333 } 334 }
334 } 335 }
335 } 336 }
336 </script> 337 </script>
337 <style scoped lang="scss">
338 /deep/.editDialogBox {
339 .el-dialog__header {
340 display: flex;
341 margin-bottom: 10px;
342 }
343 }
344 </style>
345
......
...@@ -12,15 +12,4 @@ export default { ...@@ -12,15 +12,4 @@ export default {
12 } 12 }
13 } 13 }
14 } 14 }
15
16 </script> 15 </script>
...\ No newline at end of file ...\ No newline at end of file
17
18 <style scoped lang="scss">
19 /deep/.el-textarea__inner {
20 height: 67vh !important;
21 border: none !important;
22 background-color: #08346F !important;
23 color: #ffffff;
24 border: none !important;
25 }
26 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 // .dialogCon {
2 // background: #031A46;
3 // -webkit-box-shadow: inset 0px 0px 12px 0px #02d9fd;
4 // box-shadow: inset 0px 0px 12px 0px #02d9fd;
5 // border-radius: 0px 2px 2px 2px;
6 // border: 1px solid #6BC1FC;
7 // padding: 15px;
8 // }
...@@ -526,6 +526,14 @@ ...@@ -526,6 +526,14 @@
526 border-radius: 2px; 526 border-radius: 2px;
527 border: 1px solid #6BC1FC; 527 border: 1px solid #6BC1FC;
528 margin: 0 18px 10px 18px; 528 margin: 0 18px 10px 18px;
529
530 // .el-form-item__label {
531 // color: #fff;
532 // }
533
534 // .el-form-item__content {
535 // color: #fff;
536 // }
529 } 537 }
530 538
531 .item-content-input { 539 .item-content-input {
...@@ -666,6 +674,14 @@ ...@@ -666,6 +674,14 @@
666 674
667 // 登簿日志弹出框 675 // 登簿日志弹出框
668 .entryJournal { 676 .entryJournal {
677 .el-textarea__inner {
678 height: 67vh !important;
679 border: none !important;
680 background-color: #08346F !important;
681 color: #ffffff;
682 border: none !important;
683 }
684
669 .el-tabs__header { 685 .el-tabs__header {
670 margin: 0; 686 margin: 0;
671 } 687 }
...@@ -1113,3 +1129,120 @@ ...@@ -1113,3 +1129,120 @@
1113 text-align: center; 1129 text-align: center;
1114 } 1130 }
1115 } 1131 }
1132
1133 // 权利人信息样式
1134 .itemForm {
1135 position: relative;
1136 padding: 10px;
1137
1138 /deep/.el-select {
1139 width: 100%;
1140 }
1141
1142 /deep/.el-form-item__error {
1143 right: 25px;
1144 top: 15px;
1145 text-align: right;
1146 pointer-events: none;
1147 }
1148
1149 /deep/.el-date-editor {
1150 width: 100%;
1151 }
1152
1153 /deep/.el-date-editor--date {
1154 width: 100%;
1155 }
1156
1157 /deep/.el-cascader {
1158 width: 100%;
1159 }
1160
1161 // table 样式
1162 /deep/.el-form-item__label {
1163 border-right: none;
1164 text-align: center;
1165 padding: 0;
1166 color: #05bbdb;
1167 line-height: 16px;
1168 font-size: 12px;
1169 margin-top: 8px !important;
1170 }
1171
1172 /deep/.el-form-item__content {
1173 display: flex;
1174 margin-right: -1px;
1175 }
1176
1177 .obligee-item-name,
1178 .receivingInfo-item-name,
1179 .auditInfo-item-name {
1180 background: url("~@/image/itembg.png") no-repeat;
1181 background-size: 100% 100%;
1182 color: #FFFFFF;
1183 }
1184
1185 /deep/.el-textarea__inner {
1186 margin: 5px;
1187 width: 96%;
1188 background: none;
1189 color: #FFFFFF;
1190 border-radius: 2px;
1191 border: 1px solid #6BC1FC;
1192 }
1193
1194 /deep/.el-input-number {
1195 width: 100%;
1196 }
1197
1198 /deep/.el-input-number__increase {
1199 background: #05275B;
1200 color: #FFFFFF;
1201 border: none;
1202 right: 7px;
1203 top: 2px;
1204 }
1205
1206 /deep/.el-input-number__decrease {
1207 background: #05275B;
1208 color: #FFFFFF;
1209 border: none;
1210 right: 7px;
1211 bottom: 10px;
1212 }
1213
1214 /deep/.el-input__inner {
1215 margin: 5px;
1216 width: 96%;
1217 background: #05275B;
1218 border-radius: 2px;
1219 border: 1px solid #6BC1FC;
1220 text-align: left;
1221
1222 }
1223
1224 /deep/.el-form-item {
1225 margin-bottom: 0;
1226 margin-top: -1px;
1227 }
1228
1229 .item-label {
1230 display: flex;
1231 align-items: flex-end;
1232 flex-direction: column;
1233 font-size: 12px;
1234 flex: 0 0 90px;
1235 margin-right: 3px;
1236
1237 p {
1238 line-height: 16px;
1239 white-space: nowrap;
1240 text-align: right;
1241 }
1242
1243 p:nth-child(1) {
1244 position: relative;
1245 right: 5px;
1246 }
1247 }
1248 }
......
...@@ -85,9 +85,7 @@ input[type="number"] { ...@@ -85,9 +85,7 @@ input[type="number"] {
85 // to fixed https://github.com/ElemeFE/element/issues/2461 85 // to fixed https://github.com/ElemeFE/element/issues/2461
86 // refine element ui upload 86 // refine element ui upload
87 .el-input.is-disabled .el-input__inner { 87 .el-input.is-disabled .el-input__inner {
88 color: #FFFFFF !important;
89 background-color: transparent !important; 88 background-color: transparent !important;
90 border: 1px solid #224C7C !important;
91 } 89 }
92 90
93 .upload-container { 91 .upload-container {
......
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
32 padding: 15px; 32 padding: 15px;
33 } 33 }
34 34
35 .el-dialog__close { 35 // .el-dialog__close {
36 font-size: 0; 36 // font-size: 0;
37 } 37 // }
38 38
39 .el-form-item { 39 .el-form-item {
40 display: flex; 40 display: flex;
...@@ -150,8 +150,31 @@ ...@@ -150,8 +150,31 @@
150 150
151 // 角色管理人员菜单配置弹框样式 151 // 角色管理人员菜单配置弹框样式
152 .roleconfiguration { 152 .roleconfiguration {
153 .el-dialog__close { 153 .el-tabs__item {
154 font-size: 16px !important; 154 color: #cef8ff !important;
155 // background: url("~@/image/tabitem.png") no-repeat;
156 // background-size: 100% 100%;
157 background-color: #3D59C4;
158 border-radius: 3px;
159 }
160
161 .el-dialog__headerbtn .el-dialog__close {
162 font-size: 20px;
163 color: white;
164 }
165
166 .el-dialog__header {
167 width: 100%;
168 display: flex;
169 justify-content: center;
170 font-size: 24px;
171 background-color: #3D59C4;
172
173 .dialog_title {
174
175 color: white;
176 margin-bottom: 10px;
177 }
155 } 178 }
156 179
157 } 180 }
...@@ -173,7 +196,6 @@ ...@@ -173,7 +196,6 @@
173 width: 2px; 196 width: 2px;
174 position: relative; 197 position: relative;
175 left: 10px; 198 left: 10px;
176 color: #FFFFFF;
177 } 199 }
178 200
179 .el-breadcrumb__inner { 201 .el-breadcrumb__inner {
...@@ -204,233 +226,6 @@ ...@@ -204,233 +226,6 @@
204 font-weight: normal; 226 font-weight: normal;
205 } 227 }
206 228
207 // .button {
208 // width: 76px;
209 // height: 32px;
210 // color: #ffffff;
211 // cursor: pointer;
212 // border: 0;
213 // font-size: 12px;
214 // }
215
216 // // 按钮样式
217 // .cx {
218 // background: url("../image/btn.png") no-repeat 0 -34px;
219 // background-size: cover;
220 // }
221
222 // .cx:hover {
223 // background: url("../image/btn.png") no-repeat 0 -34px;
224 // background-size: cover;
225 // color: white;
226 // }
227
228 // .cz {
229 // background: url("../image/btn.png") no-repeat 0 0;
230 // background-size: cover;
231 // }
232
233 // .cz:hover {
234 // background: url("../image/btn.png") no-repeat 0 0;
235 // background-size: cover;
236 // color: white;
237 // }
238
239 // .el-button:focus {
240 // background: none;
241 // }
242
243 // .cx:focus {
244 // background: url("../image/btn.png") no-repeat 0 -34px;
245 // background-size: cover;
246 // color: white;
247 // }
248
249 // .cz:focus {
250 // background: url("../image/btn.png") no-repeat 0 0;
251 // background-size: cover;
252 // color: white;
253 // }
254
255 // 监管弹框样式
256 .dialogBox {
257 overflow: hidden;
258 // min-height: 90vh;
259
260 .dialog_title {
261 // display: flex;
262 // position: relative;
263 // font-size: 22px;
264 // top: -10px;
265 // width: 38%;
266 // height: 40px;
267 // margin-left: 28px;
268 // justify-content: center;
269 // white-space: nowrap;
270
271 b {
272 // font-weight: 200;
273 // display: inline-block;
274 // position: relative;
275 font-size: 24px;
276 // top: -11px;
277 // width: 38%;
278 // height: 40px;
279 // margin-left: 28px;
280 // // @include flex-center;
281 display: flex;
282 justify-content: center;
283 }
284 }
285
286 .dialog_full {
287 position: absolute;
288 top: 0;
289 right: 30px;
290 }
291
292 .el-dialog__body {
293 max-height: 88vh;
294 overflow-x: hidden;
295 overflow-y: hidden;
296 }
297
298 .dialog_footer {
299 margin-bottom: 8px;
300 display: flex;
301 justify-content: center;
302 align-items: center;
303 }
304
305 .dialogBox-content {
306 height: auto
307 }
308
309 .editDialogBox-box {
310 border-radius: 3px;
311 border: 1px solid #6BC1FC;
312
313 .el-form-item__label {
314 color: #000000;
315 }
316
317 .el-form-item__content {
318 color: #000000;
319 }
320 }
321
322 .item-content-input {
323 .el-input__inner {
324 border: none !important;
325 text-align: right;
326 }
327 }
328
329 .regularHeight {
330 display: flex;
331 flex-direction: column;
332 height: 87vh;
333
334 .editDialogBox-con,
335 .JsonEditor {
336 flex: 1;
337 height: 100%;
338 }
339 }
340
341 .dialog-from {
342 padding: 13px;
343 border-radius: 2px;
344 box-sizing: border-box;
345
346 .el-row {
347 display: flex;
348 flex-wrap: nowrap;
349 }
350
351 .el-col {
352 line-height: 18px;
353 display: flex;
354 align-items: center;
355 margin-bottom: 3px;
356 color: #000000;
357 border-radius: 2px;
358 border: 1px solid #224C7C;
359
360 span {
361 display: inline-block;
362 padding: 3px;
363 border-radius: 3px;
364 overflow: hidden;
365 white-space: nowrap;
366 text-align: left;
367 color: #02D9FD;
368 }
369
370 p {
371 flex: 1;
372 width: 100%;
373 padding-left: 5px;
374 line-height: 20px;
375 color: #000307;
376 cursor: not-allowed;
377 white-space: nowrap;
378 margin-right: 5px;
379 text-align: right;
380 }
381 }
382
383 }
384
385 .el-textarea__inner {
386 // border: 1px solid #224C7C;
387 // margin: 0 0 10px 0 !important;
388 // width: 100% !important;
389 // color: #dadde3 !important;
390 // background: transparent !important;
391 }
392
393 .el-input__inner {
394 // border: 1px solid #224C7C !important;
395 // margin: 0 !important;
396 // width: 100% !important;
397 // color: #111111 !important;
398 // background: transparent !important;
399 }
400
401 .el-dialog__header {
402 color: #070000;
403 // height: 46px !important;
404 // width: 97%;
405 // margin: 0 auto;
406 // margin-top: 2px;
407 }
408
409 .el-dialog__body {
410 padding-top: 0;
411 padding-bottom: 0;
412 // height: 95vh;
413 }
414
415 // .el-dialog__headerbtn {
416 // right: 40px;
417 // top: 33px;
418
419 // &:hover {
420 // // background: rgb(4, 172, 250);
421 // right: 40px;
422 // top: 33px;
423 // }
424 // }
425
426
427 .el-form-item {
428 display: flex;
429 width: 100%;
430 }
431
432 }
433
434 .contentCenter { 229 .contentCenter {
435 position: absolute; 230 position: absolute;
436 top: 50%; 231 top: 50%;
...@@ -451,9 +246,24 @@ ...@@ -451,9 +246,24 @@
451 } 246 }
452 247
453 // 登簿日志弹出框 248 // 登簿日志弹出框
454 .entryJournal { 249 .commonDialog {
250 /deep/.dialog-from_header {
251 margin: 0 !important;
252 }
253
254 .el-dialog__headerbtn .el-dialog__close {
255 font-size: 20px;
256 color: white;
257 }
258
259 .el-dialog__header {
260 text-align: center;
261 font-size: 24px;
262 background-color: #3D59C4;
263 }
264
455 .el-tabs__header { 265 .el-tabs__header {
456 margin: 0; 266 margin: 0 !important;
457 } 267 }
458 268
459 .el-dialog { 269 .el-dialog {
...@@ -464,6 +274,7 @@ ...@@ -464,6 +274,7 @@
464 .el-dialog__body { 274 .el-dialog__body {
465 display: flex; 275 display: flex;
466 flex-direction: column; 276 flex-direction: column;
277 padding-top: 0px;
467 padding-bottom: 30px; 278 padding-bottom: 30px;
468 height: 100%; 279 height: 100%;
469 flex: 1; 280 flex: 1;
...@@ -473,30 +284,36 @@ ...@@ -473,30 +284,36 @@
473 .regularHeight { 284 .regularHeight {
474 display: flex; 285 display: flex;
475 flex-direction: column; 286 flex-direction: column;
476 height: 87vh; 287 height: 80vh;
477 margin-bottom: 5px; 288 margin-bottom: 5px;
478 289
479 .editDialogBox-con, 290 .editDialogBox-con,
480 .JsonEditor { 291 .JsonEditor {
481 flex: 1; 292 flex: 1;
482 } 293 }
483 }
484 294
485 .d-center {} 295 .editXML {
296 border: 1px solid blue;
297 margin-top: 10px;
298
299 .el-textarea__inner {
300 height: 68vh !important;
301 }
302 }
303 }
486 304
487 .dialog_title { 305 .dialog_title {
488 top: -6px 306 color: white;
307 margin-bottom: 10px;
489 } 308 }
490 309
491 .el-tabs__item { 310 .el-tabs__item {
492 color: #CEF8FF !important; 311 color: #CEF8FF !important;
493 312 background-color: none;
494 display: flex; 313 display: flex;
495 flex-direction: row; 314 flex-direction: row;
496 justify-content: center; 315 justify-content: center;
497 background: url("~@/image/tabitem.png") no-repeat; 316 border-radius: 3px;
498 background-size: 100% 100%;
499 border: none !important;
500 } 317 }
501 318
502 .el-tabs__nav { 319 .el-tabs__nav {
...@@ -513,8 +330,7 @@ ...@@ -513,8 +330,7 @@
513 } 330 }
514 331
515 .el-tabs__item.is-active { 332 .el-tabs__item.is-active {
516 background: url("~@/image/tabitemse.png") no-repeat; 333 background-color: #3D59C4;
517 background-size: 100% 100%;
518 } 334 }
519 335
520 .from-clues-content { 336 .from-clues-content {
...@@ -526,13 +342,15 @@ ...@@ -526,13 +342,15 @@
526 .editDialogBox-box { 342 .editDialogBox-box {
527 position: relative; 343 position: relative;
528 top: 10px; 344 top: 10px;
529 height: 100%;
530 } 345 }
531 346
532 .dialog-from { 347 .dialog-from {
533 padding-top: 0; 348 padding-top: 0;
534 349
535 .el-col { 350 .el-col {
351 height: 40px;
352 line-height: 40px;
353 display: flex;
536 justify-content: space-between; 354 justify-content: space-between;
537 } 355 }
538 356
...@@ -553,23 +371,62 @@ ...@@ -553,23 +371,62 @@
553 } 371 }
554 372
555 &_header { 373 &_header {
556 margin: 0 -5px !important; 374 // margin: 0 -5px !important;
557 } 375 }
558 376
559 &_title { 377 &_title {
560 font-size: 14px; 378 font-size: 14px;
561 color: #d7eaee; 379 font-weight: 600;
380 color: #000000;
562 margin: 3px 0; 381 margin: 3px 0;
563 } 382 }
564 } 383 }
565 } 384 }
566 385
386 .entryJournal {
387 .el-textarea__inner {
388 height: 67vh !important;
389 border: none !important;
390 background-color: #ffffff !important;
391 color: #000000 !important;
392 }
393 }
394
395 // 上报日志弹出框
396 .sbdialog {
397 .el-textarea__inner {
398 height: 30vh !important;
399 border: none !important;
400 background-color: #ffffff !important;
401 color: #000000 !important;
402 }
403 }
404
567 // 数据上报弹出框 405 // 数据上报弹出框
568 .dataReporting { 406 .dataReporting {
407 .el-dialog__header {
408 width: 100%;
409 display: flex;
410 justify-content: center;
411 font-size: 24px;
412 background-color: #3D59C4;
413
414 .dialog_title {
415
416 color: white;
417 margin-bottom: 10px;
418 }
419 }
420
421 .el-dialog__headerbtn .el-dialog__close {
422 font-size: 20px;
423 color: white;
424 }
425
569 .el-dialog__body { 426 .el-dialog__body {
427 padding-top: 0px;
570 display: flex; 428 display: flex;
571 flex-direction: column; 429 flex-direction: column;
572 padding-bottom: 30px;
573 } 430 }
574 431
575 .el-tabs { 432 .el-tabs {
...@@ -604,26 +461,63 @@ ...@@ -604,26 +461,63 @@
604 461
605 .el-tabs__item { 462 .el-tabs__item {
606 color: #cef8ff !important; 463 color: #cef8ff !important;
607
608 display: flex; 464 display: flex;
609 flex-direction: row; 465 flex-direction: row;
610 justify-content: center; 466 justify-content: center;
611 background: url("~@/image/tabitem.png") no-repeat; 467 background-color: #3D59C4;
612 background-size: 100% 100%; 468 border-radius: 3px;
613 border: none !important;
614 } 469 }
615 470
616 .obligee-item-name { 471 .obligee-item-name {
617 background: #05275b; 472 // background: url("~@/image/itembg.png") no-repeat;
618 color: #ffffff; 473 // background-size: 100% 100%;
619 background: url("~@/image/itembg.png") no-repeat; 474 background-color: #3D59C4;
620 background-size: 100% 100%; 475 border-radius: 3px;
476 border: 1px solid blue !important;
621 } 477 }
622 478
623 .el-tabs__nav-scroll { 479 .el-tabs__nav-scroll {
624 background: none; 480 background: none;
625 } 481 }
626 482
483 .result {
484 padding: 15px;
485 height: 100%;
486
487 /deep/.el-textarea__inner {
488 height: 50%;
489 color: #ffffff;
490 border: none !important;
491 color: #ffffff;
492 }
493
494 &-con {
495 background: #ffffff;
496 border: 1px solid blue;
497 border-radius: 2px;
498 padding: 10px;
499 box-sizing: border-box;
500 height: 49%;
501
502 p {
503 color: #2997E8;
504 font-size: 14px;
505 position: relative;
506 padding-left: 10px;
507 }
508
509 p::before {
510 position: absolute;
511 content: '';
512 width: 3px;
513 height: 10px;
514 background-color: #2997E8;
515 left: 0;
516 top: 3px;
517 }
518 }
519 }
520
627 .el-tabs__nav { 521 .el-tabs__nav {
628 display: flex; 522 display: flex;
629 border: none !important; 523 border: none !important;
...@@ -649,8 +543,8 @@ ...@@ -649,8 +543,8 @@
649 } 543 }
650 544
651 .el-tabs__item.is-active { 545 .el-tabs__item.is-active {
652 background: url("~@/image/tabitemse.png") no-repeat; 546 background-color: #1c3294;
653 background-size: 100% 100%; 547 color: #FFFFFF;
654 } 548 }
655 549
656 .success-images { 550 .success-images {
...@@ -709,6 +603,9 @@ ...@@ -709,6 +603,9 @@
709 padding-top: 0; 603 padding-top: 0;
710 604
711 .el-col { 605 .el-col {
606 height: 40px;
607 line-height: 40px;
608 display: flex;
712 justify-content: space-between; 609 justify-content: space-between;
713 } 610 }
714 611
...@@ -754,28 +651,34 @@ ...@@ -754,28 +651,34 @@
754 } 651 }
755 } 652 }
756 653
757 // 人员管理上下移动按钮样式 654 // // 人员管理上下移动按钮样式
758 .el-button.is-disabled.el-button--text { 655 // .el-button.is-disabled.el-button--text {
759 width: 64px; 656 // width: 64px;
760 height: 28px; 657 // height: 28px;
761 background: rgba(255, 255, 255, 0.1); 658 // background: rgba(255, 255, 255, 0.1);
762 border-radius: 16px; 659 // border-radius: 16px;
763 } 660 // }
764 661
765 // 人员管理角色管理菜单管理修改新增弹框样式 662 // 人员管理角色管理菜单管理修改新增弹框样式
766 .PersonnelDialog { 663 .PersonnelDialog {
664 .el-dialog__headerbtn .el-dialog__close {
665 font-size: 20px;
666 color: white;
667 }
767 668
768 .el-dialog__header { 669 .el-dialog__header {
769 text-align: center; 670 text-align: center;
770 margin-bottom: 10px; 671 margin-bottom: 10px;
672 font-size: 24px;
673 background-color: #3D59C4;
771 674
772 .el-dialog__title { 675 .dialog_title {
773 color: rgb(0, 0, 0); 676 b {
774 } 677 color: white !important;
775 } 678 }
776 679
777 .el-form-item__label { 680 margin-bottom: 10px;
778 color: rgb(0, 0, 0); 681 }
779 } 682 }
780 683
781 .el-input__inner { 684 .el-input__inner {
...@@ -793,29 +696,8 @@ ...@@ -793,29 +696,8 @@
793 // color: rgb(0, 0, 0); 696 // color: rgb(0, 0, 0);
794 } 697 }
795 698
796 .el-form-item__label {
797 color: rgb(2, 0, 0);
798 }
799
800 .el-dialog__header { 699 .el-dialog__header {
801 .dialog_title {
802 // display: -webkit-box;
803 // display: -ms-flexbox;
804 // display: flex;
805 // position: relative;
806 // top: -7px;
807 // width: 29%;
808 // height: 40px;
809 // margin-left: 28px;
810 // -webkit-box-pack: center;
811 // -ms-flex-pack: center;
812 // justify-content: center;
813 // white-space: nowrap;
814 700
815 b {
816 font-size: 16px;
817 }
818 }
819 701
820 .el-dialog__headerbtn { 702 .el-dialog__headerbtn {
821 right: 20px !important; 703 right: 20px !important;
...@@ -896,3 +778,143 @@ ...@@ -896,3 +778,143 @@
896 text-align: center; 778 text-align: center;
897 } 779 }
898 } 780 }
781
782 // 权利人信息样式
783 .itemForm {
784 position: relative;
785 padding: 10px;
786
787 .el-select {
788 width: 100%;
789 }
790
791 .el-form-item__error {
792 right: 25px;
793 top: 15px;
794 text-align: right;
795 pointer-events: none;
796 }
797
798 .el-date-editor {
799 width: 100%;
800 }
801
802 .el-date-editor--date {
803 width: 100%;
804 }
805
806 .el-cascader {
807 width: 100%;
808 }
809
810 // table 样式
811 .el-form-item__label {
812 border-right: none;
813 text-align: center;
814 padding: 0;
815 line-height: 16px;
816 font-size: 12px;
817 text-align: right;
818 margin-top: 8px !important;
819 }
820
821 .el-form-item__content {
822 display: flex;
823 margin-right: -1px;
824 }
825
826 .obligee-item-name,
827 .receivingInfo-item-name,
828 .auditInfo-item-name {
829 background-color: #3D59C4;
830 border-radius: 3px;
831 border: 1px solid blue !important;
832 color: #FFFFFF;
833 }
834
835 .el-textarea__inner {
836 margin: 5px;
837 width: 96%;
838 background: none;
839 color: #FFFFFF;
840 border-radius: 2px;
841 border: 1px solid #6BC1FC;
842 }
843
844 .el-input-number {
845 width: 100%;
846 }
847
848 .el-input-number__increase {
849 // background: #05275B;
850 color: #FFFFFF;
851 border: none;
852 right: 7px;
853 top: 2px;
854 }
855
856 .el-input-number__decrease {
857 // background: #05275B;
858 color: #FFFFFF;
859 border: none;
860 right: 7px;
861 bottom: 10px;
862 }
863
864 .el-input__inner {
865 margin: 5px;
866 width: 96%;
867 // background: #05275B;
868 border-radius: 2px;
869 border: 1px solid #6BC1FC;
870 text-align: left;
871
872 }
873
874 .el-form-item {
875 margin-bottom: 0;
876 margin-top: -1px;
877 }
878
879 .item-label {
880 display: flex;
881 align-items: flex-end;
882 flex-direction: column;
883 font-size: 12px;
884 flex: 0 0 90px;
885 margin-right: 3px;
886
887 p {
888 line-height: 16px;
889 white-space: nowrap;
890 text-align: right;
891 }
892
893 p:nth-child(1) {
894 position: relative;
895 right: 5px;
896 }
897 }
898 }
899
900 // 字典管理弹框
901 .dictionary {
902 .el-dialog__header {
903 width: 100%;
904 display: flex;
905 justify-content: center;
906 font-size: 24px;
907 background-color: #3D59C4;
908
909 .dialog_title {
910
911 color: white;
912 margin-bottom: 10px;
913 }
914 }
915
916 .el-dialog__headerbtn .el-dialog__close {
917 font-size: 20px;
918 color: white;
919 }
920 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-20 14:45:57 4 * @LastEditTime: 2023-03-28 14:11:01
5 --> 5 -->
6 <!-- 6 <!--
7 功能：结果 7 功能：结果
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 </div> 18 </div>
19 </template> 19 </template>
20 <script> 20 <script>
21 import { getReceiveDataReportResult } from "@/api/dataReport.js"; 21 import { getReceiveDataReportResult } from "@/api/dataReport.js";
22 export default { 22 export default {
23 components: {}, 23 components: {},
24 props: { 24 props: {
25 formData: { 25 formData: {
...@@ -40,10 +40,10 @@ export default { ...@@ -40,10 +40,10 @@ export default {
40 this.ERRORINFO = data.ERRORINFO 40 this.ERRORINFO = data.ERRORINFO
41 }) 41 })
42 } 42 }
43 } 43 }
44 </script> 44 </script>
45 <style scoped lang='scss'> 45 <style scoped lang='scss'>
46 .result { 46 .result {
47 padding: 15px; 47 padding: 15px;
48 48
49 p { 49 p {
...@@ -51,12 +51,12 @@ export default { ...@@ -51,12 +51,12 @@ export default {
51 line-height: 26px; 51 line-height: 26px;
52 font-size: 18px; 52 font-size: 18px;
53 } 53 }
54 } 54 }
55 55
56 /deep/.el-textarea__inner { 56 /deep/.el-textarea__inner {
57 min-height: 33vh !important; 57 min-height: 33vh !important;
58 background-color: #08346F !important; 58 background-color: #08346f !important;
59 color: #ffffff; 59 color: #ffffff;
60 border: none !important; 60 border: none !important;
61 } 61 }
62 </style> 62 </style>
......
1 <template> 1 <template>
2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog" custom-class="dialogBox entryJournal editDialogBox mainCenter" 2 <el-dialog :close-on-click-modal="false" top="0" @close="closeDialog"
3 :visible.sync="dialogVisible" width="90%"> 3 custom-class="dialogBox entryJournal commonDialog editDialogBox mainCenter" :visible.sync="dialogVisible" width="90%">
4 <div slot="title" class="dialog_title" ref="dialogTitle"> 4 <div slot="title" class="dialog_title" ref="dialogTitle">
5 {{ title || '登薄日志' }} 5 {{ title || '登薄日志' }}
6 </div> 6 </div>
...@@ -193,12 +193,12 @@ ...@@ -193,12 +193,12 @@
193 </template> 193 </template>
194 194
195 <script> 195 <script>
196 import { sbdata, sendThis } from './data/sbdata' 196 import { sbdata, sendThis } from './data/sbdata'
197 import { dbdata, sendThis1 } from './data/dbdata' 197 import { dbdata, sendThis1 } from './data/dbdata'
198 import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js" 198 import { getDetail, edit, regenerateDbXml } from "@/api/recordLog.js"
199 import JsonEditor from "@/components/JsonEditor.vue"; 199 import JsonEditor from "@/components/JsonEditor.vue";
200 import { judgeListComplete } from "@/utils/tools.js" 200 import { judgeListComplete } from "@/utils/tools.js"
201 export default { 201 export default {
202 components: { JsonEditor }, 202 components: { JsonEditor },
203 data () { 203 data () {
204 return { 204 return {
...@@ -455,8 +455,7 @@ ...@@ -455,8 +455,7 @@
455 } 455 }
456 } 456 }
457 } 457 }
458 } 458 }
459 </script> 459 </script>
460 <style scoped lang="scss"> 460
461 </style>
462 461
......
...@@ -153,6 +153,7 @@ export default { ...@@ -153,6 +153,7 @@ export default {
153 { 153 {
154 label: "操作", 154 label: "操作",
155 width: "80", 155 width: "80",
156 fixed: "right",
156 render: (h, scope) => { 157 render: (h, scope) => {
157 return ( 158 return (
158 <div> 159 <div>
......
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: 130
12 },
13 {
14 prop: "description",
15 label: "业务号"
16 },
17 {
18 prop: "description",
19 label: "受理业务名称"
20 },
21 {
22 prop: "description",
23 label: "受理业务编码"
24 },
25 {
26 prop: "description",
27 label: "受理时间"
28 },
29 {
30 prop: "description",
31 label: "登记时间"
32 },
33 {
34 prop: "description",
35 label: "接收时间"
36 },
37 {
38 prop: "description",
39 label: "读取时间"
40 }
41 ]
42 }
43 }
44 export default new data()
1 <!-- 新增 & 修改角色 -->
2 <template>
3 <dialogBox
4 class="PersonnelDialog"
5 :title="title"
6 :width="'567px'"
7 :isMain="true"
8 @closeDialog="close"
9 @submitForm="submitForm"
10 v-model="myValue">
11 <div class="dialogCon">
12 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
13 <el-row :gutter="24">
14 <el-col :span="23">
15 <el-form-item label="角色名称:" prop="roleName">
16 <el-input
17 v-model="dialogForm.roleName"
18 clearable
19 placeholder="角色名称" />
20 </el-form-item>
21 </el-col>
22 </el-row>
23 <el-row>
24 <el-col :span="23">
25 <el-form-item label="备注:" class="form-item-mb0">
26 <el-input
27 v-model="dialogForm.roleTextArea"
28 clearable
29 :rows="10"
30 type="textarea"
31 placeholder="备注" />
32 </el-form-item>
33 </el-col>
34 </el-row>
35 </el-form>
36 </div>
37 <!-- <template slot="footer">
38 <el-button
39 class="cancel-button"
40 @click="handleCloseDialog">取消</el-button>
41
42 <el-button
43 type="primary"
44 @click="handleSaveRole()">保存</el-button>
45 </template> -->
46 </dialogBox>
47 </template>
48
49 <script>
50 import Dialog from "@/components/Dialog/";
51 import { api, httpAction } from '@/api/manageApi'
52 export default {
53 components: {
54 Dialog
55 },
56 props: {
57 value: { type: Boolean, default: false },
58 },
59 data () {
60 return {
61 myValue: this.value,
62 title: '',
63 showAddEditDialog: false,
64 menuType: '',
65 roleId: '',
66 sort: 0,
67 dialogForm: {
68 roleName: '',
69 roleType: '',
70 roleTextArea: ''
71 },
72 rules: {
73 roleName: [
74 { required: true, message: '请输入角色名称', trigger: 'blur' }
75 ],
76 },
77 roleTypeOptions: [
78 { name: '定制', value: '定制' },
79 { name: '其他', value: '其他' }
80 ]
81 }
82 },
83 watch: {
84 value (val) {
85 this.myValue = val
86 }
87 },
88 methods: {
89 // 保存新增或关闭事件
90 submitForm () {
91 this.$refs.form.validate((valid) => {
92 if (valid) {
93 try {
94 const params = {
95 category: 2,
96 description: this.dialogForm.roleTextArea,
97 name: this.dialogForm.roleName,
98 sort: this.sort,
99 type: this.dialogForm.roleType
100 }
101 if (this.roleId) {
102 params.id = this.roleId
103 httpAction(`${api.roles}/${params.id}`, params, 'post').then(
104 (res) => {
105 if (res.status === 1) {
106 this.$message.success({
107 message: '修改成功',
108 showClose: true
109 })
110 this.dialogForm = {
111 roleName: '',
112 }
113 // this.showAddEditDialog = val
114 this.$emit('ok')
115 } else {
116 this.$message.error({
117 message: res.message,
118 showClose: true
119 })
120 }
121 }
122 )
123 } else {
124 httpAction(api.roles, params, 'post').then((res) => {
125 if (res.status === 1) {
126 this.$message.success({
127 message: '新增成功',
128 showClose: true
129 })
130 this.close()
131
132 this.$emit('ok')
133 // this.showAddEditDialog = val
134 this.$emit('ok', this.menuType)
135 } else {
136 this.$message.error({
137 message: res.message,
138 showClose: true
139 })
140 }
141 })
142 }
143 } catch (e) {
144 console.error(e)
145 }
146 }
147 })
148 },
149 resetForm () {
150 this.dialogForm = {
151 roleName: '',
152 }
153 this.$refs.form.resetFields()
154 },
155 close () {
156 this.resetForm()
157 this.$emit('input', false)
158 }
159 }
160 }
161 </script>
162 <style scoped lang="scss">
163 </style>
1 <template>
2 <div class="timedTask from-clues">
3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb />
7 </el-form-item>
8 <el-row class="mb-5">
9 <el-col :span="4">
10 <el-form-item label="业务号：" prop="ywh">
11 <el-input v-model="form.ywh" class="width100" clearable placeholder="业务号"></el-input>
12 </el-form-item>
13 </el-col>
14 <el-col :span="4">
15 <el-form-item label="业务名称" prop="ywmc">
16 <el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="业务名称"></el-input>
17 </el-form-item>
18 </el-col>
19 <el-col :span="6">
20 <el-form-item label="开始日期" prop="startTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
22 clearable v-model="form.startTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
23 </el-form-item>
24 </el-col>
25 <el-col :span="6">
26 <el-form-item label="结束日期" prop="endTime">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" clearable
28 v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
29 </el-form-item>
30 </el-col>
31 <!-- 操作按钮 -->
32 <el-col :span="4" class="btnColRight">
33 <btn nativeType="cz" @click="resetForm">重置</btn>
34 <btn nativeType="cx" @click="handleSearch">查询</btn>
35 </el-col>
36 </el-row>
37 </el-form>
38 </div>
39 <div class="from-clues-content">
40 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200"
41 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
42 row-key="dictid">
43 </lb-table>
44 </div>
45 </div>
46 </template>
47 <script>
48 import {
49 getUuid,
50 judgeSort,
51 realMove,
52 findParents,
53 removeTreeListItem,
54 } from "@/utils/operation";
55 import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
56 import { getUserRoles } from "@/api/personnelManage";
57 import data from "./data";
58 import { getMenuInfo } from "@/api/user";
59 import { api, getAction, deleteAction } from "@/api/manageApi";
60 import tableMixin from "@/mixins/tableMixin.js";
61 import EditDialog from "./edit-dialog.vue";
62 import Roleslistdiglog from "./roleslistdiglog.vue";
63 import { mapGetters } from "vuex";
64 import { updateOrder } from "@/api/orders"
65 export default {
66 name: "menus",
67 mixins: [tableMixin],
68 components: {
69 EditDialog,
70 Roleslistdiglog,
71 },
72 data () {
73 return {
74 // 开始结束日期限制
75 pickerOptionsStart: {
76 disabledDate: (time) => {
77 if (this.form.endTime) {
78 return time.getTime() >= new Date(this.form.endTime).getTime()
79 }
80 }
81 },
82 // 结束日期限制
83 pickerOptionsEnd: {
84 disabledDate: (time) => {
85 if (this.form.startTime) {
86 return time.getTime() < new Date(this.form.startTime).getTime()
87 }
88 }
89 },
90 listdata: [],
91 setlistdata: [],
92 // 表单
93 form: {
94 ywh: '',
95 ywmc: '',
96 startTime: '',
97 endTime: '',
98 currentPage: 1
99 },
100 tableData: {
101 columns: [
102 {
103 label: "序号",
104 type: "index",
105 width: "50",
106 index: this.indexMethod,
107 },
108 ]
109 .concat(data.columns())
110 .concat({
111 prop: "state",
112 label: "状态",
113 width: '120',
114 render: (h, scope) => {
115 return (
116 <div>
117 <span class='adopt' v-show={scope.row.state == 3}>上报失败</span>
118 <span class='adopt' v-show={scope.row.state == 2}>上报成功</span>
119 <span class='warehousing' v-show={scope.row.state == 1}>接入上报异常</span>
120 </div>
121 )
122 }
123 })
124 .concat([]),
125 },
126 data: [],
127 }
128 },
129 created () {
130 this.getTableData();
131 },
132 mounted () { },
133 methods: {
134 //查询
135 searchQuery () {
136 if (this.form.rolesName) {
137 this.listdata = this.childrenFn(this.setlistdata, this.form.rolesName);
138 } else {
139 this.getTableData()
140 }
141 },
142 childrenFn (arr, key) {
143 let searchTree = [];
144 arr.forEach((item, index) => {
145 if (item.name.indexOf(key) != -1) {
146
147 searchTree.push(item);
148 }
149 });
150 if (searchTree != undefined && searchTree.length != 0) {
151 return judgeSort(searchTree);
152 }
153 },
154 // 获取角色列表
155 getTableData () {
156 getRolesById([1, 2])
157 .then((res) => {
158 this.listdata = res.content;
159 this.listdata = judgeSort(this.listdata);
160 this.setlistdata = res.content;
161 })
162 .catch((e) => console.error(e));
163 },
164
165
166 },
167 };
168 </script>
169 <style scoped lang="scss">
170 @import "~@/styles/mixin.scss";
171 // @import "~@/styles/public.scss";
172
173 /deep/.el-button.is-disabled.el-button--text {
174 width: 64px;
175 height: 28px;
176 background: rgba(255, 255, 255, 0.1);
177 border-radius: 16px;
178 }
179 </style>
1 <template>
2 <el-dialog
3 :close-on-click-modal="false"
4 top="0"
5 @click="close()"
6 class="roleconfiguration"
7 custom-class="dialogBox editDialogBox mainCenter"
8 :visible.sync="visible"
9 width="85%">
10 <div slot="title" class="dialog_title" ref="dialogTitle">
11 {{ title || "标题" }}
12 </div>
13 <div class="editDialogBox-box">
14 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
15 <el-tab-pane label="人员配置" name="first"></el-tab-pane>
16 <el-tab-pane label="菜单配置" name="second"></el-tab-pane>
17 </el-tabs>
18 <lb-table
19 v-if="activeName == 'first'"
20 ref="multipleTable"
21 :pagination="false"
22 :column="usertableData.column"
23 :data="lastuserList"
24 @selection-change="handleSelectionChange"
25 @row-click="handleClickTableRow">
26 >
27 </lb-table>
28 <lb-table
29 :key="menukey"
30 v-if="activeName == 'second'"
31 :pagination="false"
32 :column="menutableData.column"
33 :data="lastMenuList"
34 row-key="id"
35 default-expand-all
36 :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
37 </lb-table>
38 </div>
39 <template slot="footer">
40 <btn nativeType="cx" type="primary" @click="handleSaveMember()">保存</btn>
41 <btn nativeType="cz" @click="close()">取消</btn>
42 </template>
43 </el-dialog>
44 </template>
45
46 <script>
47 import { api } from "@/api/manageApi";
48 import { getRoleAuthorityList, roleAuthority } from "@/api/authorityManage";
49 import { updateUser } from "@/api/personnelManage";
50 export default {
51 name: "",
52 data () {
53 return {
54 title: "人员配置",
55 visible: false,
56 menutableData: {
57 column: [
58 {
59 prop: "name",
60 width: 830,
61 label: "菜单名称",
62 }
63 ].concat([
64 {
65 label: "权限",
66 render: (h, scope) => {
67 return (
68 <div>
69 <el-checkbox v-model={scope.row.checkArr[0].value}
70 disabled={scope.row.checkArr[0].disabled}
71 label={scope.row.checkArr[0].name} onChange={(checked) => {
72 this.changeCheck(checked, scope.row.checkArr[0].id, scope);
73 }} />
74 <el-checkbox v-model={scope.row.checkArr[1].value}
75 disabled={scope.row.checkArr[0].disabled}
76 label={scope.row.checkArr[1].name}
77 onChange={(checked) => {
78 this.changeCheck(checked, scope.row.checkArr[1].id, scope);
79 }} />
80 </div>
81 );
82 },
83 },
84 ]),
85 },
86 usertableData: {
87 column: [
88 {
89 type: "selection",
90 width: 330,
91 },
92 {
93 prop: "name",
94 width: 330,
95 label: "姓名",
96 },
97 {
98 prop: "loginName",
99 label: "用户名",
100 },
101 ],
102 },
103 // 角色id
104 roleId: "",
105 menuList: [], // 菜单列表
106 menukey: 0,
107 activeName: "first",
108 lastuserList: [], // 人员表格数据
109 lastMenuList: [], // 重构完成的菜单表格数据
110 usermultipleSelection: [],
111 // 选中菜单列表
112 checkArr: [], // 重构操作符列表
113 authorityList: [], // 授权回显数组
114 checklistbor: [],
115 // 授权对象数据
116 menuprams: {},
117 // 系统code
118 selectedSubsystemCode: ""
119 };
120 },
121 computed: {},
122
123 created () {
124 },
125 mounted () {
126 },
127 methods: {
128
129 // 人员配置点击行勾选数据
130 handleClickTableRow (row, event) {
131 this.checkNum = 0;
132 this.isCheck = false;
133 if (event.label == "操作") {
134 return;
135 } else {
136 if (row.status == "0") {
137 return;
138 } else {
139 if (this.usermultipleSelection.length > 0) {
140 if (
141 JSON.stringify(this.usermultipleSelection).indexOf(
142 JSON.stringify(row)
143 ) == -1
144 ) {
145 this.usermultipleSelection.push(row);
146 this.$refs.multipleTable.toggleRowSelection(row, true);
147 } else {
148 this.usermultipleSelection.map((item, index) => {
149 if (item.id == row.id) {
150 this.usermultipleSelection.splice(index, 1);
151 this.$refs.multipleTable.toggleRowSelection(row, false);
152 }
153 });
154 }
155 } else {
156 this.usermultipleSelection.push(row);
157 this.$refs.multipleTable.toggleRowSelection(row, true);
158 }
159 }
160 }
161 if (this.usermultipleSelection.length > 0) {
162 this.checkNum = this.usermultipleSelection.length;
163 this.isCheck = true;
164 } else {
165 this.isCheck = false;
166 }
167 },
168 // 获取授权主体的菜单权限
169 // getMenuAuthorityList
170 menulist (operationList, id, Code, menutablelistData, operationCodes) {
171 this.selectedSubsystemCode = Code
172 this.menuList = menutablelistData;
173 getRoleAuthorityList(
174 id,
175 operationList.toString(),
176 Code + '_MENU'
177 ).then(res => {
178 if (res.status === 1) {
179 this.authorityList = res.content
180 this.getRecursionTreeData(this.menuList, this.authorityList, operationCodes)
181 this.getAuthorizedInfo()
182 // this.setCheckAllArr()
183 // this.getAuthorizedInfo()
184 } else {
185 this.$message.error({ message: res.message, showClose: true })
186 }
187 })
188
189
190 },
191 /**
192 * 递归渲染列表数据
193 * list:原始数组
194 * authorityList:已授权数组
195 */
196 getRecursionTreeData (list, authorityList, operationCodes) {
197 ++this.menukey
198 this.checkArr = []
199 for (const k in operationCodes) {
200 const obj = {}
201 obj.name = operationCodes[k]
202 obj.id = k
203 obj.value = false
204 obj.disabled = false
205 // obj.isAll = false;
206 this.checkArr.push(obj)
207 }
208 for (const [index, item] of Object.entries(list)) {
209 this.setAuthorizedConditions(
210 authorityList,
211 this.$deepCopy(this.checkArr),
212 item
213 )
214 if (
215 item.children &&
216 item.children !== null &&
217 item.children.length !== 0
218 ) {
219 item.children.forEach((child, j) => {
220 this.setAuthorizedConditions(
221 authorityList,
222 this.$deepCopy(this.checkArr),
223 child
224 )
225 })
226 this.getRecursionTreeData(item.children, authorityList, operationCodes)
227 }
228 }
229 this.lastMenuList = list
230 // this.setCheckAllArr(list)
231 },
232 // 授权条件
233 setAuthorizedConditions (authorityList, checkArr, item) {
234 if (this.roleId === '') {
235 checkArr.forEach(ele => {
236 ele.disabled = true
237 ele.value = false
238 })
239 } else {
240 if (authorityList.length !== 0) {
241 if (authorityList[0].superPermission === true) {
242 checkArr.forEach(ele => {
243 ele.value = true
244 ele.disabled = true
245 })
246 } else {
247 const repeatArr = authorityList.filter(authorityItem => {
248 return authorityItem.resourceUri === item.id
249 })
250 repeatArr.forEach(element => {
251 checkArr.forEach(ele => {
252 if (element.operationCode === ele.id) {
253 ele.value = true
254 if (this.roleId !== element.subjectId) {
255 ele.disabled = true
256 }
257 }
258 })
259 })
260 }
261 }
262 }
263 this.$set(item, 'checkArr', this.$deepCopy(checkArr))
264 },
265 // 获取拼接授权信息
266 getAuthorizedInfo () {
267 const lastArr = []
268 const authorizedList = []
269 const wholeArr = this.$deepCopy(this.lastMenuList)
270 const arr = this.$treeConvertToArr(wholeArr)
271 arr.forEach(ele => {
272 ele.checkArr.forEach(val => {
273 if (val.value === true && val.disabled === false) {
274 const obj = {
275 operationCode: val.id,
276 name: ele.name,
277 id: ele.id
278 }
279 lastArr.push(obj)
280 }
281 })
282 })
283 lastArr.forEach(element => {
284 authorizedList.push({
285 operationCode: element.operationCode, // 标识符
286 productCode: this.selectedSubsystemCode, // 子系统code
287 resourceCategoryCode: this.selectedSubsystemCode + '_MENU', // 资源类别code默认为MENU
288 resourceName: element.name,
289 resourceUri: element.id, // 授权菜单id
290 subjectId: this.roleId, // 授权对象id
291 subjectType: 'ROLE' // 授权对象类别
292 })
293 })
294 this.menuprams = {
295 subjectId: this.roleId,
296 authorizedList: authorizedList
297 }
298 },
299 // 获取人员列表做筛选
300 personlist (a, rid) {
301 this.roleId = rid;
302 this.visible = true;
303 this.lastuserList = a;
304 this.lastuserList.forEach((item, index) => {
305 if (item.selectStatus === 0) {
306 this.$nextTick(async () => {
307 await this.$refs.multipleTable
308 if (this.$refs.multipleTable) {
309 this.$refs.multipleTable.toggleRowSelection(
310 this.lastuserList[index],
311 true
312 );
313 }
314
315 });
316 }
317 });
318 },
319 // 关闭事件
320 close () {
321 this.visible = false;
322 },
323 // 保存事件
324 handleSaveMember () {
325 // 人员授权
326 const idList = this.usermultipleSelection.map((item) => {
327 return item.id;
328 })
329 updateUser(this.roleId, idList).then((res) => {
330 if (res.status === 1) {
331 this.$message.success({ message: "保存成功", showClose: true });
332 this.visible = false;
333 } else this.$message.error({ message: res.message, showClose: true });
334 });
335 // 菜单授权
336 roleAuthority(
337 this.menuprams.subjectId,
338 this.menuprams.authorizedList
339 ).then((res) => {
340 if (res.status === 1) {
341 this.$message.success({
342 message: res.message,
343 })
344 // this.authorizedContChange()
345 } else {
346 this.$message.error({ message: res.message, showClose: true })
347 }
348 })
349 },
350 // 勾选人员事件
351 handleSelectionChange (val) {
352 this.lastuserList.forEach((element, index) => {
353 delete this.lastuserList[index].selectStatus
354 });
355 this.usermultipleSelection = val;
356 this.lastuserList.forEach((element, index) => {
357 this.usermultipleSelection.forEach(element1 => {
358 if (element.id == element1.id) {
359 this.lastuserList[index].selectStatus = 0
360 }
361 });
362 });
363 },
364 // 数据筛选
365 setarrdata (scope, arr) {
366
367 arr.forEach((item, index, arr) => {
368 if (item.id == scope.row.id) {
369 this.checklistbor = [...arr]
370 } else if (item.id !== scope.row.id && item.children) {
371 this.setarrdata(scope, item.children)
372 }
373
374 })
375
376 },
377 // 勾选菜单事件
378 changeCheck (flag, checkId, scope) {
379 this.checklistbor = []
380 this.setarrdata(scope, this.lastMenuList)
381 const parents = this.$findParent(this.lastMenuList, scope.row.parentId)
382 const childs = this.$findChildren(this.lastMenuList, scope.row.id)
383 this.$setChildArr(
384 this.lastMenuList,
385 scope.row.id,
386 checkId,
387 flag,
388 this.checklistbor,
389 parents,
390 childs
391 )
392 this.getAuthorizedInfo()
393 },
394 handleClick (tab, event) {
395 this.lastuserList.forEach((item, index) => {
396 if (item.selectStatus === 0) {
397 this.$nextTick(async () => {
398 await this.$refs.multipleTable
399 if (this.$refs.multipleTable) {
400 this.$refs.multipleTable.toggleRowSelection(
401 this.lastuserList[index],
402 true
403 );
404 }
405
406 });
407 }
408 });
409 }
410
411 },
412 };
413 </script>
414 <style scoped lang="scss">
415 /deep/.dialogBox .el-dialog__header {
416 height: 59px !important;
417 }
418 </style>
1 <template> 1 <template>
2 <!-- 编辑 --> 2 <!-- 编辑 -->
3 <dialogBox submitForm="submitForm" class="tableClass" @closeDialog="closeDialog" @submitForm="handleSubmit" width="60%" 3 <dialogBox submitForm="submitForm" class="tableClass dictionary" @closeDialog="closeDialog" @submitForm="handleSubmit" width="60%"
4 v-model="myValue" :isMain="true" title="字典信息"> 4 v-model="myValue" :isMain="true" title="字典信息">
5 <div class="editDialogBox-box "> 5 <div class="editDialogBox-box ">
6 <el-form :model="ruleForm" ref="ruleForm" label-width="100px"> 6 <el-form :model="ruleForm" ref="ruleForm" label-width="100px">
...@@ -159,13 +159,14 @@ ...@@ -159,13 +159,14 @@
159 }, 159 },
160 }, 160 },
161 { 161 {
162 width: "130", 162 width: "200",
163 label: "移动", 163 label: "移动",
164 render: (h, scope) => { 164 render: (h, scope) => {
165 return ( 165 return (
166 <div> 166 <div>
167 <el-button 167 <el-button
168 type="text" 168 type="text"
169 class='movebtnColor'
169 disabled={scope.row.isTop} 170 disabled={scope.row.isTop}
170 onClick={() => { 171 onClick={() => {
171 this.moveUpward(scope.$index, scope.row); 172 this.moveUpward(scope.$index, scope.row);
...@@ -175,6 +176,7 @@ ...@@ -175,6 +176,7 @@
175 </el-button> 176 </el-button>
176 <el-button 177 <el-button
177 type="text" 178 type="text"
179 class='movebtnColor'
178 disabled={scope.row.isBottom} 180 disabled={scope.row.isBottom}
179 onClick={() => { 181 onClick={() => {
180 this.moveDown(scope.$index, scope.row); 182 this.moveDown(scope.$index, scope.row);
...@@ -187,13 +189,14 @@ ...@@ -187,13 +189,14 @@
187 }, 189 },
188 }, 190 },
189 { 191 {
190 width: "100", 192 width: "200",
191 label: "操作", 193 label: "操作",
192 render: (h, scope) => { 194 render: (h, scope) => {
193 return ( 195 return (
194 <div> 196 <div>
195 <el-button 197 <el-button
196 type="text" 198 type="text"
199 class='resetbtnColor'
197 style="margin-right:10px" 200 style="margin-right:10px"
198 onClick={() => { 201 onClick={() => {
199 this.handleAddSubordinate(scope.row); 202 this.handleAddSubordinate(scope.row);
...@@ -203,6 +206,7 @@ ...@@ -203,6 +206,7 @@
203 </el-button> 206 </el-button>
204 <el-button 207 <el-button
205 type="text" 208 type="text"
209 class='delColor'
206 style="margin-left:0" 210 style="margin-left:0"
207 onClick={() => { 211 onClick={() => {
208 this.handleMinus(scope.$index, scope.row); 212 this.handleMinus(scope.$index, scope.row);
......
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
208 message: res.message, 208 message: res.message,
209 showClose: true 209 showClose: true
210 }) 210 })
211 211 close()
212 this.resetForm()
213 this.$emit('ok') 212 this.$emit('ok')
213
214 } else { 214 } else {
215 this.$message.error({ message: res.message, showClose: true }) 215 this.$message.error({ message: res.message, showClose: true })
216 } 216 }
......
...@@ -29,20 +29,20 @@ ...@@ -29,20 +29,20 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 // 定时任务 32 // 定时任务
33 import data from "./data"; 33 import data from "./data";
34 import { deleteAction, getAction, api } from "@/api/manageApi"; 34 import { deleteAction, getAction, api } from "@/api/manageApi";
35 import EditDialog from "./edit-dialog.vue"; 35 import EditDialog from "./edit-dialog.vue";
36 import { mapGetters } from "vuex"; 36 import { mapGetters } from "vuex";
37 import { getMenuInfo } from "@/api/user"; 37 import { getMenuInfo } from "@/api/user";
38 import { 38 import {
39 getUuid, 39 getUuid,
40 judgeSort, 40 judgeSort,
41 realMove, 41 realMove,
42 findParents, 42 findParents,
43 removeTreeListItem, 43 removeTreeListItem,
44 } from "@/utils/operation"; 44 } from "@/utils/operation";
45 export default { 45 export default {
46 name: "menus", 46 name: "menus",
47 components: { 47 components: {
48 EditDialog, 48 EditDialog,
...@@ -153,6 +153,7 @@ export default { ...@@ -153,6 +153,7 @@ export default {
153 // 加载表格数据 153 // 加载表格数据
154 getTableList () { 154 getTableList () {
155 getMenuInfo(this.BASE_API.CODE).then((res) => { 155 getMenuInfo(this.BASE_API.CODE).then((res) => {
156 console.log("/sthj", res);
156 if (res.code === 200) { 157 if (res.code === 200) {
157 this.tablelistData = judgeSort(res.result) 158 this.tablelistData = judgeSort(res.result)
158 this.listData = this.tablelistData 159 this.listData = this.tablelistData
...@@ -166,7 +167,7 @@ export default { ...@@ -166,7 +167,7 @@ export default {
166 conditions: [ 167 conditions: [
167 { 168 {
168 property: "code", 169 property: "code",
169 value: sessionStorage.getItem("products"), 170 value: this.BASE_API.CODE,
170 operator: "EQ", 171 operator: "EQ",
171 }, 172 },
172 ], 173 ],
...@@ -245,14 +246,14 @@ export default { ...@@ -245,14 +246,14 @@ export default {
245 this.getTableList() 246 this.getTableList()
246 }, 247 },
247 }, 248 },
248 }; 249 };
249 </script> 250 </script>
250 <style scoped lang="scss"> 251 <style scoped lang="scss">
251 @import "~@/styles/mixin.scss"; 252 @import "~@/styles/mixin.scss";
252 253
253 // @import "~@/styles/public.scss"; 254 // @import "~@/styles/public.scss";
254 255
255 /deep/.el-table__expand-icon { 256 /deep/.el-table__expand-icon {
256 color: #fff; 257 color: #fff;
257 } 258 }
258 </style> 259 </style>
......
...@@ -29,24 +29,24 @@ ...@@ -29,24 +29,24 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 import { 32 import {
33 getUuid, 33 getUuid,
34 judgeSort, 34 judgeSort,
35 realMove, 35 realMove,
36 findParents, 36 findParents,
37 removeTreeListItem, 37 removeTreeListItem,
38 } from "@/utils/operation"; 38 } from "@/utils/operation";
39 import { getRolesById, getAuthorityListAction } from "@/api/authorityManage"; 39 import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
40 import { getUserRoles } from "@/api/personnelManage"; 40 import { getUserRoles } from "@/api/personnelManage";
41 import data from "./data"; 41 import data from "./data";
42 import { getMenuInfo } from "@/api/user"; 42 import { getMenuInfo } from "@/api/user";
43 import { api, getAction, deleteAction } from "@/api/manageApi"; 43 import { api, getAction, deleteAction } from "@/api/manageApi";
44 import tableMixin from "@/mixins/tableMixin.js"; 44 import tableMixin from "@/mixins/tableMixin.js";
45 import EditDialog from "./edit-dialog.vue"; 45 import EditDialog from "./edit-dialog.vue";
46 import Roleslistdiglog from "./roleslistdiglog.vue"; 46 import Roleslistdiglog from "./roleslistdiglog.vue";
47 import { mapGetters } from "vuex"; 47 import { mapGetters } from "vuex";
48 import { updateOrder } from "@/api/orders" 48 import { updateOrder } from "@/api/orders"
49 export default { 49 export default {
50 name: "menus", 50 name: "menus",
51 mixins: [tableMixin], 51 mixins: [tableMixin],
52 components: { 52 components: {
...@@ -431,7 +431,7 @@ export default { ...@@ -431,7 +431,7 @@ export default {
431 this.$refs.addEditDialog.menuType = this.menuType; 431 this.$refs.addEditDialog.menuType = this.menuType;
432 this.$refs.addEditDialog.roleId = value.id; 432 this.$refs.addEditDialog.roleId = value.id;
433 this.roleSort = value.sort ? value.sort : 0; 433 this.roleSort = value.sort ? value.sort : 0;
434 this.$refs.addEditDialog.dialogForm.roleType = sessionStorage.getItem("products"); 434 this.$refs.addEditDialog.dialogForm.roleType = this.BASE_API.CODE;
435 if (value.id) { 435 if (value.id) {
436 this.$refs.addEditDialog.dialogForm.roleName = value.name; 436 this.$refs.addEditDialog.dialogForm.roleName = value.name;
437 437
...@@ -503,16 +503,16 @@ export default { ...@@ -503,16 +503,16 @@ export default {
503 this.getTableData(); 503 this.getTableData();
504 }, 504 },
505 }, 505 },
506 }; 506 };
507 </script> 507 </script>
508 <style scoped lang="scss"> 508 <style scoped lang="scss">
509 @import "~@/styles/mixin.scss"; 509 @import "~@/styles/mixin.scss";
510 // @import "~@/styles/public.scss"; 510 // @import "~@/styles/public.scss";
511 511
512 /deep/.el-button.is-disabled.el-button--text { 512 /deep/.el-button.is-disabled.el-button--text {
513 width: 64px; 513 width: 64px;
514 height: 28px; 514 height: 28px;
515 background: rgba(255, 255, 255, 0.1); 515 background: rgba(255, 255, 255, 0.1);
516 border-radius: 16px; 516 border-radius: 16px;
517 } 517 }
518 </style> 518 </style>
......
...@@ -29,12 +29,12 @@ ...@@ -29,12 +29,12 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 // 定时任务 32 // 定时任务
33 import data from "./data" 33 import data from "./data"
34 import sjsbTask from '@/api/sjsbTask.js' 34 import sjsbTask from '@/api/sjsbTask.js'
35 import tableMixin from '@/mixins/tableMixin.js' 35 import tableMixin from '@/mixins/tableMixin.js'
36 import addTask from '../components/addTask.vue' 36 import addTask from '../components/addTask.vue'
37 export default { 37 export default {
38 name: "timedTask", 38 name: "timedTask",
39 mixins: [tableMixin], 39 mixins: [tableMixin],
40 components: { 40 components: {
...@@ -63,6 +63,62 @@ export default { ...@@ -63,6 +63,62 @@ export default {
63 return ( 63 return (
64 <div> 64 <div>
65 <el-button type="text" 65 <el-button type="text"
66 size="mini"
67 v-show={scope.row.jobStatus === 0}
68 class='btnColor'
69 onClick={() => { this.handleActive(scope.row) }}>激活
70 </el-button>
71 <el-button type="text"
72 size="mini"
73 v-show={scope.row.jobStatus === -1}
74 class='btnColor'
75 onClick={() => { this.recover(scope.row) }}>恢复
76 </el-button>
77 <el-button type="text"
78 size="mini"
79 class='successColor'
80 onClick={() => { this.handleEdit(scope.row) }}>编辑
81 </el-button>
82 <el-button type="text"
83 size="mini"
84 class='successColor'
85 v-show={scope.row.jobStatus !== -1}
86 onClick={() => { this.handleDel(scope.row) }}>删除
87 </el-button>
88 </div>
89 );
90 },
91 },
92 ]),
93 data: []
94 },
95 pageData: {
96 total: 0,
97 pageSize: 15,
98 current: 1,
99 },
100 }
101 },
102 methods: {
103 handleAdd () {
104 this.taskData = null
105 this.isDialog = true
106 },
107 selectionList: [],
108 tableData: {
109 columns: [{
110 label: '序号',
111 type: 'index',
112 width: '50',
113 index: this.indexMethod,
114 }].concat(data.columns()).concat([
115 {
116 label: "操作",
117 width: 380,
118 render: (h, scope) => {
119 return (
120 <div>
121 <el-button type="text"
66 v-show={scope.row.jobStatus === 0} 122 v-show={scope.row.jobStatus === 0}
67 class='btnColor' 123 class='btnColor'
68 icon="el-icon-video-pause" 124 icon="el-icon-video-pause"
...@@ -97,7 +153,6 @@ export default { ...@@ -97,7 +153,6 @@ export default {
97 pageSize: 15, 153 pageSize: 15,
98 current: 1, 154 current: 1,
99 }, 155 },
100 }
101 }, 156 },
102 methods: { 157 methods: {
103 handleAdd () { 158 handleAdd () {
......