|
@@ -315,7 +315,7 @@ export default {
|
|
|
showInfo: false, // 属性数据预览
|
|
|
showRiZhi: false, // 控制日志的显隐
|
|
|
|
|
|
- soutRiZhiSucess: '-------------------------------success--------------------------' + '\n\n',
|
|
|
+ soutRiZhiSucess: '-------------------------------info--------------------------' + '\n\n',
|
|
|
soutRizhi: '运行过程,将会显示在这儿 。再次点击日志图标,将关闭窗口', // 输出日志内容‘
|
|
|
showPreview: false, // 控制预览窗口的显隐
|
|
|
showTable: false,
|
|
@@ -472,73 +472,81 @@ export default {
|
|
|
},
|
|
|
async yunXingClick () {
|
|
|
this.showRiZhi = true
|
|
|
- this.soutRizhi = '检测设备状态完毕,开始抽取数据....' + '\n\n' + '....' // 输出日志内容
|
|
|
+ var onlyStatic = true
|
|
|
this.yunXingUid = new Date().getTime()
|
|
|
- for (let i = 0; i < this.imsql.length; i++) {
|
|
|
- if (i === 0) {
|
|
|
- this.imsql[i].oldFileName = this.userID + '_' + this.imsql[i].subEquipmentID + '_' + this.imsql[i].id
|
|
|
- this.imsql[i].newFileName = this.imsql[i].oldFileName
|
|
|
- if (this.imsql.length === 1) {
|
|
|
- this.imsql[i].oldFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ if (this.imsql.length === 0) {
|
|
|
+ this.soutRizhi = '请先选择抽取的字段....'
|
|
|
+ } else {
|
|
|
+ this.soutRizhi = '检测设备状态完毕,开始抽取数据....' + '\n\n' + '....' // 输出日志内容
|
|
|
+
|
|
|
+ for (let i = 0; i < this.imsql.length; i++) {
|
|
|
+ if (i === 0) {
|
|
|
+ this.imsql[i].oldFileName = this.userID + '_' + this.imsql[i].subEquipmentID + '_' + this.imsql[i].id
|
|
|
+ this.imsql[i].newFileName = this.imsql[i].oldFileName
|
|
|
+ if (this.imsql.length === 1) {
|
|
|
+ this.imsql[i].oldFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ this.imsql[i].newFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ }
|
|
|
+ } else if (i === this.imsql.length - 1) {
|
|
|
+ this.imsql[i].oldFileName = this.imsql[i - 1].newFileName
|
|
|
this.imsql[i].newFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ } else {
|
|
|
+ this.imsql[i].oldFileName = this.imsql[i - 1].newFileName
|
|
|
+ this.imsql[i].newFileName = this.userID + '_' + this.imsql[i].subEquipmentID + '_' + this.imsql[i].id
|
|
|
}
|
|
|
- } else if (i === this.imsql.length - 1) {
|
|
|
- this.imsql[i].oldFileName = this.imsql[i - 1].newFileName
|
|
|
- this.imsql[i].newFileName = this.userID + '_' + this.yunXingUid
|
|
|
- } else {
|
|
|
- this.imsql[i].oldFileName = this.imsql[i - 1].newFileName
|
|
|
- this.imsql[i].newFileName = this.userID + '_' + this.imsql[i].subEquipmentID + '_' + this.imsql[i].id
|
|
|
}
|
|
|
- }
|
|
|
- var onlyStatic = true
|
|
|
- for (let j = 0; j < this.imsql.length; j++) {
|
|
|
- this.imsql[j]['start'] = this.selectTime[0]
|
|
|
- this.imsql[j]['end'] = this.selectTime[1]
|
|
|
- await this.$http({
|
|
|
- url: this.$http.adornUrl('/dataset/dynamic/makeDyDataSet'),
|
|
|
- method: 'post',
|
|
|
- data: this.$http.adornData(this.imsql[j], false)
|
|
|
- }).then(subresult => {
|
|
|
- var context = subresult.data
|
|
|
|
|
|
- this.soutRizhi = context.info + '\n\n' + this.soutRizhi
|
|
|
- })
|
|
|
- onlyStatic = false
|
|
|
+ for (let j = 0; j < this.imsql.length; j++) {
|
|
|
+ this.imsql[j]['start'] = this.selectTime[0]
|
|
|
+ this.imsql[j]['end'] = this.selectTime[1]
|
|
|
+ await this.$http({
|
|
|
+ url: this.$http.adornUrl('/dataset/dynamic/makeDyDataSet'),
|
|
|
+ method: 'post',
|
|
|
+ data: this.$http.adornData(this.imsql[j], false)
|
|
|
+ }).then(subresult => {
|
|
|
+ var context = subresult.data
|
|
|
+
|
|
|
+ this.soutRizhi = context.info + '\n\n' + this.soutRizhi
|
|
|
+ })
|
|
|
+ onlyStatic = false
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if (this.st_imsql.length > 0) {
|
|
|
this.soutRizhi = '\n' + '开始组合本地数据' + '\n\n' + this.soutRizhi
|
|
|
- }
|
|
|
- for (let i = 0; i < this.st_imsql.length; i++) {
|
|
|
- if (i === 0) {
|
|
|
- this.st_imsql[i].oldFileName = this.userID + '_' + this.yunXingUid
|
|
|
- this.st_imsql[i].newFileName = this.st_imsql[i].oldFileName
|
|
|
- if (this.st_imsql.length === 1) {
|
|
|
+ for (let i = 0; i < this.st_imsql.length; i++) {
|
|
|
+ if (i === 0) {
|
|
|
this.st_imsql[i].oldFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ this.st_imsql[i].newFileName = this.st_imsql[i].oldFileName
|
|
|
+ if (this.st_imsql.length === 1) {
|
|
|
+ this.st_imsql[i].oldFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ this.st_imsql[i].newFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ }
|
|
|
+ } else if (i === this.st_imsql.length - 1) {
|
|
|
+ this.st_imsql[i].oldFileName = this.st_imsql[i - 1].newFileName
|
|
|
this.st_imsql[i].newFileName = this.userID + '_' + this.yunXingUid
|
|
|
+ } else {
|
|
|
+ this.st_imsql[i].oldFileName = this.st_imsql[i - 1].newFileName
|
|
|
+ this.st_imsql[i].newFileName = this.userID + '_' + this.st_imsql[i].subEquipmentID + '_' + this.st_imsql[i].id
|
|
|
}
|
|
|
- } else if (i === this.st_imsql.length - 1) {
|
|
|
- this.st_imsql[i].oldFileName = this.st_imsql[i - 1].newFileName
|
|
|
- this.st_imsql[i].newFileName = this.userID + '_' + this.yunXingUid
|
|
|
- } else {
|
|
|
- this.st_imsql[i].oldFileName = this.st_imsql[i - 1].newFileName
|
|
|
- this.st_imsql[i].newFileName = this.userID + '_' + this.st_imsql[i].subEquipmentID + '_' + this.st_imsql[i].id
|
|
|
}
|
|
|
- }
|
|
|
- for (let sti = 0; sti < this.st_imsql.length; sti++) {
|
|
|
- var massage = {
|
|
|
- 'st_imsql': this.st_imsql[sti],
|
|
|
- 'onlyStatic': onlyStatic
|
|
|
+ for (let sti = 0; sti < this.st_imsql.length; sti++) {
|
|
|
+ var massage = {
|
|
|
+ 'st_imsql': this.st_imsql[sti],
|
|
|
+ 'onlyStatic': onlyStatic
|
|
|
+ }
|
|
|
+ await this.$http({
|
|
|
+ url: this.$http.adornUrl('/dataset/static/makeStaticDataSet'),
|
|
|
+ method: 'post',
|
|
|
+ data: this.$http.adornData(massage, false)
|
|
|
+ }).then(subresult => {
|
|
|
+ this.soutRizhi = subresult.data.info + '\n\n' + this.soutRizhi
|
|
|
+ })
|
|
|
}
|
|
|
- await this.$http({
|
|
|
- url: this.$http.adornUrl('/dataset/static/makeStaticDataSet'),
|
|
|
- method: 'post',
|
|
|
- data: this.$http.adornData(massage, false)
|
|
|
- }).then(subresult => {
|
|
|
- this.soutRizhi = subresult.data.info + '\n\n' + this.soutRizhi
|
|
|
- })
|
|
|
+ this.soutRizhi = this.soutRiZhiSucess + '静态数据测试抽取完成,点击确定制作数据集' + '\n\n' + this.soutRizhi
|
|
|
+ } else {
|
|
|
+ this.soutRizhi = this.soutRiZhiSucess + '结束'
|
|
|
}
|
|
|
- this.soutRizhi = this.soutRiZhiSucess + '静态数据测试抽取完成,点击确定制作数据集' + '\n\n' + this.soutRizhi
|
|
|
},
|
|
|
yuLanMouseOver () {
|
|
|
document.getElementById('yuLan').className = 'iconfont icon-preview1'
|