打印设置

src/css/print.css

@@ -34,7 +34,6 @@
     display: inline-block;
   }
   .radio {
-    min-width: 150px;
     display: flex;
     margin: 5px;
     margin-right: 25px;

src/css/staticInfo.less

@@ -372,7 +372,7 @@
         margin: 5px;
         margin-right: 25px;
         float: left;
-        min-width: 150px;
+        word-wrap: break-word;
         label{
           font-weight: 400;
           color: #666666;

src/js/cdss.js

@@ -11,7 +11,7 @@ require('./../css/cdss.less');
 require('./../css/popup.css');
 require('./../css/followUpV.less');
 require('./../css/staticSearch.css')
-require('./../js/staticSearch.js')
+require('./../js/staticSearch.js');//静态知识搜索
 require('./../images/empty.png').replace(/^undefined/g, '')
 require('./../images/empty2.png').replace(/^undefined/g, '')
 require('./../images/empty3.png').replace(/^undefined/g, '')
@@ -619,7 +619,7 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
 function renderPushItem(item, type) {
   
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${type}">`
-  str += `${item.hasScale == "0" ? `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName evaluationtitle">${type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
+  str += `${item.hasScale == "0" ? `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : item.hasScale == "1" ? `<span class="pushItemName evaluationtitle">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
   str += `${ item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : "" }`
   str += '</span >'
   return str

src/js/cdssHorizontal.js

@@ -591,11 +591,10 @@ function renderItemWrapper(list, showNum, type, hasInfo) {
 }
 function renderPushItem(item, type) {
   str = `<span class="pushItemBox" data-name="${item.name}" data-type="${type}">`
-  str += `${item.hasScale == "0" ? `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName evaluationtitle">${type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
+  str += `${item.hasScale == "0" ? `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : item.hasScale == "1" ? `<span class="pushItemName evaluationtitle">${type == 8 ? ('【' + item.name + '】') : item.name}</span>` : `<span class="pushItemName">${type == 8 ? ('【' + item.name + '】') : item.name}</span>`}`
   str += `${item.hasInfo == "1" ? `<img class="infoImg" src="${infoImg}">` : ""}`
   str += '</span >'
   return str
-  return str
 }
 function bindOpenInfo() {
   $(".infoImg").on("mouseenter", function () {

src/js/jquery.PrintArea.js

@@ -1,237 +0,0 @@
-/* @license 
- * jQuery.print, version 1.3.2
- *  (c) Sathvik Ponangi, Doers' Guild
- * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/)
- *--------------------------------------------------------------------------*/
-const $ = require("jquery");
-(function ($) {
-  "use strict";
-  // A nice closure for our definitions
-  function getjQueryObject(string) {
-    // Make string a vaild jQuery thing
-    var jqObj = $("");
-    try {
-      jqObj = $(string)
-        .clone();
-    } catch (e) {
-      jqObj = $("<span />")
-        .html(string);
-    }
-    return jqObj;
-  }
-
-  function printFrame(frameWindow) {
-    // Print the selected window/iframe
-    var def = $.Deferred();
-    try {
-      setTimeout(function () {
-        // Fix for IE : Allow it to render the iframe
-        frameWindow.focus();
-        try {
-          // Fix for IE11 - printng the whole page instead of the iframe content
-          if (!frameWindow.document.execCommand('print', false, null)) {
-            // document.execCommand returns false if it failed -http://stackoverflow.com/a/21336448/937891
-            frameWindow.print();
-          }
-        } catch (e) {
-          frameWindow.print();
-        }
-        frameWindow.close();
-        def.resolve();
-      }, 250);
-    } catch (err) {
-      def.reject(err);
-    }
-    return def;
-  }
-
-  function printContentInNewWindow(content) {
-    // Open a new window and print selected content
-    var w = window.open();
-    w.document.write(content);
-    w.document.close();
-    return printFrame(w);
-  }
-
-  function isNode(o) {
-    /* http://stackoverflow.com/a/384380/937891 */
-    return !!(typeof Node === "object" ? o instanceof Node : o && typeof o === "object" && typeof o.nodeType === "number" && typeof o.nodeName === "string");
-  }
-  $.print = $.fn.print = function () {
-    // Print a given set of elements
-    var options, $this, self = this;
-    // console.log("Printing", this, arguments);
-    if (self instanceof $) {
-      // Get the node if it is a jQuery object
-      self = self.get(0);
-    }
-    if (isNode(self)) {
-      // If `this` is a HTML element, i.e. for
-      // $(selector).print()
-      $this = $(self);
-      if (arguments.length > 0) {
-        options = arguments[0];
-      }
-    } else {
-      if (arguments.length > 0) {
-        // $.print(selector,options)
-        $this = $(arguments[0]);
-        if (isNode($this[0])) {
-          if (arguments.length > 1) {
-            options = arguments[1];
-          }
-        } else {
-          // $.print(options)
-          options = arguments[0];
-          $this = $("html");
-        }
-      } else {
-        // $.print()
-        $this = $("html");
-      }
-    }
-    // Default options
-    var defaults = {
-      globalStyles: true,
-      mediaPrint: false,
-      stylesheet: null,
-      noPrintSelector: ".no-print",
-      iframe: true,
-      append: null,
-      prepend: null,
-      manuallyCopyFormValues: true,
-      deferred: $.Deferred()
-    };
-    // Merge with user-options
-    options = $.extend({}, defaults, (options || {}));
-    var $styles = $("");
-    if (options.globalStyles) {
-      // Apply the stlyes from the current sheet to the printed page
-      $styles = $("style, link, meta, title");
-    } else if (options.mediaPrint) {
-      // Apply the media-print stylesheet
-      $styles = $("link[media=print]");
-    }
-    if (options.stylesheet) {
-      // Add a custom stylesheet if given
-      $styles = $.merge($styles, $('<link rel="stylesheet" href="' + options.stylesheet + '">'));
-    }
-    // Create a copy of the element to print
-    var copy = $this.clone();
-    // Wrap it in a span to get the HTML markup string
-    copy = $("<span/>")
-      .append(copy);
-    // Remove unwanted elements
-    copy.find(options.noPrintSelector)
-      .remove();
-    // Add in the styles
-    copy.append($styles.clone());
-    // Appedned content
-    copy.append(getjQueryObject(options.append));
-    // Prepended content
-    copy.prepend(getjQueryObject(options.prepend));
-    if (options.manuallyCopyFormValues) {
-      // Manually copy form values into the HTML for printing user-modified input fields
-      // http://stackoverflow.com/a/26707753
-      copy.find("input")
-        .each(function () {
-          var $field = $(this);
-          if ($field.is("[type='radio']") || $field.is("[type='checkbox']")) {
-            if ($field.prop("checked")) {
-              $field.attr("checked", "checked");
-            }
-          } else {
-            $field.attr("value", $field.val());
-          }
-        });
-      copy.find("select").each(function () {
-        var $field = $(this);
-        $field.find(":selected").attr("selected", "selected");
-      });
-      copy.find("textarea").each(function () {
-        // Fix for https://github.com/DoersGuild/jQuery.print/issues/18#issuecomment-96451589
-        var $field = $(this);
-        $field.text($field.val());
-      });
-    }
-    // Get the HTML markup string
-    var content = copy.html();
-    // Notify with generated markup & cloned elements - useful for logging, etc
-    try {
-      options.deferred.notify('generated_markup', content, copy);
-    } catch (err) {
-      console.warn('Error notifying deferred', err);
-    }
-    // Destroy the copy
-    copy.remove();
-    if (options.iframe) {
-      // Use an iframe for printing
-      try {
-        var $iframe = $(options.iframe + "");
-        var iframeCount = $iframe.length;
-        if (iframeCount === 0) {
-          // Create a new iFrame if none is given
-          $iframe = $('<iframe height="0" width="0" border="0" wmode="Opaque"/>')
-            .prependTo('body')
-            .css({
-              "position": "absolute",
-              "top": -999,
-              "left": -999
-            });
-        }
-        var w, wdoc;
-        w = $iframe.get(0);
-        w = w.contentWindow || w.contentDocument || w;
-        wdoc = w.document || w.contentDocument || w;
-        wdoc.open();
-        wdoc.write(content);
-        wdoc.close();
-        printFrame(w)
-          .done(function () {
-            // Success
-            setTimeout(function () {
-              // Wait for IE
-              if (iframeCount === 0) {
-                // Destroy the iframe if created here
-                $iframe.remove();
-              }
-            }, 100);
-          })
-          .fail(function (err) {
-            // Use the pop-up method if iframe fails for some reason
-            console.error("Failed to print from iframe", err);
-            printContentInNewWindow(content);
-          })
-          .always(function () {
-            try {
-              options.deferred.resolve();
-            } catch (err) {
-              console.warn('Error notifying deferred', err);
-            }
-          });
-      } catch (e) {
-        // Use the pop-up method if iframe fails for some reason
-        console.error("Failed to print from iframe", e.stack, e.message);
-        printContentInNewWindow(content)
-          .always(function () {
-            try {
-              options.deferred.resolve();
-            } catch (err) {
-              console.warn('Error notifying deferred', err);
-            }
-          });
-      }
-    } else {
-      // Use a new window for printing
-      printContentInNewWindow(content)
-        .always(function () {
-          try {
-            options.deferred.resolve();
-          } catch (err) {
-            console.warn('Error notifying deferred', err);
-          }
-        });
-    }
-    return this;
-  };
-})($);

src/js/jquery.jqprint.js

@@ -0,0 +1,70 @@
+// -----------------------------------------------------------------------
+// Eros Fratini - eros@recoding.it
+// jqprint 0.3
+//
+// - 19/06/2009 - some new implementations, added Opera support
+// - 11/05/2009 - first sketch
+//
+// Printing plug-in for jQuery, evolution of jPrintArea: http://plugins.jquery.com/project/jPrintArea
+// requires jQuery 1.3.x
+//
+// Licensed under the MIT license: http://www.opensource.org/licenses/mit-license.php
+//------------------------------------------------------------------------
+const $ = require("jquery");
+(function ($) {
+  var opt;
+
+  $.fn.jqprint = function (options) {
+    opt = $.extend({}, $.fn.jqprint.defaults, options);
+
+    var $element = (this instanceof $) ? this : $(this);
+
+    if (opt.operaSupport && $.browser.opera) {
+      var tab = window.open("", "jqPrint-preview");
+      tab.document.open();
+
+      var doc = tab.document;
+    }
+    else {
+      var $iframe = $("<iframe  />");
+
+      if (!opt.debug) { $iframe.css({ position: "absolute", width: "0px", height: "0px", left: "-600px", top: "-600px" }); }
+
+      $iframe.appendTo("body");
+      var doc = $iframe[0].contentWindow.document;
+    }
+
+    if (opt.importCSS) {
+      if ($("link[media=print]").length > 0) {
+        $("link[media=print]").each(function () {
+          doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' media='print' />");
+        });
+      }
+      else {
+        $("link").each(function () {
+          doc.write("<link type='text/css' rel='stylesheet' href='" + $(this).attr("href") + "' />");
+        });
+      }
+    }
+
+    if (opt.printContainer) { doc.write($element.outer()); }
+    else { $element.each(function () { doc.write($(this).html()); }); }
+
+    doc.close();
+
+    (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).focus();
+    setTimeout(function () { (opt.operaSupport && $.browser.opera ? tab : $iframe[0].contentWindow).print(); if (tab) { tab.close(); } }, 1000);
+  }
+
+  $.fn.jqprint.defaults = {
+    debug: false,
+    importCSS: true,
+    printContainer: true,
+    operaSupport: true
+  };
+
+  // Thanks to 9__, found at http://users.livejournal.com/9__/380664.html
+  $.fn.outer = function () {
+    return $($('<div></div>').html(this.clone())).html();
+  }
+})($);

src/js/staticInfo.js

@@ -18,7 +18,8 @@ const {
   Toast
 } = require('./promise.js');
 const $ = require("jquery");
-
+require("./jquery-migrate");
+const jqprint = require("./jquery.jqprint")
 const print = require("../js/jQuery.print")
 let printing = require('./../images/printing.png');
 let printing2 = require('./../images/printing2.png');
@@ -236,11 +237,19 @@ function getprinting() {
   $('.printing').click(function () {
     $('.foot').hide()
     $('.scalebot').hide()
-    $('#Print').css({
-      'height': 'auto', //高度自动
-    }).print({
-      title: '我是你爹',
-    }); 
+     
+    var mb = myBrowser();
+    if ("IE" == mb) {
+      console.log(123)
+      $('#Print').css({
+        'height': 'auto', //高度自动
+      }).jqprint();
+    }else{
+      $('#Print').css({
+        'height': 'auto', //高度自动
+      }).print();
+    }
+
     $('.foot').show()
     $('.scalebot').show()
     $('#Print').css({
@@ -374,10 +383,11 @@ function getResult(pushInfo) {
 
     for (var i = 0; i < scrollTop.length; i++) {
       if (scrollTop[i] != undefined){
-        v = scrollTop[i]
+        v = i
         break
       }
     }
+    // var v = scrollTop.indexOf(undefined)
     if (v) {
       $(`.scale .infos`).scrollTop(v.top + 346)
     }
@@ -426,25 +436,26 @@ function getResult(pushInfo) {
         result = tmp
         proposal = proposals.join("；");
       }
-      if (result == undefined) {
-        if (num > 0) {
-          $(".score").html('总分：' + num + '分');
-        }
-        $(".score").css('display', 'block')
-        $(".copy").css('display', 'none')
-        $(".foot").css('display', 'block')
-      } else {
+      console.log(num)
+      if (result) {
         $(".hel").attr({
           "title": proposal
         });
-        $(".result_title").html('结果：'+result);
-        if (num > 0) {
+        $(".result_title").html('结果：' + result);
+        if (num >= 0) {
           $(".score").html('总分：' + num + '分');
         }
         $(".result").css('display', 'block')
         $(".score").css('display', 'block')
         $(".copy").css('display', 'block')
         $(".foot").css('display', 'block')
+      } else {
+        if (num >= 0) {
+          $(".score").html('总分：' + num + '分');
+        }
+        $(".score").css('display', 'block')
+        $(".copy").css('display', 'none')
+        $(".foot").css('display', 'block')
       }
     } else {
       Toast('温馨提示：必填选项不能为空～', 500, 'warn')