代码上传

controllers/DeviceController.go

@@ -331,7 +331,7 @@ func (c *DeviceController) DeviceWarning_List_html() {
 	}
 	json.Unmarshal(c.Ctx.Input.RequestBody, &pageSizes)
 
-	pageSize := c.GetString("pageSize", "10")
+	pageSize := c.GetString("pageSize", "100")
 	pageSizeInt, _ := strconv.Atoi(pageSize)
 	atoi, _ := strconv.Atoi(pageSizes.PageSize)
 	if atoi == 0 {

lastupdate.tmp

@@ -1 +1 @@
-{"E:\\WebstormProjects\\ColdP_server\\controllers":1718637940538532800}
+{"E:\\WebstormProjects\\ColdP_server\\controllers":1718675572899298200}

logs/logx/logx.log

@@ -176,3 +176,10 @@
 2024/06/17 22:33:28.712 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
 2024/06/17 22:50:45.648 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
 2024/06/17 23:24:14.910 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/17 23:26:04.804 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/18 09:05:24.955 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/18 09:23:39.967 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/18 09:28:24.132 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/18 09:31:51.570 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/18 09:33:13.200 [I] [WarningType.go:193]  =========== 初始化报警类型 =========
+2024/06/18 09:54:02.534 [I] [WarningType.go:193]  =========== 初始化报警类型 =========

models/Warning/Warning.go

@@ -8,6 +8,7 @@ import (
 	"github.com/beego/beego/v2/adapter/orm"
 	orm2 "github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
+	"log"
 	"strconv"
 	"strings"
 	"time"
@@ -321,6 +322,30 @@ func Update_DeviceParameter_Warning(columnName, newValue, rowId, T_Ut string) {
 	}
 	now := time.Now()
 	interval := now.Sub(parse)
+	if columnName == "t__d_name,t_sn" {
+		splits := strings.Split(columnName, ",")
+		Value := strings.Split(newValue, "，")
+		log.Printf(splits[0], splits[1], Value[0], Value[1])
+		if interval.Hours() > 40*24 {
+			o.Raw("UPDATE "+Wtab+" SET `"+splits[0]+"` = ?, `"+splits[1]+"` = ? WHERE `ID` = ?", Value[0], Value[1], rowId).Exec()
+		} else {
+			o.Raw("UPDATE "+Wtab+" SET `"+splits[0]+"` = ?, `"+splits[1]+"` = ? WHERE `ID` = ?", Value[0], Value[1], rowId).Exec()
+			o.Raw("UPDATE warning SET `"+splits[0]+"` = ?,`"+splits[1]+"`=? WHERE `ID` = ?", Value[0], Value[1], rowId).Exec()
+		}
+		return
+	}
+	if columnName == "t__d_s_name,t_id" {
+		splits := strings.Split(columnName, ",")
+		Value := strings.Split(newValue, "，")
+		log.Printf(splits[0], splits[1], Value[0], Value[1])
+		if interval.Hours() > 40*24 {
+			o.Raw("UPDATE "+Wtab+" SET `"+splits[0]+"` = ?, `"+splits[1]+"` = ? WHERE `ID` = ?", Value[0], Value[1], rowId).Exec()
+		} else {
+			o.Raw("UPDATE "+Wtab+" SET `"+splits[0]+"` = ?, `"+splits[1]+"` = ? WHERE `ID` = ?", Value[0], Value[1], rowId).Exec()
+			o.Raw("UPDATE warning SET `"+splits[0]+"` = ?,`"+splits[1]+"`=? WHERE `ID` = ?", Value[0], Value[1], rowId).Exec()
+		}
+		return
+	}
 	if interval.Hours() > 40*24 {
 		o.Raw("UPDATE "+Wtab+" SET `"+columnName+"` = ? WHERE `ID` = ?", newValue, rowId).Exec()
 	} else {

views/Device/DeviceWarning.html

@@ -76,8 +76,8 @@
 
                             <td type="text" name="T_tp_name">{{$elem.T_tp_name}}
                             </td>
-                            <td name="t__d_name,t_sn" sn="{{$elem.T_sn}}">{{$elem.T_D_name}}【{{$elem.T_sn}}】</td>
-                            <td name="t__d_s_name,t_id" t_id="{{$elem.T_id}}">{{$elem.T_DS_name}} 【{{$elem.T_id}}】</td>
+                            <td name="t__d_name,t_sn" sn="{{$elem.T_sn}}">{{$elem.T_D_name}}，{{$elem.T_sn}}</td>
+                            <td name="t__d_s_name,t_id" t_id="{{$elem.T_id}}">{{$elem.T_DS_name}}，{{$elem.T_id}}</td>
                             <td name="t__remark">{{$elem.T_Remark}}</td>
 
                             <td name="t__state">
@@ -120,10 +120,10 @@
                         </div>
                         <div class="layui-card-body ">
                             <select id="pageSizeSelector">
-                                <option value="10">10 条/页</option>
-                                <option value="20">20 条/页</option>
-                                <option value="50">50 条/页</option>
                                 <option value="100">100 条/页</option>
+                                <option value="200">200 条/页</option>
+                                <option value="500">500 条/页</option>
+                                <option value="1000">1000 条/页</option>
                             </select>
                             <div class="page">
                                 <div>
@@ -191,7 +191,10 @@
             var href = links[i].getAttribute('href');
             href = href.replace(/pageSize\s*=\s*\d+/, 'pageSize=' + encodeURIComponent(pageSize)); // 替换pageSize参数
             links[i].setAttribute('href', href+"&pageSize="+pageSize);
+            // window.location.href = links[0].href;
+
         }
+        console.log("Updated link:", links[0].href);
     }
     // 新增函数：向后端发送pageSize
     function sendPageSizeToBackend(pageSize) {
@@ -416,7 +419,7 @@
                         console.log(response);
                         if(response.Code === 200){
                             layer.msg('更新成功!', {icon: 1, time: 2000});
-                            location.reload()
+                            // location.reload()
                         } else {
                             layer.msg('更新失败，请重试!', {icon: 5, time: 2000});
                         }