master
rongweikang 2 years ago
parent 7ea3711ac6
commit 17d0439e3f

@ -91,7 +91,7 @@ export default class AtCalendarController extends React.Component<any, any> {
return ( return (
<Block> <Block>
<View className="at-calendar__controller controller flex-justify-sb"> <View className='at-calendar__controller controller flex-justify-sb'>
{hideArrow ? null : ( {hideArrow ? null : (
<View <View
className={classnames( className={classnames(
@ -103,9 +103,9 @@ export default class AtCalendarController extends React.Component<any, any> {
onClick={this.props.onPreMonth.bind(this, isMinMonth)} onClick={this.props.onPreMonth.bind(this, isMinMonth)}
/> />
)} )}
<View className="calendar-top-date-btn"> <View className='calendar-top-date-btn'>
<View <View
style="display: flex;align-items: center;" style='display: flex;align-items: center;'
onClick={this.openDate} onClick={this.openDate}
> >
{/* <Text className="controller__info"></Text> */} {/* <Text className="controller__info"></Text> */}
@ -113,10 +113,10 @@ export default class AtCalendarController extends React.Component<any, any> {
<Text style={{ fontSize: "32rpx", fontWeight: "600" }}> <Text style={{ fontSize: "32rpx", fontWeight: "600" }}>
{dayjsDate.format("YYYY.MM.DD")} {dayjsDate.format("YYYY.MM.DD")}
</Text> </Text>
<View style="margin-left: 34rpx;"> <View style='margin-left: 34rpx;'>
<Image <Image
src={require("../img/calendar.png")} src={require("../img/calendar.png")}
style="width:28rpx;height:28rpx;" style='width:28rpx;height:28rpx;'
/> />
</View> </View>
</View> </View>
@ -127,33 +127,33 @@ export default class AtCalendarController extends React.Component<any, any> {
<Popup <Popup
show={showDatePicker} show={showDatePicker}
position="bottom" position='bottom'
// close-icon="/img/fr200/close.png" // close-icon="/img/fr200/close.png"
round round
onClick={this.onClickStop} onClick={this.onClickStop}
// onClose={this.onPopupClose} // onClose={this.onPopupClose}
> >
<View className="toolbar"> <View className='toolbar'>
<View className="toolbar_title"> <View className='toolbar_title'>
<Text></Text> <Text></Text>
<View <View
style="margin-left: 20rpx;color:#666;font-size: 34rpx" style='margin-left: 20rpx;color:#666;font-size: 34rpx'
className="at-icon at-icon-close popup-date-close" className='at-icon at-icon-close popup-date-close'
onClick={this.onPopupClose} onClick={this.onPopupClose}
></View> ></View>
</View> </View>
<View className="select_box"> <View className='select_box'>
<View className="text"></View> <View className='text'></View>
<View className="date">{currentDate}</View> <View className='date'>{currentDate}</View>
</View> </View>
</View> </View>
<DatetimePicker <DatetimePicker
type="date" type='date'
value={curDate} value={curDate}
maxDate={maxDate} maxDate={maxDate}
onInput={_.throttle(this.onInput.bind(this), 500)} onInput={_.throttle(this.onInput.bind(this), 500)}
/> />
<View className="btn_confirm" onClick={this.onSelectDate}> <View className='btn_confirm' onClick={this.onSelectDate}>
</View> </View>
</Popup> </Popup>

@ -193,7 +193,7 @@ page {
background: #fff; background: #fff;
flex-direction: column; flex-direction: column;
height: 100%; height: 100%;
border-radius: 20rpx; border-radius: 30rpx;
overflow: hidden; overflow: hidden;
box-shadow: -2rpx 0 12rpx 0.5rpx rgba(129, 129, 129, 0.05); box-shadow: -2rpx 0 12rpx 0.5rpx rgba(129, 129, 129, 0.05);
margin-right: 23rpx; margin-right: 23rpx;

@ -479,7 +479,7 @@ export default class InstrumentClickInUpload extends Component<any, any> {
onClick={this.handleChooseImage} onClick={this.handleChooseImage}
> >
<Image <Image
src={require("@/img/fr200/add-Image.png")} src={require("@/img/fr200/add-image.png")}
mode='aspectFill' mode='aspectFill'
></Image> ></Image>
</View> </View>

@ -64,9 +64,9 @@ export default class Recording extends Component<any, any> {
}; };
} }
componentDidMount() {} componentDidMount() { }
componentWillUnmount() {} componentWillUnmount() { }
// 格式化时间 // 格式化时间
getTime(time) { getTime(time) {
const hour = time.slice(0, 2); const hour = time.slice(0, 2);
@ -269,11 +269,11 @@ export default class Recording extends Component<any, any> {
this.DayTime(); this.DayTime();
} }
componentDidShow() {} componentDidShow() { }
componentDidHide() {} componentDidHide() { }
async initData() {} async initData() { }
// 选择年份 // 选择年份
onChangeYear(event) { onChangeYear(event) {
this.setState({ year: event.detail.value }); this.setState({ year: event.detail.value });
@ -290,7 +290,6 @@ export default class Recording extends Component<any, any> {
// 跳转到护理报告 // 跳转到护理报告
toReport(id, recordId, item) { toReport(id, recordId, item) {
console.log(item, "查看类型", item.jumpType); console.log(item, "查看类型", item.jumpType);
item.jumpType = 1;
switch (item.jumpType) { switch (item.jumpType) {
case 1: case 1:
this.One(item); this.One(item);
@ -313,11 +312,11 @@ export default class Recording extends Component<any, any> {
let report = false; let report = false;
go( go(
"/recoding/pages/face_report_one/face_report_one?id=" + "/recoding/pages/face_report_one/face_report_one?id=" +
item.id + item.id +
"&recordId=" + "&recordId=" +
item.recordId + item.recordId +
"&report=" + "&report=" +
report report
); );
}; };
// 打开第二种类型 // 打开第二种类型
@ -326,7 +325,7 @@ export default class Recording extends Component<any, any> {
}; };
// 打开第三种类型 // 打开第三种类型
three = async (item) => { three = async (item) => {
go("/recoding/pages/moisture_test_report/moisture_test_report"); go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${item.nursingData}&date=${item.createTime}`);
}; };
// 打开其他类型 // 打开其他类型
AllDevice = async (item) => { AllDevice = async (item) => {

Loading…
Cancel
Save