add：内管报禁管理添加公司名称

controllers/Warning.go

@@ -181,6 +181,7 @@ func (c *DeviceController) DeviceWarning_List2() {
 	}
 	// 管理员界面
 	if T_admin == 1 {
+		Account.Read_Company_All_Maps()
 		// 获取最新 获取绑定的sn 如果未绑定则获取全部
 		r_jsons.Data, r_jsons.Num = Warning.Gorm_Read_Admin_Warning_List(*c.Admin_r, tpList, T_name, T_handle, Time_start, Time_end, T_abandon, abandonSN, page, page_z, countRedisKey)
 		c.Data["json"] = lib.JSONS{Code: 200, Msg: "ok!", Data: r_jsons}

models/Warning/Warning.go

@@ -71,6 +71,7 @@ func (u *Warning) TableIndex() [][]string {
 type Warning_R struct {
 	Id         int64
 	T_pid      int      // Account.Company 绑定公司
+	T_pid_name string   // Account.Company 公司名称
 	T_tp       int      // 报警类型   ->WarningList
 	T_tp_name  string   // 报警类型名称
 	T_sn       string   // 设备序列号
@@ -261,6 +262,33 @@ func WarningToWarning_R(T_history int, t Warning) (r Warning_R) {
 	r.UpdateTime = t.UpdateTime.Format("2006-01-02 15:04:05")
 	return r
 }
+func WarningToAdminWarning_R(T_history int, t Warning) (r Warning_R) {
+	r.Id = t.Id
+	r.T_pid = t.T_pid
+	r.T_pid_name = Account.Read_Company_Get(t.T_pid)
+	r.T_tp = t.T_tp
+	r.T_tp_name = Read_WarningType_Get(t.T_tp)
+	r.T_sn = t.T_sn
+	r.T_D_name = t.T_D_name
+	r.T_id = t.T_id
+	r.T_DS_name = t.T_DS_name
+	r.T_Remark = t.T_Remark
+	r.T_Ut = t.T_Ut.Format("2006-01-02 15:04:05")
+	if !t.T_fUt.IsZero() {
+		r.T_fUt = t.T_fUt.Format("2006-01-02 15:04:05")
+	}
+	r.T_Text = t.T_Text
+	if len(t.T_Log) > 0 {
+		r.T_Log = strings.Split(strings.TrimRight(t.T_Log, "\n"), "\n")
+	}
+
+	r.T_Msid = t.T_Msid
+	r.T_State = t.T_State
+	r.T_history = T_history
+	r.CreateTime = t.CreateTime.Format("2006-01-02 15:04:05")
+	r.UpdateTime = t.UpdateTime.Format("2006-01-02 15:04:05")
+	return r
+}
 func WarningToCompanyWarning_R(T_history int, t Warning) (r CompanyWarning_R) {
 	r.Id = t.Id
 	r.T_pid = t.T_pid
@@ -1351,6 +1379,7 @@ func Gorm_Read_Warning_List(T_pid int, bindSN, tpList []string, T_name string, T
 		}
 		remaining = 0
 	}
+
 	for _, v := range warnings {
 		r = append(r, WarningToWarning_R(0, v))
 	}
@@ -1499,7 +1528,7 @@ func Gorm_Read_Admin_Warning_List(admin Account.Admin, T_tp []string, T_name str
 			warnings = append(warnings, tableWarning...)
 		}
 		for _, v := range warnings {
-			r = append(r, WarningToWarning_R(0, v))
+			r = append(r, WarningToAdminWarning_R(0, v))
 		}
 		return r, cnt
 	}
@@ -1526,7 +1555,7 @@ func Gorm_Read_Admin_Warning_List(admin Account.Admin, T_tp []string, T_name str
 		remaining = 0
 	}
 	for _, v := range warnings {
-		r = append(r, WarningToWarning_R(0, v))
+		r = append(r, WarningToAdminWarning_R(0, v))
 	}
 	return r, cnt
 }