Merge branch 'dev_upgrade' of http://39.98.45.134:8090/station/amos-convertor-view into dev_upgrade

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

@@ -196,10 +196,13 @@ $scrollInnerColor: rgba(black, 0.1);
   }
 
   .risk-model-table {
-    @include pretty-scrollbar(5px, 8px, $scrollOutColor, $scrollInnerColor);
-
     width: 100%;
 
+    &::-webkit-scrollbar {
+      width: 5px;
+      height: 8px;
+    }
+
     &.fmea-table {
       overflow-x: scroll;
 
@@ -422,6 +425,10 @@ $scrollInnerColor: rgba(black, 0.1);
   min-width: 25rem;
   overflow: auto;
   max-height: 300px;
+
+  .amos-popover-content .amos-checkbox:hover {
+      color: #93b6f5;
+    }
 }
 
 .fmea-model {

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

@@ -166,6 +166,10 @@ class EquipmentFireEquipmentAdd extends Component {
   }
 
   getFireEquipmentListData = (param) => {
+    this.setState({
+      dataList: [],
+      totalCount: 0
+    });
     const { searchParam } = this.state;
     if (param.current != null) {
       // 前端的current 即后端的pageNumber
@@ -263,7 +267,7 @@ class EquipmentFireEquipmentAdd extends Component {
               onChange={(value, b) => this.onSelectChange(value)}
             />
             {/* <span>名称：</span> */}
-            <Input value={name} onChange={e => this.onChange('name', e.target.value)} placeholder='按名称搜索' />
+            <Input value={name} onChange={e => this.onChange('name', e.target.value)} placeholder='按名称或编码搜索' />
           </div>
         </div>
         <AmosGridTable

themes/transparent.css

 
-
 .amos-main-content {
   background: url('../src/assets/indexBcakground.png');
   background-size: 100% 100%;
@@ -122,14 +121,7 @@
   border: none;
 }
 
-.ant-select-dropdown,
-.amos-popover-content,
-.amos-dropdown-menu-warpper,
-.ant-dropdown-menu {
-  color: white;
-  background: #063c8c;
-}
-
+.amos-select-dropdown-popover.amos-popover-down.amos-popover .amos-popover-content, .amos-select-dropdown-popover.amos-popover-up.amos-popover .amos-popover-content,
 .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,
@@ -137,6 +129,12 @@
 .ant-dropdown-menu .ant-dropdown-menu-item,
 .ui-menu .ui-menu-item {
   color: white;
+  background: #063c8c;
+}
+
+.ant-select-dropdown {
+  color: white;
+  background: #063c8c;
 }
 
 .ant-select-dropdown .ant-select-dropdown-menu-item-selected,
@@ -147,11 +145,7 @@
   background: #084bb0;
 }
 
-.ant-select-dropdown .ant-select-dropdown-menu-item:hover,
-.ant-select-tree li .ant-select-tree-node-content-wrapper:hover,
-.amos-select-option:hover,
-.ant-dropdown-menu .ant-dropdown-menu-item:hover,
-.ui-menu .ui-menu-item:hover {
+.amos-select-dropdown-popover.amos-popover-down.amos-popover .amos-popover-content .amos-select-option:hover, .amos-select-dropdown-popover.amos-popover-up.amos-popover .amos-popover-content .amos-select-option:hover {
   color: white;
   background: #084bb0;
 }
@@ -893,6 +887,9 @@ carousel-content {
   border-top: 1px solid #143c70;
   border-left: 1px solid #143c70;
 }
+.point-view .create-device-root .create-device-host-bottom .device-list-content .ant-pagination.ant-table-pagination.mini {
+  margin: 0;
+}
 .point-view .create-device-root .create-device-host-top {
   width: 100%;
   height: 40px;
@@ -1522,6 +1519,14 @@ li.ant-calendar-time-picker-select-option-selected {
   height: '100%';
   width: '100%';
 }
+
+.ant-select-dropdown {
+  background-color: rgba(27, 52, 87);
+}
+.match-equipment-bind .amos-modal-container .amos-modal-content .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected, .match-equipment-bind .amos-modal-container .amos-modal-content .ant-select-tree-node-content-wrapper:hover {
+  background: #3795cc;
+}
+
 .ant-fullcalendar {
   font-size: 12px;
   line-height: 1.5;