Merge branch 'dev_upgrade' of 172.16.10.76:station/amos-convertor-view into dev_upgrade

.stylelintignore

@@ -3,4 +3,5 @@ lib
 libs
 *.js
 *.md
-*.scss
+src/styles/**/*.scss
+src/view/**/*.scss

package.json

@@ -29,25 +29,25 @@
     ]
   },
   "dependencies": {
-    "amos-3d": "^2.1.5",
+    "amos-3d": "^2.x",
     "amos-amap": "~1.0.9",
-    "amos-antd": "^2.1.4",
+    "amos-antd": "^2.x",
     "amos-devgrid": "^1.0.10",
-    "amos-dll": "^2.0.2",
+    "amos-dll": "^3.x",
     "amos-gojs": "^2.0.15",
-    "amos-icon": "^1.0.3",
-    "amos-mqtt": "^1.0.1",
-    "amos-pluggable": "^1.0.6",
+    "amos-icon": "^1.x",
+    "amos-mqtt": "^1.x",
+    "amos-pluggable": "^1.x",
     "amos-processor": "^2.x",
     "amos-richtext": "^1.0.1",
     "amos-rules-config": "^1.0.6",
-    "amos-security": "^2.1.1",
+    "amos-security": "^3.x",
     "amos-tool": "^1.x",
     "amos-viz": "^1.x",
-    "amos-websocket": "^1.0.3",
+    "amos-websocket": "^1.x",
     "classnames": "^2.2.5",
     "dt2react": "^1.x",
-    "ray-code-split": "^1.0.1",
+    "ray-code-split": "^2.x",
     "ray-eventpool": "^1.0.0",
     "ray-mediaquery": "^1.0.0",
     "ray-progress": "^1.0.0",
@@ -55,11 +55,11 @@
     "react-dom": "~16.3.3"
   },
   "devDependencies": {
-    "amos-build": "3.1.4",
-    "amos-designer": "^1.0.2",
-    "amos-framework": "^1.2.2",
-    "amos-iot-3dgraph": "^1.0.0",
-    "amos-iot-webstudio": "1.0.4",
+    "amos-build": "5.x",
+    "amos-designer": "^1.x",
+    "amos-framework": "^1.x",
+    "amos-iot-3dgraph": "^1.0.8",
+    "amos-iot-webstudio": "1.x",
     "eslint-config-ray": "^1.0.26",
     "mockjs": "^1.0.1-beta3",
     "ray-build": "^2.0.2",

src/base.scss

+.tsts {
+  overflow: auto;
+}

src/styles/view/3dview/pointsDetails.scss

@@ -19,6 +19,9 @@
     width: 35px;
     margin-bottom: 10px;
   }
+  content {
+    color: black;
+  }
 }
 
 .point-details-monitor {
@@ -48,7 +51,7 @@
   .carousel-img {
     width: 100%;
     height: 100%;
-    padding: 5px
+    padding: 5px;
   }
 
   .carousel-indicators {
@@ -79,7 +82,6 @@
       border-radius: 0 4px 4px 0;
     }
 
-
     .carousel-center-bar {
       position: relative;
       height: 100%;
@@ -110,7 +112,7 @@
   display: inline;
   font-size: 7px;
   line-height: 40px;
-  color: $biz-table-font-color;//white;
+  color: $biz-table-font-color; //white;
 
   .colTitle {
     padding-left: 8px;
@@ -135,9 +137,9 @@
 
   .colTitle {
     float: left;
-    width: 131px;//9.84%;
+    width: 131px; //9.84%;
     height: 40px;
-    background: $biz-table-title-color;//#333;
+    background: $biz-table-title-color; //#333;
     border-left: 1px solid $core-border-color;
     box-sizing: border-box;
     flex: 1;
@@ -145,40 +147,40 @@
 
   .colValue {
     float: left;
-    width: 131px;//9.83%;
+    width: 131px; //9.83%;
     height: 40px;
-    background: $content-color;//rgb(97, 96, 96);
+    background: $content-color; //rgb(97, 96, 96);
     flex: 1;
     border-left: 1px solid $core-border-color;
   }
 }
 
-.point-dialog-modal{
+.point-dialog-modal {
   width: 100%;
   height: 100%;
-  .amos-modal-container{
+  .amos-modal-container {
     // width: 310px !important;
-    .amos-modal-close{
+    .amos-modal-close {
       color: white;
       background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
-      .amos-modal-close-x{
+      .amos-modal-close-x {
         width: 30px;
         height: 30px;
         line-height: 30px;
       }
     }
-    .amos-modal-header{
+    .amos-modal-header {
       background: $model-header-color-3d;
       height: 30px;
       padding: 0;
-      .amos-modal-title{
+      .amos-modal-title {
         line-height: 30px;
         padding-left: 9px;
       }
     }
-    .amos-modal-content{
+    .amos-modal-content {
       padding: 0;
-      .point-dialog-body{
+      .point-dialog-body {
         .point-dialog-modal-row {
           display: flex;
           background: $model-body-color-3d;
@@ -201,52 +203,51 @@
         }
       }
     }
-
   }
 }
 
-.risk-warn-modal{
+.risk-warn-modal {
   height: 100%;
-  .amos-modal-container{
+  .amos-modal-container {
     width: 740px !important;
-    .amos-modal-close{
+    .amos-modal-close {
       color: white;
       background: linear-gradient(180deg, rgba(255, 0, 102, 1) 0%, rgba(255, 0, 102, 1) 0%, rgba(255, 51, 0, 1) 100%, rgba(255, 51, 0, 1) 100%);
-      .amos-modal-close-x{
+      .amos-modal-close-x {
         width: 30px;
         height: 30px;
         line-height: 30px;
       }
     }
-    .amos-modal-header{
+    .amos-modal-header {
       background: $model-header-color-3d;
       height: 30px;
       padding: 0;
-      .amos-modal-title{
+      .amos-modal-title {
         line-height: 30px;
         padding-left: 9px;
       }
     }
-    .amos-modal-content{
+    .amos-modal-content {
       padding: 1rem 2rem 2rem 2rem;
       max-height: 45rem;
-      .risk-warn{
-        .risk-warn-header{
+      .risk-warn {
+        .risk-warn-header {
           padding-bottom: 1rem;
           padding-top: 0.5rem;
           padding-left: 0.5rem;
           border: 1px solid $core-border-color;
           margin-bottom: 1rem;
         }
-        .risk-warn-table{
-          .ant-table-title{
+        .risk-warn-table {
+          .ant-table-title {
             display: none;
           }
-          .ant-table-body{
+          .ant-table-body {
             max-height: 35rem !important;
           }
         }
-        .risk-warn-content{
+        .risk-warn-content {
           padding-bottom: 2rem;
           border: 1px solid $core-border-color;
           margin-top: 1rem;
@@ -256,34 +257,34 @@
   }
 }
 
-.risk-warn-toast{
+.risk-warn-toast {
   width: 740px;
-  .amos-toast-inner-content{
-    .amos-toast-inner-title{
+  .amos-toast-inner-content {
+    .amos-toast-inner-title {
       width: 100%;
       height: 31px;
       background: $model-header-color-3d;
       line-height: 31px;
       padding-left: 9px;
     }
-    .amos-toast-inner-content{
-      .risk-warn{
-        .risk-warn-header{
+    .amos-toast-inner-content {
+      .risk-warn {
+        .risk-warn-header {
           padding-bottom: 1rem;
           padding-top: 0.5rem;
           padding-left: 0.5rem;
           border: 1px solid $core-border-color;
           margin-bottom: 1rem;
         }
-        .risk-warn-table{
-          .ant-table-title{
+        .risk-warn-table {
+          .ant-table-title {
             display: none;
           }
-          .ant-table-body{
+          .ant-table-body {
             max-height: 35rem !important;
           }
         }
-        .risk-warn-content{
+        .risk-warn-content {
           padding-bottom: 2rem;
           border: 1px solid $core-border-color;
           margin-top: 1rem;
@@ -291,10 +292,10 @@
       }
     }
   }
-  .amos-toast-inner-close{
+  .amos-toast-inner-close {
     color: white;
     top: 22px;
-      i{
+    i {
       padding: 9px;
       background: red;
     }

src/styles/view/biz/equipmentLedger/equipment.scss

@@ -42,17 +42,17 @@
   button {
     height: 2.5rem;
     margin-left: -0.9px !important;
-    background: $content-color;
-    border: 1px solid $core-border-color;
+    background: $header-button;
+    border: $page-border-style;
     opacity: 1;
   }
 
   .ant-table-tbody {
     .highlight-row {
-      background: #ecf6fd;
+      background: $table-highlight-row;
 
       &:hover {
-        background: #ecf6fd;
+        background: $table-highlight-row;
       }
     }
 
@@ -174,9 +174,9 @@
       padding-left: 20px;
       font-size: 15px;
       line-height: 40px;
-      color: $biz-table-font-color;
+      color: $content-color;
       text-align: left;
-      background-color: $biz-title-color;//rgba(40, 40, 40, 1);
+      background-color: $div-header-background;//rgba(40, 40, 40, 1);
     }
   }
 
@@ -188,8 +188,8 @@
   button {
     height: 2.5rem;
     margin-left: -0.9px !important;
-    background: $content-color;
-    border: 1px solid $core-border-color;
+    background: $header-button;
+    border: $page-border-style;
     opacity: 1;
   }
 }
@@ -205,12 +205,21 @@
     width: 60% !important;
     height: 76%;
 
+    .amos-upload-select-picture-card {
+      background: $card-backgtround;
+    }
+
+    .amos-modal-close {
+      height: 4%;
+    }
+
     .amos-modal-header {
       // background: #f2f2f2;
+      height: 4%;
     }
 
     .amos-modal-content {
-      height: 82%;
+      height: 89%;
       max-height: none;
       padding-top: 1rem;
 
@@ -218,6 +227,10 @@
         padding-bottom: 1rem;
         text-align: right;
 
+        .ant-select-selection {
+          background-color: $card-backgtround;
+          border: $page-border-style;
+        }
         .amos-idropdown-toggle {
           margin-right: 1rem;
           text-align: left;
@@ -230,10 +243,41 @@
           min-width: 42px;
         }
       }
+
+      .ant-select-tree-node-content-wrapper {
+        background: none;
+
+        span {
+          color: $content-color;
+          display: flex;
+        }
+
+        &:hover {
+          background: $select-tree-hover;
+        }
+
+        &.ant-select-tree-node-selected {
+          background: $select-tree-hover;
+        }
+      }
+
+      .ant-select-not-found {
+        color: $content-color;
+      }
+
+      .ant-select-tree-dropdown .ant-select-dropdown-search .ant-select-search__field {
+        background: none;
+        border: $page-border-style;
+      }
+
+      .ant-select-tree li span.ant-select-tree-switcher {
+        color: $content-color;
+      }
     }
 
     .amos-modal-footer {
       // background: #f2f2f2;
+      height: 7%;
     }
   }
 
@@ -245,6 +289,10 @@
       border: 1px solid #d8d8d8;
     }
 
+    .amos-upload-list-item {
+      border: $page-border-style;
+    }
+
     .risk_factor_input {
       width: 20rem;
     }
@@ -327,4 +375,16 @@
   }
 }
 
+.custom-eb-modal {
+  .amos-modal-container {
+    .amos-modal-header {
+      .amos-modal-title {
+        color: white;
+      }
+    }
+  }
 
+  .amos-modal-footer {
+    border: $page-border-style;
+  }
+}

src/styles/view/biz/equipmentLedger/fireResource.scss

@@ -300,9 +300,9 @@
       padding-left: 20px;
       font-size: 15px;
       line-height: 30px;
-      color: $biz-table-font-color;
+      color: $content-color;
       text-align: left;
-      background-color: $biz-title-color;//rgba(40, 40, 40, 1);
+      background-color: $div-header-background;//rgba(40, 40, 40, 1);
     }
   }
 
@@ -366,6 +366,10 @@
 
   .amos-modal-content {
     max-height: unset;
+
+    img {
+      width: 100%;
+    }
   }
 
   ::-webkit-scrollbar {

src/styles/view/biz/point/pointInfo.scss

@@ -173,7 +173,6 @@
       opacity: 1 !important;
     }
   }
-
   .amos-cardpane {
     &.amos-cardpane-bordered {
       &.amos-cardpane-animate {
@@ -201,4 +200,10 @@
       }
     }
   }
+  .porint-title {
+    color: black;
+    background: transparent;
+    height: '100%';
+    width: '100%';
+  }
 }

src/styles/view/biz/precontrol.scss

 @import './../var.scss';
+@import '~amos-framework/lib/styles/mixins/scrollbar.scss';
+
+$scrollOutColor: rgba(#dedede, 0.3);
+$scrollInnerColor: rgba(black, 0.1);
 
 .tabs-outside-precontrol {
   width: 100%;
@@ -10,10 +14,12 @@
   .amos-tabs-list {
     height: 35px;
     padding: 0 !important;
+    border: 0;
 
     .amos-tabs-tabitem-inner {
       height: 35px;
       margin-left: 0 !important;
+      color: white;
     }
 
     .amos-tabs-tabitem-active {
@@ -24,6 +30,11 @@
         border-bottom: 1px solid #108ee9 !important;
       }
     }
+
+    .amos-popover-trigger-disabled * {
+      background: $page-header-background;
+      color: $content-color;
+    }
   }
 
   .amos-tabs-panel {
@@ -54,8 +65,8 @@
     button {
       height: 2.5rem;
       margin-left: -0.9px !important;
-      background: $content-color;
-      border: 1px solid $core-border-color;
+      background: $header-button;
+      border: $page-border-style;
       opacity: 1;
     }
   }
@@ -89,6 +100,7 @@
   }
 
   .eva-model {
+    @include pretty-scrollbar(5px, 8px, $scrollOutColor, $scrollInnerColor);
     height: calc(90vh);
     overflow: scroll;
 
@@ -100,13 +112,25 @@
     .ant-table-pagination {
       display: none;
     }
+
+    .amos-cardpane-bordered {
+      margin-bottom: 5px;
+      border: $page-border-style;
+      &:hover {
+        border: 0;
+      }
+    }
+
+    .amos-cardpane-body {
+      border-top: 0;
+    }
   }
 
   button {
     height: 2.5rem;
     margin-left: -0.9px !important;
-    background: $content-color;
-    border: 1px solid $core-border-color;
+    background: $header-button;
+    border: $page-border-style;
     opacity: 1;
   }
 
@@ -133,10 +157,10 @@
 
   .ant-table-tbody {
     .highlight-row {
-      background: #ecf6fd;
+      background: $table-highlight-row;
 
       &:hover {
-        background: #ecf6fd;
+        background: $table-highlight-row;
       }
     }
 
@@ -151,6 +175,15 @@
     background: $biz-title-color;
   }
 
+  .amos-modal-content {
+    padding-top: 30px;
+
+    .amos-textarea {
+      background: none;
+      color: white;
+    }
+  }
+
   .amos-modal-footer {
     background: $biz-title-color;
   }

src/styles/view/biz/riskModel/riskModel.scss

 @import './../../var.scss';
+@import '~amos-framework/lib/styles/mixins/scrollbar.scss';
+
+$scrollOutColor: rgba(#dedede, 0.3);
+$scrollInnerColor: rgba(black, 0.1);
 
 .risk-model {
   height: 100%;
 
   button {
     opacity: 1;
+    background: $page-header-background;
   }
 
   .risk-level-map {
@@ -38,7 +43,7 @@
         text-align: center;
         padding: 8px 0;
         border-color: $biz-border-color;
-        background-color: $biz-title-color;
+        background-color: $page-header-background;
       }
       position: absolute;
       width: 60%;
@@ -74,7 +79,7 @@
         text-align: center;
         padding: 8px 0;
         border-color: $biz-border-color;
-        background-color: $biz-title-color;
+        background-color: $page-header-background;
       }
       .risk-model-eva-con {
         height: calc(100% - 37px);
@@ -112,43 +117,57 @@
     .ant-tabs-bar {
       padding-top: 10px;
       margin-bottom: -1px;
+      border-bottom: $page-border-style;
 
       .ant-tabs-tab {
-        margin-right: -1px !important;
-        background: white !important;
+        background: $header-button;
         border-radius: 0 !important;
+        border: $page-border-style;
+
+        &:hover {
+          background: $button-hover;
+        }
       }
 
       .ant-tabs-tab-active {
         margin-right: -1px !important;
-        background: #f4f4f4 !important;
+        background: $button-hover;
         border-radius: 0 !important;
+        border: $page-border-style;
+        border-left: 0;
       }
 
       .ant-tabs-extra-content {
         padding-right: 10px;
       }
+
+      .ant-tabs-tab-inner {
+        color: $content-color;
+      }
     }
 
     button {
       height: 2.5rem;
       margin-left: -0.9px !important;
-      background: $content-color;
-      border: 1px solid $core-border-color;
+      background: $header-button;
       opacity: 1;
+      border: $page-border-style;
+      &:hover {
+        background: $table-highlight-row;
+      }
     }
 
     .ant-table-tbody {
       .highlight-row {
-        background: #ecf6fd;
+        background: $table-highlight-row;
 
         &:hover {
-          background: #ecf6fd;
+          background: $table-highlight-row;
         }
       }
 
       .normal-row {
-        background: white;
+        background: $content-color;
       }
     }
 
@@ -164,11 +183,21 @@
       .ant-tabs-content {
         left: -50px;
         padding-top: 50px;
+
+        .amos-select-title {
+          background: none;
+        }
+
+        .amos-select-dropdown-icon {
+          background: none;
+        }
       }
     }
   }
 
   .risk-model-table {
+    @include pretty-scrollbar(5px, 8px, $scrollOutColor, $scrollInnerColor);
+
     width: 100%;
 
     &.fmea-table {
@@ -200,6 +229,7 @@
 .risk-model-button {
   display: block;
   margin-left: 0 !important;
+  width: 100%;
 }
 
 .share-model-button {
@@ -218,7 +248,7 @@
       border: solid;
       border-width: 1px;
       border-style: hidden hidden solid hidden;
-      background: $biz-title-color;
+      background: $page-header-background;
       border-color: $biz-border-color;
       text-align: center;
       .amos-input {
@@ -251,7 +281,7 @@
       border: solid;
       border-width: 1px;
       border-style: hidden hidden solid hidden;
-      background: $biz-title-color;
+      background: $page-header-background;
       border-color: $biz-border-color;
       text-align: center;
       .amos-input {
@@ -273,7 +303,7 @@
 
   .ant-table-tbody {
     .highlight-row {
-      background: #ecf6fd;
+      background: $table-highlight-row;
     }
   }
 }
@@ -287,7 +317,7 @@
       height: 40px;
       line-height: 40px;
       text-align: center;
-      background: $biz-title-color;
+      background: $page-header-background;
       border: solid;
       border-color: $biz-border-color;
       border-style: hidden hidden solid;
@@ -330,7 +360,7 @@
       height: 40px;
       line-height: 40px;
       text-align: center;
-      background: $biz-title-color;
+      background: $page-header-background;
       border: solid;
       border-color: $biz-border-color;
       border-style: hidden hidden solid;
@@ -356,11 +386,14 @@
 }
 
 .risk-model-model {
+  .amos-divider-horizontal {
+    background: $biz-border-color;
+  }
   .amos-modal-header {
-    background: $biz-title-color;
+    background: $page-header-background;
   }
   .amos-modal-footer {
-    background: $biz-title-color;
+    background: $page-header-background;
   }
   .amos-modal-container {
     // width: 50% !important;

src/styles/view/biz/situation/alarm.scss

 @import './../../var.scss';
 
 .alarm-view {
-  padding: 10px;
 
   .ant-table-title {
     display: none;
   }
 
-  .alarm-view-search {
+  .custom-alarm-view-search {
     width: 100%;
     height: 45px;
     line-height: 40px;
-    background-color: $biz-title-color;
+    background-color: $page-header-background;
 
     .alarm-view-select-1 {
       display: inline-block;
@@ -39,16 +38,83 @@
 
     .aficon-down {
       &::before {
-        color: $core-color;
+        color: $content-color;
       }
     }
 
     .ant-calendar-picker-icon {
-      color: $core-color;
+      &::after{
+        color: $content-color;
+      }
     }
 
     .ant-calendar-picker-input {
       height: 30px;
+      border: $page-border-style;
+      background: $page-header-background;
+      color: $content-color;
+    }
+
+    .amos-select-dropdown {
+      border: $page-border-style;
+    }
+
+    .amos-input {
+      border: $page-border-style;
+      margin-right: 5px;
+
+    }
+
+    .ant-calendar-range-picker-separator {
+      color: $content-color;
+    }
+
+  }
+}
+.custom-picker {
+  &.ant-calendar-picker-container {
+    .ant-calendar {
+      background: $custom-picker-color;
+
+      .ant-calendar-month-panel-cell-disabled {
+        a {
+          color: #bcbcbc;
+        }
+      }
+    }
+
+    .ant-calendar-date-input-wrap {
+      .ant-calendar-input {
+        background-color: $custom-picker-color;
+        color: $content-color;
+      }
+    }
+  }
+  .ant-calendar-range {
+    .ant-calendar-range-middle {
+      color: white;
+    }
+
+    .ant-calendar-in-range-cell {
+      &:before{
+        background: #4e6490;
+      }
+    }
+
+      &.ant-calendar-time{
+        .ant-calendar-time-picker-combobox {
+          background: $custom-picker-color;
+        }
+      }
+  }
+
+  .ant-calendar-month-panel {
+    background: $custom-picker-color;
+  }
+  .ant-calendar-year-panel {
+    background: $custom-picker-color;
   }
+  .ant-calendar-decade-panel {
+    background: $custom-picker-color;
   }
 }

src/styles/view/console/stationMainten/StationMainten.scss

+@import './../../var.scss';
+
 .stationMainten-body-left {
   width: 100%;
 
@@ -54,4 +56,32 @@
   .text-div{
     line-height: 35px;
   }
+
+  .amos-select-title {
+    background: none;
+    color: $content-color;
+  }
+
+  .amos-select-dropdown-icon {
+    background: none;
+    color: $content-color;
+  }
+
+  .amos-input.amos-textarea {
+    background: none;
+    color: $content-color;
+  }
+}
+
+.grid-case-header {
+  background-color: $page-header-background;
+
+  .amos-col-5 {
+    color: $content-color;
+  }
+}
+
+.stationMainten-body-right {
+  height: '614px';
+  border: $page-border-style;
 }

src/styles/view/planMgmt/text.scss

@@ -39,7 +39,7 @@
         margin-bottom: 10px;
         cursor: pointer;
         display: flex;
-        background: url(/src/assets/common/disaster/disaster-item.png) no-repeat;
+        // background: url(../../../assets/common/disaster/disaster-item.png) no-repeat;
         background-size: 100% 100%;
 
         .plan-item {
@@ -103,7 +103,7 @@
       }
 
       .nav-item-active {
-        background: url(/src/assets/common/disaster/disaster-active.png) no-repeat;
+        // background: url(/src/assets/common/disaster/disaster-active.png) no-repeat;
         background-size: 100% 100%;
       }
     }
@@ -183,7 +183,7 @@
       margin-bottom: 10px;
       cursor: pointer;
       display: flex;
-      background: url(/src/assets/common/disaster/disaster-item.png) no-repeat;
+      // background: url(../../../assets/common/disaster/disaster-item.png) no-repeat;
       background-size: 100% 100%;
 
       .plan-item {
@@ -247,7 +247,7 @@
     }
 
     .nav-item-active {
-      background: url(/src/assets/common/disaster/disaster-active.png) no-repeat;
+      // background: url(/src/assets/common/disaster/disaster-active.png) no-repeat;
       background-size: 100% 100%;
     }
   }

src/styles/view/var.scss

@@ -71,6 +71,15 @@ $core-bg2-color: #f2f2f2;
 $biz-table-font-color: black;
 $biz-table-title-color: $component-bg;
 $biz-title-color: rgba(243, 243, 243, 1);//$component-bg-active;
-$biz-border-color: rgba(201, 201, 201, 1);
+$biz-border-color: #1f5383;
 $model-header-color-3d: #ebebeb;
 $model-body-color-3d: #f9f9f9;
+$page-header-background: #01133b;
+$page-border-style: 1px solid #1f5383;
+$custom-picker-color: #063c8c;
+$table-highlight-row: #4f7e9f;
+$button-hover: rgba(30,72,142,0.7);
+$header-button: #052152;
+$div-header-background: #1f5383;
+$card-backgtround: #06153e;
+$select-tree-hover: #084bb0;

src/utils/processor.js

 import * as utils from 'amos-processor/lib/utils';
+import * as bitUtils from './../view/bizview/common/tableComponent/tool';
 
 const { renderSimpleTime } = utils.tool;
 
@@ -23,6 +24,7 @@ const trimFormData = function(form) {
 };
 
 export default {
+  tool: { ...bitUtils },
   ...utils,
   renderTimeValue,
   trimFormData

src/view/bizview/checkManage/checkDetail/CheckDetailNew.js

@@ -8,7 +8,7 @@ import { fetchCheckDetailById, fetchCheckInputByIdNew, fetchShortByCheckIdAndChe
 import CheckDetailTable from './CheckDetailTable';
 import CheckInputTable from './CheckInputTable';
 import { XJBaseURI } from './../../../../consts/urlConsts';
-import { tool } from './../../../../utils/processor';
+import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
 import Picture from './Picture';
 import { pathMapping } from './../../../../routes/customRoutes';
 import { Table } from 'amos-antd/lib';
@@ -16,7 +16,6 @@ import './cdn.scss';
 
 const CheckListPath = () => pathMapping.checkDetail;
 
-const { renderLongTime } = tool;
 
 const checkDetailHeaderResult = checkDetail => {
   let checkTime = '巡检时间';

src/view/bizview/checkManage/checkDetail/Picture.js

@@ -47,7 +47,7 @@ class Picture extends Component {
         { imgs.length === 0 &&
           <div className="points-details-empty" style={emptyStyle}>
             <img src={imgStatic.datapane.smilingFace} style={imgStyle} alt="" />
-            <p>暂无图片</p>
+            <p className="content">暂无图片</p>
           </div>
         }
       </div>

src/view/bizview/checkManage/checkDetail/index.js

@@ -9,14 +9,14 @@ import CheckDetailTable from './CheckDetailTable';
 import CheckInputTable from './CheckInputTable';
 import './../../../../styles/view/biz/checkDetail/checkDetail.scss';
 import { XJBaseURI } from './../../../../consts/urlConsts';
-import { tool } from './../../../../utils/processor';
+import { renderLongTime } from './../../../bizview/common/tableComponent/tool';
+
 import Picture from '../../../3dview/points/maxcontent/Picture';
 import { pathMapping } from './../../../../routes/customRoutes';
 import BizIcon from './../../../common/icon/BizIcon';
 
 const CheckListPath = () => pathMapping.pointCheckList;
 
-const { renderLongTime } = tool;
 
 const checkDetailHeaderResult = checkDetail => {
   let checkTime;

src/view/bizview/common/biz/ImportFile.js

@@ -63,7 +63,7 @@ class ImportFile extends Component {
     const { visible, form, title, rules } = this.state;
     return (
       <Modal
-        modalClass=""
+        modalClass="custom-eb-modal"
         width={450}
         visible={visible}
         onCancel={this.onCancel}

src/view/bizview/equipmentLedger/Equipment/EquipmentModel.js

@@ -269,22 +269,27 @@ class EquipmentModel extends Component {
     switch (file.mylist) {
       case 'imageUrl1':
         _form.imageUrl1 = [...imageUrl1, file];
+        this.setState({ form: _form });
         break;
       case 'imageUrl2':
         _form.imageUrl2 = [...imageUrl2, file];
+        this.setState({ form: _form });
         break;
       case 'imageUrl3':
         _form.imageUrl3 = [...imageUrl3, file];
+        this.setState({ form: _form });
         break;
       case 'imageUrl4':
         _form.imageUrl4 = [...imageUrl4, file];
+        this.setState({ form: _form });
         break;
       case 'equipmentPic':
         _form.equipmentPic = [...equipmentPic, file];
+        this.setState({ form: _form });
         break;
-
     }
-    this.setState({ form: _form });
+    // this.setState({ form: _form });
+
   };
 
   handlePreview = file => {
@@ -532,7 +537,7 @@ class EquipmentModel extends Component {
                 >
                   {form.imageUrl4 ? form.imageUrl4.length >= 1 ? null : uploadButton : uploadButton}
                 </Upload>
-                <Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px',overflowY: 'scroll' }}><img style={{ width: '520px' }} src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
+                <Modal className='preview-photo-modal' content={<div style={{ width: '560px', maxHeight: '500px',overflowY: 'scroll' }}><img src={previewImage} /></div>} visible={previewVisible} noDefaultFooter onCancel={this.handleCancel} />
               </div>
             </FormItem>
           </div>

src/view/bizview/pointInfo/PointInfoContent.js

@@ -281,9 +281,9 @@ class PointInfo extends Component {
     const { goBackAction } = this.props;
     const { name, no, realName, checkType, groupName } = pointDetail || {};
     let pointName = name + '(' + no + ')';
-    let reactNodespan = React.createElement('span', { style: { color: 'black', backgroundColor: 'transparent' }, height: '100%', width: '100%' }, pointName);
+    let reactNodespan = React.createElement('span', {className:'porint-title'},pointName);
 
-    //设置复选框参数
+    //设置复选框参数 { style: { color: 'black', backgroundColor: 'transparent' }, height: '100%', width: '100%' }
     let rowSelection = {
       selectedRowKeys: selectedRowKeys,
       onChange: this.onSelectChange

src/view/bizview/preControl/riskModel/index.js

@@ -739,11 +739,11 @@ class RiskModel extends Component {
       position: 'absolute',
       left: `${pageX}px`,
       top: `${pageY - 45}px`,
-      backgroundColor: '#ffffff',
+      backgroundColor: 'rgb(79 125 159)',
       border: 'solid',
-      height: isRegion === 'TRUE' ? '140px' : '70px',
+      height: isRegion === 'TRUE' ? '137px' : '69px',
       borderWidth: '1px',
-      borderColor: '#c9c9c9'
+      borderColor: 'rgb(31 83 131)'
     };
     const menu = (
       <div style={tmpStyle}>

src/view/bizview/situation/alarm/AlarmSearch.js

@@ -72,7 +72,7 @@ class AlarmSearch extends Component {
   render() {
     let { equipData, searchParam } = this.state;
     return (
-      <div className="alarm-view-search">
+      <div className="custom-alarm-view-search">
         {/*<div className="alarm-view-select-1">
           <span>建/构筑物：</span>
           <Select
@@ -96,6 +96,7 @@ class AlarmSearch extends Component {
         <div className="alarm-view-select-3">
           <span>报警时间：</span>
           <RangePicker
+            dropdownClassName = "custom-picker"
             style = {{width:400}}
             format="YYYY-MM-DD HH:mm:ss"
             onChange={e => this.onSelectChange('time', e)}

src/view/bizview/stationMainten/index.js

@@ -418,7 +418,7 @@ class StationMainten extends Component {
     };
     return (
       <div className="grid-case p-20">
-        <Row className="mb-5" style={{ height: '40px', lineHeight: '40px', backgroundColor: '#f3f3f3' }}>
+        <Row className="grid-case-header mb-5" style={{ height: '40px', lineHeight: '40px' }}>
           <Col span={5}>
             <span style={{ height: '40px', fontSize: '15px', paddingLeft: '20px' }}>站端维护</span>
           </Col>
@@ -582,7 +582,7 @@ class StationMainten extends Component {
               </div>
             </Form>
           </Col>
-          <Col span={12} style={{ height: '614px', border: '1px solid black' }}>
+          <Col className="stationMainten-body-right" span={12}>
             <div style={{ height: '614px' }}>
               { /**this.state.loadAmap && <BasicMap indexViewChange={this.indexViewChange}  pushMarkerPoint={this.handleMarkerMap} /> */}
               { this.state.loadAmap && <BasicMap indexViewChange={this.indexViewChange}  pushMarkerPoint={this.handleMarkerMap} lalng={lalng} isCanEidt={isCanEidt} /> }

src/view/bizview/task/taskList.js

@@ -4,7 +4,7 @@ import dt2react from 'dt2react';
 import { fetchTaskListAction } from './../../../services/checkInfoService';
 import AmosGridTable from './../common/tableComponent/table/AmosGridTable';
 import { pathMapping } from './../../../routes/customRoutes';
-import {renderLongTime} from './../../bizview/common/tableComponent/tool';
+import { renderLongTime } from './../../bizview/common/tableComponent/tool';
 import TaskSearch from './taskSearch'
 
 // const CheckListPath = pathMapping.pointCheckList;

src/view/mainframe/BizFrame.js

@@ -65,6 +65,7 @@ class BizFrame extends Component {
       if (header) {
         const body = document.getElementsByClassName('content-body')[0];
         body.style.top = '0px';
+        body.style.height = '100%';
         header.style.display = 'none';
       }
     }

themes/transparent.css

@@ -30,14 +30,23 @@
   margin-bottom: 0 !important;
   overflow: hidden;
   background: transparent;
+  border-top: 1px solid #1f5383;
+}
+
+.ant-table-fixed-header .ant-table-header > table {
+  border-left: 1px solid #1f5383;
+}
+
+.ant-table-fixed-header .ant-table-body >table {
+  border-left: 1px solid #1f5383;
 }
 
 .ant-table-header > table {
   border-top: #1f5383 !important;
 }
 
-.ant-table-bordered .ant-table-body > table {
-  border: 1px solid #1f5383 !important;
+.ant-table-header > table {
+  border-top: #1f5383 !important;
 }
 
 .ant-table-content .ant-table-placeholder {
@@ -79,11 +88,6 @@
   border: 1px solid rgba(0, 185, 255, 0.6) !important;
 }
 
-/* 分页样式 */
-.ant-pagination {
-  border-top: 1px solid #1f5383 !important;
-}
-
 .ant-pagination .ant-pagination-total-text {
   color: white;
 }
@@ -822,7 +826,7 @@ carousel-content {
   background: rgba(255, 255, 255, 0);
 }
 .point-view .point-first-row {
-  height: 40%;
+  height: 37%;
   margin: 10px;
   color: white;
   background: rgba(255, 255, 255, 0);
@@ -886,7 +890,10 @@ carousel-content {
   background: rgba(255, 255, 255, 0);
   border-color: #143c70;
 }
-
+.point-view .create-device-root .create-device-host-bottom .device-list-content .ant-table-header {
+  border-top: 1px solid #143c70;
+  border-left: 1px solid #143c70;
+}
 .point-view .create-device-root .create-device-host-top {
   width: 100%;
   height: 40px;
@@ -1005,7 +1012,7 @@ carousel-content {
   background: inherit;
   background-color: rgba(255, 255, 255, 0);
   border-radius: 0 0 0 0;
-  border-color: #ddddde;
+  border-color: #143c70;
   font-size: 18px;
   color: white;
   text-align: left;
@@ -1050,7 +1057,7 @@ carousel-content {
   background: rgba(255, 255, 255, 0);
   border-top: 2px solid #143c70;
   border-bottom: 1px solid #143c70;
-  border-left: 24px solid #143c70;
+  border-left: 1px solid #143c70;
 }
 .pointinfo-content .col_groupcolor4 {
   width: 8%;
@@ -1394,6 +1401,15 @@ carousel-content {
 .rayd-modal {
   background-color: rgb(6, 21, 62) !important;
 }
+.rayd-modal .rayd-icon.rayd-success.rayd-animate-success-icon .rayd-success-circular-line-left {
+  display: none;
+}
+.rayd-modal .rayd-icon.rayd-success.rayd-animate-success-icon .rayd-success-fix {
+  display: none;
+}
+.rayd-modal .rayd-icon.rayd-success.rayd-animate-success-icon .rayd-success-circular-line-right {
+  display: none;
+}
 :root .amos-tree li span.amos-tree-switcher.amos-tree-switcher-close::after {
   font-size: 12px;
   color: white;
@@ -1478,10 +1494,10 @@ li.ant-calendar-time-picker-select-option-selected {
 .risk-assessment-view .amos-layout-has-sider .amos-layout .amos-layout-content .risk-assessment-view-content .risk-incidence-severity-matrix {
   width: 494px !important;
 }
-.risk-assessment-view-situation-matrix amos-layout-content .risk-assessment-view-situation{
+.risk-assessment-view-situation-matrix amos-layout-content .risk-assessment-view-situation {
   width: 494px !important;
 }
-.amos-echarts-container{
+.amos-echarts-container {
   height: 100% !important;
 }
 
@@ -1491,6 +1507,64 @@ li.ant-calendar-time-picker-select-option-selected {
 .important-equipment .ant-table-tbody .normal-row {
   background: transparent !important;
 }
+.ant-select-dropdown .ant-select-dropdown-menu-item,
+.ant-select-tree li .ant-select-tree-node-content-wrapper,
+.ant-select-tree li .ant-select-tree-switcher_open,
+.ant-select-tree li .ant-select-tree-switcher_close,
+.ant-dropdown-menu .ant-dropdown-menu-item,
+.ui-menu .ui-menu-item {
+  color: white;
+  background: rgba(27, 52, 87);
+}
+.pointinfo-content .porint-title {
+  color: white;
+  background: transparent;
+  height: '100%';
+  width: '100%';
+}
+.ant-fullcalendar {
+  font-size: 12px;
+  line-height: 1.5;
+  outline: none;
+  border-top: 1px solid #143c70;
+}
+.point-view
+  .create-device-root
+  .create-device-host-bottom
+  .create-device-host-left
+  .ant-fullcalendar.ant-fullcalendar-full
+  .ant-fullcalendar-calendar-body
+  .ant-fullcalendar-table
+  thead
+  > tr
+  > th {
+  line-height: 40px;
+  color: white;
+  background: #345fa6;
+  border: 1px solid #143c70;
+}
+.checkDetail-root .check-header .check-detail-header {
+  width: 100%;
+  float: left;
+  color: white;
+  background: #143c70;
+  padding-left: 10px;
+  text-align: left;
+}
+.checkDetail-root .check-detail-content-input .check-detail-content2 .ant-table-content .ant-table-header {
+  border-top: 1px solid #143c70;
+  border-left: 1px solid #143c70;
+}
+.checkDetail-root .check-detail-content-input .check-detail-content2 .ant-table-content .ant-table-body {
+  border-left: 1px solid #143c70;
+}
+.checkDetail-root .content-parent .content {
+  float: left;
+  width: 70%;
+  padding-top: 10px;
+  padding-left: 10px;
+  color: white;
+}
 
 .dutyPage{
   background-color: transparent !important;