From b95d1a4750cbdde891b487dac7ddf80d0b11952c Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Mon, 29 Jul 2024 11:19:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=8A=A5=E5=91=8A=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/js/samples/samplesMge.js |  14 +-
 .../resources/static/js/tools/toolsMge.js     | 120 +++++++++++++++---
 .../static/pages/tools/toolsMge.html          |   8 ++
 3 files changed, 120 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/static/js/samples/samplesMge.js b/src/main/resources/static/js/samples/samplesMge.js
index c59b79f..11a1d5e 100644
--- a/src/main/resources/static/js/samples/samplesMge.js
+++ b/src/main/resources/static/js/samples/samplesMge.js
@@ -98,22 +98,22 @@ function initTable(dataList, limit, page) {
                     }
                 },
                 {field: "customName", width:260,title: "送样单位", unresize: true, align: "center", templet: function (d) {
-                        return `<div class="ellipsis"" title="${d.customName}">${d.customName}</div>`;
+                        return `<div class="ellipsis" title="${d.customName}">${d.customName}</div>`;
                     }},
                 {field: "sampleUser", width:150,title: "送样人", unresize: true, align: "center", templet: function (d) {
-                        return `<div class="ellipsis"" title="${d.sampleUser}">${d.sampleUser}</div>`;
+                        return `<div class="ellipsis" title="${d.sampleUser}">${d.sampleUser}</div>`;
                     }},
                 {field: "sampleTime", width:210,title: "送样时间", unresize: true, align: "center", templet: function (d) {
-                        return `<div class="ellipsis"" title="${d.sampleTime}">${d.sampleTime}</div>`;
+                        return `<div class="ellipsis" title="${d.sampleTime}">${d.sampleTime}</div>`;
                     }},
                 {field: "sampleTools", width:280,title: "送样设备", unresize: true, align: "center", templet: function (d) {
-                        return `<div class="ellipsis"" title="${d.sampleTools}">${d.sampleTools}</div>`;
+                        return `<div class="ellipsis" title="${d.sampleTools}">${d.sampleTools}</div>`;
                     }},
                 {field: "collectSamplesUser", width:140,title: "收样人", unresize: true, align: "center", templet: function (d) {
-                        return `<div class="ellipsis"" title="${d.collectSamplesUser}">${d.collectSamplesUser}</div>`;
+                        return `<div class="ellipsis" title="${d.collectSamplesUser}">${d.collectSamplesUser}</div>`;
                     }},
                 {field: "collectSamplesTime", width:210,title: "收样时间", unresize: true, align: "center", templet: function (d) {
-                        return `<div class="ellipsis"" title="${d.collectSamplesTime}">${d.collectSamplesTime}</div>`;
+                        return `<div class="ellipsis" title="${d.collectSamplesTime}">${d.collectSamplesTime}</div>`;
                     }},
                 {
                     field: "teamName", width:210,title: "试验班组", unresize: true, align: "center", templet: function (d) {
@@ -121,7 +121,7 @@ function initTable(dataList, limit, page) {
                         if (d.teamName == null) {
                             view = "<a style='cursor:pointer; background: #F2F3FF;'>未派工</a>";
                         } else {
-                            view = `<a class="ellipsis"' title="${d.teamName}">${d.teamName}</a>`;
+                            view = `<a class="ellipsis" title="${d.teamName}">${d.teamName}</a>`;
                         }
                         return view;
                     }
diff --git a/src/main/resources/static/js/tools/toolsMge.js b/src/main/resources/static/js/tools/toolsMge.js
index c2a9a14..8bd4997 100644
--- a/src/main/resources/static/js/tools/toolsMge.js
+++ b/src/main/resources/static/js/tools/toolsMge.js
@@ -74,7 +74,7 @@ function laypages(total, page, limit) {
 
 /*初始化表格*/
 function initTable(dataList, limit, page) {
-    let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+    let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0});
     tableIns = table.render({
         elem: "#table_data",
         height: "full-130",
@@ -89,24 +89,114 @@ function initTable(dataList, limit, page) {
                         return (page - 1) * limit + d.LAY_INDEX;
                     }
                 },
-                {field: "sampleTools", width:155,title: "设备类型", unresize: true, align: "center"},
-                {field: "devCode", width:150,title: "设备编号", unresize: true, align: "center"},
-                {field: "customerCode", width:150,title: "设备编码", unresize: true, align: "center"},
-                {field: "devModule", width:150,title: "设备规格", unresize: true, align: "center"},
-                {field: "customName", width:175,title: "送样单位", unresize: true, align: "center"},
-                {field: "sampleDepartment", width:170,title: "送样部门", unresize: true, align: "center"},
-                {field: "manufactureDate", width:150,title: "生产日期", unresize: true, align: "center"},
-                {field: "experTime", width:150,title: "试验日期", unresize: true, align: "center"},
-                {field: "experConclu", width:120,title: "试验结果", unresize: true, align: "center"},
                 {
-                    field: "certificate", title: "合格证",width:90, unresize: true, align: "center", templet: function (d) {
-                        console.log("d",d.id);
-                        return '<a href="#" style="color: blue;" onclick="handleClick1(\'' + d.submitLocation + '\',\'' + d.sampleTools + '\',\'' + d.devModule + '\',\'' + d.devCode + '\',\'' + d.experTime + '\',\'' + d.nextExperTime + '\',\'' + d.experUser + '\',\'' + d.experConclu + '\',\'' + d.customName + '\')">查看</a>';
+                    field: "sampleTools",
+                    width: 155,
+                    title: "设备类型",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.sampleTools}">${d.sampleTools}</div>`;
                     }
                 },
                 {
-                    field: "qrCode", title: "二维码", width: 90, unresize: true, align: "center", templet: function (d) {
-                        return '<a href="#" style="color: blue;" onclick="handleClick2(\'' + d.submitLocation + '\',\'' + d.sampleTools + '\',\'' + d.devModule + '\',\'' + d.devCode + '\',\'' + d.experTime + '\',\'' + d.nextExperTime + '\',\'' + d.experUser + '\',\'' + d.experConclu + '\',\'' + d.customName + '\')">打印</a>';
+                    field: "devCode",
+                    width: 150,
+                    title: "设备编号",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.devCode}">${d.devCode}</div>`;
+                    }
+                },
+                {
+                    field: "customerCode",
+                    width: 150,
+                    title: "设备编码",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.customerCode}">${d.customerCode}</div>`;
+                    }
+                },
+                {
+                    field: "devModule",
+                    width: 150,
+                    title: "设备规格",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.devModule}">${d.devModule}</div>`;
+                    }
+                },
+                {
+                    field: "customName",
+                    width: 175,
+                    title: "送样单位",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.customName}">${d.customName}</div>`;
+                    }
+                },
+                {
+                    field: "sampleDepartment",
+                    width: 170,
+                    title: "送样部门",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.sampleDepartment}">${d.sampleDepartment}</div>`;
+                    }
+                },
+                {
+                    field: "manufactureDate",
+                    width: 150,
+                    title: "生产日期",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.manufactureDate}">${d.manufactureDate}</div>`;
+                    }
+                },
+                {
+                    field: "experTime",
+                    width: 150,
+                    title: "试验日期",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.experTime}">${d.experTime}</div>`;
+                    }
+                },
+                {
+                    field: "experConclu",
+                    width: 120,
+                    title: "试验结果",
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<div class="ellipsis" title="${d.experConclu}">${d.experConclu}</div>`;
+                    }
+                },
+                {
+                    field: "certificate",
+                    title: "合格证",
+                    width: 90,
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<a href="#" style="color: blue;" onclick="handleClick1('${d.submitLocation}','${d.sampleTools}','${d.devModule}','${d.devCode}','${d.experTime}','${d.nextExperTime}','${d.experUser}','${d.experConclu}','${d.customName}')">查看</a>`;
+                    }
+                },
+                {
+                    field: "qrCode",
+                    title: "二维码",
+                    width: 90,
+                    unresize: true,
+                    align: "center",
+                    templet: function (d) {
+                        return `<a href="#" style="color: blue;" onclick="handleClick2('${d.submitLocation}','${d.sampleTools}','${d.devModule}','${d.devCode}','${d.experTime}','${d.nextExperTime}','${d.experUser}','${d.experConclu}','${d.customName}')">打印</a>`;
                     }
                 },
             ],
diff --git a/src/main/resources/static/pages/tools/toolsMge.html b/src/main/resources/static/pages/tools/toolsMge.html
index 50b9723..45f2ad8 100644
--- a/src/main/resources/static/pages/tools/toolsMge.html
+++ b/src/main/resources/static/pages/tools/toolsMge.html
@@ -106,6 +106,14 @@
     #qr-canvas {
         display: none;
     }
+
+    .ellipsis {
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        max-width: 150px; /* 根据需要调整宽度 */
+        display: block;
+    }
 </style>
 
 <script src="../../js/tools/toolsMge.js" charset="UTF-8" type="text/javascript"></script>