Commit 0b9ea683 by hank

添加设备使用状态I

parent ad4a9db7
...@@ -22,7 +22,7 @@ interface DeviceItem { ...@@ -22,7 +22,7 @@ interface DeviceItem {
class DeviceItem extends Component { class DeviceItem extends Component {
render() { render() {
const { equipmentName, equipmentState, equipmentUrl: url } = this.props const { equipmentName, equipmentState, equipmentUrl: url, calendarId } = this.props
return ( return (
<View className="device-item"> <View className="device-item">
<View className="device-item-img-box"> <View className="device-item-img-box">
...@@ -39,6 +39,7 @@ class DeviceItem extends Component { ...@@ -39,6 +39,7 @@ class DeviceItem extends Component {
> >
<Text className="dian" /> <Text className="dian" />
{equipmentState === 'ONLINE' ? '在线' : '离线'} {equipmentState === 'ONLINE' ? '在线' : '离线'}
<Text>{calendarId ? ' 已使用' : ''}</Text>
</View> </View>
</View> </View>
</View> </View>
......
...@@ -22,6 +22,7 @@ export interface IDeviceItem { ...@@ -22,6 +22,7 @@ export interface IDeviceItem {
equipmentUrl: string equipmentUrl: string
equipmentName: string equipmentName: string
equipmentState: string equipmentState: string
calendarId?: string
} }
export interface IBluetoothServerListItem { export interface IBluetoothServerListItem {
......
...@@ -7,7 +7,6 @@ import { getFilmList } from '@/actions/asyncCounter' ...@@ -7,7 +7,6 @@ import { getFilmList } from '@/actions/asyncCounter'
import Taro, { Component, Config } from '@tarojs/taro' import Taro, { Component, Config } from '@tarojs/taro'
import { View, Text, ScrollView, Button, Checkbox, Label } from '@tarojs/components' import { View, Text, ScrollView, Button, Checkbox, Label } from '@tarojs/components'
import './index.scss' import './index.scss'
import { any } from 'prop-types'
type PageStateProps = { type PageStateProps = {
list: any[] list: any[]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment