|
@@ -5,7 +5,6 @@ import { Grid } from 'antd-mobile';
|
|
|
import { initDate } from '@utils/index.js';
|
|
|
import ScrollTop from '@components/ScrollTop.jsx';
|
|
|
import { Swiper } from 'antd-mobile';
|
|
|
-import { Toast } from 'antd-mobile';
|
|
|
/**
|
|
|
* @刘丹: 大屏叫号
|
|
|
*/
|
|
@@ -20,16 +19,12 @@ class BigScreen extends React.Component {
|
|
|
};
|
|
|
}
|
|
|
componentDidMount() {
|
|
|
- this.initDate();
|
|
|
+ //this.initDate();
|
|
|
this.initRoom();
|
|
|
}
|
|
|
componentDidUpdate(prev) {
|
|
|
if (prev.roomObj != this.props.roomObj) {
|
|
|
- Toast.show({
|
|
|
- duration: 3000,
|
|
|
- content: this.props.roomObj?.callMsg?.refreshFlag,
|
|
|
- });
|
|
|
- if (this.props.roomObj?.callMsg?.refreshFlag == 'Y') {
|
|
|
+ if (this.props.roomObj?.refreshFlag == 'Y') {
|
|
|
this.initRoom();
|
|
|
return; // 重新获取数据
|
|
|
}
|
|
@@ -79,10 +74,6 @@ class BigScreen extends React.Component {
|
|
|
if (!cache) {
|
|
|
return;
|
|
|
}
|
|
|
- Toast.show({
|
|
|
- duration: 3000,
|
|
|
- content: '获取接口数据',
|
|
|
- });
|
|
|
cache = JSON.parse(cache);
|
|
|
React.$fetchPost('04150031', {
|
|
|
params: [{
|
|
@@ -309,6 +300,10 @@ class BigScreen extends React.Component {
|
|
|
if (data && data.result) {
|
|
|
this.setState({
|
|
|
patList: data.result,
|
|
|
+ dateStr: {
|
|
|
+ dateNow: data.curDate, //当前日期,
|
|
|
+ weekNow: data.curWeekDate, // 当前日期,
|
|
|
+ },
|
|
|
});
|
|
|
this.initArray(data.result);
|
|
|
}
|
|
@@ -337,10 +332,12 @@ class BigScreen extends React.Component {
|
|
|
}}
|
|
|
/>
|
|
|
<span className='room-name'>{ userData.areaDesc || userData.locDesc}</span>
|
|
|
- <span className='heaer-btn'>
|
|
|
- <span className='date'>{ dateStr.dateNow}</span>
|
|
|
- <br /> {dateStr.weekNow} { dateStr.timeNow}
|
|
|
- </span>
|
|
|
+ {dateStr.dateNow && <span className='heaer-btn'>
|
|
|
+ <span className='date'>{dateStr.dateNow}</span><br />
|
|
|
+ <span className='date' style={{paddingLeft: '1.8rem'}}>{ dateStr.weekNow}</span>
|
|
|
+ {/* <br /> {dateStr.weekNow} */}
|
|
|
+ {/* {dateStr.timeNow} */}
|
|
|
+ </span>}
|
|
|
</div>
|
|
|
<div className='table section mt scroll-wrap' style={{backgroundColor: '#fffff' }}>
|
|
|
<Swiper
|