隐藏的菜单不显示

services/schedule/Schedule_test.go

@@ -62,7 +62,7 @@ func TestScheduler(t *testing.T) {
 	schedeng.Tmsrv.StartDate = startDate
 	schedeng.Tmsrv.EndDate = endDate
 	// 指定加载的产线类型
-	worklineid = "RB"
+	worklineid = "G-Frame Assy"
 	fmt.Println(worklineid)
 	// 加载激活的项目主数据
 	err = schedeng.LoadProjectData()
@@ -94,7 +94,7 @@ func TestScheduler(t *testing.T) {
 	fmt.Println()
 	fmt.Printf("LoadWorklineData:%v", schedeng.WorklineDict)
 	fmt.Println()
-	fmt.Printf("RB:%v", schedeng.WorklineDict["RB"])
+	fmt.Printf("G-Frame Assy:%v", schedeng.WorklineDict["G-Frame Assy"])
 	// 加载产线班组计划出勤数据
 	err = schedeng.LoadWorkLineWorkShiftData()
 	if err != nil {
@@ -103,18 +103,18 @@ func TestScheduler(t *testing.T) {
 	fmt.Println()
 	fmt.Printf("LoadWorkLineWorkShiftData:%v", schedeng.WorklineDict)
 	fmt.Println()
-	fmt.Printf("RB:%v", schedeng.WorklineDict["RB"])
+	fmt.Printf("G-Frame Assy:%v", schedeng.WorklineDict["G-Frame Assy"])
 	// 生成产线的时间曲线
 	err = schedeng.GenerateWorkLineTimeCurve()
 	if err != nil {
 		t.Error(err.Error())
 	}
 	fmt.Println()
-	fmt.Printf("DayModelArray:%v", schedeng.WorklineDict["RB"].DayModelArray)
+	fmt.Printf("DayModelArray:%v", schedeng.WorklineDict["G-Frame Assy"].DayModelArray)
 	fmt.Println()
-	fmt.Printf("TimeLineArray:%v", schedeng.WorklineDict["RB"].TimeCurve.TimeLineArray)
+	fmt.Printf("TimeLineArray:%v", schedeng.WorklineDict["G-Frame Assy"].TimeCurve.TimeLineArray)
 	fmt.Println()
-	fmt.Printf("SchedTimeCurve:%v", schedeng.WorklineDict["RB"].SchedTimeCurve)
+	fmt.Printf("SchedTimeCurve:%v", schedeng.WorklineDict["G-Frame Assy"].SchedTimeCurve)
 	// 加载工单数据（调度任务）
 	err = schedeng.LoadSchedTaskData(worklineid)
 	if err != nil {
@@ -132,22 +132,22 @@ func TestScheduler(t *testing.T) {
 	}
 
 	fmt.Printf("WorkShiftDict:%v", schedeng.WorklineDict)
-	fmt.Println("RB")
-	fmt.Printf("RB Task:%v", schedeng.WorklineDict["RB"].SchedTaskArray)
+	fmt.Println("G-Frame Assy")
+	fmt.Printf("G-Frame Assy Task:%v", schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray)
 	fmt.Println()
-	fmt.Printf("RB TimeCurve:%v", schedeng.WorklineDict["RB"].TimeCurve)
+	fmt.Printf("G-Frame Assy TimeCurve:%v", schedeng.WorklineDict["G-Frame Assy"].TimeCurve)
 	fmt.Println()
-	fmt.Printf("RB SchedTimeCurve:%v", schedeng.WorklineDict["RB"].SchedTimeCurve)
+	fmt.Printf("G-Frame Assy SchedTimeCurve:%v", schedeng.WorklineDict["G-Frame Assy"].SchedTimeCurve)
 	fmt.Println()
-	fmt.Printf("RB WorkLoadArray:%v", schedeng.WorklineDict["RB"].WorkLoadArray)
+	fmt.Printf("G-Frame Assy WorkLoadArray:%v", schedeng.WorklineDict["G-Frame Assy"].WorkLoadArray)
 	fmt.Println()
 	// 排程任务
 	fmt.Println("排程任务：")
-	for i := 0; i < len(schedeng.WorklineDict["RB"].SchedTaskArray); i++ {
+	for i := 0; i < len(schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray); i++ {
 		fmt.Println(i, " -- ", fmt.Sprintf("生产订单：%s 计划产线：%s 计划开始时间：%v 计划结束时间：%v ,间隔时间：%v ",
-			schedeng.WorklineDict["RB"].SchedTaskArray[i].TaskId, schedeng.WorklineDict["RB"].SchedTaskArray[i].SchedResId,
-			schedeng.WorklineDict["RB"].SchedTaskArray[i].SchedStartTime, schedeng.WorklineDict["RB"].SchedTaskArray[i].SchedEndTime,
-			schedeng.WorklineDict["RB"].SchedTaskArray[i].Duration))
+			schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray[i].TaskId, schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray[i].SchedResId,
+			schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray[i].SchedStartTime, schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray[i].SchedEndTime,
+			schedeng.WorklineDict["G-Frame Assy"].SchedTaskArray[i].Duration))
 	}
 	fmt.Println()
 	// 输出排程结果

web/models/menu_model.go

@@ -106,7 +106,7 @@ func (t *Menu) Clipped() {
 //根据菜单id，查询菜单
 func (t *Menu) GetByMenuId() (Menu Menu, err error) {
 	e := db.Eloquent.Master()
-	_, err = e.Table(t.TableName()).Where("menu_id = ?", t.MenuId).Get(&Menu)
+	_, err = e.Table(t.TableName()).Where("menu_id = ? and visible = 0", t.MenuId).Get(&Menu)
 	if err != nil {
 		return
 	}
@@ -183,7 +183,7 @@ func (t *Menu) SetMenuRole(rolename string) (m []Menu, err error) {
 func (t *Menu) GetByRoleName(rolename string) []Menu {
 	menus := make([]Menu, 0)
 	e := db.Eloquent.Master()
-	err := e.SQL("select menu.* from menu left join role_menu on role_menu.menu_id=menu.menu_id where role_menu.role_name=? and menu_type in ('M','C')", rolename).Find(&menus)
+	err := e.SQL("select menu.* from menu left join role_menu on role_menu.menu_id=menu.menu_id where role_menu.role_name=? and menu.menu_type in ('M','C') and menu.visible = 0", rolename).Find(&menus)
 	if err != nil {
 		return nil
 	}
@@ -247,7 +247,7 @@ func (t *MenuRole) Get() (Menus []MenuRole, err error) {
 
 func (t *Menu) Get() (Menus []Menu, err error) {
 	e := db.Eloquent.Master()
-	table := e.Table(t.TableName()).Where("1=1")
+	table := e.Table(t.TableName()).Where("1=1").And("menu.visible = ?",0)
 	if t.MenuName != "" {
 		table = table.And("menu_name = ?", t.MenuName)
 	}
@@ -269,16 +269,13 @@ func (t *Menu) Get() (Menus []Menu, err error) {
 
 func (t *Menu) GetPage() (Menus []Menu, err error) {
 	e := db.Eloquent.Master()
-	table := e.Table(t.TableName()).Where("1=1")
+	table := e.Table(t.TableName()).Where("1=1").And("visible = ?", 0)
 	if t.MenuName != "" {
 		table = table.And("menu_name = ?", t.MenuName)
 	}
 	if t.Title != "" {
 		table = table.And("title = ?", t.Title)
 	}
-	if t.Visible != "" {
-		table = table.And("visible = ?", t.Visible)
-	}
 
 	table = table.And("menu_type in ('M','C','F')")