diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 9ce7755..3490aa2 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -197,7 +197,7 @@
     // 批量删除
     BatchDelete() {
       if (this.$refs.multipleTable.selection.length) {
-        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        this.$confirm(`确认删除选中的这些SN数据吗？`, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -227,7 +227,7 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+      this.$confirm(`确认删除此数据吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 9ce7755..3490aa2 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -197,7 +197,7 @@
     // 批量删除
     BatchDelete() {
       if (this.$refs.multipleTable.selection.length) {
-        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        this.$confirm(`确认删除选中的这些SN数据吗？`, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -227,7 +227,7 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+      this.$confirm(`确认删除此数据吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 6e17830..25d0efe 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -69,6 +69,7 @@
             record.quarterlyEvaluateFileList = record.quarterlyEvaluateFile.split(',')
           }
         })
+        res = res.filter(item => item.quarterlyEvaluateDate)
         this.tableData = res
       })
     }

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 9ce7755..3490aa2 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -197,7 +197,7 @@
     // 批量删除
     BatchDelete() {
       if (this.$refs.multipleTable.selection.length) {
-        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        this.$confirm(`确认删除选中的这些SN数据吗？`, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -227,7 +227,7 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+      this.$confirm(`确认删除此数据吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 6e17830..25d0efe 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -69,6 +69,7 @@
             record.quarterlyEvaluateFileList = record.quarterlyEvaluateFile.split(',')
           }
         })
+        res = res.filter(item => item.quarterlyEvaluateDate)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
index 18a4f11..4d2a8c1 100644
--- a/src/views/supplier/historyInquiryDialog.vue
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -57,14 +57,15 @@
     // 历史预审列表
     getHistoryInquiry(supplierCode) {
       historyInquiry({ supplierCode: supplierCode }).then(res => {
-        res.forEach(record => {
-          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
-            record.preReviewDate = record.preReviewDate.substring(0, 10)
-          }
-          if (record.preReviewFile !== '') {
-            record.preReviewFileList = record.preReviewFile.split(',')
-          }
-        })
+        // res.forEach(record => {
+        //   if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+        //     record.preReviewDate = record.preReviewDate.substring(0, 10)
+        //   }
+        //   if (record.preReviewFile !== '') {
+        //     record.preReviewFileList = record.preReviewFile.split(',')
+        //   }
+        // })
+        res = res.filter(item => item.preReviewResultName)
         this.tableData = res
       })
     }

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 9ce7755..3490aa2 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -197,7 +197,7 @@
     // 批量删除
     BatchDelete() {
       if (this.$refs.multipleTable.selection.length) {
-        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        this.$confirm(`确认删除选中的这些SN数据吗？`, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -227,7 +227,7 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+      this.$confirm(`确认删除此数据吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 6e17830..25d0efe 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -69,6 +69,7 @@
             record.quarterlyEvaluateFileList = record.quarterlyEvaluateFile.split(',')
           }
         })
+        res = res.filter(item => item.quarterlyEvaluateDate)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
index 18a4f11..4d2a8c1 100644
--- a/src/views/supplier/historyInquiryDialog.vue
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -57,14 +57,15 @@
     // 历史预审列表
     getHistoryInquiry(supplierCode) {
       historyInquiry({ supplierCode: supplierCode }).then(res => {
-        res.forEach(record => {
-          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
-            record.preReviewDate = record.preReviewDate.substring(0, 10)
-          }
-          if (record.preReviewFile !== '') {
-            record.preReviewFileList = record.preReviewFile.split(',')
-          }
-        })
+        // res.forEach(record => {
+        //   if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+        //     record.preReviewDate = record.preReviewDate.substring(0, 10)
+        //   }
+        //   if (record.preReviewFile !== '') {
+        //     record.preReviewFileList = record.preReviewFile.split(',')
+        //   }
+        // })
+        res = res.filter(item => item.preReviewResultName)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyReviewDialog.vue b/src/views/supplier/historyReviewDialog.vue
index 1c0a9d6..958ff4a 100644
--- a/src/views/supplier/historyReviewDialog.vue
+++ b/src/views/supplier/historyReviewDialog.vue
@@ -65,6 +65,7 @@
             record.inputReviewFileList = record.inputReviewFile.split(',')
           }
         })
+        res = res.filter(item => item.inputReviewResultName)
         this.tableData = res
       })
     }

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 9ce7755..3490aa2 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -197,7 +197,7 @@
     // 批量删除
     BatchDelete() {
       if (this.$refs.multipleTable.selection.length) {
-        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        this.$confirm(`确认删除选中的这些SN数据吗？`, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -227,7 +227,7 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+      this.$confirm(`确认删除此数据吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 6e17830..25d0efe 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -69,6 +69,7 @@
             record.quarterlyEvaluateFileList = record.quarterlyEvaluateFile.split(',')
           }
         })
+        res = res.filter(item => item.quarterlyEvaluateDate)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
index 18a4f11..4d2a8c1 100644
--- a/src/views/supplier/historyInquiryDialog.vue
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -57,14 +57,15 @@
     // 历史预审列表
     getHistoryInquiry(supplierCode) {
       historyInquiry({ supplierCode: supplierCode }).then(res => {
-        res.forEach(record => {
-          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
-            record.preReviewDate = record.preReviewDate.substring(0, 10)
-          }
-          if (record.preReviewFile !== '') {
-            record.preReviewFileList = record.preReviewFile.split(',')
-          }
-        })
+        // res.forEach(record => {
+        //   if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+        //     record.preReviewDate = record.preReviewDate.substring(0, 10)
+        //   }
+        //   if (record.preReviewFile !== '') {
+        //     record.preReviewFileList = record.preReviewFile.split(',')
+        //   }
+        // })
+        res = res.filter(item => item.preReviewResultName)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyReviewDialog.vue b/src/views/supplier/historyReviewDialog.vue
index 1c0a9d6..958ff4a 100644
--- a/src/views/supplier/historyReviewDialog.vue
+++ b/src/views/supplier/historyReviewDialog.vue
@@ -65,6 +65,7 @@
             record.inputReviewFileList = record.inputReviewFile.split(',')
           }
         })
+        res = res.filter(item => item.inputReviewResultName)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/supplierList.vue b/src/views/supplier/supplierList.vue
index c49722b..9363303 100644
--- a/src/views/supplier/supplierList.vue
+++ b/src/views/supplier/supplierList.vue
@@ -5,92 +5,44 @@
       <div class="productInput">
         供应商编号
         <div class="inputBox" style="width: 200px">
-          <el-input
-            v-model="selectInfo.supplierCode"
-            placeholder="请输入编号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.supplierCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         供应商名称
         <div class="inputBox" style="width: 200px">
-          <el-input
-            v-model="selectInfo.supplierName"
-            placeholder="请输入名称"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.supplierName" placeholder="请输入名称" clearable class="product-input" />
         </div>
         供应商状态
         <div class="inputBox" style="width: 200px">
-          <el-select
-            v-model="selectInfo.supplierStatus"
-            clearable
-            placeholder="供应商状态"
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in supplierStatusOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+          <el-select v-model="selectInfo.supplierStatus" clearable placeholder="供应商状态" style="width: 200px">
+            <el-option v-for="item in supplierStatusOptions" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column prop="index" width="100px" label="序号" />
       <el-table-column prop="supplierCode" width="200px" label="供应商编号" />
       <el-table-column prop="supplierName" width="400px" label="供应商名称" />
       <el-table-column prop="supplierStatusName" label="供应商状态" />
       <el-table-column prop="preReviewResultName" label="资料预审结果" />
       <el-table-column prop="inputReviewResultName" label="录库评审结果" />
-      <el-table-column
-        prop="latestQuarterlyEvaluateResultName"
-        label="最近季度评价结果"
-      />
-      <el-table-column
-        prop="latestAnnualAssessResultName"
-        label="最新年度考核结果"
-      />
+      <el-table-column prop="latestQuarterlyEvaluateResultName" label="最近季度评价结果" />
+      <el-table-column prop="latestAnnualAssessResultName" label="最新年度考核结果" />
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="detail(scope.row)">
@@ -101,15 +53,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
     <supplier-detail ref="supplierDetail" />
   </div>
@@ -188,7 +133,19 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              供应商编号: item.supplierCode,
+              供应商名称: item.supplierName,
+              供应商状态: item.supplierStatusName,
+              资料预审结果: item.preReviewResultName,
+              录库评审结果: item.inputReviewResultName,
+              最近季度评价结果: item.latestQuarterlyEvaluateResultName,
+              最新年度考核结果: item.latestAnnualAssessResultName
+            }
+          })
+          outToExcel(res.rows, '供应商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -213,25 +170,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -242,6 +205,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;

diff --git a/dist.zip b/dist.zip
index ecbaf13..792169b 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/api/system/area.js b/src/api/system/area.js
index fcb9dd2..343579b 100644
--- a/src/api/system/area.js
+++ b/src/api/system/area.js
@@ -2,6 +2,7 @@
  * 区域管理接口
  */
 import request from '@/utils/request'
+
 // 区域查询
 export function getAreaListPage(params) {
   return request({
@@ -43,7 +44,7 @@
 // 区域类型查询
 export function getAreaType() {
   return request({
-    url: 'ext/dict/code/levelType',
+    url: 'sys/dict/code/levelType',
     method: 'get'
   })
 }
diff --git a/src/components/echart/lineChart/gradientLineChart.vue b/src/components/echart/lineChart/gradientLineChart.vue
index 945f9af..140d4b0 100644
--- a/src/components/echart/lineChart/gradientLineChart.vue
+++ b/src/components/echart/lineChart/gradientLineChart.vue
@@ -98,7 +98,36 @@
             label: {
               fontSize: '16'
             }
-          }
+          },
+          position: function (point, params, dom, rect, size) {
+            // 提示框 限制在chart 图中
+            var x = 0; // x坐标位置
+            var y = 0; // y坐标位置
+
+            var pointX = point[0];
+            var pointY = point[1];
+
+            // 提示框大小
+            var boxWidth = size.contentSize[0];
+            var boxHeight = size.contentSize[1];
+
+            // boxWidth > pointX 说明鼠标左边放不下提示框
+            if (boxWidth > pointX) {
+              x = 25;
+            } else {
+              // 左边放的下
+              x = pointX - boxWidth;
+            }
+
+            if (boxHeight > pointY) {
+              y = 5;
+            } else {
+              // 上边放得下
+              y = pointY - boxHeight;
+            }
+            dom.style.transform = 'translateZ(0)'  // 提示框被遮挡时可以设置
+            return [x, y];
+          },
         },
         xAxis: [
           {
diff --git a/src/components/mycomponent/dialog/categoryAddDialog.vue b/src/components/mycomponent/dialog/categoryAddDialog.vue
index 754c1dd..0e31049 100644
--- a/src/components/mycomponent/dialog/categoryAddDialog.vue
+++ b/src/components/mycomponent/dialog/categoryAddDialog.vue
@@ -141,7 +141,7 @@
           {
             paramName: '',
             paramOrder: 0,
-            paramRequire: '0'
+            paramRequire: 0
           }
         ]
       },
diff --git a/src/components/mycomponent/dialog/categoryInfoDialog.vue b/src/components/mycomponent/dialog/categoryInfoDialog.vue
index 08a9d09..66b5f95 100644
--- a/src/components/mycomponent/dialog/categoryInfoDialog.vue
+++ b/src/components/mycomponent/dialog/categoryInfoDialog.vue
@@ -23,7 +23,7 @@
             <span>参数{{ index+1 }}：</span>
             <span class="param-name">参数名称:</span><span class="param-value">{{ param.paramName }}</span>
             <span class="param-name">排序:</span><span class="param-value">{{ param.paramOrder }}</span>
-            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire?'是':'否' }}</span>
+            <span class="param-name">必填:</span><span class="param-value">{{ param.paramRequire === '0' ? '否' :'是' }}</span>
           </div>
         </el-descriptions-item>
       </el-descriptions>
diff --git a/src/components/mycomponent/dialog/deviceInfoDialog.vue b/src/components/mycomponent/dialog/deviceInfoDialog.vue
index 30149bc..0449f01 100644
--- a/src/components/mycomponent/dialog/deviceInfoDialog.vue
+++ b/src/components/mycomponent/dialog/deviceInfoDialog.vue
@@ -685,7 +685,7 @@
           // 数据处理
           this.rowInfo.deviceActive = this.dealstate(this.rowInfo.deviceActive)
           this.rowInfo.deviceBindUser = this.dealstate(this.rowInfo.deviceBindUser)
-
+          this.rowInfo.deviceStatus = this.dealstate(this.rowInfo.deviceStatus)
           this.rowInfo.businessExt.switchStatus = this.dealwitch(this.rowInfo.businessExt.switchStatus)
           this.rowInfo.businessExt.oilPouringReminder = this.dealwitch(this.rowInfo.businessExt.oilPouringReminder)
         })
diff --git a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
index 964678a..0900244 100644
--- a/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
+++ b/src/components/mycomponent/dialog/move/hotandNewsDialog.vue
@@ -167,8 +167,9 @@
   },
   mounted() {
     list().then((res) => {
-      const str = res[26].detail;
-      const str2 = res[27].detail;
+      console.log(res)
+      const str = res[25].detail;
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
       this.modelList = this.dealAry(str);
     });
diff --git a/src/views/distributor/distributorList.vue b/src/views/distributor/distributorList.vue
index c899612..1695565 100644
--- a/src/views/distributor/distributorList.vue
+++ b/src/views/distributor/distributorList.vue
@@ -5,11 +5,11 @@
       <div class="productInput">
         经销商编号
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         经销商名称
         <div class="inputBox" style="width: 200px">
-          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input"/>
+          <el-input v-model="selectInfo.distributorName" placeholder="请输入名称" clearable class="product-input" />
         </div>
       </div>
       <div class="productBtn">
@@ -18,21 +18,14 @@
         <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">导出</el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <!-- <el-table-column prop="index" width="100px" label="序号" /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -42,7 +35,10 @@
       <el-table-column prop="companyTypeName" width="200px" label="企业类型" />
       <el-table-column prop="companyProvince, companyCity, companyArea, companyAddress" label="详细地址">
         <template slot-scope="scope">
-          {{ scope.row.companyProvince }} / {{ scope.row.companyCity }} / {{ scope.row.companyArea }} / {{ scope.row.companyAddress }}
+          {{ (scope.row.companyProvince === scope.row.companyCity ?
+              scope.row.companyCity +'/'+ scope.row.companyArea +'/'+ scope.row.companyAddress :
+              scope.row.companyProvince +'/'+ scope.row.companyCity +'/'+ scope.row.companyArea+'/'+ scope.row.companyAddress)
+          }}
         </template>
       </el-table-column>
       <el-table-column label="操作">
@@ -55,7 +51,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <distributor-detail ref="distributorDetail" />
   </div>
 </template>
@@ -91,16 +88,16 @@
     // 获取指定页面
     getListPage(limit = 10, offset = 1) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
         this.tableData = res
       })
     },
-    search(limit, offset){
+    search(limit, offset) {
       listPage(`limit=${limit}&offset=${offset}`, this.selectInfo).then(res => {
-      // 得到相关数据
+        // 得到相关数据
         res.rows.forEach((item, index) => {
           item.index = (index + 1) + ((offset - 1) * limit)
         })
@@ -128,7 +125,18 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              经销商编号: item.distributorCode,
+              经销商名称: item.distributorName,
+              单位性质: item.companyNatureName,
+              企业类型: item.companyTypeName,
+              详细地址: item.companyProvince === item.companyCity ? (item.companyProvince + item.companyCity + item.companyArea+ item.companyAddress) : (item.companyCity + item.companyArea+item.companyAddress)
+            }
+
+          })
+          outToExcel(res.rows, '经销商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -153,25 +161,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -183,6 +197,7 @@
 
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/login/index_2.vue b/src/views/login/index_2.vue
index ef21e99..5ef08a2 100644
--- a/src/views/login/index_2.vue
+++ b/src/views/login/index_2.vue
@@ -52,8 +52,8 @@
             </el-form-item>
             <kaptcha-comp v-if="showKaptcha" ref="kaptcha" @passKaptcha="passKaptcha" />
 
-            <el-form-item>
-              <el-button :loading="loading" class="login-btn" type="primary" style="width: 270px"
+            <el-form-item style="margin-left: 54px;">
+              <el-button :loading="loading" class="login-btn" type="primary" style="width: 217px"
                 @click.native.prevent="handleLogin">
                 登录
               </el-button>
diff --git a/src/views/move/hotAndNews.vue b/src/views/move/hotAndNews.vue
index 488c26d..6b18471 100644
--- a/src/views/move/hotAndNews.vue
+++ b/src/views/move/hotAndNews.vue
@@ -5,76 +5,35 @@
       <div class="productInput">
         标题
         <div class="inputBox" style="width: 120px">
-          <el-input
-            v-model="selectInfo.recommendTitle"
-            placeholder="请输入标题"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.recommendTitle" placeholder="请输入标题" clearable class="product-input" />
         </div>
         类型
         <div class="inputBox" style="width: 140px">
-          <el-select
-            v-model="selectInfo.recommendType"
-            filterable
-            placeholder="热门推荐"
-          >
-            <el-option
-              v-for="item in typeList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
-            />
+          <el-select v-model="selectInfo.recommendType" filterable placeholder="类型">
+            <el-option v-for="item in typeList" :key="item.key" :label="item.value" :value="item.key" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="success"
-          icon="el-icon-circle-plus-outline"
-          class="btnItem bggreen"
-          @click="addCategory"
-        >
+        <el-button type="success" icon="el-icon-circle-plus-outline" class="btnItem bggreen" @click="addCategory">
           新增
         </el-button>
-        <el-button
-          type="danger"
-          icon="el-icon-delete-solid"
-          class="btnItem bgred"
-          @click="BatchDelete"
-        >
+        <el-button type="danger" icon="el-icon-delete-solid" class="btnItem bgred" @click="BatchDelete">
           删除
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column type="selection" width="55" />
       <el-table-column prop="index" label="序号" width="60" />
       <el-table-column prop="recommendCode" label="编号" />
@@ -83,13 +42,8 @@
       <el-table-column prop="recommendTitle" label="标题" />
       <el-table-column prop="recommendPicture" label="图片">
         <template slot-scope="scope">
-          <img
-            v-if="scope.row.recommendPicture != ''"
-            :src= "scope.row.recommendPicture"
-            width="100"
-            height="100px"
-            alt=""
-          />
+          <img v-if="scope.row.recommendPicture != ''" :src="scope.row.recommendPicture" width="100" height="100px"
+            alt="" />
         </template>
       </el-table-column>
       <el-table-column prop="recommendContent" label="内容" />
@@ -108,22 +62,10 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
-    <hotand-news-dialog
-      :is-show-info="isShowAdd"
-      :title="title"
-      :data-info="rowInfo"
-      @close="closeAdd"
-    />
+    <hotand-news-dialog :is-show-info="isShowAdd" :title="title" :data-info="rowInfo" @close="closeAdd" />
   </div>
 </template>
 
@@ -157,7 +99,8 @@
   },
   mounted() {
     list().then((res) => {
-      const str2 = res[27].detail;
+      console.log(res)
+      const str2 = res[26].detail;
       this.typeList = this.dealAry(str2);
     });
   },
@@ -196,11 +139,12 @@
           res.rows.forEach((item, index) => {
             item.index = index + 1 + (offset - 1) * 10;
           });
-          res.rows = res.rows.map((item, index) =>{
-            return{
+          res.rows = res.rows.map((item, index) => {
+            return {
               ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
+              recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+              publishTime: item.publishTime.split(' ')[0],
+              recommendContent: item.recommendContent.substr(3, item.recommendContent.length - 7)
             }
           })
           this.tableData = res;
@@ -217,13 +161,14 @@
         res.rows.forEach((item, index) => {
           item.index = index + 1 + (1 - 1) * 10;
         });
-        res.rows = res.rows.map((item, index) =>{
-            return{
-              ...item,
-              recommendPicture: "http://111.198.10.15:21403/static/" + item.recommendPicture,
-              publishTime:item.publishTime.split(' ')[0]
-            }
-          })
+        res.rows = res.rows.map((item, index) => {
+          return {
+            ...item,
+            recommendPicture: item.recommendPicture ? "http://111.198.10.15:21403/static/" + item.recommendPicture : '',
+            publishTime: item.publishTime.split(' ')[0],
+            recommendContent: item.recommendContent.substr(2, item.recommendContent.length - 3)
+          }
+        })
         this.tableData = res;
       });
     },
@@ -242,14 +187,14 @@
               ids.push(ele.id);
             });
             batchDelete({ ids: ids }).then((res) => {
-                this.$message({
-                  message: "删除成功",
-                  type: "success",
-                });
-                this.refresh();
+              this.$message({
+                message: "删除成功",
+                type: "success",
+              });
+              this.refresh();
             });
           })
-          .catch(() => {});
+          .catch(() => { });
       } else {
         this.$message.error("请选择需要删除的数据");
       }
@@ -264,11 +209,11 @@
         const id = row.id;
         bdelete({ id: id }).then((res) => {
           // 删除成功跟新数据
-            this.$message({
-              message: "删除成功",
-              type: "success",
-            });
-            this.refresh();
+          this.$message({
+            message: "删除成功",
+            type: "success",
+          });
+          this.refresh();
         });
       });
     },
@@ -282,25 +227,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -311,6 +262,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/move/message.vue b/src/views/move/message.vue
index 94f52ad..8e27eac 100644
--- a/src/views/move/message.vue
+++ b/src/views/move/message.vue
@@ -190,7 +190,7 @@
     editCategory(row){
       console.log(row)
       this.isShowAdd = true
-      this.title = '消息推送编辑'
+      this.title = '消息推送详情'
       this.$refs.addMessage.init(row)
     },
     // 批量删除
diff --git a/src/views/product/brandList.vue b/src/views/product/brandList.vue
index 652300f..d20a139 100644
--- a/src/views/product/brandList.vue
+++ b/src/views/product/brandList.vue
@@ -16,7 +16,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandName"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
@@ -25,7 +25,7 @@
         <div class="inputBox" style="width: 144px">
           <el-input
             v-model="selectInfo.brandProperty"
-            placeholder="请输入品类名称"
+            placeholder="请输入品牌名称"
             clearable
             class="product-input"
           />
diff --git a/src/views/product/categoryList.vue b/src/views/product/categoryList.vue
index 71ae178..b10accb 100644
--- a/src/views/product/categoryList.vue
+++ b/src/views/product/categoryList.vue
@@ -92,7 +92,7 @@
       <el-table-column prop="categoryCode" label="编号" />
       <el-table-column prop="categoryName" label="名称" />
       <el-table-column prop="pCategoryName" label="上级品类" />
-      <el-table-column prop="qualifyStr" label="资质需求" />
+      <el-table-column prop="qualifyStr" label="资质要求" />
       <el-table-column prop="remark" label="备注" />
       <el-table-column label="操作">
         <template slot-scope="scope">
diff --git a/src/views/product/deviceList.vue b/src/views/product/deviceList.vue
index feb9245..ac77a64 100644
--- a/src/views/product/deviceList.vue
+++ b/src/views/product/deviceList.vue
@@ -2,25 +2,12 @@
 <template>
   <div class="product_container">
     <div class="productData">
-      <data-info-item
-        :img="require('@/assets/kitchen/设备数.png')"
-        :number="statistics.activeDeviceQuantity"
-        :title="'累计激活设备数'"
-        :unit="'个'"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/设备在线数.png')"
-        :number="statistics.onlineDeviceQuantity"
-        :title="'今日设备在线数'"
-        :unit="'个'"
-        class="middle"
-      />
-      <data-info-item
-        :img="require('@/assets/kitchen/在线率.png')"
-        :number="statistics.onlineDeviceRatio"
-        :title="'今日设备在线率'"
-        :unit="''"
-      />
+      <data-info-item :img="require('@/assets/kitchen/设备数.png')" :number="statistics.activeDeviceQuantity"
+        :title="'累计激活设备数'" :unit="'个'" />
+      <data-info-item :img="require('@/assets/kitchen/设备在线数.png')" :number="statistics.onlineDeviceQuantity"
+        :title="'今日设备在线数'" :unit="'个'" class="middle" />
+      <data-info-item :img="require('@/assets/kitchen/在线率.png')" :number="statistics.onlineDeviceRatio"
+        :title="'今日设备在线率'" :unit="''" />
     </div>
 
     <div class="productFun" style="margin-top: 30px">
@@ -42,23 +29,13 @@
         设备状态
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceStatus" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in DevState"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in DevState" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
         是否绑定用户
         <div class="inputBox" style="width: 90px">
           <el-select v-model="selectInfo.deviceBindUser" filterable clearable placeholder="请选择">
-            <el-option
-              v-for="item in userBind"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in userBind" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </div>
       </div>
@@ -69,7 +46,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">
@@ -80,78 +57,43 @@
         </el-button>
       </div>
     </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'}"
-      :row-style="{'text-align': 'center'}"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+    <el-table ref="multipleTable" v-loading="loading" :data="tableData.rows" :row-class-name="tableRowClassName"
+      :header-cell-style="{ 'text-align': 'center', background: '  #2483b3', color: 'white' }"
+      :row-style="{ 'text-align': 'center' }" style="width: 100%">
+      <el-table-column type="selection" width="55" />
       <!-- <el-table-column
         type="index"
         width="55"
         label="编号"
       /> -->
-      <el-table-column type="index" label="序号" >
-      <template slot-scope="scope">
+      <el-table-column type="index" label="序号">
+        <template slot-scope="scope">
           {{ (offset - 1) * limit + scope.$index + 1 }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="snCode"
-        label="SN码"
-      />
-      <el-table-column
-        prop="brandName"
-        label="设备品牌"
-      />
-      <el-table-column
-        prop="productCode"
-        label="设备型号"
-      />
-      <el-table-column
-        prop="createTime"
-        label="生产日期"
-      />
-      <el-table-column
-        prop="deviceStatus"
-        label="设备状态"
-      >
+      <el-table-column prop="snCode" label="SN码" />
+      <el-table-column prop="brandName" label="设备品牌" />
+      <el-table-column prop="productCode" label="设备型号" />
+      <el-table-column prop="createTime" label="生产日期" />
+      <el-table-column prop="deviceStatus" label="设备状态">
         <template slot-scope="scope">
           <!-- {{scope.deviceStatus=='1'}} -->
           <!-- {{scope.row.deviceStatus=='1'}} -->
-          {{ scope.row.deviceStatus=='1'?'在线':'离线' }}
+          {{ scope.row.deviceStatus == '1' ? '在线' : '离线' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceActiveTime"
-        label="激活时间"
-      />
-      <el-table-column
-        prop="deviceActive"
-        label="是否激活"
-      >
+      <el-table-column prop="deviceActiveTime" label="激活时间" />
+      <el-table-column prop="deviceActive" label="是否激活">
         <template slot-scope="scope">
-          {{ scope.row.deviceActive=='1'?'是':'否' }}
+          {{ scope.row.deviceActive == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        prop="deviceBindUser"
-        label="是否用户绑定设备"
-      >
+      <el-table-column prop="deviceBindUser" label="是否用户绑定设备">
         <template slot-scope="scope">
-          {{ scope.row.deviceBindUser=='1'?'是':'否' }}
+          {{ scope.row.deviceBindUser == '1' ? '是' : '否' }}
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-      >
+      <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="showInfo(scope.row)">
             详情
@@ -160,7 +102,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total" @setOffset="setOffset" @setLimit="setLimit" />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <device-info-dialog :is-show-info="isShowInfo" :data-info="rowInfo" @close="closeInfo" />
   </div>
 </template>
@@ -177,6 +120,7 @@
 import { SelectList } from '../../api/product/brand'
 import { exportFile } from '@/utils/exportutils'
 import { export_json_to_excel } from "../../utils/Export2Excel";
+import { outToExcel } from '../../utils/myUtils/exportToExcel'
 export default {
   components: {
     DataInfoItem,
@@ -242,7 +186,7 @@
     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)
         })
@@ -305,86 +249,72 @@
         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)
-      })
-      // d_listPage("offset=1", {}).then((res) => {
-      //   console.log(res.rows, "全部数据");
-        // 对数据进行加工
-        // res.rows = res.rows.map((item) => {
-        //   return {
-        //     产品名称: item.productName,
-        //     产品品牌: item.brandName,
-        //     产品型号: item.productCode,
-        //     产品品类: item.categoryStr,
-        //     产品颜色: item.productColor,
-        //     产品材质: item.productMaterialQuality,
-        //     产品状态: item.productStatus,
-        //     产品版本: item.productEdition,
-        //     规格: item.productPackageSize,
-        //     重量: item.productWeight,
-        //     国际69码: item.internationalCode,
-        //     更新时间: item.updateTime,
-        //   };
-        // });
-      //   this.ExportTable = res.rows;
-      //   const header = Object.keys(res.rows[0]);
-      //   console.log(header);
-      //   const data = res.rows.map((user, index) => {
-      //     const userArr = [];
-      //     console.log(user, index);
-      //     for (const key in res.rows[0]) {
-      //       // console.log(res.rows[key]);
-      //       const item = user[key];
-      //       userArr.push(item);
-      //     }
-      //     return userArr;
-      //   });
-      //   console.log(data);
-      //   // //把定义好的header和data放进export_json_to_excel的函数里作为参数
-      //   export_json_to_excel({
-      //     header,
-      //     data,
-      //     filename: "设备列表",
-      //   });
-      // });
+      d_listPage(`limit=100000000&offset=1`, {})
+        .then((res) => {
+          res.rows = res.rows.map((item,index) => {
+            return {
+              序号:index + 1,
+              SN码:item.snCode,
+              设备品牌:item.brandName,
+              设备型号:item.productCode,
+              生产日期:item.createTime,
+              设备状态:item.deviceStatus == '1' ? '在线' : '离线' ,
+              激活时间:item.deviceActiveTime,
+              是否激活:item.deviceActive == '1' ? '是' : '否',
+              是否用户绑定设备: item.deviceBindUser == '1' ? '是' : '否'
+            }
+          })
+          outToExcel(res.rows, '设备列表')
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: '导出成功',
+            type: 'success'
+          })
+        }).catch(error => {
+          loading.close() // 关闭加载动画
+          this.$message({
+            message: error.message,
+            type: 'error'
+          })
+        })
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
 .product_container {
   position: relative;
   width: 100%;
   // min-height: 600px;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     // min-width:1725px;
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 0px 0px 30px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 8px;
       }
     }
+
     .productBtn {
       .btnItem {
         //margin-right: 10px;
diff --git a/src/views/product/snCodeRuls.vue b/src/views/product/snCodeRuls.vue
index 9ce7755..3490aa2 100644
--- a/src/views/product/snCodeRuls.vue
+++ b/src/views/product/snCodeRuls.vue
@@ -197,7 +197,7 @@
     // 批量删除
     BatchDelete() {
       if (this.$refs.multipleTable.selection.length) {
-        this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+        this.$confirm(`确认删除选中的这些SN数据吗？`, "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -227,7 +227,7 @@
     },
     // 删除
     Bdelete(row) {
-      this.$confirm(`确认删除${row.brandName}品牌吗？`, "提示", {
+      this.$confirm(`确认删除此数据吗？`, "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
diff --git a/src/views/supplier/historyEvaluateDialog.vue b/src/views/supplier/historyEvaluateDialog.vue
index 6e17830..25d0efe 100644
--- a/src/views/supplier/historyEvaluateDialog.vue
+++ b/src/views/supplier/historyEvaluateDialog.vue
@@ -69,6 +69,7 @@
             record.quarterlyEvaluateFileList = record.quarterlyEvaluateFile.split(',')
           }
         })
+        res = res.filter(item => item.quarterlyEvaluateDate)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyInquiryDialog.vue b/src/views/supplier/historyInquiryDialog.vue
index 18a4f11..4d2a8c1 100644
--- a/src/views/supplier/historyInquiryDialog.vue
+++ b/src/views/supplier/historyInquiryDialog.vue
@@ -57,14 +57,15 @@
     // 历史预审列表
     getHistoryInquiry(supplierCode) {
       historyInquiry({ supplierCode: supplierCode }).then(res => {
-        res.forEach(record => {
-          if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
-            record.preReviewDate = record.preReviewDate.substring(0, 10)
-          }
-          if (record.preReviewFile !== '') {
-            record.preReviewFileList = record.preReviewFile.split(',')
-          }
-        })
+        // res.forEach(record => {
+        //   if (record.preReviewDate !== '' && record.preReviewDate.length > 10) {
+        //     record.preReviewDate = record.preReviewDate.substring(0, 10)
+        //   }
+        //   if (record.preReviewFile !== '') {
+        //     record.preReviewFileList = record.preReviewFile.split(',')
+        //   }
+        // })
+        res = res.filter(item => item.preReviewResultName)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/historyReviewDialog.vue b/src/views/supplier/historyReviewDialog.vue
index 1c0a9d6..958ff4a 100644
--- a/src/views/supplier/historyReviewDialog.vue
+++ b/src/views/supplier/historyReviewDialog.vue
@@ -65,6 +65,7 @@
             record.inputReviewFileList = record.inputReviewFile.split(',')
           }
         })
+        res = res.filter(item => item.inputReviewResultName)
         this.tableData = res
       })
     }
diff --git a/src/views/supplier/supplierList.vue b/src/views/supplier/supplierList.vue
index c49722b..9363303 100644
--- a/src/views/supplier/supplierList.vue
+++ b/src/views/supplier/supplierList.vue
@@ -5,92 +5,44 @@
       <div class="productInput">
         供应商编号
         <div class="inputBox" style="width: 200px">
-          <el-input
-            v-model="selectInfo.supplierCode"
-            placeholder="请输入编号"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.supplierCode" placeholder="请输入编号" clearable class="product-input" />
         </div>
         供应商名称
         <div class="inputBox" style="width: 200px">
-          <el-input
-            v-model="selectInfo.supplierName"
-            placeholder="请输入名称"
-            clearable
-            class="product-input"
-          />
+          <el-input v-model="selectInfo.supplierName" placeholder="请输入名称" clearable class="product-input" />
         </div>
         供应商状态
         <div class="inputBox" style="width: 200px">
-          <el-select
-            v-model="selectInfo.supplierStatus"
-            clearable
-            placeholder="供应商状态"
-            style="width: 200px"
-          >
-            <el-option
-              v-for="item in supplierStatusOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.value"
-            />
+          <el-select v-model="selectInfo.supplierStatus" clearable placeholder="供应商状态" style="width: 200px">
+            <el-option v-for="item in supplierStatusOptions" :key="item.id" :label="item.name" :value="item.value" />
           </el-select>
         </div>
       </div>
       <div class="productBtn">
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          class="btnItem"
-          @click="selectData"
-        >
+        <el-button type="primary" icon="el-icon-search" class="btnItem" @click="selectData">
           查询
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-refresh-right"
-          class="btnItem"
-          @click="reset"
-        >
+        <el-button type="primary" icon="el-icon-refresh-right" class="btnItem" @click="reset">
           重置
         </el-button>
-        <el-button
-          type="primary"
-          icon="el-icon-folder-opened"
-          class="btnItem"
-          @click="exportToExcel"
-        >
+        <el-button type="primary" icon="el-icon-folder-opened" class="btnItem" @click="exportToExcel">
           导出
         </el-button>
       </div>
     </div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData.rows"
-      :row-class-name="tableRowClassName"
-      :header-cell-style="{
-        'text-align': 'center',
-        background: '  #2483b3',
-        color: 'white',
-      }"
-      :row-style="{ 'text-align': 'center' }"
-      style="width: 100%"
-    >
+    <el-table ref="multipleTable" :data="tableData.rows" :row-class-name="tableRowClassName" :header-cell-style="{
+      'text-align': 'center',
+      background: '  #2483b3',
+      color: 'white',
+    }" :row-style="{ 'text-align': 'center' }" style="width: 100%">
       <el-table-column prop="index" width="100px" label="序号" />
       <el-table-column prop="supplierCode" width="200px" label="供应商编号" />
       <el-table-column prop="supplierName" width="400px" label="供应商名称" />
       <el-table-column prop="supplierStatusName" label="供应商状态" />
       <el-table-column prop="preReviewResultName" label="资料预审结果" />
       <el-table-column prop="inputReviewResultName" label="录库评审结果" />
-      <el-table-column
-        prop="latestQuarterlyEvaluateResultName"
-        label="最近季度评价结果"
-      />
-      <el-table-column
-        prop="latestAnnualAssessResultName"
-        label="最新年度考核结果"
-      />
+      <el-table-column prop="latestQuarterlyEvaluateResultName" label="最近季度评价结果" />
+      <el-table-column prop="latestAnnualAssessResultName" label="最新年度考核结果" />
       <el-table-column label="操作">
         <template slot-scope="scope">
           <el-button type="text" size="small" @click="detail(scope.row)">
@@ -101,15 +53,8 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <group-page
-      v-model="isFristPage"
-      :limit="limit"
-      :total="total"
-      :offset="offset"
-      :count="tableData.total"
-      @setOffset="setOffset"
-      @setLimit="setLimit"
-    />
+    <group-page v-model="isFristPage" :limit="limit" :total="total" :offset="offset" :count="tableData.total"
+      @setOffset="setOffset" @setLimit="setLimit" />
     <!-- 新增弹框 -->
     <supplier-detail ref="supplierDetail" />
   </div>
@@ -188,7 +133,19 @@
       });
       listPage(`limit=100000000&offset=1`, {})
         .then((res) => {
-          outToExcel(res.rows);
+          res.rows = res.rows.map((item, index) => {
+            return {
+              序号: index + 1,
+              供应商编号: item.supplierCode,
+              供应商名称: item.supplierName,
+              供应商状态: item.supplierStatusName,
+              资料预审结果: item.preReviewResultName,
+              录库评审结果: item.inputReviewResultName,
+              最近季度评价结果: item.latestQuarterlyEvaluateResultName,
+              最新年度考核结果: item.latestAnnualAssessResultName
+            }
+          })
+          outToExcel(res.rows, '供应商列表');
           loading.close(); // 关闭加载动画
           this.$message({
             message: "导出成功",
@@ -213,25 +170,31 @@
   width: 100%;
   min-height: 700px;
   overflow: auto;
+
   .productData {
     width: 100%;
     display: flex;
     justify-content: center;
+
     .middle {
       margin: 0 30px;
     }
   }
+
   .productFun {
     margin: 10px 20px;
     display: flex;
     justify-content: space-between;
+
     .productInput {
       display: flex;
       align-items: center;
+
       .inputBox {
         margin: 0 50px 0 10px;
       }
     }
+
     .productBtn {
       .btnItem {
         margin-right: 10px;
@@ -242,6 +205,7 @@
       }
     }
   }
+
   .footer {
     display: flex;
     justify-content: space-between;
diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue
index 577580f..f93cd14 100644
--- a/src/views/system/area/listArea.vue
+++ b/src/views/system/area/listArea.vue
@@ -54,7 +54,7 @@
       columns: [
         {
           text: '区域名称',
-          value: 'name',
+          value: 'areaName',
           align: 'center'
         },
         {