Browse Source

叫号调整

liudan 3 weeks ago
parent
commit
a8452d4522

BIN
dist.zip


+ 18 - 2
src/assets/scss/style.scss

@@ -201,9 +201,22 @@ html{
       }
     }
     .swaper-wrap{
-      background-color: #E1E1E1;
       height: 100%;
     }
+    .border{
+      position: relative;
+      &::before{
+        content: '';
+        display: block;
+        width: 1px;
+        height: 98%;
+        position: absolute;
+        left: 0;
+        top: 2%;
+        background-color: #333;
+        opacity: 0.3;
+      }
+    }
     .swaper-header{
       font-size: 1.4rem;
       text-align: center;
@@ -230,7 +243,8 @@ html{
       overflow: hidden;
       text-overflow: ellipsis;
       font-size: 1.6rem;
-      text-align: center;
+      box-sizing: border-box;
+      padding: 0 4px;
       &.green{
         color: #64B77C;
       }
@@ -239,10 +253,12 @@ html{
       }
       &.icon{
        flex: 0 0 1.9rem;
+       text-align: center;
       }
       &.state{
         font-size: 1.4rem;
         flex: 0 0 3rem;
+        text-align: center;
       }
     }
   }

+ 9 - 8
src/pages/bigScreen/Index.jsx

@@ -78,11 +78,11 @@ class BigScreen extends React.Component {
     cache = JSON.parse(cache);
     Toast.show({
       duration: 3000,
-      content: '获取接口数据' + cache.use[0],
+      content: '获取接口数据' + cache.room[0],
     });
     React.$fetchPost('04150031', {
       params: [{
-        locID: cache.use[0],
+        locID: cache.room[0],
      }],
     }, true).then((data) => {
       Toast.show({
@@ -342,10 +342,10 @@ class BigScreen extends React.Component {
             <br /> {dateStr.weekNow} {  dateStr.timeNow}
           </span>
         </div>
-        <div className='table section mt scroll-wrap'>
+        <div className='table section mt scroll-wrap' style={{backgroundColor: '#fffff' }}>
         <Swiper
           autoplay={true}
-          autoplayInterval={6000}
+          autoplayInterval={20000}
           loop={true}
           style={{height: '100%'}}
           total={this.state.swapperArray.length}
@@ -353,13 +353,13 @@ class BigScreen extends React.Component {
           defaultIndex={1}
         >
           {this.state.swapperArray.map((patlist, index) => {
-            return <Swiper.Item key={index} style={{ height: '100%' }}>
+            return <Swiper.Item key={index} style={{ height: '100%'}}>
               <Grid columns={4} gap={6} className='swaper-wrap'>
               {patlist.map((item,i) => {
-                return <Grid.Item span={1} key={index + i}  className='scroll-wrap'>
+                return <Grid.Item span={1} key={index + i}  className='scroll-wrap'style={{backgroundColor: '#E1E1E1' }}>
                   <div className='swaper-header bg'>{item.roomDesc}-{item.docName || '-'} </div>
                   <div className='swaper-header red'> {item?.callMsg?.callPat?.map(v => v.patCallNo + '' + v.patName).join(('、'))}正在就诊</div>
-                  <Grid columns={24} className='scroll-content'>
+                  <Grid columns={24} className='scroll-content' gap={-1}>
                     <Grid.Item span={15} className='scroll-wrap'>
                       <div className='swaper-header bg'>候诊</div>
                       <div className='scroll-content'>
@@ -381,7 +381,7 @@ class BigScreen extends React.Component {
                     </Grid.Item >
                     <Grid.Item span={9} className='scroll-wrap'>
                       <div className='swaper-header bg'>看报告</div>
-                      <div className='scroll-content'>
+                      <div className='scroll-content border'>
                         <ScrollTop>
                           {item?.callMsg?.reWaitPat?.map((v, ri) => {
                             return <div className='swaper-text' key={ri}>{v.patCallNo}{v.patName}</div>;
@@ -402,6 +402,7 @@ class BigScreen extends React.Component {
           <div className='scroll-big'>
             <Scroll text={this.props.delayPat}/>
           </div>
+          看报告,请到报道机或护士站报到
         </div>
       </div>
     );

+ 0 - 1
src/pages/bigScreen/IndexOld.jsx

@@ -19,7 +19,6 @@ class BigScreen extends React.Component {
     this.initDate();
   }
   componentDidUpdate(prev) {
-    console.log(this.props.patListArea);
     if (prev.patListArea != this.props.patListArea) {
       this.setState({
         patList: this.props.patListArea,

+ 1 - 1
src/pages/home/Index.jsx

@@ -285,7 +285,7 @@ class Home extends React.Component {
         ++start;
       }, 5000);
     };
-    // test();
+    test();
   }
   initAndroidVoice() {
     window.mediaPlayOver = (flag) => {