'搜索优化'

src/components/CourseChart.js

@@ -938,8 +938,8 @@ class CourseChart extends React.Component {
             </div>
             <div className={pageStyle.rightbox}>
               {LocalStorage.getItem('role') != 1 &&
-              <Select className={pageStyle.selectitem} value={scheduleListQueryParams.teacher_id} onChange={this.changeTeacher}>
-                <Option value="">全部老师</Option>
+              <Select className={pageStyle.selectitem} allowClear placeholder="全部老师" value={scheduleListQueryParams.teacher_id == '' ? undefined : scheduleListQueryParams.teacher_id} onChange={this.changeTeacher}>
+                {/* <Option value="">全部老师</Option> */}
                 {teacherList.map(ele => (
                   <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>
                 ))

src/pages/classdetail/index.js

@@ -18,7 +18,7 @@ import {
 } from '../../utils/index';
 const { TabPane } = Tabs;
 const { Option } = Select;
-const { TextArea } = Input;
+const { TextArea, Search } = Input;
 const FormItem = Form.Item;
 const { Group } = Radio;
 const { RangePicker } = DatePicker;
@@ -1667,13 +1667,16 @@ class ClassDetailForm extends React.Component {
                       style={{ width: '214px', marginRight: '21px' }}
                       placeholder="搜索学员姓名"
                       suffix={
-                        <Icon type="search" style={{ color: 'rgba(0,0,0,.45)' }} />
+                        <Icon type="search" style={{ color: 'rgba(0,0,0,.45)' }} onClick={this.handleSearchStudent} />
                       }
                       value={studentKeyword}
                       onChange={e => this.handleSearchKeyword(e)}
                     />
-                    <Button onClick={this.handleSearchReset} style={{ marginRight: 10 }}>重 置</Button>
-                    <Button type="primary" onClick={this.handleSearchStudent}>搜 索</Button>
+                    <Tooltip title="清空筛选">
+                      <img onClick={this.handleSearchReset} className={pageStyle.resetIcon} src={`${__IMGCDN__}common/reset.png`} alt="" />
+                    </Tooltip>
+                    {/* <Button onClick={this.handleSearchReset} style={{ marginRight: 10 }}>重 置</Button> */}
+                    {/* <Button type="primary" onClick={this.handleSearchStudent}>搜 索</Button> */}
                   </Col>
                 </Row>
                 <div className={pageStyle.studenttablebox}>
@@ -1708,8 +1711,8 @@ class ClassDetailForm extends React.Component {
                 <Row type="flex" justify="space-between" className={pageStyle.courseoperate}>
                   <Col xs={{ span: 24 }} sm={{ span: 24 }} md={{ span: 24 }} lg={{ span: 24 }} xl={{ span: 8 }} style={{ display: 'flex', alignItems: 'center', marginBottom: '12px' }}>
                     <div className={pageStyle.dianmingtime}>一周点名情况 {scheduleListQueryParams.start_time}～{scheduleListQueryParams.end_time}</div>
-                    <Select value={scheduleListQueryParams.teacher_id} onChange={this.filterTeachersSchedule}>
-                      <Option value="">全部老师</Option>
+                    <Select value={scheduleListQueryParams.teacher_id == '' ? undefined : scheduleListQueryParams.teacher_id} allowClear placeholder="全部老师" onChange={this.filterTeachersSchedule} style={{ width: 150 }}>
+                      {/* <Option value="">全部老师</Option> */}
                       {classDetail.school_teachers && classDetail.school_teachers.map(ele => <Option key={ele.id} value={ele.id}>{ele.nickname}</Option>)}
                     </Select>
                   </Col>
@@ -1726,6 +1729,7 @@ class ClassDetailForm extends React.Component {
                       }}
                       onChange={this.onRangePickerChange}
                       style={{ width: 280, marginRight: 15 }}
+                      allowClear={false}
                       value={[moment(scheduleListQueryParams.start_time, 'YYYY-MM-DD'), moment(scheduleListQueryParams.end_time, 'YYYY-MM-DD')]}
                     />
                     {hasBtnPower('sjd/classdetail', 'noPlanCallStudent') && <Button className={pageStyle.resetcourse} type="primary" onClick={this.toQuickCallStudents}>未排课直接点名</Button>}

src/pages/classdetail/index.less

@@ -25,6 +25,12 @@
 .classDetailbox {
     padding: 32px 16px 27px 32px;
 }
+.resetIcon {
+    width: 14px;
+    height: 14px;
+    cursor: pointer;
+    margin-right: 15px;
+}
 .detailrow:first-child {
     margin-bottom: 26px;
 }

src/pages/teacherinfo/index.less

@@ -28,7 +28,31 @@
             }
         }
     }
-
+}
+.rightList {
+    display: flex;
+    align-items: center;
+    height: 32px;
+    .resetIcon {
+        width: 14px;
+        height: 14px;
+        cursor: pointer;
+        margin-right: 15px;
+    }
+    .expend {
+        font-size:13px;
+        font-family:PingFangSC-Regular,PingFang SC;
+        font-weight:400;
+        color:rgba(102,102,102,1);
+        display: inline-block;
+        cursor: pointer;
+    }
+  }
+.resetIcon {
+    width: 14px;
+    height: 14px;
+    cursor: pointer;
+    margin-right: 15px;
 }
 .headerbtn{
     margin-right: 15px;