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;
@@ -30,8 +62,8 @@
         width: 30px;
         height: 30px;
         right: 0;
-        background-image: linear-gradient(0deg, 
-            #eb0404 0%, 
+        background-image: linear-gradient(0deg,
+            #eb0404 0%,
             #ff0057 100%);
         opacity: 0.6;
         text-align: center;
@@ -123,7 +155,7 @@
         .ant-calendar-picker-icon:after{
             color: white;
         }
-        
+
         ::-webkit-input-placeholder {
             color: white;
         }
@@ -145,7 +177,7 @@
 
         .ant-table-thead {
 
-        } 
+        }
 
 
         .ant-table-content {
@@ -162,22 +194,22 @@
                 top: 55px;
                 border: none !important;
             }
-        
+
             .ant-table-body {
                 color: white;
                 max-height: 500px !important ;
                 min-height: 500px !important ;
-                overflow-y: auto !important; 
+                overflow-y: auto !important;
                 overflow-x: hidden;
                 background:transparent!important;
                 border:1px solid rgba(234,234,234,0.3);
-        
+
                 table {
                     border-color: transparent !important;
-        
+
                     td {
                         border:1px solid rgba(234,234,234,0.3) !important;
-                        
+
                     }
 
                     th {
@@ -186,7 +218,7 @@
                     }
                 }
             }
-            
+
             .ant-table-placeholder{
                 background:transparent!important;
                 color: white;
@@ -200,7 +232,7 @@
                 text-align: center;
              }
 
-         
+
             .ant-table-thead > tr.ant-table-row-hover > td, .ant-table-tbody > tr.ant-table-row-hover > td, .ant-table-thead > tr:hover > td, .ant-table-tbody > tr:hover > td {
                 background: rgba(255,255,255,0.3);
             }
@@ -228,8 +260,8 @@
                 }
             }
 
-            
-  
+
+
         }
 
         .ant-table-pagination {
@@ -260,4 +292,6 @@
             }
         }
     // }
-}
+}
\ No newline at end of file
+
+

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/index.js

@@ -128,7 +128,7 @@ class SearchPane extends Component {
     }
   }
 
-  
+
     /**
    * 获取表格刷新方法
    */
@@ -186,7 +186,7 @@ class SearchPane extends Component {
         searchParam.title = item.value;
       } else if (item.name === 'time') {
         searchParam.time = item.value;
-      } 
+      }
     });
     msgAction(searchParam, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
       this.setState({msgDataList:d.content,totalCount: d.totalElements});
@@ -220,7 +220,7 @@ class SearchPane extends Component {
     });
 
     searchAction(inputText, dataLevel, orgCode, nodeState, protectObjName, routeName, type,  this.pageConfig.current, this.pageConfig.pageSize).then(d => {
-      this.setState({ 
+      this.setState({
         dataList: d.content ,
         totalCount: d.totalElements,
        })
@@ -266,7 +266,7 @@ class SearchPane extends Component {
           <div className="search-pane-close" onClick={this.props.changeSearchPaneVisible()}>
             <Icon icon="close" />
           </div>
-          <Tabs 
+          <Tabs
             activeKey={activeKey}
             onChange={(index, key) => this.onTabClick(key)}
             // destroyContent
@@ -282,7 +282,7 @@ class SearchPane extends Component {
                 <AmosGridTable
                   rowKey="id"
                   columns={getColumns(this,retrieveType)}
-                  getTableDataAction={()=>{}} 
+                  getTableDataAction={()=>{}}
                   callBack={this.reload}
                   isPageable = {true}
                   setPageConfig={this.setPageConfig}
@@ -292,13 +292,13 @@ class SearchPane extends Component {
                   totals={totalCount}
                   onRowDoubleClick={this.onRetrieveRowDoubleClick}
                   getTableDataAction={this.fetchRetrieveData}
-                /> 
+                />
               {/* </div> */}
             </TabPanel>
             <TabPanel activeKey="message">
               <AmosGridTable
                 columns={getMsgColumns()}
-                getTableDataAction={()=>{}} 
+                getTableDataAction={()=>{}}
                 callBack={this.reload}
                 isPageable = {true}
                 setPageConfig={this.setPageConfig}
@@ -306,12 +306,12 @@ class SearchPane extends Component {
                 dataList={msgDataList}
                 totals={totalCount}
                 getTableDataAction={this.fetchMsgData}
-              /> 
+              />
             </TabPanel>
             <TabPanel activeKey="record">
               <AmosGridTable
                 columns={getRecordColumns()}
-                getTableDataAction={()=>{}} 
+                getTableDataAction={()=>{}}
                 callBack={this.reload}
                 isPageable = {true}
                 setPageConfig={this.setPageConfig}
@@ -319,12 +319,12 @@ class SearchPane extends Component {
                 dataList={recordDataList}
                 totals={totalCount}
                 getTableDataAction={this.fetchRecordData}
-              /> 
+              />
             </TabPanel>
             <TabPanel activeKey="trajectory">
               <AmosGridTable
                 columns={getTrajectoryColumns()}
-                getTableDataAction={()=>{}} 
+                getTableDataAction={()=>{}}
                 callBack={this.reload}
                 isPageable = {true}
                 setPageConfig={this.setPageConfig}
@@ -332,7 +332,7 @@ class SearchPane extends Component {
                 dataList={trajectoryDataList}
                 totals={totalCount}
                 getTableDataAction={this.fetchTrajectoryData}
-              /> 
+              />
             </TabPanel>
           </Tabs>
         </SidePane>}

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

@@ -107,7 +107,7 @@ class paramsHeader extends Component {
       this.setState({ filter }, this.props.paramsOnChange(filter));
     }
   }
-  
+
   paramsTypeonChange = (name,value,type,key) => {
     let {recordFilter} = this.state;
     if(name === 'checkTime'){
@@ -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}>
@@ -162,24 +162,24 @@ class paramsHeader extends Component {
         <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
       </div>
       {
-        showRiskLevel && 
+        showRiskLevel &&
         <Select
           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)}
       />
       }
       {
-        showImpEquiList && 
+        showImpEquiList &&
         <Select
           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}>