diff --git a/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp b/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp index 92c4a53..0282dba 100644 --- a/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp +++ b/usrc/uicontroler/page/mupage/MuAcidDistMgrPage.cpp @@ -170,7 +170,7 @@ class MuAcidDistMgrPage : public IPageProcesser { return; } m_chId = slecId; - setText(bid, "%s(%d)", AcidChCfgDao::getCfg(slecId)->acidChooseName, slecId); + setText(bid, "通道%d-%s", slecId, AcidChCfgDao::getCfg(slecId)->acidChooseName); } else if (bid == ob_muAcidDistMgr_volumeVal) { float val = atof(text); if (val < 0) { @@ -259,7 +259,7 @@ class MuAcidDistMgrPage : public IPageProcesser { ZUSBFileOperator::openNew("1.csv"); CHECK_USB_FILE_OPERATION(); - ZUSBFileOperator::write("ID,时间,发放人,领酸人,酸液名称,容量\n"); + ZUSBFileOperator::write("ID,时间,发放人,领酸人,酸液名称,容量(ml)\n"); CHECK_USB_FILE_OPERATION(); for (int i = 0; i < table->recordNum; i++) { @@ -269,7 +269,8 @@ class MuAcidDistMgrPage : public IPageProcesser { osDelay(3); ZUSBFileOperator::write( // - "%d/%d/%d %02d:%02d:%02d,%s,%s,%s,%d\n", // + "%d,%d/%d/%d %02d:%02d:%02d,%s,%s,%s,%d\n", // + record->id, // record->date.year, record->date.month, record->date.day, record->date.hours, record->date.minutes, record->date.seconds, // UserDao::getUserByIdNotNull(record->distrubtAcidUsrid)->name, // UserDao::getUserByIdNotNull(record->takeAcidUsrid)->name, // diff --git a/usrc/uicontroler/page/mupage/muAcidUseMgr_page.cpp b/usrc/uicontroler/page/mupage/muAcidUseMgr_page.cpp index 1705c25..5ee577b 100644 --- a/usrc/uicontroler/page/mupage/muAcidUseMgr_page.cpp +++ b/usrc/uicontroler/page/mupage/muAcidUseMgr_page.cpp @@ -157,10 +157,11 @@ class MuAcidUseMgrPage : public IPageProcesser { osDelay(3); ZUSBFileOperator::write( // - "%d/%d/%d %02d:%02d:%02d,%s,%s,%.2f,%.2f,%.2f,%.2f\n", // + "%d,%d/%d/%d %02d:%02d:%02d,%s,%s,%.2f,%.2f,%.2f,%.2f\n", // + record->id, // record->date.year, record->date.month, record->date.day, record->date.hours, record->date.minutes, record->date.seconds, // UserDao::getUserByIdNotNull(record->usrid)->name, // - record->dirty ? "0" : "1", // + record->dirty ? "否" : "是", // record->ch0take0p1ml / 10.0, record->ch1take0p1ml / 10.0, record->ch2take0p1ml / 10.0, record->ch3take0p1ml / 10.0); CHECK_USB_FILE_OPERATION(); }