Merge remote-tracking branch 'origin/master'

src/main/java/com/bonus/aqgqj/basis/controller/DownLoadController.java

@@ -491,7 +491,7 @@ public class DownLoadController {
                 if (basisVos.size() == 1) {
                     sb.append("1、" + basisVo.getBasisName());
                 } else {
-                    sb.append(i + "、" + basisVo.getBasisName() + "\n");
+                    sb.append((i + 1) + "、" + basisVo.getBasisName() + "\n");
                 }
             }
         }

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 style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;" 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 style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;" 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 style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;" 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 style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;" 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 style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;" 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 style="text-overflow: ellipsis; overflow: hidden; white-space: nowrap;" 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 style='color: black; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;' title="${d.teamName}">${d.teamName}</a>`;
+                            view = `<a class="ellipsis"' title="${d.teamName}">${d.teamName}</a>`;
                         }
                         return view;
                     }