diff --git a/src/views/dataReport/components/deviceExportDialog.vue b/src/views/dataReport/components/deviceExportDialog.vue
new file mode 100644
index 00000000..8a9d707a
--- /dev/null
+++ b/src/views/dataReport/components/deviceExportDialog.vue
@@ -0,0 +1,97 @@
+<template>
+  <el-dialog
+    title="选择设备"
+    :visible.sync="dialogVisible"
+    :before-close="handleClose"
+    class="deviceBoxDialog"
+    width="326px"
+  >
+    <div class="device">
+      <el-form :model="sblxform">
+        <el-form-item label="设备类型">
+          <el-select v-model="sblxform.sblxId" placeholder="请选择设备类型">
+            <el-option
+              v-for="item in sblxOptions"
+              :key="item.id"
+              :label="item.mc"
+              :value="item.id"
+            >
+              {{ item.mc }}
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" @click="onSubmit">确定导出</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { modevtypeListAllApi } from "@/utils/api/index";
+
+export default {
+  name: "deviceBoxDialog",
+  components: {},
+  data() {
+    return {
+      sblxform: {
+        sblxId: "",
+      },
+      dialogVisible: false,
+      sblxOptions: [],
+      startTime: "",
+      endTime: "",
+      page: 1, // 当前页数
+      pageSize: 20, // 每页数量
+      total: 0, //总条数
+    };
+  },
+  created() {},
+  watch: {},
+  mounted() {},
+  methods: {
+    getdeviceList() {
+      modevtypeListAllApi()
+        .then((res) => {
+          console.log(res);
+          this.sblxOptions = res.data;
+        })
+        .catch((err) => {
+          console.log(err); //代码错误、请求失败捕获
+        });
+    },
+
+    onSubmit() {
+      console.log(this.sblxform);
+      console.log(this.startTime, this.endTime);
+      window.location.href =
+        "/cac-api/nsensor/export?typeId=" +
+        this.sblxform.sblxId +
+        "&startTime=" +
+        this.startTime +
+        "&endTime=" +
+        this.endTime;
+      this.dialogVisible = false;
+    },
+
+    display(stime, etime) {
+      this.startTime = stime;
+      this.endTime = etime;
+      this.dialogVisible = true;
+      this.getdeviceList();
+    },
+    handleClose() {
+      this.dialogVisible = false;
+      this.sblxform.sblxId = "";
+    },
+  },
+};
+</script>
+
+<style lang="less">
+.deviceBoxDialog {
+}
+</style>
diff --git a/src/views/dataReport/index.vue b/src/views/dataReport/index.vue
index 75033d60..4839bd87 100644
--- a/src/views/dataReport/index.vue
+++ b/src/views/dataReport/index.vue
@@ -20,6 +20,7 @@
           :filter-node-method="filterNode"
           highlight-current
           :current-node-key="currentNodekey"
+          :default-expanded-keys="defaultExpandedKeys"
           :expand-on-click-node="true"
           accordion
           @node-click="handleNodeClick"
@@ -48,7 +49,12 @@
     </div>
     <div class="reportTable">
       <div class="reportHead">
-        <h3>数据展示</h3>
+        <h3>
+          数据展示
+          <el-button type="primary" class="exporBtn" @click="handleAllExport"
+            >按设备类型导出数据</el-button
+          >
+        </h3>
         <div class="searchMain">
           <el-form :inline="true" :model="formdata" class="demo-form-inline">
             <el-form-item label="开始日期">
@@ -202,14 +208,19 @@
         </el-tabs>
       </div>
     </div>
+    <deviceExportDialog ref="deviceRef"></deviceExportDialog>
   </div>
 </template>
 <script>
 import { getTreeApi, getDetailApi, getexportApi } from "@/utils/api/index";
 import lineChart from "./components/line";
+import deviceExportDialog from "./components/deviceExportDialog";
 export default {
   name: "dataReport",
-  components: { lineChart },
+  components: {
+    lineChart,
+    deviceExportDialog,
+  },
   data() {
     return {
       pickerOptions: {
@@ -265,7 +276,6 @@ export default {
       key: 1,
       tableData: [], //表格数据
       columns: [], //表头数据
-
       page: 1, // 当前页数
       pageSize: 20, // 每页数量
       total: 0, //总条数
@@ -345,7 +355,7 @@ export default {
           this.treeData = this.processData(response.data);
           console.log(this.treeData[0]);
           this.defaultExpandedKeys = [
-            this.treeData[0].children[0].children[0].id,
+            this.treeData[0].children[0].children[0].compositeKey,
           ];
           this.currentNodekey =
             this.treeData[0].children[0].children[0].children[0].compositeKey;
@@ -685,6 +695,12 @@ export default {
         "&pageSize=" +
         this.pageSize;
     },
+    handleAllExport() {
+      this.$refs.deviceRef.display(
+        this.formdata.starttime,
+        this.formdata.endtime
+      );
+    },
     //点击分页
     handleCurrentChange(val) {
       this.page = val;
@@ -885,6 +901,9 @@ export default {
         font-weight: normal;
         height: 40px;
         line-height: 40px;
+        .exporBtn {
+          margin-left: 12px;
+        }
       }
       .searchMain {
         display: flex;