diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, 'res')
           res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10;
-          });
-          this.tableData = res;
+            item.index = index + 1 + (offset - 1) * 10
+          })
+          this.tableData = res
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, 'res')
           res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10;
-          });
-          this.tableData = res;
+            item.index = index + 1 + (offset - 1) * 10
+          })
+          this.tableData = res
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <!--      <el-table-column type="index" label="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, 'res')
           res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10;
-          });
-          this.tableData = res;
+            item.index = index + 1 + (offset - 1) * 10
+          })
+          this.tableData = res
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <!--      <el-table-column type="index" label="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 257c99a..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
-        设备品类
+        品牌
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
-            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备品牌">
+            <el-option v-for="item in brandList" :key="item.id" :label="item.brandName" :value="item.brandName" />
           </el-select>
         </div>
         设备状态
@@ -69,7 +69,7 @@
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" @click=" BatchDelete">
           一键解绑
         </el-button>
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -161,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -183,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -213,8 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      this.categoryList = res.data
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -228,12 +229,16 @@
     // },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       d_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -245,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -254,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -273,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      d_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '设备列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, 'res')
           res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10;
-          });
-          this.tableData = res;
+            item.index = index + 1 + (offset - 1) * 10
+          })
+          this.tableData = res
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <!--      <el-table-column type="index" label="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 257c99a..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
-        设备品类
+        品牌
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
-            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备品牌">
+            <el-option v-for="item in brandList" :key="item.id" :label="item.brandName" :value="item.brandName" />
           </el-select>
         </div>
         设备状态
@@ -69,7 +69,7 @@
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" @click=" BatchDelete">
           一键解绑
         </el-button>
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -161,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -183,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -213,8 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      this.categoryList = res.data
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -228,12 +229,16 @@
     // },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       d_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -245,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -254,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -273,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      d_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '设备列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index c86d264..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -157,9 +158,11 @@
       this.$refs.addProduct.initDialog('add')
     },
     getProductList() {
+      this.loading = true
       listPage(`limit=${this.limit}&offset=${this.offset}`, this.listQuery).then(res => {
         this.tableData = res.rows
         this.total = res.total
+        this.loading = false
       })
     },
     setLimit(crrentSize) {

diff --git a/src/api/product/category.js b/src/api/product/category.js
index aea97c7..d655a11 100644
--- a/src/api/product/category.js
+++ b/src/api/product/category.js
@@ -69,7 +69,8 @@
   return request({
     url: '/categoryInfo/listExport',
     method: 'post',
-    data
+    data,
+    responseType: 'blob'
   })
 }
 
diff --git a/src/api/product/device.js b/src/api/product/device.js
index e5b8b02..ccfa5cf 100644
--- a/src/api/product/device.js
+++ b/src/api/product/device.js
@@ -22,7 +22,7 @@
 
 // 设备列表导出
 const d_listExport = (data) => {
-  return instance.post('/deviceInfo/listExport', data)
+  return instance.post('/deviceInfo/listExport', data, { responseType: 'blob' })
 }
 
 // 统计：累计激活设备数、今日设备在线数、今日设备在线率
diff --git a/src/api/request/http.js b/src/api/request/http.js
index 9a49dc5..a7f20d1 100644
--- a/src/api/request/http.js
+++ b/src/api/request/http.js
@@ -43,7 +43,7 @@
   console.log('err ============')
   //  对于请求报错进行处理
   Message.error(err.message)
-  return ''
-  // return Promise.reject(err)
+  // return ''
+  return Promise.reject(err)
 })
 export { instance }
diff --git a/src/components/mycomponent/dialog/snFieldInfoDialog.vue b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
index 23d020b..b85f8bc 100644
--- a/src/components/mycomponent/dialog/snFieldInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snFieldInfoDialog.vue
@@ -1,7 +1,6 @@
 <!--SN码详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
       <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="description-label" :column="2" border>
         <el-descriptions-item label="SN码(固定标识)">
@@ -43,7 +42,7 @@
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog' // 抽离porp 和 methods
 export default {
   mixins: [infoDialog]
 }
diff --git a/src/components/mycomponent/dialog/snRulsInfoDialog.vue b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
index c9c37a5..d63eedf 100644
--- a/src/components/mycomponent/dialog/snRulsInfoDialog.vue
+++ b/src/components/mycomponent/dialog/snRulsInfoDialog.vue
@@ -1,50 +1,47 @@
 <!--SN码规则详情弹窗-->
 <template>
-  <el-dialog title="详情" width='920px' :visible.sync="isShowInfo" append-to-body @close='close'>
-
+  <el-dialog title="详情" width="920px" :visible.sync="isShowInfo" append-to-body @close="close">
     <div class="contanier">
-      <div class="box">
-        <div class="item">
-          <div class="title">序号</div>
-          <div class="content"> {{ dataInfo.id }}</div>
-        </div>
-        <div class="item">
-          <div class="title">SN码</div>
-          <div class="content"> {{ dataInfo.snCode }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码说明</div>
-          <div class="content"> {{ dataInfo.snIllustration }}</div>
-        </div>
-        <div class="item">
-          <div class="title">创建时间</div>
-          <div class="content"> {{ dataInfo.createTime }}</div>
-        </div>
-      </div>
-      <div class="box">
-        <div class="item">
-          <div class="title">SN码个数</div>
-          <div class="content"> {{ dataInfo.snQuantity }}</div>
-        </div>
-        <div class="item">
-          <div class="title">更新时间</div>
-          <div class="content"> {{ dataInfo.updateTime }}</div>
-        </div>
-      </div>
+      <el-descriptions v-if="dataInfo" class="margin-top" title="" label-class-name="sn-description-label" :column="2" border>
+        <el-descriptions-item label="SN码(固定标识)">
+          {{ dataInfo.snCode ? dataInfo.snCode : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）个数">
+          {{ dataInfo.snQuantity ? dataInfo.snQuantity : '' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="SN码（固定标识）说明">
+          {{ dataInfo.snIllustration ? dataInfo.snIllustration : '' }}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import {infoDialog} from '../../../utils/myUtils/mixins/infoDialog'  //抽离porp 和 methods
+import { infoDialog } from '../../../utils/myUtils/mixins/infoDialog'
+import { S_detail } from '@/api/product/snCodeRuls' // 抽离porp 和 methods
 export default {
-  mixins: [infoDialog]
+  mixins: [infoDialog],
+  data() {
+    return {
+      detailList: []
+    }
+  },
+  methods: {
+    fetchDetail() {
+      S_detail(this.dataInfo.id).then(res => {
+        this.detailList = res
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 @import '../../../assets/css/infoDialog.scss';
-
+</style>
+<style>
+.sn-description-label{
+  width: 200px;
+}
 </style>
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index fd9b13c..2dfc80a 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -66,19 +66,19 @@
         </el-button>
         <el-tooltip class="item" effect="dark" content="导出所有品牌数据" placement="top-start">
           <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
-          导出
-        </el-button>
-    </el-tooltip>
-
+            type="primary"
+            icon="el-icon-folder-opened"
+            class="btnItem"
+            @click="exportToExcel"
+          >
+            导出
+          </el-button>
+        </el-tooltip>
       </div>
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -88,10 +88,9 @@
       }"
       :row-style="{ 'text-align': 'center' }"
       style="width: 100%"
-      v-loading="loading"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" width="75" label="序号" />
+      <!--      <el-table-column prop="index" width="75" label="序号" />-->
       <el-table-column prop="brandCode" label="编号" />
       <el-table-column prop="brandName" label="名称" />
       <el-table-column prop="brandProperty" label="性质" />
@@ -133,18 +132,18 @@
 <script>
 // 组件
 
-import GroupPage from "../../components/mycomponent/groupPage.vue";
+import GroupPage from '../../components/mycomponent/groupPage.vue'
 //  element ui Dialog
-import InfoDialog from "../../components/mycomponent/dialog/InfoDialog.vue";
-import DetailBrand from "@/views/product/detailBrand";
-import EditBrand from "@/views/product/editBrand";
+import InfoDialog from '../../components/mycomponent/dialog/InfoDialog.vue'
+import DetailBrand from '@/views/product/detailBrand'
+import EditBrand from '@/views/product/editBrand'
 
 // 逻辑
-import { tableRowClassName } from "../../utils/myUtils/changeTableTr";
-import { listPage, batchDelete, Branddelete } from "@/api/product/brand";
-import { batchExportBrand } from "@/api/common";
-import { listMixin, elDataDialog } from "../../utils/myUtils/mixins/listPage";
-import { outToExcel } from "../../utils/myUtils/exportToExcel";
+import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
+import { listPage, batchDelete, Branddelete } from '@/api/product/brand'
+import { batchExportBrand } from '@/api/common'
+import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   // 加入分页逻辑
   components: {
@@ -161,12 +160,12 @@
       dataInfo: {}, // 新数据的chushixiang
       selectInfo: {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
       },
-      loading:false, // 表格的loading
-    };
+      loading: false // 表格的loading
+    }
   },
   // mounted(){
   //   //获取 品牌表格列表
@@ -175,26 +174,28 @@
   methods: {
     tableRowClassName: tableRowClassName,
     closeAdd() {
-      this.isShowAdd = false;
+      this.isShowAdd = false
     },
     addBrand() {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("create");
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('create')
     },
     // 编辑
     update(row) {
-      this.isShowAdd = true;
-      this.$refs.editBrand.initDialog("update", row);
+      this.isShowAdd = true
+      this.$refs.editBrand.initDialog('update', row)
     },
     // 重置
     reset() {
       this.selectInfo = {
         // 搜索框中的数据的数据
-        brandCode: "",
-        brandName: "",
-        brandProperty: "",
-      };
-      // this.queryInfo = {...this.selectInfo}   //重置搜索内容
+        brandCode: '',
+        brandName: '',
+        brandProperty: ''
+      }
+      this.offset = 1
+      this.queryInfo = { ...this.selectInfo } // 重置搜索内容
+      this.refresh()
     },
     detail(row) {
       this.$refs.detailBrand.initDialog('detail', row)
@@ -206,11 +207,11 @@
       listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(
         (res) => {
           // 得到相关数据
-          console.log(res, "res");
+          console.log(res, 'res')
           res.rows.forEach((item, index) => {
-            item.index = index + 1 + (offset - 1) * 10;
-          });
-          this.tableData = res;
+            item.index = index + 1 + (offset - 1) * 10
+          })
+          this.tableData = res
           this.loading = false
         }
       ).catch(err => {
@@ -219,57 +220,57 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      this.$confirm(`确认删除${row.brandName}品牌吗？`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       })
         .then(() => {
-          const id = row.id;
+          const id = row.id
           Branddelete({ id: id }).then((res) => {
-            console.log(res, "res");
+            console.log(res, 'res')
             // 删除成功跟新数据
             this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
-          });
+              message: '删除成功',
+              type: 'success'
+            })
+            this.refresh()
+          })
         })
-        .catch(() => {});
+        .catch(() => {})
     },
 
     // 批量删除
     BatchDelete() {
       // 先判断有无选中
       if (this.$refs.multipleTable.selection.length !== 0) {
-        this.$confirm(`确认删除选中的这些品牌吗？`, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm(`确认删除选中的这些品牌吗？`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
         })
           .then(() => {
             //  得到选中行
-            const dle_ary = this.$refs.multipleTable.selection;
-            const ids = [];
+            const dle_ary = this.$refs.multipleTable.selection
+            const ids = []
             dle_ary.forEach((ele) => {
-              ids.push(ele.id);
-            });
+              ids.push(ele.id)
+            })
             batchDelete({ ids: ids }).then((res) => {
-              console.log(res, "res");
+              console.log(res, 'res')
               this.$message({
-                message: "删除成功",
-                type: "success",
-              });
-              this.refresh();
-            });
+                message: '删除成功',
+                type: 'success'
+              })
+              this.refresh()
+            })
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
         this.$message({
-          message: "请先勾选需要删除的品牌",
-          type: "error",
-        });
+          message: '请先勾选需要删除的品牌',
+          type: 'error'
+        })
       }
     },
     // 导出到excel
@@ -277,26 +278,26 @@
       // 全屏加载动画;
       const loading = this.$loading({
         lock: true,
-        text: "数据处理中,请稍后...",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
+        text: '数据处理中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
-          loading.close(); // 关闭加载动画
+          outToExcel(res.rows)
+          loading.close() // 关闭加载动画
           this.$message({
-            message: "导出成功",
-            type: "success",
-          });
+            message: '导出成功',
+            type: 'success'
+          })
         })
         .catch((error) => {
-          loading.close(); // 关闭加载动画
+          loading.close() // 关闭加载动画
           this.$message({
             message: error.message,
-            type: "error",
-          });
-        });
+            type: 'error'
+          })
+        })
       // batchExportBrand(this.selectInfo)
       //   .then((res) => {
       //     loading.close(); // 关闭加载动画
@@ -313,9 +314,9 @@
       //   .catch((res) => {
       //     loading.close();
       //   });
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 7930e4c..80a22b2 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -82,7 +82,7 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column type="index" label="序号" />
+      <!--      <el-table-column type="index" label="序号" />-->
       <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
@@ -156,10 +156,12 @@
 import {
   C_listPage,
   C_batchDelete,
-  C_delete
+  C_delete, C_listExport
 } from '../../api/product/category'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
 import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SN_listExport } from '@/api/product/snCodeField'
+import { exportFile } from '@/utils/exportutils'
 
 export default { // 加入分页逻辑
   components: {
@@ -199,6 +201,8 @@
         categoryCode: '',
         categoryName: ''
       }
+      this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 获取指定页面
     getListPage(limit, offset) {
@@ -271,8 +275,19 @@
       this.$refs.addDialog.initDialog('update', row)
     },
     exportToExcel() {
-      C_listPage('limit=1000000000&offset=1', {}).then((res) => {
-        outToExcel(res.data.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      C_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '品类列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index 257c99a..e1e9818 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -33,10 +33,10 @@
         <div class="inputBox" style="width: 144px">
           <el-input v-model="selectInfo.productCode" placeholder="请入设备型号" clearable class="product-input" />
         </div>
-        设备品类
+        品牌
         <div class="inputBox" style="width: 194px">
-          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备类型">
-            <el-option v-for="item in categoryList" :key="item.id" :label="item.categoryName" :value="item.categoryName" />
+          <el-select v-model="selectInfo.brandName" filterable clearable placeholder="请输入或选择设备品牌">
+            <el-option v-for="item in brandList" :key="item.id" :label="item.brandName" :value="item.brandName" />
           </el-select>
         </div>
         设备状态
@@ -69,7 +69,7 @@
         <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" click=" BatchDelete">
+        <el-button type="danger" con="el-icon-delete-solid" lass="btnItem bgred" @click=" BatchDelete">
           一键解绑
         </el-button>
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
@@ -82,6 +82,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{'text-align': 'center' ,background:'  #2483b3',color:'white'}"
@@ -161,10 +162,10 @@
 import GroupPage from '../../components/mycomponent/groupPage.vue'
 // 逻辑
 import { tableRowClassName } from '../../utils/myUtils/changeTableTr'
-import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade } from '../../api/product/device'
+import { d_listPage, d_statistics, d_unbind, d_firmwareUpgrade, d_listExport } from '../../api/product/device'
 import { listMixin, elDataDialog } from '../../utils/myUtils/mixins/listPage'
-import { C_list } from '../../api/product/category'
-import { outToExcel } from '../../utils/myUtils/exportToExcel'
+import { SelectList } from '../../api/product/brand'
+import { exportFile } from '@/utils/exportutils'
 export default {
   components: {
     DataInfoItem,
@@ -183,7 +184,7 @@
         deviceStatus: '',
         deviceBindUser: ''
       },
-      categoryList: [],
+      brandList: [],
       DevState: [
 
         {
@@ -213,8 +214,8 @@
     d_statistics().then(res => {
       this.statistics = res
     })
-    C_list().then(res => {
-      this.categoryList = res.data
+    SelectList().then(res => {
+      this.brandList = res
     })
   },
   methods: {
@@ -228,12 +229,16 @@
     // },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       d_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
+      }).catch(_ => {
+        this.loading = false
       })
     },
     reset() {
@@ -245,6 +250,7 @@
         deviceBindUser: ''
       }
       this.queryInfo = { ...this.selectInfo }
+      this.refresh()
     },
     // 批量删除
     BatchDelete() {
@@ -254,14 +260,14 @@
       dle_ary.forEach(ele => {
         ids.push(ele.id)
       })
-      d_unbind({ ids: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '删除成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+      d_unbind({ deviceIds: ids }).then(res => {
+        this.$message({
+          message: res || '解绑成功',
+          type: 'success'
+        })
+        this.refresh()
+      }).catch(_ => {
+
       })
     },
     Upgrade() {
@@ -273,18 +279,27 @@
         ids.push(ele.deviceId)
       })
       d_firmwareUpgrade({ deviceIds: ids }).then(res => {
-        if (res != '') {
-          this.$message({
-            message: '升级成功',
-            type: 'success'
-          })
-          this.refresh()
-        }
+        this.$message({
+          message: res || '升级成功',
+          type: 'success'
+        })
+        this.refresh()
       })
     },
     exportToExcel() {
-      d_listPage('limit=1000000000&offset=1', {}).then(res => {
-        outToExcel(res.rows)
+      // 全屏加载动画
+      const loading = this.$loading({
+        lock: true,
+        text: '下载中,请稍后...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      d_listExport(this.selectInfo).then(res => {
+        loading.close() // 关闭加载动画
+        const blob = new Blob([res.data])
+        let fileName = '设备列表.xlsx'
+        fileName = fileName.replace(/-|:| /g, '')
+        exportFile(blob, fileName)
       })
     }
   }
diff --git a/src/views/product/productList.vue b/src/views/product/productList.vue
index c86d264..4ee9765 100644
--- a/src/views/product/productList.vue
+++ b/src/views/product/productList.vue
@@ -39,6 +39,7 @@
       <el-table
         id="out-table"
         ref="multipleTable"
+        v-loading="loading"
         :data="tableData"
         style="width: 100%"
         :row-class-name="tableRowClassName"
@@ -157,9 +158,11 @@
       this.$refs.addProduct.initDialog('add')
     },
     getProductList() {
+      this.loading = true
       listPage(`limit=${this.limit}&offset=${this.offset}`, this.listQuery).then(res => {
         this.tableData = res.rows
         this.total = res.total
+        this.loading = false
       })
     },
     setLimit(crrentSize) {
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 8c0d4cd..58c8ca9 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -32,6 +32,7 @@
     </div>
     <el-table
       ref="multipleTable"
+      v-loading="loading"
       :data="tableData.rows"
       :row-class-name="tableRowClassName"
       :header-cell-style="{
@@ -43,8 +44,6 @@
       style="width: 100%"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="index" label="序号" />
-      <!-- <el-table-column prop="id" label="序号"> </el-table-column> -->
       <el-table-column prop="snCode" label="SN码（固定标识）" />
       <el-table-column prop="snQuantity" label="SN码（固定标识）个数" />
       <el-table-column prop="snIllustration" label="SN码（固定标识）说明" />
@@ -115,12 +114,14 @@
     },
     // 获取指定页面
     getListPage(limit, offset) {
+      this.loading = true
       S_listPage(`limit=${limit}&offset=${offset}`, this.queryInfo).then(res => {
       // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * 10)
         })
         this.tableData = res
+        this.loading = false
       })
     },
     reset() {