ad97b7d9 by renchao@pashanhoo.com

style:样式修改

1 parent 22344843
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,9 +12,4 @@ export default { ...@@ -12,9 +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
20 </style>
......
...@@ -86,7 +86,6 @@ input[type="number"] { ...@@ -86,7 +86,6 @@ input[type="number"] {
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 background-color: transparent !important; 88 background-color: transparent !important;
89 border: 1px solid #224C7C !important;
90 } 89 }
91 90
92 .upload-container { 91 .upload-container {
......
...@@ -223,18 +223,9 @@ ...@@ -223,18 +223,9 @@
223 } 223 }
224 224
225 // 登簿日志弹出框 225 // 登簿日志弹出框
226 .entryJournal { 226 .commonDialog {
227 .el-textarea__inner {
228 height: 67vh !important;
229 border: none !important;
230 background-color: #ffffff !important;
231 color: #000000 !important;
232 }
233
234 /deep/.dialog-from_header { 227 /deep/.dialog-from_header {
235 margin: 0 !important; 228 margin: 0 !important;
236
237
238 } 229 }
239 230
240 .el-dialog__headerbtn .el-dialog__close { 231 .el-dialog__headerbtn .el-dialog__close {
...@@ -270,16 +261,23 @@ ...@@ -270,16 +261,23 @@
270 .regularHeight { 261 .regularHeight {
271 display: flex; 262 display: flex;
272 flex-direction: column; 263 flex-direction: column;
273 height: 87vh; 264 height: 80vh;
274 margin-bottom: 5px; 265 margin-bottom: 5px;
275 266
276 .editDialogBox-con, 267 .editDialogBox-con,
277 .JsonEditor { 268 .JsonEditor {
278 flex: 1; 269 flex: 1;
279 } 270 }
280 }
281 271
282 .d-center {} 272 .editXML {
273 border: 1px solid blue;
274 margin-top: 10px;
275
276 .el-textarea__inner {
277 height: 68vh !important;
278 }
279 }
280 }
283 281
284 .dialog_title { 282 .dialog_title {
285 color: white; 283 color: white;
...@@ -288,14 +286,11 @@ ...@@ -288,14 +286,11 @@
288 286
289 .el-tabs__item { 287 .el-tabs__item {
290 color: #CEF8FF !important; 288 color: #CEF8FF !important;
291 background-color: #3D59C4; 289 background-color: none;
292 display: flex; 290 display: flex;
293 flex-direction: row; 291 flex-direction: row;
294 justify-content: center; 292 justify-content: center;
295 // background: url("~@/image/tabitem.png") no-repeat;
296 // background-size: 100% 100%;
297 border-radius: 3px; 293 border-radius: 3px;
298 border: 1px solid blue !important;
299 } 294 }
300 295
301 .el-tabs__nav { 296 .el-tabs__nav {
...@@ -312,8 +307,7 @@ ...@@ -312,8 +307,7 @@
312 } 307 }
313 308
314 .el-tabs__item.is-active { 309 .el-tabs__item.is-active {
315 // background: url("~@/image/tabitemse.png") no-repeat; 310 background-color: #3D59C4;
316 // background-size: 100% 100%;
317 } 311 }
318 312
319 .from-clues-content { 313 .from-clues-content {
...@@ -325,7 +319,6 @@ ...@@ -325,7 +319,6 @@
325 .editDialogBox-box { 319 .editDialogBox-box {
326 position: relative; 320 position: relative;
327 top: 10px; 321 top: 10px;
328 // height: 100%;
329 } 322 }
330 323
331 .dialog-from { 324 .dialog-from {
...@@ -367,6 +360,25 @@ ...@@ -367,6 +360,25 @@
367 } 360 }
368 } 361 }
369 362
363 .entryJournal {
364 .el-textarea__inner {
365 height: 67vh !important;
366 border: none !important;
367 background-color: #ffffff !important;
368 color: #000000 !important;
369 }
370 }
371
372 // 上报日志弹出框
373 .sbdialog {
374 .el-textarea__inner {
375 height: 30vh !important;
376 border: none !important;
377 background-color: #ffffff !important;
378 color: #000000 !important;
379 }
380 }
381
370 // 数据上报弹出框 382 // 数据上报弹出框
371 .dataReporting { 383 .dataReporting {
372 .el-dialog__header { 384 .el-dialog__header {
...@@ -426,15 +438,11 @@ ...@@ -426,15 +438,11 @@
426 438
427 .el-tabs__item { 439 .el-tabs__item {
428 color: #cef8ff !important; 440 color: #cef8ff !important;
429
430 display: flex; 441 display: flex;
431 flex-direction: row; 442 flex-direction: row;
432 justify-content: center; 443 justify-content: center;
433 // background: url("~@/image/tabitem.png") no-repeat;
434 // background-size: 100% 100%;
435 background-color: #3D59C4; 444 background-color: #3D59C4;
436 border-radius: 3px; 445 border-radius: 3px;
437 border: 1px solid blue !important;
438 } 446 }
439 447
440 .obligee-item-name { 448 .obligee-item-name {
...@@ -512,8 +520,8 @@ ...@@ -512,8 +520,8 @@
512 } 520 }
513 521
514 .el-tabs__item.is-active { 522 .el-tabs__item.is-active {
515 // background: url("~@/image/tabitemse.png") no-repeat; 523 background-color: #1c3294;
516 // background-size: 100% 100%; 524 color: #FFFFFF;
517 } 525 }
518 526
519 .success-images { 527 .success-images {
...@@ -640,10 +648,6 @@ ...@@ -640,10 +648,6 @@
640 } 648 }
641 } 649 }
642 650
643 .el-form-item__label {
644 color: rgb(0, 0, 0);
645 }
646
647 .el-input__inner { 651 .el-input__inner {
648 // background-color: #07388b; 652 // background-color: #07388b;
649 } 653 }
...@@ -659,10 +663,6 @@ ...@@ -659,10 +663,6 @@
659 // color: rgb(0, 0, 0); 663 // color: rgb(0, 0, 0);
660 } 664 }
661 665
662 .el-form-item__label {
663 color: rgb(2, 0, 0);
664 }
665
666 .el-dialog__header { 666 .el-dialog__header {
667 .dialog_title { 667 .dialog_title {
668 668
...@@ -785,9 +785,9 @@ ...@@ -785,9 +785,9 @@
785 border-right: none; 785 border-right: none;
786 text-align: center; 786 text-align: center;
787 padding: 0; 787 padding: 0;
788 color: #05bbdb;
789 line-height: 16px; 788 line-height: 16px;
790 font-size: 12px; 789 font-size: 12px;
790 text-align: right;
791 margin-top: 8px !important; 791 margin-top: 8px !important;
792 } 792 }
793 793
......
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>
......