From d9aa433581af4504e10da176bc3eecd7abf27707 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 30 八月 2024 15:11:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/home/console.html | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html
index ffb10e7..5510b29 100644
--- a/WebTM/views/home/console.html
+++ b/WebTM/views/home/console.html
@@ -266,6 +266,8 @@
, table = layui.table
, form = layui.form
, element = layui.element
+ , tr = layui.tr
+ , td = layui.td
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
@@ -273,7 +275,7 @@
var $ = layui.jquery;
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�"];
+ var titleData = ["HItemID", "HInterID", "HEntryID", "HDeptID", "涓诲唴鐮�", "瀛愬唴鐮�", "鎺ユ敹浜�"];
//鐧诲綍骞冲彴(PC绔�佹墜鏈虹)
var HType = "PC";
@@ -409,12 +411,12 @@
switch (data[i].Type) {
//int
case 'DateTime':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 75 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'MM-dd')}}</div>", width: 100 });
break;
case 'String':
- if (data[i].id == '绱ф�ョ▼搴�') {
+ if (data[i].id == '鐘跺喌') {
col.push({
- field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 70
+ field: data[i].id, title: data[i].name, alert: 'center', sort: true, templet: "<div>{{d." + data[i].name + " == '0' ? '绱ф��': '鏅��'}}</div>", width: 80
});
break;
}
--
Gitblit v1.9.1