314637581
/
flossom-miniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge：处理冲突

Browse Source
master
blak-kong 2 years ago
parent 23ffb520fb
commit 66a87f249d
1 changed files with 92 additions and 101 deletions
Show Stats Download Patch File Download Diff File

193
src/moduleIOT/pages/iotCarePlan/FR200.tsx
Unescape Escape View File

@ -290,9 +290,9 @@ class IotCarePlanFR200 extends Component<any, any> {
this.getInstrumentClockSummary(); this.getInstrumentClockSummary();
this.getInstrumentClockDetail(); this.getInstrumentClockDetail();
} }
componentDidMount() { } componentDidMount() {}
componentWillUnmount() { } componentWillUnmount() {}
componentDidShow() { componentDidShow() {
console.log("页面显示了"); console.log("页面显示了");
@ -684,72 +684,78 @@ class IotCarePlanFR200 extends Component<any, any> {
let date = new Date(); let date = new Date();
let year = date.getFullYear(); let year = date.getFullYear();
<<<<<<< HEAD
let month = (date.getMonth() + 1).toString().padStart(2, "0"); let month = (date.getMonth() + 1).toString().padStart(2, "0");
let day = date.getDate().toString().padStart(2, "0"); let day = date.getDate().toString().padStart(2, "0");
let formattedDate = `${year}.${month}.${day}`; let formattedDate = `${year}.${month}.${day}`;
go( this.moistureTest(
`/recoding/pages/moisture_test_report/moisture_test_report?data=${params.nursingData}&date=${formattedDate}&modeId=${ActiveModeItem.id}&id=${currentDevice.id}` params.nursingData,
formattedDate,
ActiveModeItem.id,
currentDevice.id
); );
=======
let month = (date.getMonth() + 1).toString().padStart(2, '0');
let day = date.getDate().toString().padStart(2, '0');
let formattedDate = `${year}.${month}.${day}`;
this.moistureTest(params.nursingData, formattedDate, ActiveModeItem.id, currentDevice.id)
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca
}, 2000); }, 2000);
}; };
async moistureTest(nursingData, formattedDate, ActiveModeItemId, currentDeviceId) { async moistureTest(
nursingData,
formattedDate,
ActiveModeItemId,
currentDeviceId
) {
let data = { let data = {
queryDate: formattedDate, queryDate: formattedDate,
instrumentId: currentDeviceId instrumentId: currentDeviceId,
} };
let res = await InstrumentInfo.fr200.moistureTest(data); let res = await InstrumentInfo.fr200.moistureTest(data);
let echartsData = res.data.rows let echartsData = res.data.rows;
for (let i = 0; i < echartsData.length; i++) { for (let i = 0; i < echartsData.length; i++) {
for (let j = i + 1; j < echartsData.length; j++) { for (let j = i + 1; j < echartsData.length; j++) {
if (echartsData[i].createTime.split(' ')[0] == echartsData[j].createTime.split(' ')[0]) { if (
let result = Date.parse(echartsData[i].createTime) - Date.parse(echartsData[j].createTime) echartsData[i].createTime.split(" ")[0] ==
echartsData[j].createTime.split(" ")[0]
) {
let result =
Date.parse(echartsData[i].createTime) -
Date.parse(echartsData[j].createTime);
if (result < 0) { if (result < 0) {
echartsData.splice(i, 1) echartsData.splice(i, 1);
} else { } else {
echartsData.splice(j, 1) echartsData.splice(j, 1);
} }
} }
} }
} }
let gears: any = [] let gears: any = [];
let eDate: any = [] let eDate: any = [];
echartsData?.map(item => { echartsData?.map((item) => {
console.log(item,'查看数据'); console.log(item, "查看数据");
const result = item.createTime.split(' ')[0].substring(5); const result = item.createTime.split(" ")[0].substring(5);
eDate.push(result) eDate.push(result);
item.nursingData = JSON.parse(item.nursingData) item.nursingData = JSON.parse(item.nursingData);
let level: any = 0 let level: any = 0;
item.nursingData?.GearData?.map(gear => { item.nursingData?.GearData?.map((gear) => {
level = level + gear.forehead level = level + gear.forehead;
}) });
level = Math.floor(level / 3) level = Math.floor(level / 3);
gears.push(level) gears.push(level);
}) });
echartsData = { echartsData = {
gears, eDate gears,
} eDate,
setStorageSync('moistureEachtsData', JSON.stringify(echartsData)) };
setStorageSync("moistureEachtsData", JSON.stringify(echartsData));
// go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${allData.nursingData}&date=${allData.createTime}&modeId=${allData.modeId}&id=${allData.instrumentId}&echartsData=${JSON.stringify(echartsData)}`); // go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${allData.nursingData}&date=${allData.createTime}&modeId=${allData.modeId}&id=${allData.instrumentId}&echartsData=${JSON.stringify(echartsData)}`);
go(`/recoding/pages/moisture_test_report/moisture_test_report?data=${nursingData}&date=${formattedDate}&modeId=${ActiveModeItemId}&id=${currentDeviceId}&echartsData=${JSON.stringify(echartsData)}`); go(
`/recoding/pages/moisture_test_report/moisture_test_report?data=${nursingData}&date=${formattedDate}&modeId=${ActiveModeItemId}&id=${currentDeviceId}&echartsData=${JSON.stringify(
echartsData
)}`
);
} }
/** /**
* @name 不可切换光照提示 * @name 不可切换光照提示
* @description 检测紧贴肌肤 * @description 检测紧贴肌肤
@ -775,10 +781,10 @@ class IotCarePlanFR200 extends Component<any, any> {
} }
}, 1000); }, 1000);
} }
updata() { } updata() {}
// 绘制能量图 // 绘制能量图
drawProwerPicture() { } drawProwerPicture() {}
/** 切换光照 */ /** 切换光照 */
onSwitchChange = async () => { onSwitchChange = async () => {
@ -1368,11 +1374,7 @@ class IotCarePlanFR200 extends Component<any, any> {
* @description 步骤+1并设置视频 * @description 步骤+1并设置视频
*/ */
waterTestNext(index) { waterTestNext(index) {
<<<<<<< HEAD
let ActiveModeItem = this.state.ActiveModeItem; let ActiveModeItem = this.state.ActiveModeItem;
=======
let ActiveModeItem = this.state.ActiveModeItem
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca
if (index === 0 && ActiveModeItem.stepOneVideo) { if (index === 0 && ActiveModeItem.stepOneVideo) {
this.VideoSrcLoad(ActiveModeItem.stepOneVideo); this.VideoSrcLoad(ActiveModeItem.stepOneVideo);
} else if (index === 1 && ActiveModeItem.stepTwoVideo) { } else if (index === 1 && ActiveModeItem.stepTwoVideo) {
@ -1622,11 +1624,7 @@ class IotCarePlanFR200 extends Component<any, any> {
// 水分测试需要特殊处理 // 水分测试需要特殊处理
// 水分测试准备 水分测试工作 水分测试启动 // 水分测试准备 水分测试工作 水分测试启动
if (ActiveModeItem.modeType === "moistureTest") { if (ActiveModeItem.modeType === "moistureTest") {
<<<<<<< HEAD
let that = this; let that = this;
=======
let that = this
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca
sendParams.testStatus = "standby"; // 切换为准备 sendParams.testStatus = "standby"; // 切换为准备
let waterStepList = this.state.waterStepList; let waterStepList = this.state.waterStepList;
let waterStepIndex = this.state.waterStepIndex; let waterStepIndex = this.state.waterStepIndex;
@ -2033,20 +2031,18 @@ class IotCarePlanFR200 extends Component<any, any> {
// 脸部one // 脸部one
todoPromise = async () => { todoPromise = async () => {
const nowFR200NursingHistory = Taro.getStorageSync("FR200NursingHistory"); const nowFR200NursingHistory = Taro.getStorageSync("FR200NursingHistory");
<<<<<<< HEAD
console.log(nowFR200NursingHistory, "nowFR200NursingHistory"); console.log(nowFR200NursingHistory, "nowFR200NursingHistory");
=======
console.log(nowFR200NursingHistory, 'nowFR200NursingHistory');
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca
// 护理脸部 // 护理脸部
if ([ if (
"face", [
"eyes", "face",
"nasolabialFold", "eyes",
"mandibularLine", "nasolabialFold",
"headLiftingPro", "mandibularLine",
].includes(nowFR200NursingHistory.jsonStatus.workMode)) { "headLiftingPro",
].includes(nowFR200NursingHistory.jsonStatus.workMode)
) {
// 把working=工作中的状态数据筛选出来 // 把working=工作中的状态数据筛选出来
let filtered = nowFR200NursingHistory.dataArray.filter( let filtered = nowFR200NursingHistory.dataArray.filter(
(item) => item.workStatus === "working" (item) => item.workStatus === "working"
@ -2110,10 +2106,12 @@ class IotCarePlanFR200 extends Component<any, any> {
return nursingData; return nursingData;
} }
<<<<<<< HEAD return {
======= nursingData: JSON.stringify({
return { nursingData: JSON.stringify({ workMode: nowFR200NursingHistory.workMode, }),showFace:true } workMode: nowFR200NursingHistory.workMode,
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca }),
showFace: true,
};
}; };
// 计算挡位 // 计算挡位
@ -2151,7 +2149,6 @@ class IotCarePlanFR200 extends Component<any, any> {
} }
let res1: any = await this.todoPromise(); let res1: any = await this.todoPromise();
if (!res1?.showFace) { if (!res1?.showFace) {
params = { ...params, ...res1 }; params = { ...params, ...res1 };
} }
console.log(res1, "查看返回数据"); console.log(res1, "查看返回数据");
@ -2176,7 +2173,12 @@ class IotCarePlanFR200 extends Component<any, any> {
isShowNursingSuccess: false, isShowNursingSuccess: false,
}); });
this.goFaceReport(res1, ActiveModeItem.id, res2.data.data, currentDevice.id); // 跳转 this.goFaceReport(
res1,
ActiveModeItem.id,
res2.data.data,
currentDevice.id
); // 跳转
}, 2000); }, 2000);
} }
} }
@ -2285,51 +2287,40 @@ class IotCarePlanFR200 extends Component<any, any> {
"headLiftingPro", "headLiftingPro",
].includes(nursingData.workMode) ].includes(nursingData.workMode)
) { ) {
let ids = Number(deviceid) let ids = Number(deviceid);
// 获取echarts数据 这个是获取接口更新echarts页面 // 获取echarts数据 这个是获取接口更新echarts页面
let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids); let res2 = await InstrumentInfo.apiNursingLog.getStatiCDE(ids);
let nursingDatas = JSON.parse(res2.data.data.nursingData) let nursingDatas = JSON.parse(res2.data.data.nursingData);
let obj = { let obj = {
modeName: res2.data.data.modeName, modeName: res2.data.data.modeName,
data: nursingDatas data: nursingDatas,
} };
let report = true; let report = true;
go( go(
"/recoding/pages/face_report_one/face_report_one?id=" + "/recoding/pages/face_report_one/face_report_one?id=" +
<<<<<<< HEAD ids +
id +
"&report=" + "&report=" +
report report +
======= "&obj=" +
ids + JSON.stringify(obj)
"&report=" +
report + "&obj=" +
JSON.stringify(obj)
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca
); );
} else if ("moistureTest" === nursingData.workMode) { } else if ("moistureTest" === nursingData.workMode) {
console.log("水分测试"); console.log("水分测试");
} else { } else {
console.log('跳转11111111'); console.log("跳转11111111");
let report = true; let report = true;
go( go(
"/recoding/pages/face_report/face_report?id=" + "/recoding/pages/face_report/face_report?id=" +
<<<<<<< HEAD deviceid +
this.state.currentDevice.id + "&recordId=" +
currentDevice +
"&report=" + "&report=" +
report report
=======
deviceid +
"&recordId=" + currentDevice +
"&report=" +
report
>>>>>>> 4c77ad357cabdbdc964386fcd5d889fe5cc5caca
); );
} }
}; };
@ -2640,9 +2631,9 @@ class IotCarePlanFR200 extends Component<any, any> {
deviceInfo={currentDevice} deviceInfo={currentDevice}
close={this.connectionClose} close={this.connectionClose}
isDisconnect={!isConnectionBlutoot} isDisconnect={!isConnectionBlutoot}
offlineChange={() => { }} offlineChange={() => {}}
pairingChange={this.pairingChange} pairingChange={this.pairingChange}
upgradeFun={() => { }} upgradeFun={() => {}}
/> />
)} )}
@ -2725,12 +2716,12 @@ class IotCarePlanFR200 extends Component<any, any> {
{(ActiveModeItem.modeType === "maskPenetration" || {(ActiveModeItem.modeType === "maskPenetration" ||
ActiveModeItem.modeType === "essence") && ( ActiveModeItem.modeType === "essence") && (
<Gears <Gears
onEmitMinus={this.handleMinus} onEmitMinus={this.handleMinus}
onEmitAdd={this.handleAdd} onEmitAdd={this.handleAdd}
GearData={GearData} GearData={GearData}
></Gears> ></Gears>
)} )}
{ActiveModeItem.modeType === "moistureTest" && ( {ActiveModeItem.modeType === "moistureTest" && (
<WaterTest <WaterTest

Write Preview
Loading…
Cancel
Save