|
@@ -7,7 +7,7 @@
|
|
|
<el-button style="float:right;margin-top:4px;" @click="updateExcel = true">导入Excel</el-button>
|
|
|
<el-button style="float:right;margin-top:4px;" @click="downloadExcel = true">导出Excel模板</el-button>
|
|
|
<el-checkbox style="float:right;line-height:40px;" @change="getData" v-model="checked">只显示使用的原始点位</el-checkbox>
|
|
|
- <el-button>获取原始点位当前值</el-button>
|
|
|
+ <el-button @click="clickPointVal">获取原始点位当前值</el-button>
|
|
|
</div>
|
|
|
<div id="handsontableSteps1" v-loading="isLoading">
|
|
|
<handsontable-component v-if="!!allData.length" @delete="delePoint" ref="handsontable" @mouseDown="clickTable" @change="changeHand"></handsontable-component>
|
|
@@ -58,7 +58,8 @@
|
|
|
createPoint,
|
|
|
downloadTemplete,
|
|
|
uploadPointFile,
|
|
|
- deletePoint
|
|
|
+ deletePoint,
|
|
|
+ getPointValue
|
|
|
} from "@/fetch/point_http"
|
|
|
import uploadFile from "@/components/common/uploadFile"
|
|
|
import axios from 'axios'
|
|
@@ -120,8 +121,37 @@
|
|
|
closeFalg() {
|
|
|
this.localtionDialog = false
|
|
|
},
|
|
|
+ clickPointVal(){
|
|
|
+ let data = this.hot.getSourceData()
|
|
|
+ if(!data || !data.length){
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ console.log(data,'data')
|
|
|
+ let param = {
|
|
|
+ data: {
|
|
|
+ DataSourceId: this.datasourceId,
|
|
|
+ PointIds: data.map(item => {
|
|
|
+ return item.Id
|
|
|
+ })
|
|
|
+ },
|
|
|
+ type: this.protocolType
|
|
|
+ }
|
|
|
+ getPointValue(param,res => {
|
|
|
+ console.log(res,'res')
|
|
|
+ if(!!res.Content && res.Content.length){
|
|
|
+ data.map(item => {
|
|
|
+ res.Content.map(child => {
|
|
|
+ if(item.Id == child.PointId){
|
|
|
+ item.pointValue = child.Data.Data
|
|
|
+ item.pointDate = child.Data.Time
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return item
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
changeLoc(val) {
|
|
|
- console.log(val, 'val')
|
|
|
this.renderData.LocationFlag = val
|
|
|
this.changeFlag = false
|
|
|
},
|
|
@@ -218,33 +248,6 @@
|
|
|
}).catch(function(err) {
|
|
|
console.dirxml(err);
|
|
|
})
|
|
|
- // downloadTemplete({
|
|
|
- // data: {
|
|
|
- // DataSourceId: this.datasourceId,
|
|
|
- // },
|
|
|
- // type: this.protocolType
|
|
|
- // },{
|
|
|
- // responseType: 'blob'
|
|
|
- // },res => {
|
|
|
- // var blob = new Blob([res.data], {
|
|
|
- // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
|
|
|
- // });
|
|
|
- // var fileName = res.headers['content-disposition'];
|
|
|
- // if (fileName)
|
|
|
- // fileName = fileName.substring(fileName.indexOf('=') + 1);
|
|
|
- // if ('download' in document.createElement('a')) { // 非IE下载
|
|
|
- // const elink = document.createElement('a')
|
|
|
- // elink.download = fileName
|
|
|
- // elink.style.display = 'none'
|
|
|
- // elink.href = URL.createObjectURL(blob)
|
|
|
- // document.body.appendChild(elink)
|
|
|
- // elink.click()
|
|
|
- // URL.revokeObjectURL(elink.href) // 释放URL 对象
|
|
|
- // document.body.removeChild(elink)
|
|
|
- // } else { // IE10+下载
|
|
|
- // navigator.msSaveBlob(blob, fileName)
|
|
|
- // }
|
|
|
- // })
|
|
|
},
|
|
|
//点击表格
|
|
|
clickTable(info, row) {
|
|
@@ -311,7 +314,6 @@
|
|
|
currentPage: this.pages.currentPage
|
|
|
}
|
|
|
queryPoint(param, res => {
|
|
|
- console.log(res)
|
|
|
this.isLoading = false
|
|
|
this.changeFlag = true
|
|
|
this.allData = res.Content || []
|
|
@@ -327,7 +329,6 @@
|
|
|
data: this.allData,
|
|
|
colHeaders: changeHeader(header),
|
|
|
columns: showTypes(header),
|
|
|
- // colWidths: width,
|
|
|
rowHeights: 30,
|
|
|
maxRows: this.allData.length,
|
|
|
contextMenu: {
|
|
@@ -363,15 +364,16 @@
|
|
|
arr1 = [],
|
|
|
createList = [];
|
|
|
data.map(item => {
|
|
|
- // console.log(item.LocationFlag,1111)
|
|
|
if (!!item.Id) {
|
|
|
- // if(!item.LocationFlag){
|
|
|
- // item.LocationFlag = []
|
|
|
- // }
|
|
|
console.log(item)
|
|
|
delete item.CreateTime
|
|
|
delete item.LastUpdate
|
|
|
- console.log(item)
|
|
|
+ if(item.hasOwnProperty('pointDate')){
|
|
|
+ delete item.pointDate
|
|
|
+ }
|
|
|
+ if(item.hasOwnProperty('pointValue')){
|
|
|
+ delete item.pointValue
|
|
|
+ }
|
|
|
arr1.push(item)
|
|
|
updateList.push(item)
|
|
|
} else {
|
|
@@ -401,7 +403,6 @@
|
|
|
this.changeFlag = true
|
|
|
},
|
|
|
async create(obj) {
|
|
|
- console.log(obj)
|
|
|
for (let key in obj) {
|
|
|
if (key == "LocationFlag" && obj[key] == "") {
|
|
|
obj[key] = []
|