From 1a927fa6b6a1332b38ec3f711fde002f6ec0641d Mon Sep 17 00:00:00 2001
From: wangky <m1561510467@163.com>
Date: 星期三, 06 十一月 2024 15:02:29 +0800
Subject: [PATCH] Merge branch 'master' of ssh://115.28.86.8:29418/~admin/昆仑_1025
---
Client/姜可庚/code/2024kunlun_project_permisson/permissonwindow.cpp | 99 +++++++++++++++++++++----------------------------
1 files changed, 43 insertions(+), 56 deletions(-)
diff --git "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp" "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
index 71580ef..212aa8a 100644
--- "a/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
+++ "b/Client/\345\247\234\345\217\257\345\272\232/code/2024kunlun_project_permisson/permissonwindow.cpp"
@@ -11,46 +11,20 @@
ui(new Ui::PermissonWindow)
{
ui->setupUi(this);
- clientSocket = new PmsClientSocket(this);
-
- dia = new PermissonDialog(this,clientSocket);
-
-
-
- connect(this,SIGNAL(sendUserNo(PmsQueryResult)),dia,SLOT(recvUserNo(PmsQueryResult)));
- connect(clientSocket,SIGNAL(notifyDateChange(vector<PmsQueryResult>)),this,SLOT(renderItemData(vector<PmsQueryResult>)));
-
- roleMap["鏅�氶噰鐭垮憳宸�"] = 1;
- roleMap["鎶�鏈淮鎶や汉鍛�"] = 2;
- roleMap["绯荤粺绠＄悊鍛�"] = 3;
- roleMap["瀹夊叏绠＄悊浜哄憳"] = 4;
-
this->setWindowTitle("鏉冮檺绠＄悊");
vector<QString> lableList;
lableList.push_back("鍛樺伐缂栧彿");
lableList.push_back("濮撳悕");
- lableList.push_back("褰撳ぉ宸ヤ綔鏃堕棿");
- lableList.push_back("褰撳ぉ缁撴潫鏃堕棿");
+ lableList.push_back("閮ㄩ棬");
+ lableList.push_back("鐧诲綍鏃堕棿");
+ lableList.push_back("娉ㄥ唽鏃堕棿");
+
lableList.push_back("鑱屼綅");
+ clientSocket = new PmsClientSocket(this);
-
+ dia = new PermissonDialog(this,clientSocket);
m_model = new QStandardItemModel(globalPms.size(),lableList.size(),this);
-
- ui->tableView->setModel(m_model);
-
- for(int i=0;i<m_model->rowCount();i++){
- PmsQueryResult curRes = globalPms[i];
- m_model->setItem(i,0,new QStandardItem(QString::fromStdString(curRes.getUserNo())));
- m_model->setItem(i,1,new QStandardItem(QString::fromLocal8Bit(curRes.getName().c_str())));
- m_model->setItem(i,2,new QStandardItem(QString::fromStdString(curRes.getStartDateTime())));
- m_model->setItem(i,3,new QStandardItem(QString::fromStdString(curRes.getEndDateTime())));
- m_model->setItem(i,4,new QStandardItem(QString::fromLocal8Bit(curRes.getPermissonType().c_str())));
-
- }
-
- ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
- ui->tableView->verticalHeader()->hide();
QStringList lable;
@@ -60,11 +34,22 @@
m_model->setHorizontalHeaderLabels(lable);
+ ui->tableView->setModel(m_model);
+ ui->tableView->verticalHeader()->hide();
+
+ connect(this,SIGNAL(sendUserNo(PmsQueryResult)),dia,SLOT(recvUserNo(PmsQueryResult)));
+ connect(clientSocket,SIGNAL(notifyDateChange(vector<PmsQueryResult>)),this,SLOT(renderItemData(vector<PmsQueryResult>)));
+ connect(m_model,SIGNAL(itemChanged(QStandardItem*)),this,SLOT(listenItemChange(QStandardItem*)));
+
+
+ // 鍙戜竴娆℃煡璇㈠叏閮ㄦ暟鎹姹�
+ clientSocket->queryAllUserAboutUser();
+
+
+
+
QComBoxDelegate * qc = new QComBoxDelegate(this);
-
-
-
- ui->tableView->setItemDelegateForColumn(4,qc);
+ ui->tableView->setItemDelegateForColumn(5,qc);
m = new QMenu(this);
@@ -82,17 +67,13 @@
connect(ac1,&QAction::triggered,[=]{
int row = ui->tableView->currentIndex().row();
qDebug() << "鏇存柊褰撳墠鍛樺伐淇℃伅"
- << QString::fromStdString( globalPms[row].getUserNo());
+ << globalPms[row].getUserNo();
// 鍙戦�佸憳宸ョ紪鍙蜂俊鎭�
emit sendUserNo(globalPms[row]);
dia->setModal(true);
dia->show();
});
-
-
- connect(m_model,SIGNAL(itemChanged(QStandardItem*)),this,SLOT(listenItemChange(QStandardItem*)));
-
}
@@ -123,44 +104,50 @@
void PermissonWindow::on_pushButton_clicked()
{
- qDebug() << "鍙戦�佹煡璇㈣姹�";
+
PmsParam pm;
- pm.setName(ui->lineEdit->text().toStdString());
- pm.setPermissonType(ui->lineEdit_2->text().toStdString());
- pm.setUserNo(ui->lineEdit_3->text().toStdString());
+ pm.setName(ui->lineEdit->text());
+ pm.setPermissonType(ui->lineEdit_2->text());
+ pm.setUserNo(ui->lineEdit_3->text());
clientSocket->queryPmsByParam(pm);
- qDebug() << "鏌ヨ涓�";
}
void PermissonWindow::listenItemChange(QStandardItem *item)
{
- QString localText = item->text();
- if(roleMap.count(localText.toStdString())){
- qDebug() << "鍙戣捣鑱屼綅鏇存柊璇锋眰";
+ if(item->column()==m_model->columnCount()-1){
+ QString localText = item->text();
+
PmsPlusParma pm;
- pm.setPermissonType(localText.toStdString());
- pm.setRoleId(roleMap[localText.toStdString()]);
+ pm.setPermissonType(localText);
+
+ int id = globalPms[item->row()].getId();
+ pm.setId(id);
clientSocket->updatePmsByParam(pm);
}
}
void PermissonWindow::renderItemData(vector<PmsQueryResult> res)
{
+
globalPms = res;
m_model->setRowCount(globalPms.size());
for(int i=0;i<m_model->rowCount();i++){
PmsQueryResult curRes = globalPms[i];
- m_model->setItem(i,0,new QStandardItem(QString::fromStdString(curRes.getUserNo())));
- m_model->setItem(i,1,new QStandardItem(QString::fromLocal8Bit(curRes.getName().c_str())));
- m_model->setItem(i,2,new QStandardItem(QString::fromStdString(curRes.getStartDateTime())));
- m_model->setItem(i,3,new QStandardItem(QString::fromStdString(curRes.getEndDateTime())));
- m_model->setItem(i,4,new QStandardItem(QString::fromLocal8Bit(curRes.getPermissonType().c_str())));
+ m_model->setItem(i,0,new QStandardItem(curRes.getUserNo()));
+ m_model->setItem(i,1,new QStandardItem(curRes.getName()));
+ m_model->setItem(i,2,new QStandardItem(QString::fromStdString(curRes.getDepartment())));
+ m_model->setItem(i,3,new QStandardItem(QString::fromStdString(curRes.getLoginTime())));
+ m_model->setItem(i,4,new QStandardItem(QString::fromStdString(curRes.getRegisterTime())));
+ m_model->blockSignals(true);
+ m_model->setItem(i,5,new QStandardItem(curRes.getPermissonType()));
+ m_model->blockSignals(false);
}
ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+
qDebug() << "鏌ヨ鍒扮殑鏁伴噺 " << globalPms.size();
}
--
Gitblit v1.8.0