Merge remote-tracking branch 'origin/bochk-poc' into bochk-poc

src/assets/css/common.css

@@ -32,8 +32,8 @@
   /* rgb(232, 232, 232); */
   --lineheight: 32px;
   --normalfont: 12px;
-  /* --themecolor: #1561E0; */
-  --themecolor: #1561E0;
+  /* --themecolor: #B31C2A; */
+  --themecolor: #B31C2A;
 }
 
 #app {
@@ -41,6 +41,13 @@
   display: flex;
   flex-direction: column;
 }
+.el-button:hover {
+  color: var(--themecolor);
+}
+.el-button:focus{
+  color: var(--themecolor);
+  background: linear-gradient(180deg, #B31C2A 0%, #FF6A6A 100%);
+}
 
 .e-table-wrapper {
   display: flex;
@@ -123,12 +130,18 @@
   padding: 0 10px;
   height: 38px;
   line-height: 38px;
-  font-size: 16px;
   font-weight: bold;
   border-bottom: 1px solid var(--themecolor);
   /* border-top: 1px solid #ccc; */
   background-image: linear-gradient(#fff, #dedede);
   box-sizing: content-box;
+  font-family: 思源黑体;
+  font-weight: 700;
+  font-size: 14;
+
+}
+.el-tabs--card>.el-tabs__header .el-tabs__item:hover{
+  color: var(--themecolor);
 
 }
 
@@ -149,7 +162,7 @@
   border-right: 1px solid var(--themecolor);
   border-top: 1px solid var(--themecolor);
   /* background-image: linear-gradient(#fff, #fff); */
-  background-image: linear-gradient(#1561E0, #1561E0);
+  background-image: linear-gradient(var(--themecolor), var(--themecolor));
   color: white;
   /* color: var(--themecolor); */
   /* border-bottom: 1px solid #fff; */
@@ -228,14 +241,22 @@
 .el-button--small.el-button--text {
   padding-left: 0;
   padding-right: 0;
+  color:#B31C2A
 }
 
 .el-button--primary {
   color: #FFF;
-  background-color: #1561E0;
-  border-color: #1561E0;
+  background-color: var(--themecolor);
+  border-color: var(--themecolor);
+}
+.el-button--primary:hover{
+  background: linear-gradient(180deg, #B31C2A 0%, #FF6A6A 100%);
+}
+.el-button--primary.is-disabled,.el-button--primary.is-disabled:hover{
+  color: #707070;
+  background: #F5F5F5;
+  border-color: #E4E4E4;
 }
-
 .el-card {
   margin-bottom: 8px;
 }
@@ -286,17 +307,17 @@
 }
 
 .el-checkbox__input.is-checked+.el-checkbox__label {
-  color: #1561E0;
+  color: #B31C2A;
 }
 
 .el-checkbox__input.is-checked .el-checkbox__inner {
-  background-color: #1561E0;
-  border-color: #1561E0;
+  background-color: #B31C2A;
+  border-color: #B31C2A;
 }
 
 .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  background-color: #1561E0;
-  border-color: #1561E0;
+  background-color: #B31C2A;
+  border-color: #B31C2A;
 }
 
 .c-title {
@@ -436,7 +457,7 @@
 .el-collapse-item__header.is-active {
   font-size: 15px;
   font-weight: bold;
-  color: #1561E0;
+  color: #B31C2A;
 }
 
 .el-collapse-item__arrow.is-active {
@@ -504,9 +525,21 @@
 .el-pagination.is-background .btn-prev,
 .el-pagination.is-background .el-pager li {
   border-radius: 0px;
+  color:#B31C2A;
 }
 
 
+.el-pagination .el-pager li.active {
+  border-radius: 0px;
+  color:#B31C2A;
+}
+
+.el-pagination button:hover{
+  color:#B31C2A;
+}
+.el-select-dropdown__item.selected{
+  color:#B31C2A;
+}
 @media screen and (min-width: 2561px) {
 
   #business_container .eibs-tab {

src/business/sptsel/views/Sptpopup.vue

@@ -465,7 +465,7 @@ export default {
     text-align: left;
     font-weight:bold;
   font-size: 15px;
-  color:#1561E0;
+  color:#B31C2A;
   width: auto!important;
 }
 </style>

src/business/trnrel/views/InftrnpsDetail.vue

@@ -725,7 +725,7 @@
       text-align: left;
       font-weight: bold;
       font-size: 15px;
-      color:#1561E0;
+      color:#B31C2A;
       width: auto!important;
     }
     </style>
\ No newline at end of file

src/components/c-page.vue

@@ -56,7 +56,7 @@ export default {
     border: none;
     border-radius: 0px;
     margin-left: 0px !important;
-    background-color: #1561e0;
+    background-color: #B31C2A;
     color: white;
     border-right: solid 1px;
     position: relative;
@@ -67,7 +67,7 @@ export default {
 .fast-button .el-button:hover {
     background: white;
     border-color: white;
-    color: #1561e0;
+    color: #B31C2A;
 }
 
 .c-page-container-div {

src/views/Business/Sptsel/Sptpopup.vue

@@ -392,7 +392,7 @@ export default {
     text-align: left;
     font-weight:bold;
   font-size: 15px;
-  color:#1561E0;
+  color:#B31C2A;
   width: auto!important;
 }
 </style>

src/views/Business/Trnrel/InftrnpsDetail.vue

@@ -712,7 +712,7 @@ export default {
   text-align: left;
   font-weight: bold;
   font-size: 15px;
-  color:#1561E0;
+  color:#B31C2A;
   width: auto!important;
 }
 </style>
\ No newline at end of file

src/views/Business/Trnrel/Trnfnd/TrnfndsDetail.vue

@@ -567,7 +567,7 @@ export default {
   text-align: left;
   font-weight: bold;
   font-size: 15px;
-  color:#1561E0;
+  color:#B31C2A;
   width: auto!important;
 }
 </style>
\ No newline at end of file

src/views/Layout/Header.vue

 <template>
   <div class="self-header">
-    <div style="display: inline-block; height: 40px">
-      <img src="../../assets/logo.png" alt="" style="height: 100%" />
+    <div style="display: inline-block; height: 33px">
+      <img src="../../assets/banklogo.png" alt="" style="width:156px;height:33px" />
     </div>
     <div class="self_header_label">
-      <h2>国际结算系统</h2>
+      <h2>Trade Finance System</h2>
       <!--h2 style="margin-left: 15px;">International Settlement</h2-->
     </div>
     <div class="header-tool">
@@ -409,19 +409,21 @@ export default {
   /* position: relative; */
   padding: 0px 0px 0px 30px;
   /* background-size: cover; */
-  background-image: linear-gradient(#ededed, #dbebfc);
-  border-bottom: solid 5px #2346dd;
+  background: linear-gradient(180deg, #F1F1F1 0%, #D1D1D1 100%);
+  border-bottom: solid 5px #B31C2A;
   box-sizing: border-box;
   display: flex;
   align-items: center;
 }
 
 .self-header h2 {
-  margin: 0;
-  padding: 0;
-  display: inline;
-  font-weight: unset;
-  font-size: 22px;
+  font-family: 思源黑体;
+  font-size: 20px;
+  font-weight: normal;
+  line-height: 20px;
+  letter-spacing: 0em;
+
+  color: #000000;
 }
 
 .self_header_label {
@@ -440,7 +442,7 @@ export default {
   border-left: 1px solid #fff;
   /* ui美化 */
   font-size: 30px;
-  border-image: radial-gradient(#2244d4,transparent) 1 20;
+  border-image: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #FFFFFF 51%, rgba(255, 255, 255, 0) 100%) 1 20;
 }
 .self_header_label p {
   font-family: "Times New Roman", Times, serif;

src/views/Layout/SideMenu.vue

@@ -456,7 +456,10 @@ export default {
     content: "";
 }
 /* 修改箭头颜色 */
-.el-scrollbar__view .el-submenu__title i{
+/* .el-scrollbar__view .el-submenu__title i{
   color: var(--themecolor);
+} */
+.el-scrollbar__view .el-submenu__title i{
+  color: #707070;
 }
 </style>
\ No newline at end of file

src/views/Layout/index.vue

@@ -108,10 +108,10 @@
       <el-aside width="240px" style="background-color: white">
         <sideMenu></sideMenu>
       </el-aside>
-      <div style="width: 0.5px;background-color: #1561e0;opacity: 0.2;"></div>
+      <div style="width: 0.5px;background-color: #B31C2A;opacity: 0.2;"></div>
       <el-main class="m-app-main">
         <tagViews></tagViews>
-        <div style="height: 0.5px;background-color: #1561e0;opacity: 0.2;"></div>
+        <div style="height: 0.5px;background-color: #B31C2A;opacity: 0.2;"></div>
         <business></business>
         <toolbars @openTool="handleChooseTool"></toolbars>
       </el-main>
@@ -332,9 +332,9 @@ export default {
   width: 1000;
   padding: 10px 20px 10px 20px;
   z-index: 10000 !important;
-  background-color: #1561e0;
+  background-color: #B31C2A;
   /* border:0px; */
-  border: 1px solid #1561e0;
+  border: 1px solid #B31C2A;
 }
 .m-draggable-content {
   height: 420px;