|
|
@@ -195,13 +195,6 @@ export default {
|
|
|
getWaterData({ size: 1000 }).then(res => {
|
|
|
if (res.code != 1) return
|
|
|
this.waterData = res.result.records
|
|
|
-<<<<<<< HEAD
|
|
|
- console.log("水厂数据" + JSON.stringify(res));
|
|
|
- console.log("水厂id" + this.waterData[0].id + '');
|
|
|
-=======
|
|
|
- // console.log("水厂数据"+JSON.stringify(res));
|
|
|
- // console.log("水厂id"+this.waterData[0].id + '');
|
|
|
->>>>>>> 879d1914908639184a9e193a63c4c35496c92336
|
|
|
let water = this.waterData[0].id + '';
|
|
|
this.queryBtn(water);
|
|
|
})
|
|
|
@@ -233,19 +226,9 @@ export default {
|
|
|
}
|
|
|
this.chartsDataX = arrX;
|
|
|
this.chartsDataY = arrY;
|
|
|
-<<<<<<< HEAD
|
|
|
- console.log("表格数据@@@@@" + JSON.stringify(arrX));
|
|
|
- console.log("表格数据@@@@@" + JSON.stringify(this.chartsDataX));
|
|
|
- console.log("表格数据@@@@@" + JSON.stringify(this.chartsDataY));
|
|
|
this.$nextTick(() => {
|
|
|
this.initCharts();
|
|
|
- // myChart1.setOption(this.setData(data[0]))
|
|
|
})
|
|
|
-=======
|
|
|
- // console.log("表格数据@@@@@"+JSON.stringify(arrX));
|
|
|
- // console.log("表格数据@@@@@"+JSON.stringify(this.chartsDataX));
|
|
|
- // console.log("表格数据@@@@@"+JSON.stringify(this.chartsDataY));
|
|
|
->>>>>>> 879d1914908639184a9e193a63c4c35496c92336
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -437,11 +420,6 @@ export default {
|
|
|
this.$message.error("请选择需要导出的水厂！");
|
|
|
} else {
|
|
|
exportDrugUseInfo(params).then(res => {
|
|
|
-<<<<<<< HEAD
|
|
|
- console.log("daochuwenjian" + JSON.stringify(res));
|
|
|
-=======
|
|
|
- // console.log("daochuwenjian"+JSON.stringify(res));
|
|
|
->>>>>>> 879d1914908639184a9e193a63c4c35496c92336
|
|
|
const blob = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' }))
|
|
|
const a = document.createElement('a')
|
|
|
a.href = blob
|
