细节调整

src/assets/scss/style.scss

@@ -195,14 +195,17 @@ html{
         word-break: break-word;
         white-space: normal;
       }
-      &.waiting {
-        background-color: #f39a06;
-        border-color: #f39a06;
+      &.green{
         text-align: center;
+        color: #64B77C;
       }
-      &.sussess {
-        background-color: #6fba2c;
-        border-color: #6fba2c;
+      &.yellow{
+        color: rgb(224, 161, 27);
+        text-align: center;
+      }
+      &.red{
+        color: #fff;
+        background-color: #F22039;
         text-align: center;
       }
     }

src/pages/doctorScreen/Index.jsx

@@ -129,7 +129,7 @@ class DoctorScreen extends React.Component {
                       <div className='table-content'>{ item.patCallNo } {item.patName || '***'}</div>
                     </Grid.Item>
                     <Grid.Item span={4}>
-                      <div className={'table-content sussess'}>就诊</div>
+                      <div className={'table-content red'}>就诊</div>
                     </Grid.Item>
                   </Grid>);
                 })}
@@ -137,7 +137,7 @@ class DoctorScreen extends React.Component {
                   <Swiper
                     autoplay={true}
                     direction='vertical'
-                    autoplayInterval={5000}
+                    autoplayInterval={8000}
                     loop={true}
                     style={{height: '100%'}}
                     total={this.state.waitPat.length}
@@ -145,15 +145,21 @@ class DoctorScreen extends React.Component {
                     defaultIndex={1}
                   >
                     {this.state.waitPat.map((patlist, index) => {
-                      return <Swiper.Item key={index} style={{ height: '100%'}}>
+                      return <Swiper.Item key={index} style={{ height: '100%', background: '#fff'}}>
                         {patlist?.map((item, index) => {
                           return (<Grid  columns={14} gap={8} key={index} className='mt'>
                             <Grid.Item span={10}>
                               <div className='table-content'>{item.patCallType} { item.patCallNo } {item.patName || '***'} </div>
                             </Grid.Item>
                             <Grid.Item span={4}>
-                              <div className='table-content waiting'>
-                                候诊
+                              <div className={
+                                 item.patCallStatusDesc == '待诊'
+                                 ? 'table-content green'
+                                 : item.patCallStatusDesc == '未签'
+                                    ? 'table-content yellow'
+                                    : 'table-content'
+                              }>
+                                {item.patCallStatusDesc}
                               </div>
                             </Grid.Item>
                           </Grid>);
@@ -174,7 +180,7 @@ class DoctorScreen extends React.Component {
                 <div className="scroll-content">
                 <Swiper
                     autoplay={true}
-                    autoplayInterval={5000}
+                    autoplayInterval={8000}
                     loop={true}
                     direction='vertical'
                     style={{height: '100%'}}
@@ -183,7 +189,7 @@ class DoctorScreen extends React.Component {
                     defaultIndex={1}
                   >
                     {this.state.reWaitPat.map((patlist, index) => {
-                      return <Swiper.Item key={index} style={{ height: '100%' }}>
+                      return <Swiper.Item key={index} style={{ height: '100%',background: '#fff' }}>
                          {patlist.map((item, index) => {
                           return (<Grid columns={1} gap={8} key={index} className='mt'>
                             <Grid.Item span={1}>

src/pages/home/Index.jsx

@@ -40,42 +40,42 @@ class Home extends React.Component {
           {
             'callPat': [{ 'patCallNo': '11号', 'patName': '患*者' }],
             'waitPat': [
-              { 'patCallNo': '08:00 1', 'patName': '患*者1' },
-              { 'patCallNo': '08:00 2', 'patName': '患*者2' },
-              { 'patCallNo': '08:00 3', 'patName': '患*者3' },
-              { 'patCallNo': '08:00 4', 'patName': '患*者4' },
-              { 'patCallNo': '08:00 5', 'patName': '患*者5' },
-              { 'patCallNo': '08:00 6', 'patName': '患*者1' },
-              { 'patCallNo': '08:00 7', 'patName': '患*者2' },
-              { 'patCallNo': '08:00 1', 'patName': '患*者1' },
-              { 'patCallNo': '08:00 2', 'patName': '患*者2' },
-              { 'patCallNo': '08:00 3', 'patName': '患*者3' },
-              { 'patCallNo': '08:00 4', 'patName': '患*者4' },
-              { 'patCallNo': '08:00 5', 'patName': '患*者5' },
-              { 'patCallNo': '08:00 6', 'patName': '患*者1' },
-              { 'patCallNo': '08:00 7', 'patName': '患*者2' },
-              { 'patCallNo': '复03', 'patName': '患者3a' },
-              { 'patCallNo': '复01', 'patName': '患*者1' },
-              { 'patCallNo': '复02', 'patName': '患*者2' },
-              { 'patCallNo': '复03', 'patName': '患者3a' },
-              { 'patCallNo': '复04', 'patName': '患者4a' },
-              { 'patCallNo': '10', 'patName': '患*者10' },
-              { 'patCallNo': '11', 'patName': '患*者11' },
-              { 'patCallNo': '12', 'patName': '患*者12' }
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 1', 'patName': '患*者1' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 2', 'patName': '患*者2' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 3', 'patName': '患*者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 4', 'patName': '患*者4' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 5', 'patName': '患*者5' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 6', 'patName': '患*者1' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 7', 'patName': '患*者2' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 1', 'patName': '患*者1' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 2', 'patName': '患*者2' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 3', 'patName': '患*者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 4', 'patName': '患*者4' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 5', 'patName': '患*者5' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 6', 'patName': '患*者1' },
+              { patCallStatusDesc: '未签', 'patCallNo': '08:00 7', 'patName': '患*者2' },
+              { patCallStatusDesc: '未签', 'patCallNo': '复03', 'patName': '患者3a' },
+              { patCallStatusDesc: '未签', 'patCallNo': '复01', 'patName': '患*者1' },
+              { patCallStatusDesc: '未签', 'patCallNo': '复02', 'patName': '患*者2' },
+              { patCallStatusDesc: '未签', 'patCallNo': '复03', 'patName': '患者3a' },
+              { patCallStatusDesc: '未签', 'patCallNo': '复04', 'patName': '患者4a' },
+              { patCallStatusDesc: '未签', 'patCallNo': '10', 'patName': '患*者10' },
+              { patCallStatusDesc: '未签', 'patCallNo': '11', 'patName': '患*者11' },
+              { patCallStatusDesc: '未签', 'patCallNo': '12', 'patName': '患*者12' }
             ],
             'reWaitPat': [
-              { 'patCallNo': '01', 'patName': '患*者', patCallStatusDesc: '未签' },
-              { 'patCallNo': '02', 'patName': '患*者', patCallStatusDesc: '待诊' },
-              { 'patCallNo': '03', 'patName': '患者3' },
-              { 'patCallNo': '01', 'patName': '患*者' },
-              { 'patCallNo': '02', 'patName': '患*者' },
-              { 'patCallNo': '03', 'patName': '患者3' },
-              { 'patCallNo': '04', 'patName': '患者4' },
-              { 'patCallNo': '03', 'patName': '患者3' },
-              { 'patCallNo': '01', 'patName': '患*者' },
-              { 'patCallNo': '02', 'patName': '患*者' },
-              { 'patCallNo': '03', 'patName': '患者3' },
-              { 'patCallNo': '04', 'patName': '患者4' }],
+              { patCallStatusDesc: '未签', 'patCallNo': '01', 'patName': '患*者', },
+              { patCallStatusDesc: '未签', 'patCallNo': '02', 'patName': '患*者', },
+              { patCallStatusDesc: '未签', 'patCallNo': '03', 'patName': '患者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': '01', 'patName': '患*者' },
+              { patCallStatusDesc: '未签', 'patCallNo': '02', 'patName': '患*者' },
+              { patCallStatusDesc: '未签', 'patCallNo': '03', 'patName': '患者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': '04', 'patName': '患者4' },
+              { patCallStatusDesc: '未签', 'patCallNo': '03', 'patName': '患者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': '01', 'patName': '患*者' },
+              { patCallStatusDesc: '未签', 'patCallNo': '02', 'patName': '患*者' },
+              { patCallStatusDesc: '未签', 'patCallNo': '03', 'patName': '患者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': '04', 'patName': '患者4' }],
           },
           delayPat: '患*者1,患*者2,患者3a,患*者1,患*者2,患者3a,患者4a,患*者1,患*者2,患者3a,患*者1,患*者2,患者3a,患者4a患*者1,患*者2,患者3a,患*者1,患*者2,患者3a,患者4a',
         },
@@ -84,18 +84,18 @@ class Home extends React.Component {
           {
             'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
             'waitPat': [
-              { 'patCallNo': 'A1', 'patName': '患*者1' },
-              { 'patCallNo': 'A2', 'patName': '患*者2' },
-              { 'patCallNo': 'A3', 'patName': '患*者3' },
-              { 'patCallNo': 'A4', 'patName': '患*者4' },
-              { 'patCallNo': 'A5', 'patName': '患*者5' },
-              { 'patCallNo': 'A6', 'patName': '患*者6' },
-              { 'patCallNo': 'A7', 'patName': '患*者7' },
-              { 'patCallNo': 'A8', 'patName': '患*者8' },
-              { 'patCallNo': 'A9', 'patName': '患*者9' },
-              { 'patCallNo': 'A10', 'patName': '患*者10' },
-              { 'patCallNo': 'A11', 'patName': '患*者11' },
-              { 'patCallNo': 'A12', 'patName': '患*者12' }],
+              { patCallStatusDesc: '未签', 'patCallNo': 'A1', 'patName': '患*者1' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A2', 'patName': '患*者2' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A3', 'patName': '患*者3' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A4', 'patName': '患*者4' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A5', 'patName': '患*者5' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A6', 'patName': '患*者6' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A7', 'patName': '患*者7' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A8', 'patName': '患*者8' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A9', 'patName': '患*者9' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A10', 'patName': '患*者10' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A11', 'patName': '患*者11' },
+              { patCallStatusDesc: '未签', 'patCallNo': 'A12', 'patName': '患*者12' }],
             'reWaitPat': [
               { 'patCallNo': '复01', 'patName': '患*者1' },
             ],
@@ -271,7 +271,7 @@ class Home extends React.Component {
     this.initAndroidVoice();
     const test = () => {
       var start = 0;
-      setInterval(() => {
+      setTimeout(() => {
         if (start > 12) {
           return;
         }