Skip to content

bdc / bdcjg-web

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

Merge branch 'master' into dev

2 parents feec9292 2f686431
Inline Side-by-side
Showing 4 changed files with 74 additions and 40 deletions
1 { 1 {
2 "TITLE": "汉中市数据上报系统", 2 "TITLE": "汉中市数据上报系统",
3 "THEME": "sb", 3 "THEME": "sb",
4 "CODE": "BDCJGPT", 4 "CODE": "BDCSBPT",
5 "SERVERAPI": "/bdcsjsb", 5 "SERVERAPI": "/bdcsjsb",
6 "calcHeight": 160, 6 "calcHeight": 160,
7 "echartTextColor": "#4A4A4A", 7 "echartTextColor": "#4A4A4A",
......
...@@ -16,6 +16,10 @@ $themes: (blue: ( //背景 ...@@ -16,6 +16,10 @@ $themes: (blue: ( //背景
16 // 操纵btn 16 // 操纵btn
17 btnBg: #4162D8, 17 btnBg: #4162D8,
18 btnColor: #4162D8, 18 btnColor: #4162D8,
19 // 边框
20 border: #4162D8,
21 // 选中按钮
22 btnselect:#203cb8,
19 // table样式相关 23 // table样式相关
20 pagBg:rgba(65, 98, 216, 0.1), 24 pagBg:rgba(65, 98, 216, 0.1),
21 pagBorderColor: #D9D9D9, 25 pagBorderColor: #D9D9D9,
...@@ -28,4 +32,4 @@ $themes: (blue: ( //背景 ...@@ -28,4 +32,4 @@ $themes: (blue: ( //背景
28 menuActive: linear-gradient(90deg, rgba(61, 90, 198, 0.7) 0%, rgba(61, 90, 198, 0) 100%), 32 menuActive: linear-gradient(90deg, rgba(61, 90, 198, 0.7) 0%, rgba(61, 90, 198, 0) 100%),
29 //字体 33 //字体
30 menuText: #A1A7C2, 34 menuText: #A1A7C2,
31 menuActiveText: #FFFFFF))
...\ No newline at end of file ...\ No newline at end of file
35 menuActiveText: #FFFFFF))
......
1 @import '~@/styles/sbElement-ui.scss'; 1 @import '~@/styles/sbElement-ui.scss';
2 @import "~@/styles/_handle.scss"; 2 @import "~@/styles/_handle.scss";
3 @import "~@/styles/_handle.scss";
3 4
4 //input 5 //input
5 .el-input__inner { 6 .el-input__inner {
...@@ -154,10 +155,14 @@ ...@@ -154,10 +155,14 @@
154 color: #cef8ff !important; 155 color: #cef8ff !important;
155 // background: url("~@/image/tabitem.png") no-repeat; 156 // background: url("~@/image/tabitem.png") no-repeat;
156 // background-size: 100% 100%; 157 // background-size: 100% 100%;
157 background-color: #3D59C4; 158 @include background("btnBg");
158 border-radius: 3px; 159 border-radius: 3px;
159 } 160 }
160 161
162 .el-tabs__item.is-active {
163 @include background("btnselect");
164 }
165
161 .el-dialog__headerbtn .el-dialog__close { 166 .el-dialog__headerbtn .el-dialog__close {
162 font-size: 20px; 167 font-size: 20px;
163 color: white; 168 color: white;
...@@ -180,17 +185,17 @@ ...@@ -180,17 +185,17 @@
180 } 185 }
181 186
182 // 面包屑 187 // 面包屑
183 .breadcrumb { 188 // .breadcrumb {
184 width: 80%; 189 // width: 80%;
185 text-indent: 10px; 190 // text-indent: 10px;
186 background: url("~@/image/breadcrumb.png") no-repeat; 191 // background: url("~@/image/breadcrumb.png") no-repeat;
187 background-size: 100% 100%; 192 // background-size: 100% 100%;
188 line-height: 32px; 193 // line-height: 32px;
189 height: 32px; 194 // height: 32px;
190 padding-left: 35px; 195 // padding-left: 35px;
191 margin: 8px 0 10px 6px; 196 // margin: 8px 0 10px 6px;
192 color: #CEF8FF; 197 // color: #CEF8FF;
193 } 198 // }
194 199
195 .el-icon-arrow-right { 200 .el-icon-arrow-right {
196 width: 2px; 201 width: 2px;
...@@ -247,6 +252,11 @@ ...@@ -247,6 +252,11 @@
247 252
248 // 登簿日志弹出框 253 // 登簿日志弹出框
249 .commonDialog { 254 .commonDialog {
255 .el-textarea.is-disabled .el-textarea__inner {
256 margin-top: 20px;
257 @include borderColor("border");
258 }
259
250 /deep/.dialog-from_header { 260 /deep/.dialog-from_header {
251 margin: 0 !important; 261 margin: 0 !important;
252 } 262 }
...@@ -259,11 +269,12 @@ ...@@ -259,11 +269,12 @@
259 .el-dialog__header { 269 .el-dialog__header {
260 text-align: center; 270 text-align: center;
261 font-size: 24px; 271 font-size: 24px;
262 background-color: #3D59C4; 272 @include background("navbg");
263 } 273 }
264 274
265 .el-tabs__header { 275 .el-tabs__header {
266 margin: 0 !important; 276 margin: 0 !important;
277 border-bottom: none;
267 } 278 }
268 279
269 .el-dialog { 280 .el-dialog {
...@@ -293,7 +304,6 @@ ...@@ -293,7 +304,6 @@
293 } 304 }
294 305
295 .editXML { 306 .editXML {
296 border: 1px solid blue;
297 margin-top: 10px; 307 margin-top: 10px;
298 308
299 .el-textarea__inner { 309 .el-textarea__inner {
...@@ -329,8 +339,17 @@ ...@@ -329,8 +339,17 @@
329 display: none; 339 display: none;
330 } 340 }
331 341
342 .el-tabs__item {
343 color: #cef8ff !important;
344 display: flex;
345 flex-direction: row;
346 justify-content: center;
347 @include background("btnBg");
348 border-radius: 3px;
349 }
350
332 .el-tabs__item.is-active { 351 .el-tabs__item.is-active {
333 background-color: #3D59C4; 352 @include background("btnselect");
334 } 353 }
335 354
336 .from-clues-content { 355 .from-clues-content {
...@@ -365,8 +384,10 @@ ...@@ -365,8 +384,10 @@
365 width: 100%; 384 width: 100%;
366 } 385 }
367 386
387
388
368 .el-textarea__inner { 389 .el-textarea__inner {
369 border: none !important; 390
370 margin: 0; 391 margin: 0;
371 } 392 }
372 393
...@@ -409,7 +430,7 @@ ...@@ -409,7 +430,7 @@
409 display: flex; 430 display: flex;
410 justify-content: center; 431 justify-content: center;
411 font-size: 24px; 432 font-size: 24px;
412 background-color: #3D59C4; 433 @include background("navbg");
413 434
414 .dialog_title { 435 .dialog_title {
415 436
...@@ -464,16 +485,16 @@ ...@@ -464,16 +485,16 @@
464 display: flex; 485 display: flex;
465 flex-direction: row; 486 flex-direction: row;
466 justify-content: center; 487 justify-content: center;
467 background-color: #3D59C4; 488 @include background("btnBg");
468 border-radius: 3px; 489 border-radius: 3px;
469 } 490 }
470 491
471 .obligee-item-name { 492 .obligee-item-name {
472 // background: url("~@/image/itembg.png") no-repeat; 493 // background: url("~@/image/itembg.png") no-repeat;
473 // background-size: 100% 100%; 494 // background-size: 100% 100%;
474 background-color: #3D59C4; 495 @include background("btnBg");
475 border-radius: 3px; 496 border-radius: 3px;
476 border: 1px solid blue !important; 497 @include borderColor("border");
477 } 498 }
478 499
479 .el-tabs__nav-scroll { 500 .el-tabs__nav-scroll {
...@@ -493,7 +514,8 @@ ...@@ -493,7 +514,8 @@
493 514
494 &-con { 515 &-con {
495 background: #ffffff; 516 background: #ffffff;
496 border: 1px solid blue; 517 // @include borderColor("border");
518 // border: 1px solid blue;
497 border-radius: 2px; 519 border-radius: 2px;
498 padding: 10px; 520 padding: 10px;
499 box-sizing: border-box; 521 box-sizing: border-box;
...@@ -532,6 +554,7 @@ ...@@ -532,6 +554,7 @@
532 .el-tabs__header { 554 .el-tabs__header {
533 border: none; 555 border: none;
534 margin-bottom: 0; 556 margin-bottom: 0;
557 border-bottom: none;
535 } 558 }
536 559
537 .el-tabs__item.is-top:not(:last-child) { 560 .el-tabs__item.is-top:not(:last-child) {
...@@ -543,7 +566,7 @@ ...@@ -543,7 +566,7 @@
543 } 566 }
544 567
545 .el-tabs__item.is-active { 568 .el-tabs__item.is-active {
546 background-color: #1c3294; 569 @include background("btnselect");
547 color: #FFFFFF; 570 color: #FFFFFF;
548 } 571 }
549 572
...@@ -624,7 +647,7 @@ ...@@ -624,7 +647,7 @@
624 } 647 }
625 648
626 .el-input__suffix { 649 .el-input__suffix {
627 right: -25px !important; 650 right: 0px !important;
628 top: -5px; 651 top: -5px;
629 } 652 }
630 653
...@@ -670,7 +693,7 @@ ...@@ -670,7 +693,7 @@
670 text-align: center; 693 text-align: center;
671 margin-bottom: 10px; 694 margin-bottom: 10px;
672 font-size: 24px; 695 font-size: 24px;
673 background-color: #3D59C4; 696 @include background("navbg");
674 697
675 .dialog_title { 698 .dialog_title {
676 b { 699 b {
...@@ -736,7 +759,6 @@ ...@@ -736,7 +759,6 @@
736 padding: 0 8px; 759 padding: 0 8px;
737 height: 40px; 760 height: 40px;
738 line-height: 40px; 761 line-height: 40px;
739 border: 1px solid #6bc1fc;
740 } 762 }
741 } 763 }
742 } 764 }
...@@ -764,7 +786,6 @@ ...@@ -764,7 +786,6 @@
764 padding: 0 8px; 786 padding: 0 8px;
765 height: 40px; 787 height: 40px;
766 line-height: 40px; 788 line-height: 40px;
767 border: 1px solid #6bc1fc;
768 } 789 }
769 } 790 }
770 791
...@@ -826,9 +847,8 @@ ...@@ -826,9 +847,8 @@
826 .obligee-item-name, 847 .obligee-item-name,
827 .receivingInfo-item-name, 848 .receivingInfo-item-name,
828 .auditInfo-item-name { 849 .auditInfo-item-name {
829 background-color: #3D59C4; 850 @include background("btnselect");
830 border-radius: 3px; 851 border-radius: 3px;
831 border: 1px solid blue !important;
832 color: #FFFFFF; 852 color: #FFFFFF;
833 } 853 }
834 854
...@@ -838,7 +858,6 @@ ...@@ -838,7 +858,6 @@
838 background: none; 858 background: none;
839 color: #FFFFFF; 859 color: #FFFFFF;
840 border-radius: 2px; 860 border-radius: 2px;
841 border: 1px solid #6BC1FC;
842 } 861 }
843 862
844 .el-input-number { 863 .el-input-number {
...@@ -866,7 +885,6 @@ ...@@ -866,7 +885,6 @@
866 width: 96%; 885 width: 96%;
867 // background: #05275B; 886 // background: #05275B;
868 border-radius: 2px; 887 border-radius: 2px;
869 border: 1px solid #6BC1FC;
870 text-align: left; 888 text-align: left;
871 889
872 } 890 }
...@@ -904,7 +922,7 @@ ...@@ -904,7 +922,7 @@
904 display: flex; 922 display: flex;
905 justify-content: center; 923 justify-content: center;
906 font-size: 24px; 924 font-size: 24px;
907 background-color: #3D59C4; 925 @include background("navbg");
908 926
909 .dialog_title { 927 .dialog_title {
910 928
......
1 /* 1 /*
2 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器 2 * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-21 15:03:37 4 * @LastEditTime: 2023-03-29 10:14:34
5 */ 5 */
6 import Vue from 'vue'
6 import axios from "axios"; 7 import axios from "axios";
7 import { Message } from "element-ui"; 8 import { Message } from "element-ui";
8 import { endLoadingSubCount } from "./requestLoading"; 9 import { endLoadingSubCount } from "./requestLoading";
...@@ -68,12 +69,23 @@ function handleErrorData (status) { ...@@ -68,12 +69,23 @@ function handleErrorData (status) {
68 window.tokenValid = false; 69 window.tokenValid = false;
69 Message.error("由于长时间未操作，请重新登录!"); 70 Message.error("由于长时间未操作，请重新登录!");
70 localStorage.removeItem("token"); 71 localStorage.removeItem("token");
71 router.replace({ 72 let code = Vue.prototype.BASE_API.CODE
72 path: "/jg", 73 if (code == 'BDCSBPT') {
73 query: { 74 router.replace({
74 redirect: router.history.current.fullPath, 75 path: "/sb",
75 }, 76 query: {
76 }); 77 redirect: router.history.current.fullPath,
78 },
79 });
80 } else {
81 router.replace({
82 path: "/jg",
83 query: {
84 redirect: router.history.current.fullPath,
85 },
86 });
87 }
88
77 } 89 }
78 break; 90 break;
79 case 403: 91 case 403:
......