From 8624aaf95a57e2be761d99edd5400e3a7e64a458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 14:42:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 28 +++++++++---------- .../modules/courses/shixunHomework/style.css | 8 ++++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 855f860ef..460799d97 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -100,32 +100,32 @@ class Listofworksstudentone extends Component { key: 'number', align: "center", className: 'font-14', - width: '100px', + width: '90px', render: (text, record) => ( - + {record.number === undefined ? -- : record.number === "" ? -- : record.number === "--" ? -- : {record.number} } @@ -183,31 +183,31 @@ class Listofworksstudentone extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: "center", - className: 'font-14 maxnamewidth145', - width: '145px', + className: 'font-14 maxnamewidth120', + width: '120px', render: (text, record) => ( - {record.stduynumber === undefined ? -- : record.stduynumber === null ? -- : record.stduynumber === "" ? -- : @@ -217,7 +217,7 @@ class Listofworksstudentone extends Component { style={{ color: '#000', textAlign: "center", - width: '145px', + width: '120px', }}>{ record.stduynumber } diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css index 657ebded0..3129b640e 100644 --- a/public/react/src/modules/courses/shixunHomework/style.css +++ b/public/react/src/modules/courses/shixunHomework/style.css @@ -73,6 +73,14 @@ white-space:nowrap; cursor: default; } + +.maxnamewidth120{ + max-width: 120px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + cursor: default; +} .maxnamewidth145{ max-width: 145px; overflow:hidden; From a7a4e56fb0551932de9b6da3a5f47484b46930ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 14:51:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Listofworksstudentone.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 17adb5bd3..fa9aa17a5 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -226,9 +226,7 @@ class Listofworksstudentone extends Component { record.stduynumber } - } - ), },