diff --git a/src/views/clientDownFile/downrecord/index.vue b/src/views/clientDownFile/downrecord/index.vue index 07137152..5c7f1afa 100644 --- a/src/views/clientDownFile/downrecord/index.vue +++ b/src/views/clientDownFile/downrecord/index.vue @@ -36,18 +36,18 @@ {{ scope.row.id }} --> - + - + + + + + + + diff --git a/src/views/dataReport/index.vue b/src/views/dataReport/index.vue index ab6ba2ee..0ff3f927 100644 --- a/src/views/dataReport/index.vue +++ b/src/views/dataReport/index.vue @@ -205,6 +205,12 @@ + +
+

{{ crrrentName }}

+
+ +
@@ -215,11 +221,13 @@ import { getTreeApi, getDetailApi, getexportApi } from "@/utils/api/index"; import lineChart from "./components/line"; import deviceExportDialog from "./components/deviceExportDialog"; +import ptFile from "./components/ptFile"; export default { name: "dataReport", components: { lineChart, deviceExportDialog, + ptFile, }, data() { return { @@ -583,6 +591,8 @@ export default { this.formdata.starttime, this.formdata.endtime ); + } else if (this.tabName == "ptFileTab") { + this.$refs.ptflieRef.getdownAll(this.currentId, this.formdata); } }, //获取数据接口 @@ -665,13 +675,15 @@ export default { this.formdata.starttime, this.formdata.endtime ); - } else { + } else if (this.tabName === "dataTab") { this.getDetailTable( this.currentId, this.formdata.dayValue, this.formdata.starttime, this.formdata.endtime ); + } else if (this.tabName === "ptFileTab") { + this.$refs.ptflieRef.getdownAll(this.currentId, this.formdata); } }, //导出数据 diff --git a/src/views/equipment/jcsb/components/addjcsbDialog.vue b/src/views/equipment/jcsb/components/addjcsbDialog.vue index 2b956574..3824c3bd 100644 --- a/src/views/equipment/jcsb/components/addjcsbDialog.vue +++ b/src/views/equipment/jcsb/components/addjcsbDialog.vue @@ -40,6 +40,13 @@ + + +