liudan 4 days ago
parent
commit
7ce3e18442

+ 14 - 1
src/assets/scss/style.scss

@@ -2,11 +2,16 @@ html,
 body {
   margin: 0;
   padding: 0;
-  font-size: 30px; // 30px医生屏1080*1920 20px大屏幕1200*700
   box-sizing: border-box;
   width: 100%;
   height: 100%;
 }
+html{
+  font-size: 2.5vw; // 30px医生屏1080*1920 14px大屏幕1200*700 东莞1920*1080 16px
+  &.big{
+    font-size: 1vw;
+  }
+}
 .adm-selector {
   max-height: 8rem;
   overflow: auto;
@@ -19,6 +24,14 @@ body {
   color: #333;
   height: 100%;
   box-sizing: border-box;
+
+}
+.bottom-set{
+  position: fixed;
+  right: 0.6rem;
+  bottom: 0.6rem;
+  padding: 0.4rem;
+  font-size: 1.2rem;
 }
 .page-body {
   margin: 0;

+ 1 - 0
src/components/ScrollTop.jsx

@@ -25,6 +25,7 @@ class ScrollTop extends React.Component {
   initHeight = () => {
     const scrolH = ref.current.parentNode.parentNode.offsetHeight;
     const curH = ref.current.offsetHeight;
+    console.log(curH > scrolH, curH, scrolH);
     this.setState({
       height: (curH - scrolH  + 10) + 'px',
       isScroll: curH > scrolH,

+ 10 - 11
src/pages/bigScreen/Index.jsx

@@ -17,7 +17,6 @@ class BigScreen extends React.Component {
   }
   componentDidMount() {
     this.initDate();
-    document.querySelector('html').style.fontSize = '16px';
   }
   componentDidUpdate(prev) {
     if (prev.patListArea != this.props.patListArea) {
@@ -55,41 +54,41 @@ class BigScreen extends React.Component {
           </span>
         </div>
         <div className='table section mt scroll-wrap'>
-          <Grid columns={12} gap={8}>
-            <Grid.Item span={2}>
+          <Grid columns={24} gap={6}>
+            <Grid.Item span={4}>
               {/* <div className='table-header'>{userData.locDesc === '验光配镜分诊区' ? '验光室' : '诊室'}</div> */}
               <div className='table-header'>{ userData.locDesc === '验光配镜分诊区' ? '验光师':'医生' }</div>
             </Grid.Item >
-            <Grid.Item span={1}>
+            <Grid.Item span={3}>
               <div className='table-header'>正在就诊</div>
             </Grid.Item >
-             <Grid.Item span={7}>
+             <Grid.Item span={12}>
               <div className='table-header'>准备就诊</div>
             </Grid.Item >
-            <Grid.Item span={2}>
+            <Grid.Item span={5}>
               <div className='table-header'>看报告</div>
             </Grid.Item >
           </Grid>
           <div className='scroll-content'>
             <ScrollTop text={this.state.patList}>
             {this.state.patList.map((item,index) => {
-              return (<Grid columns={12} gap={8} key={index} className='mt'>
-                <Grid.Item span={2}>
+              return (<Grid columns={24} gap={6} key={index} className='mt'>
+                <Grid.Item span={4}>
                   <div className='table-content docname'>{item.roomDesc}-{item.docName || '-'}</div>
                 </Grid.Item >
-                <Grid.Item span={1}>
+                <Grid.Item span={3}>
                   <div className='table-content patname'>
                     {item?.callMsg?.callPat?.map(v => v.patName + '' + v.patCallNo).join(('、'))}
                   </div>
                 </Grid.Item >
-                <Grid.Item span={7}>
+                <Grid.Item span={12}>
                   <div className='table-content'>
                     <Scroll
                       text={item?.callMsg?.waitPat?.map(v => v.patName + '' + v.patCallNo).join(('、'))}
                     />
                   </div>
                 </Grid.Item >
-                <Grid.Item span={2}>
+                <Grid.Item span={5}>
                   <div className='table-content'>
                     <Scroll
                       text={item?.callMsg?.reWaitPat?.map(v => v.patName + '' + v.patCallNo).join(('、'))}

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

@@ -42,7 +42,7 @@ class DoctorScreen extends React.Component {
   render() {
     const { userData = {} } = this.props;
     return (
-      <div className='page-body big-scrren'>
+      <div className='page-body doctor-body'>
         <div className='header'>
           <img
             src={this.props.hosLogo || logo}

+ 49 - 40
src/pages/home/Index.jsx

@@ -233,45 +233,48 @@ class Home extends React.Component {
   }
   componentDidMount() {
     this.initDevice();
-    // var start = 0;
-    // setInterval(() => {
-    //   const data = this.state.tempList[start];
-    //   const patList = [...data.callMsg.callPat, ...data.callMsg.waitPat.map(v => {
-    //     return { ...v, status: 'waiting' };
-    //   })];
-    //   const { roomObj } = this.state;
-    //   roomObj[data.roomDesc] = data;
-    //   const newArray = Object.keys(roomObj).map(key => {
-    //     return roomObj[key];
-    //   });
-    //   this.setState({
-    //     userData: {
-    //       ...data?.userData,
-    //       areaDesc: data.locDesc, // 大屏诊区
-    //       roomDesc: data.roomDesc, // 诊室
-    //     },
-    //     patList,
-    //     waitPat: data.callMsg.waitPat,
-    //     reWaitPat: data.callMsg.reWaitPat,
-    //     patListArea: newArray,
-    //     roomObj,
-    //     delayPat: data.delayPat,
-    //   });
-    //   //++start;
-    //   if (start > 13) {
-    //     start = 0;
-    //   }
-    //   if (!data.path || !data.voiceFileName) {
-    //     return;
-    //   }
-    //   this.setState({
-    //     audioSrc: data.path + data.voiceFileName,
-    //   }, () => {
-    //     const domAudio = document.querySelector('#audio');
-    //     domAudio.currentTime = 0;
-    //     domAudio.play();
-    //   });
-    // }, 1000);
+    const test = () => {
+      var start = 0;
+      setInterval(() => {
+        const data = this.state.tempList[start];
+        const patList = [...data.callMsg.callPat, ...data.callMsg.waitPat.map(v => {
+          return { ...v, status: 'waiting' };
+        })];
+        const { roomObj } = this.state;
+        roomObj[data.roomDesc] = data;
+        const newArray = Object.keys(roomObj).map(key => {
+          return roomObj[key];
+        });
+        this.setState({
+          userData: {
+            ...data?.userData,
+            areaDesc: data.locDesc, // 大屏诊区
+            roomDesc: data.roomDesc, // 诊室
+          },
+          patList,
+          waitPat: data.callMsg.waitPat,
+          reWaitPat: data.callMsg.reWaitPat,
+          patListArea: newArray,
+          roomObj,
+          delayPat: data.delayPat,
+        });
+        ++start;
+        if (start > 13) {
+          start = 0;
+        }
+        if (!data.path || !data.voiceFileName) {
+          return;
+        }
+        this.setState({
+          audioSrc: data.path + data.voiceFileName,
+        }, () => {
+          const domAudio = document.querySelector('#audio');
+          domAudio.currentTime = 0;
+          domAudio.play();
+        });
+      }, 1000);
+    };
+    //test();
   }
   initDevice = async () => {
     //接收Android端身份证信息函数
@@ -415,6 +418,12 @@ class Home extends React.Component {
           this.setState({
             showType: obj[data.code], // Loc医生诊室 Room,OptomeRoom大屏 OperLoc 手术室
           });
+          if (obj[data.code] == 'doctor') {
+            document.querySelector('html').className = '';
+          } else {
+            console.log(1);
+            document.querySelector('html').className = 'big';
+          }
           return data?.result[0] || null;
         } else {
           this.openLogin();
@@ -459,7 +468,7 @@ class Home extends React.Component {
         }
       </div>
       <span
-        style={{ position: 'fixed', right: '0.6rem', bottom: '0.6rem', padding: '0.4rem' }}
+        className='bottom-set'
       >
         <AntOutline
           style={{color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764', marginLeft: '10px'}}

+ 14 - 15
src/pages/operateScreen/Index.jsx

@@ -16,7 +16,6 @@ class OperateScreen extends React.Component {
   }
   componentDidMount() {
     this.initDate();
-    document.querySelector('html').style.fontSize = '16px';
   }
   componentDidUpdate(prev) {
     if (prev.patList != this.props.patList) {
@@ -53,48 +52,48 @@ class OperateScreen extends React.Component {
           </span>
         </div>
         <div className='table section mt scroll-wrap'>
-          <Grid columns={12} gap={8}>
-            <Grid.Item span={1}>
+          <Grid columns={24} gap={6}>
+            <Grid.Item span={3}>
               <div className='table-header'>姓名</div>
             </Grid.Item>
-            <Grid.Item span={1}>
+            <Grid.Item span={2}>
               <div className='table-header'>性别</div>
             </Grid.Item>
-             <Grid.Item span={1}>
+             <Grid.Item span={2}>
               <div className='table-header'>年龄</div>
             </Grid.Item>
-            <Grid.Item span={7}>
+            <Grid.Item span={11}>
               <div className='table-header'>手术类别</div>
             </Grid.Item>
-            <Grid.Item span={1}>
+            <Grid.Item span={3}>
               <div className='table-header'>手术状态</div>
             </Grid.Item>
-            <Grid.Item span={1}>
+            <Grid.Item span={3}>
               <div className='table-header'>手术间</div>
             </Grid.Item>
           </Grid>
           <div className='scroll-content'>
             <ScrollTop text={this.state.patList}>
             {this.state.patList.map((item,index) => {
-            return (<Grid  columns={12} gap={8} key={index} className='mt'>
-              <Grid.Item span={1}>
+            return (<Grid  columns={24} gap={6} key={index} className='mt'>
+              <Grid.Item span={3}>
                 <div className='table-content'>{ item.patName || '***'}</div>
               </Grid.Item>
-              <Grid.Item span={1}>
+              <Grid.Item span={2}>
                 <div className='table-content'>{item.patSex || '***'}</div>
               </Grid.Item>
-               <Grid.Item span={1}>
+               <Grid.Item span={2}>
                 <div className='table-content'>{item.patAge || '***'}</div>
               </Grid.Item>
-               <Grid.Item span={7}>
+               <Grid.Item span={11}>
                 <div className='table-content patOpeName'>
                   {item.patOpeName || '***'}
                 </div>
               </Grid.Item>
-                <Grid.Item span={1}>
+                <Grid.Item span={3}>
                 <div className='table-content'>{ item.patOpeState || '***'}</div>
               </Grid.Item>
-                <Grid.Item span={1}>
+                <Grid.Item span={3}>
                 <div className='table-content'>{ item.patOpeRom || '***'}</div>
               </Grid.Item>
             </Grid>);