Ming 4 anni fa
parent
commit
6cd331e97a
3 ha cambiato i file con 18 aggiunte e 2 eliminazioni
  1. 2 2
      js/index.js
  2. 15 0
      js/point.js
  3. 1 0
      pages/operation/point.html

+ 2 - 2
js/index.js

@@ -340,7 +340,7 @@ function getIndexDate(queryParam = {}) {
                 myChart.resize();
             });
         })();
-         /* 横向柱状图 */
+        /* 横向柱状图 */
         (function() {
 
             var pie = result.warning;
@@ -577,7 +577,7 @@ function getIndexDate(queryParam = {}) {
                 var warningInfo = eval('(' + evt.data + ')');
                 if (warningInfo.dwtype) {
                     arrData.push(warningInfo)
-                        // console.log('arrData')
+                    console.log('arrData')
                         // console.log(arrData)
                 }
                 var items = '';

+ 15 - 0
js/point.js

@@ -385,7 +385,13 @@ function getDataExport(queryParam = {}) {
 
 
 //点位标签弹框
+
+// var flag = true;
+
+
 $(document).on('click', 'a.pointLabel', function(event) {
+
+    // alert(1)
     let dwId = $(this).data('id');
     layerDepartmentIndex = layer.open({
         type: 1,
@@ -411,10 +417,18 @@ $(document).on('click', 'a.pointLabel', function(event) {
             }, 3);
 
             $('.pointLabelDownload').click(function() {
+                // alert(1)
                 cutDiv()
             })
 
+            // $('#test-down:eq(0)').click(function() {
+            //     alert(1)
+
+            // })
+
+
             $('.clsBtn2,.cancel2').click(function() {
+                // alert(2)
                 innerPage = 1;
                 layer.close(layerDepartmentIndex);
             })
@@ -471,6 +485,7 @@ var downPng = function(canvas) {
 }
 
 var cutDiv = function() {
+
         var content = document.getElementById("imgOut");
         html2canvas(content, {
             onrendered: function(canvas) {

+ 1 - 0
pages/operation/point.html

@@ -214,6 +214,7 @@
             </div>
             <div class="btnArea ">
                 <div class="btnGroup ">
+                    <!-- <a id="test-down">下载测试</a> -->
                     <a class="sgBtn ok pointLabelDownload" id="updateData" download><img src="../../images/accept.png" alt=""> 下载
                     </a>
                     <a class="sgBtn cancel2 "><img src="../../images/cancel.png " alt=" ">关闭</a>