sbd-npm 1.5.47 → 1.5.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/snowball_tweet.js +1 -1
  3. package/status.js +11 -5
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sbd-npm",
3
- "version": "1.5.47",
3
+ "version": "1.5.48",
4
4
  "description": "Stock Big Data",
5
5
  "author": "DHQ <dhq314@gmail.com>",
6
6
  "license": "ISC",
package/snowball_tweet.js CHANGED
@@ -128,7 +128,7 @@ $(function () {
128
128
  });
129
129
  });
130
130
  ttsm_object.on('hidden.bs.modal', function () {
131
- $("#today_tweet_statistics_modal_body").html("");
131
+ // $("#today_tweet_statistics_modal_body").html("");
132
132
  Util.hide_tips();
133
133
  });
134
134
  }
package/status.js CHANGED
@@ -196,14 +196,20 @@ $(function () {
196
196
  let html = [], ip_num = 0;
197
197
  j.data.forEach(function (item) {
198
198
  ip_num++;
199
+ let is_trigger_block_ip = 0;
199
200
  if (item.type === 1) {
200
201
  html.push("<tr class='success'>");
201
202
  } else if (item.type === 2) {
202
203
  html.push("<tr class='danger'>");
203
204
  } else {
205
+ is_trigger_block_ip = 1;
204
206
  html.push("<tr>");
205
207
  }
206
- html.push("<td><a href='#' class='block_ip'>", ip_num, "</a></td>");
208
+ if (is_trigger_block_ip === 1) {
209
+ html.push("<td><a href='#' class='block_ip'>", ip_num, "</a></td>");
210
+ } else {
211
+ html.push("<td>", ip_num, "</td>");
212
+ }
207
213
  html.push("<td>", Util.pack_html_link(Status.ip_url(item.ip), item.ip), "</td>");
208
214
  html.push("<td>", Status.map_url(Status.convert_ip_address(item)), "</td>");
209
215
  html.push("<td>", item.times, "</td>");
@@ -665,11 +671,11 @@ $(function () {
665
671
  } else {
666
672
  Status.task_status = 0;
667
673
  if (j.code === 2) {
668
- let do_content = j.do_content ? ("(" + j.do_content + ")") : "";
669
- $("#task_tips").html("<b class='text-danger'>已添加新任务" + do_content + "在处理中！</b>");
674
+ $("#task_tips").html("<b class='text-danger'>已添加新任务" + (j.do_content ? ("(" + j.do_content + ")") : "") + "在处理中！</b>");
670
675
  } else if (j.code === 3) {
671
- let doing_content = j.doing_content ? ("(" + j.doing_content + ")") : "";
672
- $("#task_tips").html("<b class='text-danger'>有任务" + doing_content + "在执行中！</b>");
676
+ $("#task_tips").html("<b class='text-danger'>有任务" + (j.doing_content ? ("(" + j.doing_content + ")") : "") + "在执行中！</b>");
677
+ } else if (j.code === 4) {
678
+ $("#task_tips").html("<b class='text-danger'>任务 `" + (j.done_content ? j.done_content : "") + "` 已经执行过！</b>");
673
679
  } else {
674
680
  $("#task_tips").html("<b class='text-danger'>参数异常！</b>");
675
681
  }