Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

mods/components/3dviewConvertor/styles/moduleEdit.scss

@@ -84,7 +84,6 @@
 
     }
 
-
 // 左侧树
     .leftTree {
         position: absolute;
@@ -114,6 +113,8 @@
                 color: #F0DF2D;
 
             }
+
+
             .leftSearch {
                 height: 33px;
                 line-height: 33px;
@@ -260,3 +261,25 @@
         left: 50%;
     }
 }
+.amos-select-options{
+  .selectOption{
+    color:#fff;
+    background-color: rgba(10, 53, 62, 0.8);
+  }
+  .selectOption:hover{
+    color:#F0DF2D;
+    background-color: rgba(10, 53, 62, 0.8)
+  }
+}
+// .rayd-modal{
+//   background-color:  rgba(25, 86, 147, 0.6) !important;
+//   .amos-alert-head{
+//      color:#fff
+//   }
+//   .rayd-content{
+//     color: #fff !important;
+//   }
+// }
+
+
+

mods/components/3dviewConvertor/styles/searchpane.scss

@@ -10,7 +10,39 @@
     background-size: 100% 100%;
     z-index: 99;
 }
-
+// .ant-calendar{
+//   background-color: #13428f !important;
+//   border:none !important;
+//   .ant-calendar-input{
+//     background-color: #13428f !important;
+//   }
+
+// }
+.amos-popover-content{
+  ::-webkit-scrollbar {             /* 血槽宽度 */
+    width:5px;
+    height: 5px;
+    background-color: rgba(10, 53, 62, 1);
+    border-radius: 5px;
+  }
+  ::-webkit-scrollbar-thumb {           /* 拖动条 */
+    border-radius: 5px;
+    background-color: rgba(255, 255, 255, 0.4);
+  }
+  ::-webkit-scrollbar-track {          /* 背景槽 */
+    background-color:rgba(17, 44, 88, 0.2);
+  }
+  .amos-select-options{
+    .modalSelectOption{
+      color:#fff;
+      background-color: #13428f;
+    }
+    .modalSelectOption:hover{
+      color:#F0DF2D;
+      background-color: #13428f
+    }
+  }
+}
 .search-pane{
     position: absolute !important;
     right: 20px !important;
@@ -261,3 +293,5 @@
         }
     // }
 }
+
+

mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js

@@ -191,15 +191,16 @@ class PointLeftTree extends Component {
           <div className='leftContainer'>
             <div className='topForm'>
             {(pointType!='') &&
+
               <Select  onChange={this.onSelectChange} defaultValue={pointType} value={pointType} className='leftSelect'>
                 {
                   pointTypeArr.map(item => {
-                    return (<Option value={item.code} >{item.name}</Option>)
+                    return (<Option className='selectOption' value={item.code} >{item.name}</Option>)
                   })
                 }
               </Select>
-              }
 
+              }
               <Search className='leftSearch' icon="search"  onChange={this.onSearchChange} onIconClick={this.onSearchChange} />
             </div>
             <div className='treeBox'>

mods/components/3dviewConvertor/view/searchPane/paramsHeader.js

@@ -148,8 +148,8 @@ class paramsHeader extends Component {
         key="searchType"
         style={selectStyle}
         data={bizControlsTypes}
-        renderOption={item => <Option key={item.key} value={item.key}>{item.label}</Option>}
-        defaultOption={<Option>全部</Option>}
+        renderOption={item => <Option className='modalSelectOption' key={item.key} value={item.key}>{item.label}</Option>}
+        defaultOption={<Option className='modalSelectOption'>全部</Option>}
         onChange={this.onSearchTypeChange}
       />
       <div className="params-input" style={inputStyle}>
@@ -167,8 +167,8 @@ class paramsHeader extends Component {
           key="searchLevel"
           style={levelStyle}
           data={riskSourceLevel}
-          renderOption={item => <Option key={item.key} value={item.key}>{item.label}</Option>}
-          defaultOption={<Option>全部</Option>}
+          renderOption={item => <Option className='modalSelectOption' key={item.key} value={item.key}>{item.label}</Option>}
+          defaultOption={<Option className='modalSelectOption'>全部</Option>}
           onChange={(v) => this.onPamarmsChange('dataLevel',v)}
       />
       }
@@ -178,8 +178,8 @@ class paramsHeader extends Component {
           key="implSelect"
           style={implStyle}
           data={impEquiList}
-          renderOption={item => <Option key={item.name} value={item.name}>{item.name}</Option>}
-          defaultOption={<Option>全部</Option>}
+          renderOption={item => <Option className='modalSelectOption' key={item.name} value={item.name}>{item.name}</Option>}
+          defaultOption={<Option className='modalSelectOption'>全部</Option>}
           onChange={(v) => this.onPamarmsChange('impEquipment',v)}
       />
       }
@@ -194,8 +194,8 @@ class paramsHeader extends Component {
         key="messageType"
         style={selectStyle}
         data={MsgTypeEnum}
-        renderOption={item => <Option key={item.id} value={item.id}>{item.name}</Option>}
-        defaultOption={<Option>类别</Option>}
+        renderOption={item => <Option  className='modalSelectOption' key={item.id} value={item.id}>{item.name}</Option>}
+        defaultOption={<Option className='modalSelectOption'>类别</Option>}
         onChange={(v) => this.onPamarmsChange('type', v)}
       />
       <div className="params-input" style={inputStyle}>
@@ -258,8 +258,8 @@ class paramsHeader extends Component {
         key="statusSel"
         style={selectStyle}
         data={statusList}
-        renderOption={item => <Option key={item.code} value={item.code}>{item.name}</Option>}
-        defaultOption={<Option>全部</Option>}
+        renderOption={item => <Option className='modalSelectOption' key={item.code} value={item.code}>{item.name}</Option>}
+        defaultOption={<Option className='modalSelectOption'>全部</Option>}
         onChange={(v) => this.paramsTypeonChange('isOK', v , SingleQueryEnum.EQUAL)}
       />
       <div className="params-input" style={inputStyle}>