Merge branch 'dev_xzeq' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq

src/components/ptCxForm_components.vue

@@ -850,7 +850,8 @@
                   pageBs != 'queryBsh' &&
                   pageBs != 'khtj'&&
                   pageBs != 'zdhdxxcjqk'&&
-                  pageBs != 'addGzqk'
+                  pageBs != 'addGzqk'&&
+                  pageBs != 'queryJcgz'
                 ">
                 <i class="el-icon-plus"></i> 新增
               </div>
@@ -5523,13 +5524,19 @@ export default {
 ::v-deep .new-image img {
   width: 100px;
 }
-.total-num {
-  width: 40px;
-  height: 40px;
-  background: #007aff;
-  border-radius: 20px;
-  cursor: pointer;
+.rwgl_s span {
   display: inline-block;
+  padding: 2px 4px;
+  border-radius: 5px;
+}
+.rwgl_s .s_stop {
+  background: #888;
+  color: #000;
+  margin-right: 8px;
+}
+.rwgl_s .s_runn {
+  color: #fff;
+  background: green;
 }
 /* .dele{
   cursor: pointer;

src/excel/htmlToExcel.js

+import FileSaver from 'file-saver';
+import XLSX from 'xlsx';
+export default {
+  // 导出Excel表格
+  exportExcel (name, tableName) {
+    debugger
+    //name表示生成excel的文件名     tableName表示表格的id
+    let fix = document.querySelector('.el-table__fixed');
+    //let con = document.querySelector(tableName);
+    //console.log(con);
+    let sel;
+    if(fix){ //判断要导出的节点中是否有fixed的表格，如果有，转换excel时先将该dom移除，然后append回去
+      sel = XLSX.utils.table_to_book(document.querySelector('#myTable').removeChild(fix));
+      document.querySelector('#myTable').appendChild(fix);
+    }else{
+      sel = XLSX.utils.table_to_book(document.querySelector(tableName));
+    }
+    //var sel = XLSX.utils.table_to_book(document.querySelector(tableName))
+    var selIn = XLSX.write(sel, { bookType: 'xlsx', bookSST: true, type: 'array' })
+    try {
+      FileSaver.saveAs(new Blob([selIn], { type: 'application/octet-stream' }), name)
+    } catch (e) {
+      if (typeof console !== 'undefined') console.log(e, selIn)
+    }
+    return selIn
+  }
+};
+

src/main.js

@@ -20,6 +20,9 @@ import './assets/iconfont/iconfont.css'
 import moment from 'moment'
 import rules from "./utils/rules.js";
 import baseUrl from './api/base'
+//全局导出excel
+import htmlToExcel from './excel/htmlToExcel';
+Vue.prototype.htmlToExcels = htmlToExcel;
 const Base64 = require('js-base64').Base64
 //引入echarts