From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index 69ca945..b68f175 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -64,35 +64,48 @@
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
- ActionEntity actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "Print";
- actionEntity2.PageIco = "fa fa-print";
- actionEntity2.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "Print";
+ //actionEntity2.PageIco = "fa fa-print";
+ //actionEntity2.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity2);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Zhuanyi";
- actionEntity3.PageIco = "fa fa-plus";
- actionEntity3.ActionName = "鏁版嵁杞Щ";
- actionlist.Add(actionEntity3);
-
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Zhuanyi";
+ //actionEntity3.PageIco = "fa fa-plus";
+ //actionEntity3.ActionName = "鏁版嵁杞Щ";
+ //actionlist.Add(actionEntity3);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ExpertTestTopic/Index");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
ViewData["ActionInfo"] = actionlist;
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
@@ -140,6 +153,11 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ExpertTestTopic/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
var expertTestTopicanwserDTOs = new List<ExpertTestTopicanwserDTO>();
var expertTestTopicjiexiDTOs = new List<ExpertTestTopicjiexiDTO>();
@@ -299,8 +317,6 @@
ViewBag.Area = areaDTOs;
-
- List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ExpertTestTopic/Index");
ViewData["pageEntities"] = pageEntities;
--
Gitblit v1.9.1