Merge branch 'CocaColaV2.0' of http://172.16.10.76/bank/AmosBankView into CocaColaV2.0

amos.config.js

@@ -119,6 +119,8 @@
   };
 
   window.Amos = Amos;
+  window.theme = 'red';
+  window.defaultRoute = '/biz/cccheck';
   window.LogConfig = LogConfig;
   window.innerConfig = innerConfig;
   window.demo = true;
@@ -127,4 +129,4 @@
   window.appKey = 'AMOS_BANK';
   window.product = 'AMOS_BANK_WEB';
   window.dutyType = 'bank'; //normal/bank
-})();
+})();
\ No newline at end of file

src/routes/asyncView.js

@@ -144,6 +144,12 @@ const Routes = {
   autologin: AsyncAutoLogin,
   differentiate: AsyncDifferentiate,
 
+  cccheck: AsyncConfig,
+  cczhili: AsyncConfig,
+  ccdzwlgl: AsyncConfig,
+  ccxfsbgl: AsyncConfig,
+  ccmjgl: AsyncConfig,
+
   modelManage: RiskModelMgt,
   knowledgeManage: RiskKnowledgeMgt,
   // riskElementManage: SubConsoleView

src/routes/view.js

@@ -116,6 +116,11 @@ const Routes = {
   // checkdetail: CheckDetail,
   checklist: CheckList,
   task: TaskView,
+  cccheck: Config,
+  cczhili: Config,
+  ccdzwlgl: Config,
+  ccxfsbgl: Config,
+  ccmjgl: Config,
 
   //设备台账
   assessment: RiskAssessment,

src/styles/index.js

 import './base.scss';
 import './view/index.scss';
+import './redtheme.scss';

src/styles/redtheme.scss

+
+#app .view-port.red {
+  .header {
+    background: #c9000b;
+  }
+
+  .header .header-navs .logo-wrapper {
+    display: inline-block;
+    width: auto;
+    padding-left: 20px;
+  
+    .header-logo {
+      padding-right: 66px;
+      background: #c9000b;
+      border-right: 1px solid #b30b14;
+      font-size: 16px;
+      color: #fafafa;
+  
+      .header-logo-pic {
+        max-height: 100%;
+        margin-right: 8px;
+      }
+    }
+  }
+
+  .header .header-navs .nav-menu-wrapper .nav-menu-box {
+    .nav-menu-list {
+      >.nav-menu-item {
+        height: 42px;
+        border-right: 1px solid #b30b14;
+  
+        .nav-menu-item-label {
+          font-size: 14px;
+          color: #ffffff;
+        }
+      }
+    }
+  }
+
+  .tabs-outside-precontrol .amos-tabs-list .amos-tabs-tabitem {
+    margin-right: 8px;
+  }
+
+  .tabs-outside-precontrol .amos-tabs-list .amos-tabs-tabitem-active .amos-tabs-tabitem-inner {
+    height: 35px;
+    margin-left: 0 !important;
+    color: black !important;
+    border: 1px solid #e6e0e0 !important;
+    background: linear-gradient(#eeeeee, #e1e1e1);
+    display: flex;
+    align-items: center;
+  }
+
+  .tabs-outside-precontrol .amos-tabs-list .amos-tabs-tabitem-inner {
+    display: flex;
+    align-items: center;
+    border: 1px solid #e6e0e0 !important;
+
+    &:hover {
+      border: 1px solid #e6e0e0 !important;
+      background: linear-gradient(#eeeeee, #e1e1e1);
+      color: black !important;
+    }
+  }
+
+  .header .header-navs .nav-menu-wrapper .nav-menu-box .nav-menu-list .nav-menu-item.active {
+    background-color :#94040c;
+  }
+
+  .nav-menu-wrapper >.nav-menu-box {
+    > .nav-menu-list  {
+      > .nav-menu-item {
+        > .nav-menu-item-label {
+          .menu-item-link:active, .menu-item-link:focus, .menu-item-link:hover {
+            color: white;
+            text-decoration: none;
+          }
+        }
+
+        .menusub-wrapper {
+          .menu-subitem {
+            padding: 0;
+
+            a {
+              display: block;
+              padding: 0.5rem 0;
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

src/uaconf/index.js

@@ -206,12 +206,51 @@
     }
 
     .app-item-footer {
-      color: red !important;
-      text-shadow: none !important;
+      color: white !important;
+      text-shadow: rgb(52, 95, 166) 0px 0px 0.2em !important;
+    }
+
+    #app .setting-box-img {
+      height: 100%;
+      display: flex;
+      align-items: center;
+    }
+
+    #app .app-list-content-one {
+      margin-top: 9vw;
+    }
+
+    #app .setting-box-img img {
+      width: 24px;
+      height: 24px;
+    }
+
+    #app .header .user-area .amos-single-pop-trigger {
+      height: 42px;
+      line-height: 42px;
+      display: flex;
+      align-items: center;
+    }
+
+    #app .header .user-area .amos-avatar {
+      width: 24px;
+      height: 24px;
+      border-radius: 4px;
     }
 
     #app .app-center {
-      background: url(/uaconf/application.jpg) no-repeat;
+      background: transparent;
+      position: relative;
+    }
+
+    #app .app-center::before {
+      content: "";
+      background: url(/uaconf/application.png) no-repeat;
+      position: absolute;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      z-index: 0;
     }
   `;
   document.head.appendChild(b);

src/view/common/mainframe/MainFrameView.js

@@ -115,7 +115,8 @@ class MainFrame extends Component {
     // if (defaultLink){
     //   this.context.router ? this.context.router.push(defaultLink) : browserHistory.push(defaultLink);
     // }
-    browserHistory.push('/main/3dview');
+    debugger
+    window.defaultRoute && browserHistory.push(window.defaultRoute);
     this.props.onLogoClick && this.props.onLogoClick();
   }
 
@@ -149,7 +150,7 @@ class MainFrame extends Component {
       sweepReducers
     };
     return (
-      <div className="view-port">
+      <div className={`view-port ${window.theme} `}>
         <Header
           navs={extendSystem}
           logoText={'西安CCPC运维安全预控执行系统'}

src/view/common/mainframe/style/main.scss

@@ -388,43 +388,6 @@
   }
 }
 
-#app .view-port .header {
-  background: #c9000b;
-}
-
-#app .view-port .header .header-navs .logo-wrapper {
-  display: inline-block;
-  width: auto;
-  padding-left: 20px;
-
-  .header-logo {
-    padding-right: 66px;
-    background: #c9000b;
-    border-right: 1px solid #b30b14;
-    font-size: 16px;
-    color: #fafafa;
-
-    .header-logo-pic {
-      max-height: 100%;
-      margin-right: 8px;
-    }
-  }
-}
-
-#app .view-port .header .header-navs .nav-menu-wrapper .nav-menu-box {
-  .nav-menu-list {
-    >.nav-menu-item {
-      height: 42px;
-      border-right: 1px solid #b30b14;
-
-      .nav-menu-item-label {
-        font-size: 14px;
-        color: #ffffff;
-      }
-    }
-  }
-}
-
 .user-area {
   .amos-single-pop-trigger {
     height: $top-height;

src/view/region/index.js

@@ -72,13 +72,15 @@ class RegionSelect extends Component {
         lsTool.write('selectedCompany', companyName);
         lsTool.write('selectedCompanyOrg', companyOrgCode);
         lsTool.write('companySequenceNbr', companySequenceNbr);
+        // debugger
         if (state) {
-          browserHistory.push('/main/3dview');
-          // browserHistory.push('/biz/preControl');
+          // browserHistory.push('/main/3dview');
+          window.defaultRoute && browserHistory.push(window.defaultRoute);
           tirggerTransTopic(CONSTS.region_change, { refresh: { refresh: true } });
         } else {
           //1.打开3d屏
-          browserHistory.push('/main/3dview');
+          // browserHistory.push('/main/3dview');
+          window.defaultRoute && browserHistory.push(window.defaultRoute);
           //2.通过配置，确定是否打开业务屏
           // if (isAutoOpen){
           //   // window.open('/biz/assessment');