Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-09-03 84fdebf3b5703202340bcd9afb5a0ec58b5439d5

 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;
                                             }