Merge branch 'dev' of http://app.puruiit.cn:9092/data_center_platform/CallApp_React into dev

src/assets/scss/style.scss

@@ -46,7 +46,18 @@ body {
   .header {
     position: relative;
     .logo {
-      width: 10.2rem;
+      width: 16rem;
+      border-radius: 0.5rem;
+      display: inline-block;
+      padding: 0.1em 1.5rem;
+      background: #FFF;
+    }
+    .logodefault {
+      width: 10rem;
+      border-radius: 0.5rem;
+      display: inline-block;
+      padding: 0.1em 1.5rem;
+      background: #FFF;
     }
     .room-name {
       position: absolute;

src/pages/bigScreen/Index.jsx

@@ -97,7 +97,7 @@ class BigScreen extends React.Component {
           <img
             src={this.props.hosLogo || logo}
             alt='Logo'
-            className='logo'
+            className={this.props.hosLogo ? 'logo' : 'logodefault'}
             onError={(e) => {
               e.target.src = `${logo}`;
             }}

src/pages/doctorScreen/Index.jsx

@@ -91,7 +91,7 @@ class DoctorScreen extends React.Component {
           <img
             src={this.props.hosLogo || logo}
             alt='Logo'
-            className='logo'
+            className={this.props.hosLogo ? 'logo' : 'logodefault'}
             onError={(e) => {
               e.target.src = `${logo}`;
             }}

src/pages/home/Index.jsx

@@ -79,7 +79,7 @@ class Home extends React.Component {
   openLogin = (cache) => {
     if (!cache) {
       cache = {
-        BASE_URL: 'http://10.1.42.29:8090',
+        BASE_URL: 'http://10.1.?.29:8090',
         Address: '/bdhealth/',
         room: '',
         use: '',
@@ -114,7 +114,7 @@ class Home extends React.Component {
       console.log('Room接收消息：',data );
       data = JSON.parse(data);
       if (data.callMsg) {
-        const patList = [...data.callMsg.callPat, ...data.callMsg.waitPat.map(v => { 
+        const patList = [...data.callMsg.callPat, ...data.callMsg.waitPat.map(v => {
           return { ...v, status: 'waiting' };
         })];
         const { roomObj } = this.state;
@@ -172,7 +172,7 @@ class Home extends React.Component {
         this.setState({
           userData: data?.result[0] || {},
           // https://172.16.1.6/images/hoslogo/H02.png 医院logo
-          hosLogo: `/images/hoslogo/${data?.result[0]?.hospCode}.png` 
+          hosLogo: `/images/hoslogo/${data?.result[0]?.hospCode}.png`
         });
         if (obj[data.code]) {
           this.setState({
@@ -199,7 +199,7 @@ class Home extends React.Component {
           deviceID={this.state.deviceID}
         />
         {/* 医生诊室呼叫 */}
-        {this.state.showType == 'doctor' 
+        {this.state.showType == 'doctor'
           ? <DoctorScreen
               userData={this.state.userData}
               patList={this.state.patList}
@@ -207,12 +207,12 @@ class Home extends React.Component {
               hosLogo={this.state.hosLogo}
             />
           : this.state.showType == 'operate'
-            ? < OperateScreen 
+            ? < OperateScreen
                 patList={this.state.waitPat}
                 userData={this.state.userData}
                 hosLogo={this.state.hosLogo}
               />
-            : < BigScreen 
+            : < BigScreen
                 userData={this.state.userData}
                 patListArea={this.state.patListArea}
                 delayPat={this.state.delayPat}

src/pages/operateScreen/Index.jsx

@@ -87,7 +87,7 @@ class OperateScreen extends React.Component {
           <img
             src={this.props.hosLogo || logo}
             alt='Logo'
-            className='logo'
+            className={this.props.hosLogo ? 'logo' : 'logodefault'}
             onError={(e) => {
               e.target.src = `${logo}`;
             }}

src/utils/index.js

@@ -1,4 +1,7 @@
 import dayjs from 'dayjs';
+function formatNumber(num) {
+    return num.toString().padStart(2, '0');
+}
 // 获取日期 时间 星期
 export const initDate = () => {
   const now = dayjs(Date.now());
@@ -6,7 +9,7 @@ export const initDate = () => {
   const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
   return {
     dateNow: `${now.year()}年${now.month() + 1}月${now.date()}日`,
-    timeNow: `${now.hour()}:${now.minute()}`,
+    timeNow: `${formatNumber(now.hour())}:${formatNumber(now.minute())}`,
     weekNow: `${weekdays[weekdayNumber]}`,
   };
-};
+};