diff --git a/bin/xyylMCWEACSystem.exe b/bin/xyylMCWEACSystem.exe index ce254ff..86d3be7 100644 Binary files a/bin/xyylMCWEACSystem.exe and b/bin/xyylMCWEACSystem.exe differ diff --git a/xyylMCWEACSystem/medicalrecordwidget.cpp b/xyylMCWEACSystem/medicalrecordwidget.cpp index e11c598..5fdc004 100644 --- a/xyylMCWEACSystem/medicalrecordwidget.cpp +++ b/xyylMCWEACSystem/medicalrecordwidget.cpp @@ -17,6 +17,27 @@ MedicalRecordWidget::~MedicalRecordWidget() } void MedicalRecordWidget::init() { + setStyleSheet("QPushButton{\ + background-color: rgb(255,255,230);\ + color: blue;\ + border-radius: 30px;\ + font-size: 16px;\ + font-weight: bold;\ + }\ + QPushButton:hover{\ + background: rgb(85, 85, 85);\ + border-radius: 30px;\ + }\ + QPushButton:pressed{\ + background: rgb(80, 80, 80);\ + border-radius: 30px;\ + }\ + QPushButton:checked{\ + background: #0d9ddb;\ + border-radius: 30px;\ + }"\ + "QWidget#NavList{background-color:rgb(47, 61, 82);}"\ + ); // setFixedSize(600,600); m_labStar.setText(tr("*")); @@ -55,6 +76,7 @@ void MedicalRecordWidget::init() //m_labDiagnosticRecord.setFixedWidth(iwidth); #else + m_gbx.setTitle("病历资料"); //检查号 m_labCheckNum.setText(tr("检查号")); @@ -65,20 +87,24 @@ void MedicalRecordWidget::init() m_chOutpatient.setText(tr("门诊")); //姓名 - m_labName.setText(tr("姓名")); + m_labName.setText(tr("姓 名")); //性别 m_labSex.setText(tr("性别"));; + m_chMan.setText(tr("男"));; + m_chWan.setText(tr("女"));; //左右利 - m_labLaterality.setText(tr("左右利")); + m_labLaterality.setText(tr(" 左右利")); + m_chLeft.setText(tr("左"));; + m_chRfight.setText(tr("右"));; //检查日期 m_labDate_Of_inspection.setText(tr("检查日期")); m_labAge.setText(tr("年龄")); m_labBirthDay.setText(tr("出生日期")); //诊断病历 - m_labDiagnosticRecord.setText(tr("其他:")); -m_labDiagnosticRecord.setFixedHeight(30); - m_btnOk.setText(tr("ok")); - m_btnCancel.setText(tr("Cancel")); + m_labDiagnosticRecord.setText(tr("其 他:")); + m_labDiagnosticRecord.setFixedHeight(30); + m_btnOk.setText(tr("保存")); + m_btnCancel.setText(tr("取消")); int iwidth = QFontMetrics(this->font()).width("Laterality"); //m_labCheckNum.setFixedWidth(iwidth); @@ -90,7 +116,7 @@ m_labDiagnosticRecord.setFixedHeight(30); } void MedicalRecordWidget::initLay() { - +#if 1 QHBoxLayout * hlayStart1 = new QHBoxLayout; hlayStart1->addWidget(&m_labStar); hlayStart1->addWidget(&m_labCheckNum); @@ -100,7 +126,7 @@ void MedicalRecordWidget::initLay() hlayStart1->addWidget(&m_labType); hlayStart1->addWidget(&m_chHospitalized); hlayStart1->addWidget(&m_chOutpatient); - + hlayStart1->addStretch(); QHBoxLayout * hlayStart2 = new QHBoxLayout; hlayStart2->addWidget(&m_labStar2); @@ -111,12 +137,16 @@ void MedicalRecordWidget::initLay() hlayStart2->addWidget(&m_labSex); hlayStart2->addWidget(&m_chMan); hlayStart2->addWidget(&m_chWan); + hlayStart2->addStretch(); QHBoxLayout * hlay3 = new QHBoxLayout; hlay3->addWidget(&m_labBirthDay); hlay3->addWidget(&m_dateBirthDay); + + hlay3->addWidget(&m_labAge); hlay3->addWidget(&m_editAge); + hlay3->addStretch(); QHBoxLayout * hlay4 = new QHBoxLayout; hlay4->addWidget(&m_labLaterality); @@ -124,124 +154,70 @@ void MedicalRecordWidget::initLay() hlay4->addWidget(&m_chRfight); hlay4->addWidget(&m_labDate_Of_inspection); hlay4->addWidget(&m_dateInspection); + hlay4->addStretch(); QHBoxLayout * hlay5 = new QHBoxLayout; hlay5->addWidget(&m_labDiagnosticRecord); hlay5->addWidget(&m_textDiagnosticRecord); + QHBoxLayout * hlay6 = new QHBoxLayout; + hlay6->addStretch(); + hlay6->addWidget(&m_btnCancel); + hlay6->addWidget(&m_btnOk); + hlay6->addStretch(); + + QVBoxLayout *vlay = new QVBoxLayout; vlay->addLayout(hlayStart1); vlay->addLayout(hlayStart2); vlay->addLayout(hlay3); vlay->addLayout(hlay4); vlay->addLayout(hlay5); - setLayout(vlay); -#if 0 + vlay->addLayout(hlay6); - QGridLayout * gridlay = new QGridLayout; - - int col=0,row = 0; - gridlay->addWidget(&m_labStar,0,col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_labCheckNum,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_editCheckNum,row,++col,1,2); - ++col; - gridlay->addWidget(&m_labType,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chHospitalized,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chOutpatient,row,++col,1,1); + vlay->addStretch(); - row ++; - col=0; - gridlay->addWidget(&m_labStar2,row,0,1,1,Qt::AlignRight); - gridlay->addWidget(&m_labName,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_editName,row,++col,1,2); - ++col; - gridlay->addWidget(&m_labSex,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chMan,row,++col,1,1); - gridlay->addWidget(&m_chWan,row,++col,1,1); + m_gbx.setLayout(vlay); + QHBoxLayout * vlayall = new QHBoxLayout; - // - row ++; - col=0; - gridlay->addWidget(&m_labBirthDay,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_dateBirthDay,row,++col,1,2); - ++col; - gridlay->addWidget(&m_labAge,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_editAge,row,++col,1,2); + vlayall->addWidget(&m_gbx); + setLayout(vlayall); - row ++; - col=0; - gridlay->addWidget(&m_labLaterality,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chLeft,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chRfight,row,++col,1,1); - ++col; - gridlay->addWidget(&m_labDate_Of_inspection,row,col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_dateInspection,row,++col,1,2); + int iwidth = 200; + m_editCheckNum.setFixedWidth(iwidth); + m_editName.setFixedWidth(iwidth); + m_dateBirthDay.setFixedWidth(iwidth); + m_chLeft.setFixedWidth(iwidth); + m_editAge.setFixedWidth(iwidth); +#else - row ++; - col=0; - gridlay->addWidget(&m_labDiagnosticRecord,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_textDiagnosticRecord,++row,++col,3,5); - gridlay->setSpacing(1); - // gridlay->setContentsMargins(0,0,0,0); - setLayout(gridlay); + QVBoxLayout * vlay1 = new QVBoxLayout; + QHBoxLayout * hlayStart1 = new QHBoxLayout; + hlayStart1->addWidget(&m_labStar); + hlayStart1->addWidget(&m_labCheckNum); + vlay1->addLayout(hlayStart1); -# //--------------- - QGridLayout * gridlay = new QGridLayout; - - int col=0,row = 0; - //gridlay->addWidget(&m_labStar,0,col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_labCheckNum,row,col,1,1); - gridlay->addWidget(&m_editCheckNum,row,++col,1,2,Qt::AlignLeft); - ++col; - gridlay->addWidget(&m_labType,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chHospitalized,row,++col,1,1,Qt::AlignLeft); - gridlay->addWidget(&m_chOutpatient,row,++col,1,1); - - - row ++; - col=0; - - // gridlay->addWidget(&m_labStar2,row,0,1,1,Qt::AlignRight); - gridlay->addWidget(&m_labName,row,col,1,1); - gridlay->addWidget(&m_editName,row,++col,1,2,Qt::AlignLeft); - ++col; - gridlay->addWidget(&m_labSex,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_chMan,row,++col,1,1,Qt::AlignLeft); - gridlay->addWidget(&m_chWan,row,++col,1,1); - - // - row ++; - col=0; - gridlay->addWidget(&m_labBirthDay,row,col,1,1); - gridlay->addWidget(&m_dateBirthDay,row,++col,1,2,Qt::AlignLeft); - ++col; - gridlay->addWidget(&m_labAge,row,++col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_editAge,row,++col,1,2); - - row ++; - col=0; - gridlay->addWidget(&m_labLaterality,row,col,1,1); - gridlay->addWidget(&m_chLeft,row,++col,1,1,Qt::AlignLeft); - gridlay->addWidget(&m_chRfight,row,++col,1,1); - ++col; - gridlay->addWidget(&m_labDate_Of_inspection,row,col,1,1,Qt::AlignRight); - gridlay->addWidget(&m_dateInspection,row,++col,1,2); - - row ++; - col=0; - gridlay->addWidget(&m_labDiagnosticRecord,row,col,1,1); - gridlay->addWidget(&m_textDiagnosticRecord,++row,++col,3,5); - //gridlay->setSpacing(1); - // gridlay->setContentsMargins(0,0,0,0); - setLayout(gridlay); + QHBoxLayout * hlayStart2 = new QHBoxLayout; + hlayStart2->addWidget(&m_labStar2); + hlayStart2->addWidget(&m_labName); + vlay1->addLayout(hlayStart2); + vlay1->addWidget(&m_labBirthDay); + vlay1->addWidget(&m_labLaterality); + vlay1->addWidget(&m_labDiagnosticRecord); + QVBoxLayout * vlay2 = new QVBoxLayout; + vlay2->addWidget(&m_editCheckNum); + vlay2->addWidget(&m_editName); + vlay2->addWidget(&m_dateBirthDay); + QHBoxLayout * hlay3 = new QHBoxLayout; + hlay3->addWidget(&m_chLeft); + hlay3->addWidget(&m_chRfight); + vlay2->addLayout(hlay3); #endif - - } bool MedicalRecordWidget::initConnect() { diff --git a/xyylMCWEACSystem/medicalrecordwidget.h b/xyylMCWEACSystem/medicalrecordwidget.h index 6282079..a92a6d4 100644 --- a/xyylMCWEACSystem/medicalrecordwidget.h +++ b/xyylMCWEACSystem/medicalrecordwidget.h @@ -25,6 +25,10 @@ public: void initLay(); bool initConnect(); private: + + QGroupBox m_gbx; + + QLabel m_labStar; QLabel m_labStar2; //检查号 diff --git a/xyylMCWEACSystem/systemsettingwidget.cpp b/xyylMCWEACSystem/systemsettingwidget.cpp index 3e9939e..e9c02fe 100644 --- a/xyylMCWEACSystem/systemsettingwidget.cpp +++ b/xyylMCWEACSystem/systemsettingwidget.cpp @@ -21,7 +21,8 @@ SystemSettingWidget::~SystemSettingWidget() void SystemSettingWidget::init() { - this->setStyleSheet("QWidget{background: rgb(47, 61, 82);border:0px}"); + //this->setStyleSheet("QWidget{background: rgb(47, 61, 82);border:0px}"); + this->setStyleSheet("QWidget{background: rgb(47, 61, 82);}"); m_labDes.setStyleSheet("border-image:url(:/image/systemsetting.png);}"); m_btnRet.setStyleSheet("border-image:url(:/image/icon_back_2.png);}"); m_labDes.setMaximumSize(QSize(200,30)); @@ -46,7 +47,8 @@ void SystemSettingWidget::initLay() QVBoxLayout * vlay = new QVBoxLayout; vlay->addWidget(w1,1); QWidget * w = new QWidget; - w->setStyleSheet("QWidget{background-color:#ffffff;border:1px solid blcak}"); + //w->setStyleSheet("QWidget{background-color:#ffffff;border:1px solid blcak}"); + w->setStyleSheet("QWidget{background-color:#ffffff;}"); vlay->addWidget(w,9); vlay->setContentsMargins(0,0,0,0); vlay->setSpacing(10);