tiaoz

lib/tasks/poll_publish.rake

@@ -83,7 +83,7 @@ namespace :poll_publish do
   end
 
   task :end => :environment do
-
+    puts "--------------------------------poll_publish end start"
     #1.统一设置的截止
     polls = Poll.includes(:poll_users).where("polls_status = 2 AND end_time <=?",Time.now + 900)
     polls.each do |poll|

public/react/src/common/DateUtil.js

@@ -1,46 +1,69 @@
-import moment  from "moment";
+import moment  from "moment";
-
+
-// 处理整点 半点
+// 处理整点 半点
-// 取传入时间往后的第一个半点
+// 取传入时间往后的第一个半点
-export function handleDateString(dateString) {
+export function handleDateString(dateString) {
-  if (!dateString) return dateString;
+  if (!dateString) return dateString;
-  const ar = dateString.split(':')
+  const ar = dateString.split(':')
-  if (ar[1] == '00' || ar[1] == '30') {
+  if (ar[1] == '00' || ar[1] == '30') {
-    return dateString
+    return dateString
-  }
+  }
-  const miniute = parseInt(ar[1]);
+  const miniute = parseInt(ar[1]);
-  if (miniute < 30 || miniute == 60) {
+  if (miniute < 30 || miniute == 60) {
-    return [ar[0], '30'].join(':')
+    return [ar[0], '30'].join(':')
-  }
+  }
-  if (miniute < 60) { 
+  if (miniute < 60) { 
-    // 加一个小时
+    // 加一个小时
-    const tempStr = [ar[0], '00'].join(':');
+    const tempStr = [ar[0], '00'].join(':');
-    const format = "YYYY-MM-DD HH:mm";
+    const format = "YYYY-MM-DD HH:mm";
-    const _moment = moment(tempStr, format)
+    const _moment = moment(tempStr, format)
-    _moment.add(1, 'hours')
+    _moment.add(1, 'hours')
-    return _moment.format(format)
+    return _moment.format(format)
-  }
+  }
-  
+  
-  return dateString
+  return dateString
-}
+}
-
+
-// 给moment对象取下一个半点或整点
+// 给moment对象取下一个半点或整点
-export function getNextHalfHourOfMoment(moment) {
+export function getNextHalfHourOfMoment(moment) {
-  if (!moment) {
+  if (!moment) {
-    return moment
+    return moment
-  }
+  }
-  const minutes = moment.minutes()
+  const minutes = moment.minutes()
-  if (minutes < 30) {
+  if (minutes < 30) {
-    moment.minutes(30)
+    moment.minutes(30)
-  } else if (minutes < 60) {
+  } else if (minutes < 60) {
-    moment.minutes(0).add(1, 'hours')
+    moment.minutes(0).add(1, 'hours')
-  }
+  }
-  return moment
+  return moment
-}
+}
-
+
-export function formatDuring(mss){
+export function formatDuring(mss){
-  var days = parseInt(mss / (1000 * 60 * 60 * 24));
+  var days = parseInt(mss / (1000 * 60 * 60 * 24));
-  var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+  var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-  var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
+  var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
-  return days + "天" + hours + "小时" + minutes + "分";
+	// console.log("formatDuringformatDuring");
+	// console.log(days);
+	// console.log(hours);
+	// console.log(minutes);
+	// console.log(Math.abs(days));
+	// console.log(Math.abs(hours));
+	// console.log(Math.abs(minutes));
+
+	try {
+		days = Math.abs(days);
+	} catch (e) {
+
+	}
+	try {
+		hours = Math.abs(hours);
+	} catch (e) {
+
+	}
+	try {
+		minutes = Math.abs(minutes);
+	} catch (e) {
+
+	}
+  return days + "天" + hours + "小时" + minutes + "分";
 }

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js

@@ -91,13 +91,13 @@ class CompetitionContents extends Component{
 				title: 'username',
 				dataIndex: 'username',
 				key: 'username',
-				render: text => <a>{text}</a>,
+				render: text => <a title={text}>{text}</a>,
 			},
 			{
 				title: 'school',
 				dataIndex: 'school',
 				key: 'school',
-				render: text => <a>{text}</a>,
+				render: text => <a title={text}>{text}</a>,
 			},
 			{
 				title: 'spendtime',
@@ -316,9 +316,23 @@ class CompetitionContents extends Component{
 					<style>
 						{
 							`
-							.ant-table-tbody > tr > td:nth-last-child(3) a{
+							 .ant-table-tbody > tr > td:nth-last-child(4){
-							   	 width: 300px;
+									line-height: 63px;
-   								 display: inline-block;
+									width: 300px;
+									height: 96px;
+									display: inline-block;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap;
+							 }
+							.ant-table-tbody > tr > td:nth-last-child(3){
+				       	 line-height: 63px;
+									width: 305px;
+									height: 96px;
+									display: inline-block;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap;
 							 }
 							`
 						}

public/react/src/modules/courses/poll/PollDetailTabFirst.js

@@ -17,6 +17,21 @@ function formatDuring(mss){
   var days = parseInt(mss / (1000 * 60 * 60 * 24));
   var hours = parseInt((mss % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
   var minutes = parseInt((mss % (1000 * 60 * 60)) / (1000 * 60));
+  try {
+    days = Math.abs(days);
+  } catch (e) {
+
+  }
+  try {
+    hours = Math.abs(hours);
+  } catch (e) {
+
+  }
+  try {
+    minutes = Math.abs(minutes);
+  } catch (e) {
+
+  }
   return days + "天" + hours + "小时" + minutes + "分";
 }
 class PollDetailTabFirst extends Component{