fix:横屏

master
blak-kong 2 years ago
parent a4d2d7a438
commit 51051e6bfb

@ -99,6 +99,7 @@ class IotCarePlanFR200 extends Component<any, any> {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
isFullScreen: true,
textshow: false, textshow: false,
textscreen: "portrait", textscreen: "portrait",
name: "FR200", name: "FR200",
@ -390,7 +391,6 @@ class IotCarePlanFR200 extends Component<any, any> {
]; ];
async onLoad(option) { async onLoad(option) {
// await closeBLEConnection(this.props.bluetoothInfo.deviceId);
console.log(option, "跳转过来的数据"); console.log(option, "跳转过来的数据");
if (option.modeId) { if (option.modeId) {
this.setState({ activeModeID: option.modeId }); this.setState({ activeModeID: option.modeId });
@ -2392,12 +2392,14 @@ class IotCarePlanFR200 extends Component<any, any> {
return ( return (
<Block> <Block>
{isFullScreen && (
<Navbar <Navbar
titleSlot={title} titleSlot={title}
isBack isBack
isCustomBack isCustomBack
customBack={this.customBack} customBack={this.customBack}
/> />
)}
<View> <View>
<View catchMove> <View catchMove>
@ -2612,7 +2614,9 @@ class IotCarePlanFR200 extends Component<any, any> {
/> />
)} )}
<button onClick={this.updata.bind(this)}> </button> <button onClick={this.updata.bind(this)}> </button>
{/* <button onClick={this.updata.bind(this)}>添加数据 </button> */} <View className={classnames({ show: showEcharts })}>
<Echarts series={series} full={this.full.bind(this)}></Echarts>
</View>
{(ActiveModeItem?.modeType === "maskPenetration" || {(ActiveModeItem?.modeType === "maskPenetration" ||
ActiveModeItem?.modeType === "essence") && ActiveModeItem?.modeType === "essence") &&
@ -2646,23 +2650,6 @@ class IotCarePlanFR200 extends Component<any, any> {
)} )}
</View> </View>
</View> </View>
{/*
<View>
<button onClick={this.updata.bind(this)}> </button>
<EchartsFullScean
series={series}
full={this.full}
></EchartsFullScean>
</View> */}
<View
className={classnames({ show: showEcharts })}
style="margin-top:200px"
>
<Echarts series={series} full={this.full.bind(this)}></Echarts>
</View>
</Block> </Block>
); );
} }

Loading…
Cancel
Save