1.优化跟踪记录导出时页面等待问题

src/views/jhzxgl/yppFK_bak

@@ -1,578 +0,0 @@
-<template>
-  <!--  <el-dialog title="收货地址" :visible.sync="dialogFormVisible">-->
-  <el-container>
-    <el-header style="width: 100%; height: 80px;font-size: 12px">
-      <el-form :inline="true"  label-width="60px"  label-position="left">
-        <el-row>
-          <el-col :span="22">
-            <el-form-item label="状态:">
-              <el-select v-model="queryParam.zt" placeholder="状态" clearable @change="ztChange">
-                <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="船号:">
-              <vxe-pulldown ref="xDown4" transfer >
-                <template #default>
-                  <vxe-input
-                    v-model="queryParam.dcch"
-                    placeholder="船号"
-                    style="height: 28px;
-                    line-height: 28px; width: 140px;"
-                    suffix-icon="vxe-icon--search"
-                    @keyup="keyupEvent4"
-                    @focus="focusEvent4"
-                  />
-                </template>
-                <template #dropdown>
-                  <div class="my-dropdown  mytable " style="width: 250px">
-                    <vxe-grid
-                      highlight-hover-row
-                      height="auto"
-                      :data="projectData"
-                      :columns="projectColumns"
-                      @cell-click="cellClickEvent"
-                      show-overflow
-                    >
-                      <template #wgbsEdit="{ row}">
-                        <vxe-checkbox v-model="row.wgbs"  checked-value="Y" unchecked-value="N"   disabled ></vxe-checkbox>
-                      </template>
-                    </vxe-grid>
-                  </div>
-                </template>
-              </vxe-pulldown>
-            </el-form-item>
-            <el-form-item label="批量:">
-              <el-input v-model="queryParam.pl" type="search" placeholder="批量" ></el-input>
-            </el-form-item>
-            <el-form-item label="分段:">
-              <el-input v-model="queryParam.fd" type="search" placeholder="分段" ></el-input>
-            </el-form-item>
-<!--            <el-form-item label="套料图:">
-              <el-input v-model="queryParam.tlth" type="search" placeholder="套料图" ></el-input>
-            </el-form-item>-->
-          </el-col>
-          <el-col :span="2">
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="initList">查询</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="20"  >
-          </el-col>
-          <el-col :span="4" >
-            <el-form-item style="float: right" >
-              <el-button type="success" @click="wzxjc">完整性检查</el-button>
-              <el-button type="success" @click="slpgclick">报工</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-    </el-header>
-    <el-container  style="padding-top: 0px">
-      <el-container>
-        <el-main>
-          <div class="mytable">
-            <vxe-grid
-              id="id"
-              ref="xGrid"
-              border
-              resizable
-              keep-source
-              :align="'center'"
-              :height="height"
-              :auto-resize="true"
-              :columns="tableColumn"
-              highlight-current-row
-              :data="list"
-              :scroll-y="{enabled: true}"
-              :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
-              highlight-hover-row
-              show-overflow
-              show-header-overflow
-            >
-            </vxe-grid>
-          </div>
-        </el-main>
-      </el-container>
-    </el-container>
-  </el-container>
-</template>
-
-<script>
-import {
-  saveDmPgdXd, getDmPgd, getPgdBase, saveDmPgdFk, saveDmPgdJs, saveDmPgdXdBack, getQmPgd
-} from '@/api/jhzxgl/pgd'
-import { mapGetters } from 'vuex'
-import XEUtils from 'xe-utils'
-import {null2str} from "@/utils/rpkj";
-import { getToken } from '@/utils/auth'
-import { startLoading, endLoading } from '@/utils'
-import { Message } from 'element-ui'
-import {saveDmppxxb, getDmppxxbList, saveDmppxxbpg, getDmppxxbListAndYz} from "@/api/jhzxgl/ypp";
-export default {
-  name:'Cgjhdh',
-  data() {
-    return {
-      queryParam: {
-        dcch:'',
-        pl:'',
-        fd:'',
-        fkyy:'',
-        zt:'02',
-        'lx':'d',
-        qgkw:'',
-        tlth:'',
-        qy:'',
-        dw:''
-      },
-      statusOptions: [
-        {
-          value: "02",
-          label: "未报工",
-        },
-        {
-          value: "03",
-          label: "已报工",
-        },
-
-
-      ],
-      inParam:{
-        qy:'',
-        dw:''
-      },
-      dwxxs:[],
-      zyqs:[],
-      zyrys:[],
-      list: [],
-      heads: { token: getToken() },
-      uploadAction: process.env.VUE_APP_BASE_API + '/dmCzplpNew/uploadPl',
-      dictData:{},
-      height: '500px',
-      projectData:[],
-      projectData1:[],
-      projectColumns: [
-        {field: 'cbbm', title: '船号',width: 110},
-        { field: 'wgbs', title: '完工标识', width: 80,
-          slots:{
-            default: 'wgbsEdit'
-          },
-        },
-      ],
-
-      tableColumn: [
-        { type: 'checkbox', width: 40 },
-        { type: 'seq', width: 40, title: '序号' },
-        { field: 'ppzt', title: '状态', width: 90, formatter: ['dictFormat', 'PPZT'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'czbh', title: '船号', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        {
-          field: 'ypph',
-          title: '虚拟托盘',
-          width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination' }
-        },
-        { field: 'pl', title: '批量', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'fd', title: '分段', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'kw', title: '跨位', width: 90,formatter: ['dictFormat', 'QGKW'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'zl', title: '组立', width: 100,formatter: ['dictFormat','ZLLB'],
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'tlth', title: '套料图号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ljbh', title: '零件编号', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'ljgg', title: '零件规格', width: 90,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'ljcz', title: '零件材质', width: 120,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'sl', title: '数量', width: 70,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'qfxqrqxz', title: '前方需求小组期', width: 100,
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-
-        { field: 'qq', title: '区域', width: 90,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        { field: 'dw', title: '垛位', width: 120,editRender: { name: 'input' },
-          filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-          filterRender: { name: 'FilterCombination', },
-        },
-        // { field: 'rkry', title: '报工人员', width: 90,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // { field: 'rkrq', title: '报工日期', width: 120,editRender: { name: 'input' },
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination', },
-        // },
-        // {
-        //   field: 'yzDcCh',
-        //   title: '配盘船号',
-        //   width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' }
-        // },
-        // {
-        //   field: 'yzDcPl',
-        //   title: '配盘批量',
-        //   width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' }
-        // },
-        // {
-        //   field: 'yzDcFd',
-        //   title: '配盘分段',
-        //   width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' }
-        // },
-        // {
-        //   field: 'yzTz',
-        //   title: '配盘特征',
-        //   width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' }
-        // },
-        // {
-        //   field: 'yzLx',
-        //   title: '配盘流向',
-        //   width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' }
-        // },
-        // {
-        //   field: 'yzXj',
-        //   title: '配盘下级',
-        //   width: 100,
-        //   filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],
-        //   filterRender: { name: 'FilterCombination' }
-        // },
-      ]
-    }
-  },
-  computed: {
-    ...mapGetters(['name', 'bmbm'])
-  },
-  created() {
-    window.addEventListener('resize', this.getHeight)
-    this.getHeight()
-    this.initBase()
-  },
-  methods: {
-    //完整性检查
-    wzxjc(){
-
-    },
-    zlFormat({cellValue}){
-      if(cellValue==='D'){
-        return '中大组立'
-      }
-      if(cellValue==='X'){
-        return '小组立'
-      }
-      return cellValue
-    },
-    cellClickEvent({row}) {
-      this.queryParam.dcch = row.cbbm
-      this.$refs.xDown4.hidePanel()
-    },
-    focusEvent4() {
-      this.$refs.xDown4.showPanel()
-    },
-    keyupEvent4() {
-
-
-      if (this.queryParam.dcch) {
-        this.projectData = this.projectData1.filter(row => row.cbbm.indexOf(this.queryParam.dcch.toUpperCase()) > -1)
-      } else {
-        this.projectData = this.projectData1.slice(0)
-      }
-
-    },
-    ztChange(){
-      this.list=[]
-    },
-    bzClick(){
-
-      this.dictData.dwxxs= this.dwxxs.filter(fst=>fst.qy===this.queryParam.qy)
-      console.log(this.dictData.zyqs)
-    },
-    bzClick1(){
-      this.dictData.dwxxs1= this.dwxxs.filter(fst=>fst.qy===this.inParam.qy)
-      console.log(this.dictData.zyqs)
-    },
-    updates2(){
-      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-
-
-          selectRecords[i].qq = this.inParam.qy
-          selectRecords[i].dw = this.inParam.dw
-
-
-
-        }
-        this.$refs.xGrid.updateData(this.list)
-      }
-    },
-    updates(type){
-
-
-      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-          if(type==='1'){
-
-            selectRecords[i].slksrq = this.inParam.slks
-          }else if (type==='2'){
-            selectRecords[i].dmFkry = this.inParam.slry
-            selectRecords[i].dmFkrq = this.inParam.sljs
-          }
-
-        }
-        this.$refs.xGrid.updateData(this.list)
-      }
-
-    },
-
-    activeRowMethod({ row, rowIndex }){
-      // if(row.zt==="01"){
-      //   return  true
-      // }else{
-      //   return  false
-      // }
-
-      return true;
-    },
-
-    initBase(){
-      getPgdBase({}).then(res=>{
-        console.log(res.data)
-        this.zyqs=res.data.zyqs
-        this.dwxxs=res.data.dwxxs
-        this.zyrys=res.data.zyrys
-        this.dictData = res.data
-        this.projectData=res.data.cbbm
-        this.projectData1=res.data.cbbm
-      })
-    },
-    plClick(){
-      let selectRecords = this.$refs.xGrid.getCheckboxRecords()
-      if(selectRecords.length>0){
-        for(let i = 0; i < selectRecords.length; i++) {
-          selectRecords[i].fkyy = this.queryParam.fkyy
-        }
-        this.$refs.xGrid.updateData(this.list)
-      }
-
-    },
-    saveclick(){
-
-      if(this.queryParam.zt!=='02'){
-        return
-      }
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      // if(obj.length===0){
-      //   this.$message({ message: '请填写反馈原因在进行反馈', type: 'warning' })
-      //   return
-      // }
-      saveDmPgdFk(obj).then(res=>{
-        if(res.success){
-          this.initList()
-        }
-      })
-    },
-
-    slpgclick(){
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      if(obj.length===0){
-        return
-      }
-      if (this.queryParam.zt==='02') {
-        this.$confirm('报工？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() =>{
-          saveDmppxxbpg(obj).then(res=>{
-            if(res.success){
-              this.initList()
-            }
-          })
-
-        })
-      }
-
-
-    },
-    xdClick(){
-
-      if(this.queryParam.zt!=="02"){
-        return
-      }
-      let obj=this.$refs.xGrid.getCheckboxRecords()
-      if(obj.length===0){
-        return
-      }
-      // if(this.queryParam.zt==='03'){
-      //   this.$confirm('取消接收？', '提示', {
-      //     confirmButtonText: '确定',
-      //     cancelButtonText: '取消',
-      //     type: 'warning'
-      //   }).then(() =>{
-      //     saveQgPgdXdBack(obj).then(res=>{
-      //       if(res.success){
-      //         this.$message({ message: '取消下达成功', type: 'success' })
-      //         this.initList()
-      //       }
-      //     })
-      //
-      //   })
-      // }else  {
-      this.$confirm('接收？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() =>{
-        saveDmPgdJs(obj).then(res=>{
-          if(res.success){
-            this.$message({ message: '接收成功', type: 'success' })
-            this.initList()
-          }
-        })
-
-      })
-      // }
-
-
-    },
-    initList() {
-      // if (this.queryParam.dcch === '') {
-      //   this.$message.warning('选择船只编号')
-      //   return
-      // }
-      getDmppxxbListAndYz(this.queryParam).then((res) => {
-        this.list = res.data
-        if (this.$refs.xGrid) {
-          this.$refs.xGrid.loadData(this.list)
-          console.log(this.list)
-        }
-
-      })
-    },
-    selectChange(row) {
-      // this.$refs.xGrid.clearActived() // 清除单元格激活状态
-      this.$refs.xGrid.clearEdit() // 清除单元格激活状态
-      //  this.$refs.xGrid.setEditCell(row.row, row.column.property) // 设置单元格为激活状态
-      null2str(row.row)
-    },
-    getHeight() {
-      this.height = window.innerHeight - 190
-    },
-
-  }
-}
-</script>
-<style lang="scss" scoped >
-
-.el-header{margin:0;padding: 5px;height:auto;
-  .el-input{
-    width: 140px;
-  }
-  .el-select{
-    width: 140px;
-  }
-
-}
-.el-container{padding: 0;margin:0;}
-.el-main{padding: 0;}
-.el-col{padding: 0;height: 32px;}
-.el-aside{background: #fff;padding: 0}
-.el-container{padding: 0}
-.el-row {}
-.el-row:last-child {margin-bottom: 0; }
-
-.tableStyles{
-  background: #0a76a4;
-}
-
-.my-dropdown {
-  width: 400px;
-  height: 400px;
-  background-color: #fff;
-  border: 1px solid #dcdfe6;
-  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
-  font-size: 12px;
-
-}
-.mytable1{
-
-}
-.borderClass{
-
-}
-.vxe-input {
-  display: inline-block !important;
-  position: relative !important;
-  width: auto;
-}
-.el-input {
-  display: inline-block !important;
-  position: relative !important;
-  width: auto;
-}
-.keyword-lighten {
-  color: #000;
-  background-color: #FFFF00;
-}
-
-.vxe-textarea--inner {
-  line-height: inherit;
-}
-.el-form-item__label-wrap {
-  margin-left: 0px !important;
-  float: left;
-}
-.fontClass{
-  font-size: 12px;
-  font-weight: bold;
-}
-
-
-</style>

src/views/kban/index.vue_bak

@@ -1,93 +0,0 @@
-<template>
-  <div id="data-view">
-    <dv-full-screen-container>
-      <top-header />
-      <div class="main-content">
-        <digital-flop />
-        <div class="block-left-right-content">
-          <ranking-board />
-          <div class="block-top-bottom-content">
-            <div class="block-top-content">
-              <rose-chart />
-              <water-level-chart />
-              <scroll-board />
-            </div>
-            <cards />
-          </div>
-        </div>
-      </div>
-    </dv-full-screen-container>
-  </div>
-</template>
-
-<script>
-import topHeader from './comps/topHeader'
-import digitalFlop from './comps/digitalFlop'
-import rankingBoard from './comps/rankingBoard'
-import roseChart from './comps/roseChart'
-import waterLevelChart from './comps/waterLevelChart'
-import scrollBoard from './comps/scrollBoard'
-import cards from './comps/cards'
-
-export default {
-  name: 'DataView',
-  components: {
-    topHeader,
-    digitalFlop,
-    rankingBoard,
-    roseChart,
-    waterLevelChart,
-    scrollBoard,
-    cards
-  },
-  data () {
-    return {}
-  },
-  methods: {}
-}
-</script>
-
-<style lang="less">
-#data-view {
-  width: 100%;
-  height: 100%;
-  background-color: #030409;
-  color: #fff;
-
-  #dv-full-screen-container {
-    background-image: url('img/bg.png');
-    background-size: 100% 100%;
-    box-shadow: 0 0 3px blue;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .main-content {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-  }
-
-  .block-left-right-content {
-    flex: 1;
-    display: flex;
-    margin-top: 20px;
-  }
-
-  .block-top-bottom-content {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    padding-left: 20px;
-  }
-
-  .block-top-content {
-    height: 55%;
-    display: flex;
-    flex-grow: 0;
-    box-sizing: border-box;
-    padding-bottom: 20px;
-  }
-}
-</style>

src/views/sjzx/ydjhzzCX.vue

@@ -103,6 +103,7 @@
 import {
   getYdjhzzList, getCzplBase, dbs
 } from '@/api/sjzx/jcsj'
+import axios from 'axios'
 import { mapGetters } from 'vuex'
 import XEUtils from 'xe-utils'
 import { getToken } from '@/utils/auth'
@@ -770,21 +771,42 @@ export default {
       }
       return null
     },
-    handleExport() {
+    handleExport(){
-      this.$refs.xGrid.exportData({
+      // 将当前表格已加载的数据直接POST提交给后端
-        filename: `${this.queryParam.dcch}跟踪记录`,// 文件名字
+      axios.post(`${process.env.VUE_APP_BASE_API}/ydjhzz/export`, this.list, {
-        sheetName: 'Sheet1',
+        responseType: 'blob'
-        type: 'xlsx',//导出文件类型 xlsx 和 csv
+      }).then(res => {
-        data: this.list, // 数据源
+        // 处理后端返回的文件流，触发浏览器下载
-        // sheetMethod: this.sheetMethod,
+        const blob = new Blob([res.data], {
-        useStyle: true,
+          type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        // 过滤那个字段导出
+        });
-        columnFilterMethod: function(column, $columnIndex) {
+        const link = document.createElement('a');
-          return !(column.$columnIndex === 0 )
+        link.href = window.URL.createObjectURL(blob);
-          // 0是复选框 不导出
+        link.download = `${this.queryParam.dcch}跟踪记录.xlsx`;
-        }
+        document.body.appendChild(link);
-      })
+        link.click();
+        document.body.removeChild(link);
+        window.URL.revokeObjectURL(link.href);
+      }).catch(err => {
+        console.log(err)
+        this.$message.error('导出失败');
+      });
     },
+    // handleExport() {
+    //   this.$refs.xGrid.exportData({
+    //     filename: `${this.queryParam.dcch}跟踪记录`,// 文件名字
+    //     sheetName: 'Sheet1',
+    //     type: 'xlsx',//导出文件类型 xlsx 和 csv
+    //     data: this.list, // 数据源
+    //     // sheetMethod: this.sheetMethod,
+    //     useStyle: true,
+    //     // 过滤那个字段导出
+    //     columnFilterMethod: function(column, $columnIndex) {
+    //       return !(column.$columnIndex === 0 )
+    //       // 0是复选框 不导出
+    //     }
+    //   })
+    // },
     hdwNum(row){
       var n=(row.hdw+row.hdw1).toFixed(1);
       return n;