|
|
@@ -33,235 +33,6 @@ class Home extends React.Component {
|
|
|
isPlay: false,
|
|
|
voiceList: [],
|
|
|
myStatus: false,
|
|
|
- // 模拟数据
|
|
|
- tempList: [
|
|
|
- {
|
|
|
- 'roomDesc': '专家诊室1', 'docName': '宦大达', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '11号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 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': [
|
|
|
- { 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',
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '专家诊室2', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 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' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室2', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': 'B复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室3', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- { 'patCallNo': '复1', 'patName': '患*者2' },
|
|
|
- { 'patCallNo': '01', 'patName': '患*者3' },
|
|
|
- { 'patCallNo': '复1', 'patName': '患*者4' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室4', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室5', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '专家诊室4', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室7', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室8', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室9', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室10', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- refreshFlag: 'Y',
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室11', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '11号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '1', 'patName': '患*者1' },
|
|
|
- { 'patCallNo': '2', 'patName': '患*者2' },
|
|
|
- { 'patCallNo': '3', 'patName': '患*者3' },
|
|
|
- { 'patCallNo': '4', 'patName': '患*者4' },
|
|
|
- { 'patCallNo': '5', 'patName': '患*者5' },
|
|
|
- { 'patCallNo': '6', 'patName': '患*者6' },
|
|
|
- { 'patCallNo': '7', 'patName': '患*者7' },
|
|
|
- { 'patCallNo': '8', 'patName': '患*者8' },
|
|
|
- { 'patCallNo': '9', 'patName': '患*者9' },
|
|
|
- { 'patCallNo': '10', 'patName': '患*者10' },
|
|
|
- { 'patCallNo': '11', 'patName': '患*者11' },
|
|
|
- { 'patCallNo': '12', 'patName': '患*者12' }],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- { 'patCallNo': '复02', 'patName': '患*者2' },
|
|
|
- { 'patCallNo': '复03', 'patName': '患者3a' },
|
|
|
- { 'patCallNo': '复04', 'patName': '患者4a' }],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室12', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- 'roomDesc': '诊室13', 'docName': '医生1', 'callMsg':
|
|
|
- {
|
|
|
- 'callPat': [{ 'patCallNo': '1号', 'patName': '患*者' }],
|
|
|
- 'waitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- 'reWaitPat': [
|
|
|
- { 'patCallNo': '复01', 'patName': '患*者1' },
|
|
|
- ],
|
|
|
- }
|
|
|
- },
|
|
|
- ],
|
|
|
roomObjtmp: {},
|
|
|
patListArea: [],
|
|
|
updateTime: '',
|
|
|
@@ -270,50 +41,19 @@ class Home extends React.Component {
|
|
|
componentDidMount() {
|
|
|
this.initDevice();
|
|
|
this.initAndroidVoice();
|
|
|
- const test = () => {
|
|
|
- var start = 0;
|
|
|
- setTimeout(() => {
|
|
|
- if (start > 12) {
|
|
|
- return;
|
|
|
- }
|
|
|
- const data = this.state.tempList[start];
|
|
|
- const patList = [...data.callMsg.callPat, ...data.callMsg.waitPat.map(v => {
|
|
|
- return { ...v, status: 'waiting' };
|
|
|
- })];
|
|
|
- const { roomObjtmp } = this.state;
|
|
|
- roomObjtmp[data.roomDesc] = data;
|
|
|
- const newArray = Object.keys(roomObjtmp).map(key => {
|
|
|
- return roomObjtmp[key];
|
|
|
- });
|
|
|
- this.setState({
|
|
|
- userData: {
|
|
|
- ...data?.userData,
|
|
|
- areaDesc: data.locDesc, // 大屏诊区
|
|
|
- roomDesc: data.roomDesc, // 诊室
|
|
|
- },
|
|
|
- patList,
|
|
|
- callPat: data.callMsg.callPat,
|
|
|
- waitPat: data.callMsg.waitPat,
|
|
|
- reWaitPat: data.callMsg.reWaitPat,
|
|
|
- roomObj: data,
|
|
|
- delayPat: data.delayPat,
|
|
|
- roomObjtmp: roomObjtmp,
|
|
|
- patListArea: newArray,
|
|
|
- });
|
|
|
- ++start;
|
|
|
- }, 1000);
|
|
|
- };
|
|
|
- //test();
|
|
|
}
|
|
|
initAndroidVoice() {
|
|
|
window.mediaPlayOver = (flag) => {
|
|
|
if (flag == 'success') {
|
|
|
this.state.voiceList.splice(0, 1);
|
|
|
- this.setState({
|
|
|
- voiceList: this.state.voiceList,
|
|
|
- }, () => {
|
|
|
- this.soundPaly();
|
|
|
- });
|
|
|
+ this.setState(
|
|
|
+ {
|
|
|
+ voiceList: this.state.voiceList,
|
|
|
+ },
|
|
|
+ () => {
|
|
|
+ this.soundPaly();
|
|
|
+ },
|
|
|
+ );
|
|
|
} else {
|
|
|
Toast.show({
|
|
|
duration: 10000,
|
|
|
@@ -324,19 +64,24 @@ class Home extends React.Component {
|
|
|
}
|
|
|
soundPaly() {
|
|
|
const isDev = import.meta.env.MODE == 'development';
|
|
|
- if (isDev || (this.state.voiceList.length > 0)) {
|
|
|
- this.setState({
|
|
|
- myStatus: true,
|
|
|
- }, () => {
|
|
|
- const ua = navigator.userAgent.toLowerCase();
|
|
|
- if (/android/.test(ua)) {
|
|
|
- const src = isDev ? 'https://np.h03.p0551.com/images/wav/eba7ea72748b33c07d55ca7c443d6146.wav' : this.state.voiceList[0];
|
|
|
- window.JavaClientCall && window.JavaClientCall.mediaFilePlay(src);
|
|
|
- }
|
|
|
- });
|
|
|
+ if (isDev || this.state.voiceList.length > 0) {
|
|
|
+ this.setState(
|
|
|
+ {
|
|
|
+ myStatus: true,
|
|
|
+ },
|
|
|
+ () => {
|
|
|
+ const ua = navigator.userAgent.toLowerCase();
|
|
|
+ if (/android/.test(ua)) {
|
|
|
+ const src = isDev
|
|
|
+ ? 'https://np.h03.p0551.com/images/wav/eba7ea72748b33c07d55ca7c443d6146.wav'
|
|
|
+ : this.state.voiceList[0];
|
|
|
+ window.JavaClientCall && window.JavaClientCall.mediaFilePlay(src);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ );
|
|
|
} else {
|
|
|
this.setState({
|
|
|
- myStatus: false
|
|
|
+ myStatus: false,
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
@@ -344,11 +89,14 @@ class Home extends React.Component {
|
|
|
initDevice = async () => {
|
|
|
//接收Android端身份证信息函数
|
|
|
window.webGetDeviceId = (deviceId) => {
|
|
|
- this.setState({
|
|
|
- deviceID: deviceId,
|
|
|
- }, () => {
|
|
|
- this.loginInit();
|
|
|
- });
|
|
|
+ this.setState(
|
|
|
+ {
|
|
|
+ deviceID: deviceId,
|
|
|
+ },
|
|
|
+ () => {
|
|
|
+ this.loginInit();
|
|
|
+ },
|
|
|
+ );
|
|
|
};
|
|
|
const ua = navigator.userAgent.toLowerCase();
|
|
|
if (/android/.test(ua)) {
|
|
|
@@ -359,11 +107,14 @@ class Home extends React.Component {
|
|
|
if (isDev) {
|
|
|
const fp = await FingerprintJS.load();
|
|
|
const AndroidInfo = await fp.get();
|
|
|
- this.setState({
|
|
|
- deviceID: AndroidInfo.visitorId,
|
|
|
- }, () => {
|
|
|
- this.loginInit();
|
|
|
- });
|
|
|
+ this.setState(
|
|
|
+ {
|
|
|
+ deviceID: AndroidInfo.visitorId,
|
|
|
+ },
|
|
|
+ () => {
|
|
|
+ this.loginInit();
|
|
|
+ },
|
|
|
+ );
|
|
|
}
|
|
|
};
|
|
|
// 改变颜色
|
|
|
@@ -417,15 +168,18 @@ class Home extends React.Component {
|
|
|
}
|
|
|
obj.deviceID = this.state.deviceID;
|
|
|
initSocket(obj, (data) => {
|
|
|
- // console.log('Room接收消息:',data );
|
|
|
+ // console.log('Room接收消息:', data);
|
|
|
data = JSON.parse(data);
|
|
|
if (data.callMsg) {
|
|
|
- const patList = [...data.callMsg.callPat, ...data.callMsg.waitPat.map(v => {
|
|
|
- return { ...v, status: 'waiting' };
|
|
|
- })];
|
|
|
+ const patList = [
|
|
|
+ ...data.callMsg.callPat,
|
|
|
+ ...data.callMsg.waitPat.map((v) => {
|
|
|
+ return { ...v, status: 'waiting' };
|
|
|
+ }),
|
|
|
+ ];
|
|
|
const { roomObjtmp } = this.state;
|
|
|
roomObjtmp[data.roomDesc] = data;
|
|
|
- const newArray = Object.keys(roomObjtmp).map(key => {
|
|
|
+ const newArray = Object.keys(roomObjtmp).map((key) => {
|
|
|
return roomObjtmp[key];
|
|
|
});
|
|
|
this.setState({
|
|
|
@@ -448,13 +202,16 @@ class Home extends React.Component {
|
|
|
return;
|
|
|
}
|
|
|
this.state.voiceList.push(data.path + data.voiceFileName);
|
|
|
- this.setState({
|
|
|
- voiceList: this.state.voiceList,
|
|
|
- }, () => {
|
|
|
- if (!this.state.myStatus) {
|
|
|
- this.soundPaly();
|
|
|
- }
|
|
|
- });
|
|
|
+ this.setState(
|
|
|
+ {
|
|
|
+ voiceList: this.state.voiceList,
|
|
|
+ },
|
|
|
+ () => {
|
|
|
+ if (!this.state.myStatus) {
|
|
|
+ this.soundPaly();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ );
|
|
|
}
|
|
|
});
|
|
|
};
|
|
|
@@ -465,12 +222,18 @@ class Home extends React.Component {
|
|
|
return;
|
|
|
}
|
|
|
cache = JSON.parse(cache);
|
|
|
- return React.$fetchPost('04150020', {
|
|
|
- params: [{
|
|
|
- ip: cache.BASE_URL,
|
|
|
- identifyCode: this.state.deviceID,
|
|
|
- }],
|
|
|
- }, true).then((data) => {
|
|
|
+ return React.$fetchPost(
|
|
|
+ '04150020',
|
|
|
+ {
|
|
|
+ params: [
|
|
|
+ {
|
|
|
+ ip: cache.BASE_URL,
|
|
|
+ identifyCode: this.state.deviceID,
|
|
|
+ },
|
|
|
+ ],
|
|
|
+ },
|
|
|
+ true,
|
|
|
+ ).then((data) => {
|
|
|
if (data) {
|
|
|
const obj = {
|
|
|
Loc: 'area',
|
|
|
@@ -481,7 +244,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({
|
|
|
@@ -512,8 +275,8 @@ class Home extends React.Component {
|
|
|
loginInit={this.loginInit}
|
|
|
deviceID={this.state.deviceID}
|
|
|
/>
|
|
|
- {this.state.showType == 'doctor'
|
|
|
- ? <DoctorScreen
|
|
|
+ {this.state.showType == 'doctor' ? (
|
|
|
+ <DoctorScreen
|
|
|
userData={this.state.userData}
|
|
|
patList={this.state.patList}
|
|
|
callPat={this.state.callPat}
|
|
|
@@ -521,48 +284,62 @@ class Home extends React.Component {
|
|
|
reWaitPat={this.state.reWaitPat}
|
|
|
hosLogo={this.state.hosLogo}
|
|
|
/>
|
|
|
- : this.state.showType == 'operate'
|
|
|
- ? <OperateScreen
|
|
|
- patList={this.state.waitPat}
|
|
|
- userData={this.state.userData}
|
|
|
- hosLogo={this.state.hosLogo}
|
|
|
- />
|
|
|
- : this.state.isGm
|
|
|
- ? <BigScreen
|
|
|
- userData={this.state.userData}
|
|
|
- roomObj={this.state.roomObj}
|
|
|
- delayPat={this.state.delayPat}
|
|
|
- hosLogo={this.state.hosLogo}
|
|
|
- />
|
|
|
- : < BigScreen
|
|
|
- userData={this.state.userData}
|
|
|
- roomObj={this.state.roomObj}
|
|
|
- patListArea={this.state.patListArea}
|
|
|
- delayPat={this.state.delayPat}
|
|
|
- hosLogo={this.state.hosLogo}
|
|
|
- />
|
|
|
- }
|
|
|
- <span
|
|
|
- className='bottom-set'
|
|
|
- >
|
|
|
+ ) : this.state.showType == 'operate' ? (
|
|
|
+ <OperateScreen
|
|
|
+ patList={this.state.waitPat}
|
|
|
+ userData={this.state.userData}
|
|
|
+ hosLogo={this.state.hosLogo}
|
|
|
+ />
|
|
|
+ ) : this.state.isGm ? (
|
|
|
+ <BigScreen
|
|
|
+ userData={this.state.userData}
|
|
|
+ roomObj={this.state.roomObj}
|
|
|
+ delayPat={this.state.delayPat}
|
|
|
+ hosLogo={this.state.hosLogo}
|
|
|
+ />
|
|
|
+ ) : (
|
|
|
+ <BigScreen
|
|
|
+ userData={this.state.userData}
|
|
|
+ roomObj={this.state.roomObj}
|
|
|
+ patListArea={this.state.patListArea}
|
|
|
+ delayPat={this.state.delayPat}
|
|
|
+ hosLogo={this.state.hosLogo}
|
|
|
+ />
|
|
|
+ )}
|
|
|
+ <span className="bottom-set">
|
|
|
{/* 测试用,现在出现的问题就是显示的与实际的数据不符,不知道是没有监听到还是前端拿到了数据没更新 */}
|
|
|
- {!!(this.state?.updateTime) && (
|
|
|
- <span style={{ color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764', marginLeft: '10px' }}>
|
|
|
+ {!!this.state?.updateTime && (
|
|
|
+ <span
|
|
|
+ style={{
|
|
|
+ color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764',
|
|
|
+ marginLeft: '10px',
|
|
|
+ }}>
|
|
|
{this.state?.updateTime || ''}
|
|
|
</span>
|
|
|
)}
|
|
|
<AntOutline
|
|
|
- style={{ color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764', marginLeft: '10px' }}
|
|
|
+ style={{
|
|
|
+ color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764',
|
|
|
+ marginLeft: '10px',
|
|
|
+ }}
|
|
|
onClick={this.changeSwitch}
|
|
|
/>
|
|
|
<SetOutline
|
|
|
onClick={this.openLogin}
|
|
|
- style={{ color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764', marginLeft: '10px' }}
|
|
|
+ style={{
|
|
|
+ color: this.state.colorName == 'dark-bg' ? '#fff' : '#0D2764',
|
|
|
+ marginLeft: '10px',
|
|
|
+ }}
|
|
|
/>
|
|
|
</span>
|
|
|
- <audio controls id="audio"
|
|
|
- style={{ position: 'fixed', left: '-1000px', top: '100px' }}
|
|
|
- ></audio>
|
|
|
+ <audio
|
|
|
+ controls
|
|
|
+ id="audio"
|
|
|
+ style={{
|
|
|
+ position: 'fixed',
|
|
|
+ left: '-1000px',
|
|
|
+ top: '100px',
|
|
|
+ }}></audio>
|
|
|
</div>
|
|
|
</>
|
|
|
);
|