From 5e9b9b53a8a853365c29149871bd024c9ca0cbac Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 11 十二月 2025 11:26:27 +0800
Subject: [PATCH] 1.报告的删除功能；
---
SourceCode/Bond/Servo/CUserManager2.cpp | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CUserManager2.cpp b/SourceCode/Bond/Servo/CUserManager2.cpp
index 4f45e52..334333c 100644
--- a/SourceCode/Bond/Servo/CUserManager2.cpp
+++ b/SourceCode/Bond/Servo/CUserManager2.cpp
@@ -4,6 +4,7 @@
#include <vector>
#include <map>
#include <utility>
+#include <algorithm>
#include <sstream>
#include <cwchar>
@@ -66,14 +67,18 @@
bool hasAny = false;
for (auto& ln : SplitLines(buffer)) { if (!ln.empty()) { hasAny = true; break; } }
if (!hasAny) {
- const wchar_t* roles = L"Admin:100\nEngineer:50\nOperator:10\n";
+ const wchar_t* roles = L"Admin:100\nEE:80\nPE:50\nOperator:10\n";
(void)UX_SetRoleDefinitions(roles);
(void)UX_AddUser(L"admin", L"Administrator", L"admin123", L"Admin");
UX_DefineAction(L"start", L"鍚姩鏈哄彴", L"Operator");
UX_DefineAction(L"stop", L"鍋滄満", L"Operator");
- UX_DefineAction(L"recipe", L"缂栬緫閰嶆柟", L"Engineer");
+ UX_DefineAction(L"recipe", L"缂栬緫閰嶆柟", L"PE");
+ UX_DefineAction(L"delVarialbles", L"鍒犻櫎鍙橀噺", L"PE");
+ UX_DefineAction(L"addVarialbles", L"鏂板鍙橀噺", L"PE");
+ UX_DefineAction(L"editVarialbles", L"缂栬緫鍙橀噺", L"PE");
}
+ UX_DefineAction(L"delReports", L"鍒犻櫎Report", L"PE");
}
bool CUserManager2::login(const char* pszAccount, const char* pszPwd)
@@ -146,9 +151,15 @@
}
}
+ std::sort(roles.begin(), roles.end(), [](const RoleInfo& a, const RoleInfo& b) {
+ if (a.level == b.level) {
+ return a.name < b.name;
+ }
+ return a.level > b.level;
+ });
+
return roles;
}
-
std::vector<CUserManager2::UserInfo> CUserManager2::getUsers()
{
std::vector<UserInfo> users;
--
Gitblit v1.9.3