diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/views/dashboard/components/commonSelectChart.vue b/src/views/dashboard/components/commonSelectChart.vue
index 327de62..d9e611f 100644
--- a/src/views/dashboard/components/commonSelectChart.vue
+++ b/src/views/dashboard/components/commonSelectChart.vue
@@ -171,77 +171,63 @@
           });
         }
         this.seriesData = [
-        {
-          name:this.legendDefault[0],
-          type: "bar",
-          data: seriesData[1].data,
-          barWidth:20
-        },
-        {
-          name: this.legendDefault[1],
-          type: "line",
-          data: seriesData[2].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[0],
+            type: "bar",
+            data: seriesData[1].data,
+
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-        {
-          name: this.legendDefault[2],
-          type: "line",
-          data: seriesData[3].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[1],
+            type: "line",
+            data: seriesData[2].data.map((item) => parseFloat(item)),
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-      ];
-      this.xAxisData = seriesData[0].data;
-      this.legend = this.legendDefault
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          position: 'left',
-          axisLabel: {
-            formatter: "{value}",
-            fontSize: 12,
-            color: "#000",
+          {
+            name: this.legendDefault[2],
+            type: "line",
+            data: seriesData[3].data.map((item) => parseFloat(item)),
           },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          // interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          position: 'right',
-          axisLabel: {
-            formatter: "{value}%",
-            fontSize: 12,
-            color: "#000",
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          // interval: 20,
-        },
-      ];
+        ];
+        this.xAxisData = seriesData[0].data;
+        this.legend = this.legendDefault;
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'left',
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     // interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     // interval: 20,
+        //   },
+        // ];
       });
     },
   },

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/views/dashboard/components/commonSelectChart.vue b/src/views/dashboard/components/commonSelectChart.vue
index 327de62..d9e611f 100644
--- a/src/views/dashboard/components/commonSelectChart.vue
+++ b/src/views/dashboard/components/commonSelectChart.vue
@@ -171,77 +171,63 @@
           });
         }
         this.seriesData = [
-        {
-          name:this.legendDefault[0],
-          type: "bar",
-          data: seriesData[1].data,
-          barWidth:20
-        },
-        {
-          name: this.legendDefault[1],
-          type: "line",
-          data: seriesData[2].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[0],
+            type: "bar",
+            data: seriesData[1].data,
+
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-        {
-          name: this.legendDefault[2],
-          type: "line",
-          data: seriesData[3].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[1],
+            type: "line",
+            data: seriesData[2].data.map((item) => parseFloat(item)),
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-      ];
-      this.xAxisData = seriesData[0].data;
-      this.legend = this.legendDefault
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          position: 'left',
-          axisLabel: {
-            formatter: "{value}",
-            fontSize: 12,
-            color: "#000",
+          {
+            name: this.legendDefault[2],
+            type: "line",
+            data: seriesData[3].data.map((item) => parseFloat(item)),
           },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          // interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          position: 'right',
-          axisLabel: {
-            formatter: "{value}%",
-            fontSize: 12,
-            color: "#000",
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          // interval: 20,
-        },
-      ];
+        ];
+        this.xAxisData = seriesData[0].data;
+        this.legend = this.legendDefault;
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'left',
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     // interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     // interval: 20,
+        //   },
+        // ];
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutChartVerticalBar.vue b/src/views/dashboard/components/layoutChartVerticalBar.vue
index 8b2dc23..e871d27 100644
--- a/src/views/dashboard/components/layoutChartVerticalBar.vue
+++ b/src/views/dashboard/components/layoutChartVerticalBar.vue
@@ -51,20 +51,7 @@
     };
   },
   mounted() {
-    // this.fetchData(); // 后期接口改好直接用
-    setTimeout(() => {
-      //模拟数据
-      this.seriesData = [
-        { width:8,
-          data: [120, 200, 150, 80, 70, 110, 130],
-        },
-        {
-          width:1,
-          data: [200, 200, 200, 200, 200, 200, 200],
-        }
-      ];
-      this.yAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-    });
+    this.fetchData(); 
   },
   methods: {
     async fetchData() {
@@ -81,7 +68,7 @@
       data.forEach((element) => {
         this.seriesData[0].data.push(element.deviceCount);
         this.seriesData[1].data.push(max);
-        this.yAxisData.push(element.regionName);
+        this.yAxisData.push(this.type === "region" ? element.regionName + '-' +element.deviceCount : element.supplierName +'-' +element.deviceCount);
       });
     },
   },

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/views/dashboard/components/commonSelectChart.vue b/src/views/dashboard/components/commonSelectChart.vue
index 327de62..d9e611f 100644
--- a/src/views/dashboard/components/commonSelectChart.vue
+++ b/src/views/dashboard/components/commonSelectChart.vue
@@ -171,77 +171,63 @@
           });
         }
         this.seriesData = [
-        {
-          name:this.legendDefault[0],
-          type: "bar",
-          data: seriesData[1].data,
-          barWidth:20
-        },
-        {
-          name: this.legendDefault[1],
-          type: "line",
-          data: seriesData[2].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[0],
+            type: "bar",
+            data: seriesData[1].data,
+
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-        {
-          name: this.legendDefault[2],
-          type: "line",
-          data: seriesData[3].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[1],
+            type: "line",
+            data: seriesData[2].data.map((item) => parseFloat(item)),
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-      ];
-      this.xAxisData = seriesData[0].data;
-      this.legend = this.legendDefault
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          position: 'left',
-          axisLabel: {
-            formatter: "{value}",
-            fontSize: 12,
-            color: "#000",
+          {
+            name: this.legendDefault[2],
+            type: "line",
+            data: seriesData[3].data.map((item) => parseFloat(item)),
           },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          // interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          position: 'right',
-          axisLabel: {
-            formatter: "{value}%",
-            fontSize: 12,
-            color: "#000",
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          // interval: 20,
-        },
-      ];
+        ];
+        this.xAxisData = seriesData[0].data;
+        this.legend = this.legendDefault;
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'left',
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     // interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     // interval: 20,
+        //   },
+        // ];
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutChartVerticalBar.vue b/src/views/dashboard/components/layoutChartVerticalBar.vue
index 8b2dc23..e871d27 100644
--- a/src/views/dashboard/components/layoutChartVerticalBar.vue
+++ b/src/views/dashboard/components/layoutChartVerticalBar.vue
@@ -51,20 +51,7 @@
     };
   },
   mounted() {
-    // this.fetchData(); // 后期接口改好直接用
-    setTimeout(() => {
-      //模拟数据
-      this.seriesData = [
-        { width:8,
-          data: [120, 200, 150, 80, 70, 110, 130],
-        },
-        {
-          width:1,
-          data: [200, 200, 200, 200, 200, 200, 200],
-        }
-      ];
-      this.yAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-    });
+    this.fetchData(); 
   },
   methods: {
     async fetchData() {
@@ -81,7 +68,7 @@
       data.forEach((element) => {
         this.seriesData[0].data.push(element.deviceCount);
         this.seriesData[1].data.push(max);
-        this.yAxisData.push(element.regionName);
+        this.yAxisData.push(this.type === "region" ? element.regionName + '-' +element.deviceCount : element.supplierName +'-' +element.deviceCount);
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutMixChart.vue b/src/views/dashboard/components/layoutMixChart.vue
deleted file mode 100644
index b2bad49..0000000
--- a/src/views/dashboard/components/layoutMixChart.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div class="chart-container">
-    <div class="chart-header">
-      <!--标题  -->
-      <span class="title"> 经销商订单同比/环比统计 </span>
-      <el-select v-model="value" placeholder="请选择" size="mini">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <div class="chart-content" :style="{'height':height,'width':width}">
-      <!-- echarts内容 -->
-      <MixChart
-        :xAxisData="xAxisData"
-        :seriesData="seriesData"
-        :yAxisData="yAxisData"
-        :legend="legend"
-        width="600px"
-        height="400px"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import MixChart from "../../../components/echart/barChart/MixChart.vue";
-export default {
-  name: "layoutChartSelect",
-  components: {
-    MixChart,
-  },
-  props: {
-    name: {
-      type: String,
-      default: "",
-    },
-    width:{
-      type: String,
-      default: "500px"
-    },
-    height:{
-      type: String,
-      default: "250px"
-    }
-  },
-  data() {
-    return {
-      value: "12",
-      options: [
-        { value: "12", label: "近一年" },
-        { value: "1", label: "近一月" },
-      ],
-      seriesData: [],
-      xAxisData: [],
-      yAxisData: [],
-      legend: [],
-    };
-  },
-  mounted() {
-    setTimeout(() => {
-      this.seriesData = [
-        {
-          name: "Evaporation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3,
-          ],
-        },
-        {
-          name: "Precipitation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3,
-          ],
-        },
-        {
-          name: "Temperature",
-          type: "line",
-          yAxisIndex: 1,
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " °C";
-            },
-          },
-          data: [
-            2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-          ],
-        },
-      ];
-      this.xAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} ml",
-            fontSize: 12,
-            color:'#000'
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: { //多条横线
-            show: true
-          },
-          interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} °C",
-            fontSize: 12,
-            color:'#000'
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          interval: 20,
-        },
-      ];
-      this.legend = ["Evaporation", "Precipitation", "Temperature"];
-    });
-  },
-  watch: {
-    value(newVal) {
-      // 根据选择的选项获取不同的数据
-      if (newVal === "12") {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-            ],
-          },
-        ];
-      } else {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              22.0, 43.9, 17.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              12.6, 15.9, 29.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              42.0, 2.2, 3.3, 94.5, 36.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0,
-              16.2,
-            ],
-          },
-        ];
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.chart-container {
-  .chart-header {
-    width: 600px;
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-  }
-  .chart-content {
-    // width: 600px;
-    // height: 400px;
-  }
-}
-</style>
\ No newline at end of file

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/views/dashboard/components/commonSelectChart.vue b/src/views/dashboard/components/commonSelectChart.vue
index 327de62..d9e611f 100644
--- a/src/views/dashboard/components/commonSelectChart.vue
+++ b/src/views/dashboard/components/commonSelectChart.vue
@@ -171,77 +171,63 @@
           });
         }
         this.seriesData = [
-        {
-          name:this.legendDefault[0],
-          type: "bar",
-          data: seriesData[1].data,
-          barWidth:20
-        },
-        {
-          name: this.legendDefault[1],
-          type: "line",
-          data: seriesData[2].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[0],
+            type: "bar",
+            data: seriesData[1].data,
+
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-        {
-          name: this.legendDefault[2],
-          type: "line",
-          data: seriesData[3].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[1],
+            type: "line",
+            data: seriesData[2].data.map((item) => parseFloat(item)),
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-      ];
-      this.xAxisData = seriesData[0].data;
-      this.legend = this.legendDefault
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          position: 'left',
-          axisLabel: {
-            formatter: "{value}",
-            fontSize: 12,
-            color: "#000",
+          {
+            name: this.legendDefault[2],
+            type: "line",
+            data: seriesData[3].data.map((item) => parseFloat(item)),
           },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          // interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          position: 'right',
-          axisLabel: {
-            formatter: "{value}%",
-            fontSize: 12,
-            color: "#000",
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          // interval: 20,
-        },
-      ];
+        ];
+        this.xAxisData = seriesData[0].data;
+        this.legend = this.legendDefault;
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'left',
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     // interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     // interval: 20,
+        //   },
+        // ];
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutChartVerticalBar.vue b/src/views/dashboard/components/layoutChartVerticalBar.vue
index 8b2dc23..e871d27 100644
--- a/src/views/dashboard/components/layoutChartVerticalBar.vue
+++ b/src/views/dashboard/components/layoutChartVerticalBar.vue
@@ -51,20 +51,7 @@
     };
   },
   mounted() {
-    // this.fetchData(); // 后期接口改好直接用
-    setTimeout(() => {
-      //模拟数据
-      this.seriesData = [
-        { width:8,
-          data: [120, 200, 150, 80, 70, 110, 130],
-        },
-        {
-          width:1,
-          data: [200, 200, 200, 200, 200, 200, 200],
-        }
-      ];
-      this.yAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-    });
+    this.fetchData(); 
   },
   methods: {
     async fetchData() {
@@ -81,7 +68,7 @@
       data.forEach((element) => {
         this.seriesData[0].data.push(element.deviceCount);
         this.seriesData[1].data.push(max);
-        this.yAxisData.push(element.regionName);
+        this.yAxisData.push(this.type === "region" ? element.regionName + '-' +element.deviceCount : element.supplierName +'-' +element.deviceCount);
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutMixChart.vue b/src/views/dashboard/components/layoutMixChart.vue
deleted file mode 100644
index b2bad49..0000000
--- a/src/views/dashboard/components/layoutMixChart.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div class="chart-container">
-    <div class="chart-header">
-      <!--标题  -->
-      <span class="title"> 经销商订单同比/环比统计 </span>
-      <el-select v-model="value" placeholder="请选择" size="mini">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <div class="chart-content" :style="{'height':height,'width':width}">
-      <!-- echarts内容 -->
-      <MixChart
-        :xAxisData="xAxisData"
-        :seriesData="seriesData"
-        :yAxisData="yAxisData"
-        :legend="legend"
-        width="600px"
-        height="400px"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import MixChart from "../../../components/echart/barChart/MixChart.vue";
-export default {
-  name: "layoutChartSelect",
-  components: {
-    MixChart,
-  },
-  props: {
-    name: {
-      type: String,
-      default: "",
-    },
-    width:{
-      type: String,
-      default: "500px"
-    },
-    height:{
-      type: String,
-      default: "250px"
-    }
-  },
-  data() {
-    return {
-      value: "12",
-      options: [
-        { value: "12", label: "近一年" },
-        { value: "1", label: "近一月" },
-      ],
-      seriesData: [],
-      xAxisData: [],
-      yAxisData: [],
-      legend: [],
-    };
-  },
-  mounted() {
-    setTimeout(() => {
-      this.seriesData = [
-        {
-          name: "Evaporation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3,
-          ],
-        },
-        {
-          name: "Precipitation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3,
-          ],
-        },
-        {
-          name: "Temperature",
-          type: "line",
-          yAxisIndex: 1,
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " °C";
-            },
-          },
-          data: [
-            2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-          ],
-        },
-      ];
-      this.xAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} ml",
-            fontSize: 12,
-            color:'#000'
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: { //多条横线
-            show: true
-          },
-          interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} °C",
-            fontSize: 12,
-            color:'#000'
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          interval: 20,
-        },
-      ];
-      this.legend = ["Evaporation", "Precipitation", "Temperature"];
-    });
-  },
-  watch: {
-    value(newVal) {
-      // 根据选择的选项获取不同的数据
-      if (newVal === "12") {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-            ],
-          },
-        ];
-      } else {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              22.0, 43.9, 17.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              12.6, 15.9, 29.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              42.0, 2.2, 3.3, 94.5, 36.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0,
-              16.2,
-            ],
-          },
-        ];
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.chart-container {
-  .chart-header {
-    width: 600px;
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-  }
-  .chart-content {
-    // width: 600px;
-    // height: 400px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/dashboard/components/opportunityStatistics.vue b/src/views/dashboard/components/opportunityStatistics.vue
index f029f8a..68aa9c7 100644
--- a/src/views/dashboard/components/opportunityStatistics.vue
+++ b/src/views/dashboard/components/opportunityStatistics.vue
@@ -138,25 +138,25 @@
           },
         ];
         this.xAxisData = seriesData[0].data;
-        this.yAxisData = [
-          {
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-        ];
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        // ];
         this.legend = ['商机个数','商机转订单个数']
       });
     },

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/views/dashboard/components/commonSelectChart.vue b/src/views/dashboard/components/commonSelectChart.vue
index 327de62..d9e611f 100644
--- a/src/views/dashboard/components/commonSelectChart.vue
+++ b/src/views/dashboard/components/commonSelectChart.vue
@@ -171,77 +171,63 @@
           });
         }
         this.seriesData = [
-        {
-          name:this.legendDefault[0],
-          type: "bar",
-          data: seriesData[1].data,
-          barWidth:20
-        },
-        {
-          name: this.legendDefault[1],
-          type: "line",
-          data: seriesData[2].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[0],
+            type: "bar",
+            data: seriesData[1].data,
+
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-        {
-          name: this.legendDefault[2],
-          type: "line",
-          data: seriesData[3].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[1],
+            type: "line",
+            data: seriesData[2].data.map((item) => parseFloat(item)),
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-      ];
-      this.xAxisData = seriesData[0].data;
-      this.legend = this.legendDefault
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          position: 'left',
-          axisLabel: {
-            formatter: "{value}",
-            fontSize: 12,
-            color: "#000",
+          {
+            name: this.legendDefault[2],
+            type: "line",
+            data: seriesData[3].data.map((item) => parseFloat(item)),
           },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          // interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          position: 'right',
-          axisLabel: {
-            formatter: "{value}%",
-            fontSize: 12,
-            color: "#000",
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          // interval: 20,
-        },
-      ];
+        ];
+        this.xAxisData = seriesData[0].data;
+        this.legend = this.legendDefault;
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'left',
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     // interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     // interval: 20,
+        //   },
+        // ];
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutChartVerticalBar.vue b/src/views/dashboard/components/layoutChartVerticalBar.vue
index 8b2dc23..e871d27 100644
--- a/src/views/dashboard/components/layoutChartVerticalBar.vue
+++ b/src/views/dashboard/components/layoutChartVerticalBar.vue
@@ -51,20 +51,7 @@
     };
   },
   mounted() {
-    // this.fetchData(); // 后期接口改好直接用
-    setTimeout(() => {
-      //模拟数据
-      this.seriesData = [
-        { width:8,
-          data: [120, 200, 150, 80, 70, 110, 130],
-        },
-        {
-          width:1,
-          data: [200, 200, 200, 200, 200, 200, 200],
-        }
-      ];
-      this.yAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-    });
+    this.fetchData(); 
   },
   methods: {
     async fetchData() {
@@ -81,7 +68,7 @@
       data.forEach((element) => {
         this.seriesData[0].data.push(element.deviceCount);
         this.seriesData[1].data.push(max);
-        this.yAxisData.push(element.regionName);
+        this.yAxisData.push(this.type === "region" ? element.regionName + '-' +element.deviceCount : element.supplierName +'-' +element.deviceCount);
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutMixChart.vue b/src/views/dashboard/components/layoutMixChart.vue
deleted file mode 100644
index b2bad49..0000000
--- a/src/views/dashboard/components/layoutMixChart.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div class="chart-container">
-    <div class="chart-header">
-      <!--标题  -->
-      <span class="title"> 经销商订单同比/环比统计 </span>
-      <el-select v-model="value" placeholder="请选择" size="mini">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <div class="chart-content" :style="{'height':height,'width':width}">
-      <!-- echarts内容 -->
-      <MixChart
-        :xAxisData="xAxisData"
-        :seriesData="seriesData"
-        :yAxisData="yAxisData"
-        :legend="legend"
-        width="600px"
-        height="400px"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import MixChart from "../../../components/echart/barChart/MixChart.vue";
-export default {
-  name: "layoutChartSelect",
-  components: {
-    MixChart,
-  },
-  props: {
-    name: {
-      type: String,
-      default: "",
-    },
-    width:{
-      type: String,
-      default: "500px"
-    },
-    height:{
-      type: String,
-      default: "250px"
-    }
-  },
-  data() {
-    return {
-      value: "12",
-      options: [
-        { value: "12", label: "近一年" },
-        { value: "1", label: "近一月" },
-      ],
-      seriesData: [],
-      xAxisData: [],
-      yAxisData: [],
-      legend: [],
-    };
-  },
-  mounted() {
-    setTimeout(() => {
-      this.seriesData = [
-        {
-          name: "Evaporation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3,
-          ],
-        },
-        {
-          name: "Precipitation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3,
-          ],
-        },
-        {
-          name: "Temperature",
-          type: "line",
-          yAxisIndex: 1,
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " °C";
-            },
-          },
-          data: [
-            2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-          ],
-        },
-      ];
-      this.xAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} ml",
-            fontSize: 12,
-            color:'#000'
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: { //多条横线
-            show: true
-          },
-          interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} °C",
-            fontSize: 12,
-            color:'#000'
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          interval: 20,
-        },
-      ];
-      this.legend = ["Evaporation", "Precipitation", "Temperature"];
-    });
-  },
-  watch: {
-    value(newVal) {
-      // 根据选择的选项获取不同的数据
-      if (newVal === "12") {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-            ],
-          },
-        ];
-      } else {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              22.0, 43.9, 17.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              12.6, 15.9, 29.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              42.0, 2.2, 3.3, 94.5, 36.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0,
-              16.2,
-            ],
-          },
-        ];
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.chart-container {
-  .chart-header {
-    width: 600px;
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-  }
-  .chart-content {
-    // width: 600px;
-    // height: 400px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/dashboard/components/opportunityStatistics.vue b/src/views/dashboard/components/opportunityStatistics.vue
index f029f8a..68aa9c7 100644
--- a/src/views/dashboard/components/opportunityStatistics.vue
+++ b/src/views/dashboard/components/opportunityStatistics.vue
@@ -138,25 +138,25 @@
           },
         ];
         this.xAxisData = seriesData[0].data;
-        this.yAxisData = [
-          {
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-        ];
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        // ];
         this.legend = ['商机个数','商机转订单个数']
       });
     },
diff --git a/src/views/dashboard/components/supplierCommon.vue b/src/views/dashboard/components/supplierCommon.vue
index ae696dc..e9f478f 100644
--- a/src/views/dashboard/components/supplierCommon.vue
+++ b/src/views/dashboard/components/supplierCommon.vue
@@ -232,61 +232,53 @@
             name: this.legendDefault[0],
             type: "bar",
             data: preViewCount,
-            barWidth: 20,
           },
           {
             name: this.legendDefault[1],
             type: "line",
             data: passRatio.map(item => parseInt(item)),
-            smooth: false, // 折线平滑
-            symbol: "circle", // 控制折线处小点
-            tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
-          },
           },
         ];
         this.xAxisData = date;
-        this.yAxisData = [
-          {
-            name:this.legendDefault[0],
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-          {
-            name:this.legendDefault[1],
-            type: "value",
-            show: true,
-            positon:'right',
-            axisLabel: {
-              formatter: "{value}%",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-        ];
+        // this.yAxisData = [
+        //   {
+        //     name:this.legendDefault[0],
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        //   {
+        //     name:this.legendDefault[1],
+        //     type: "value",
+        //     show: true,
+        //     positon:'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        // ];
         this.legend = this.legendDefault;
       });
     },

diff --git a/src/components/echart/barChart/MixChart.vue b/src/components/echart/barChart/MixChart.vue
index 7dadfd8..c47e798 100644
--- a/src/components/echart/barChart/MixChart.vue
+++ b/src/components/echart/barChart/MixChart.vue
@@ -1,5 +1,9 @@
 <template>
-  <div :id="id" :class="className" :style="{ 'height': '300px', 'width': '500px' }" />
+  <div
+    :id="id"
+    :class="className"
+    :style="{ height: '300px', width: '500px' }"
+  />
 </template>
 <!-- 折柱混合图表 -->
 <script>
@@ -114,25 +118,63 @@
           },
           // data: [],
         },
-        xAxis: [{
-          type: "category",
-          data: [],
-          // axisPointer: {
-          //   type: "shadow",
-          // },
-          axisLine: {
-            show: true,
+        xAxis: [
+          {
+            type: "category",
+            data: [],
+            axisLine: {
+              show: true,
+            },
+            axisTick: {
+              show: true,
+            },
+            axisLabel: {
+              show: true,
+              color: "#000",
+            },
           },
-          axisTick: {
+        ],
+        yAxis: [
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value}",
+              fontSize: 12,
+              color: "#000",
+            },
             show: true,
+            position: "left",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-          axisLabel: {
-            show: true,
-            color:'#000'
-            // alignWithLabel: true,
+          {
+            type: "value",
+            show:true,
+            axisLabel: {
+              formatter: "{value} %",
+              fontSize: 12,
+              color: "#000",
+            },
+            position: "right",
+            axisLine: {
+              show: false,
+            },
+            splitLine: {
+              //多条横线
+              show: true,
+            },
           },
-        }],
-        yAxis: [],
+          {
+            type: "value",
+            show: false,
+          },
+        ],
         series: [],
         grid: {
           left: 30,
@@ -161,15 +203,40 @@
     },
     seriesData: {
       handler(newVal) {
-        console.log(newVal, 'newVal')
         const newSeries = [];
+        let index = 1
         for (const item of newVal) {
-          const series = {
-            ...item,
-            name: item.name,
-            type: item.type,
-            data: item.data,
-          };
+          // const series = {
+          //   ...item,
+          //   name: item.name,
+          //   type: item.type,
+          //   data: item.data,
+          // };
+          let series = {}
+          if( item.type==='bar'){
+            index++
+            series = {
+              ...item,
+            barWidth: 15,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value;
+              },
+            },
+            }
+          } else if( item.type === 'line'){
+            series = {
+              ...item,
+              tooltip: {
+              valueFormatter: function (value) {
+                return value + "%";
+              },
+            },
+            yAxisIndex: index,
+            smooth: false, // 折线平滑
+            symbol: "circle", // 控制折线处小点
+            }
+          }
           newSeries.push(series);
         }
         this.$set(this.option, "series", newSeries);
diff --git a/src/components/echart/barChart/verticalBarChart.vue b/src/components/echart/barChart/verticalBarChart.vue
index 8914b67..460d923 100644
--- a/src/components/echart/barChart/verticalBarChart.vue
+++ b/src/components/echart/barChart/verticalBarChart.vue
@@ -31,7 +31,7 @@
       // 颜色
       type: Array,
       default: () => {
-        return ["#01b4ff", "#0337ff"];
+        return ["#2D8CF0", "#0337ff"];
       },
     },
     axisLineColor: {
@@ -102,7 +102,7 @@
           {
             name: this.unit,
             type: "category",
-            inverse: true, // 方向坐标轴
+            inverse: true, // 开启方向坐标轴
             data: [], //y轴显示内容
             show: true,
             color: "#000",
@@ -123,10 +123,13 @@
               fontSize: 12,
               formatter: function (value, index) {
                 // 用于修改y轴显示内容
-                return "{a|NO.}" + `{a|${index + 1}}` + value;
+                return "{a|NO.}" + `{a|${index + 1}}` + value.split('-')[0];
               },
-              padding: [0, 0, 20, 0],
-              margin: -60,
+              // aligin:'right',
+              inside:'true',
+              verticalAlign :'bottom',
+              margin:0,
+              lineHeight :20,
               rich: {
                 a: {
                   color: "blue",
@@ -152,25 +155,21 @@
             name: item.name,
             type: "bar",
             barWidth: item.width,
-            showBackground: true,
+            // showBackground: true,
             barCategoryGap: "100%",
-            backgroundStyle: {
-              color: "#fff",
-              // borderWidth:2,
-              // shadowBlur:10,
-              // shadowColor :'#000',
-              // shadowOffsetY:10
-            },
             label: {
-              show: item.width > 2, //显示文本
-              // position: ["100%", "-110%"], //数据值位置
+              show: item.width < 2, //显示文本
               textStyle: {
                 color: "#000",
                 fontSize: "14",
               },
-              offset:[475,-10],
-              position:'left',
+              offset:[-20,-14],
+              formatter :(params)=> params.name.split('-')[1],
+              position:'right',
             },
+            itemStyle:{
+                color:this.colors[0]
+              },
             data: item.data,
             
           };
@@ -182,52 +181,6 @@
       deep: true,
     },
   },
-  //   mounted() {
-  //     this.refreshChart();
-  //   },
-  //   methods: {
-  //     refreshChart() {
-  //       this.unit && (this.option.yAxis[0].name = this.unit);
-  //       if (this.xAxisData.length) {
-  //         this.option.legend.data = this.legend;
-  //         this.option.xAxis[0].data = this.xAxisData;
-  //         const newSeries = [];
-  //         for (const item of this.seriesData) {
-  //           const series = {
-  //             name: item.name,
-  //             type: "bar",
-  //             itemStyle: {
-  //               color: `rgb(${item.color})`,
-  //             },
-  //             lineStyle: {
-  //               width: 1,
-  //             },
-  //             areaStyle: {
-  //               color: new this.$echarts.graphic.LinearGradient(
-  //                 0,
-  //                 0,
-  //                 0,
-  //                 1, // 变化度 //三种由深及浅的颜色
-  //                 [
-  //                   {
-  //                     offset: 0.1,
-  //                     color: `rgba(${item.color},.6)`,
-  //                   },
-  //                   {
-  //                     offset: 1,
-  //                     color: "rgba(0,0,0,.0)",
-  //                   },
-  //                 ]
-  //               ),
-  //             },
-  //             data: item.data,
-  //           };
-  //           newSeries.push(series);
-  //         }
-  //         this.$set(this.option, "series", newSeries);
-  //       }
-  //     },
-  //   },
 };
 </script>
   
diff --git a/src/components/guadMap/index.vue b/src/components/guadMap/index.vue
index cb2c58d..402ad7e 100644
--- a/src/components/guadMap/index.vue
+++ b/src/components/guadMap/index.vue
@@ -7,6 +7,7 @@
 <script>
 import AMapLoader from "@amap/amap-jsapi-loader";
 import baseConfig from "../../../public/config/project.config.json";
+import circle from "./circle.vue";
 // 设置安全密钥
 window._AMapSecurityConfig = {
   securityJsCode: "56bf9671d4b3517d294caec4751889a1", // 后期需替换
@@ -28,7 +29,7 @@
     // 初始化地图
     initMap() {
       AMapLoader.load({
-        key: "40849e82b4e33f5255b17372520c954d",  // 后期需替换
+        key: "40849e82b4e33f5255b17372520c954d", // 后期需替换
         version: "2.0", // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
         plugins: ["AMap.Scale"], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
       })
@@ -38,9 +39,14 @@
             viewMode: "2D", //  是否为3D地图模式
             zoom: 18, // 初始化地图级别
             center:
-              this.deviceList.length > 0 && this.deviceList[0].lat && this.deviceList[0].lon
-                ? [this.deviceList[0].lon, this.deviceList[0].lat]
-                : [116.4,39.9],
+              this.deviceList.length > 0 &&
+              this.deviceList[0].lat &&
+              this.deviceList[0].lon
+                ? [
+                    Number(this.deviceList[0].lon),
+                    Number(this.deviceList[0].lat),
+                  ]
+                : [116.4, 39.9],
             resizeEnable: true,
           });
           this.marker();
@@ -55,17 +61,27 @@
       for (let i = 0; i < this.deviceList.length; i++) {
         if (this.deviceList[i].lon && this.deviceList[i].lat) {
           var marker = new AMap.Marker({
-            position: [this.deviceList[i].lon, this.deviceList[i].lat], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
+            position: [
+              Number(this.deviceList[i].lon),
+              Number(this.deviceList[i].lat),
+            ], // 经纬度对象，也可以是经纬度构成的一维数组[116.39, 39.9]
             map: this.map,
-            content: `<div class="circle-container">
-    <div class="circle-one"></div>
-    <div class="circle-three"></div>
-    <div class="circle-two"></div>
-  </div>`,
+            title: this.deviceList[i].deviceName,
+            content:
+              '<div class="circle-container">xxxxxxx<div class="circle-one"></div><div class="circle-three"></div><div class="circle-two"></div><div class="circle-four"></div></div>',
             offset: new AMap.Pixel(-15, -20),
           });
+          
+          
           // 将创建的点标记添加到已有的地图实例：
           this.map.add([marker]);
+          // 信息窗体
+          // var infoWindow = new AMap.InfoWindow({
+          //   content: "提示信息",
+          // });
+          // marker.on("click", function () {
+          //   infoWindow.open(map, marker.getPosition());
+          // });
         }
       }
     },
@@ -73,8 +89,29 @@
     fetchPositionData() {
       getDevicePosition()
         .then((res) => {
-          // console.log(res);
-          this.deviceList = res.data;
+          // this.deviceList = res.data; // 有数据之后可以直接使用暂时模拟数据
+          this.deviceList = [
+            {
+              deviceName: "燃气灶",
+              lat: "39.97",
+              lon: "116.3",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.93",
+              lon: "116.15",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.8",
+              lon: "116.22",
+            },
+            {
+              deviceName: "燃气灶",
+              lat: "39.74",
+              lon: "116.33",
+            },
+          ];
           // 初始化地图
           this.initMap();
         })
@@ -109,9 +146,11 @@
   display: none !important;
 }
 </style>
-<style scoped>
+<style lang="scss" scoped>
 circle-container {
   position: absolute;
+  width: 30px;
+  height: 30px;
 }
 
 .circle-one,
@@ -121,7 +160,7 @@
   width: 0px;
   height: 0px;
   background-color: transparent;
-  border: 3px solid blue;
+  border: 3px solid rgb(181, 211, 247);
   border-radius: 50%;
   position: absolute;
   left: 50%;
@@ -134,15 +173,14 @@
 }
 
 .circle-two {
-  animation: transition-circle 2s infinite 0.5s;
+  animation: transition-circle 2s infinite 0.7s;
 }
 
 .circle-three {
-  animation: transition-circle 2s infinite 1s;
+  animation: transition-circle 2s infinite 1.4s;
 }
-
 .circle-three {
-  animation: transition-circle 2s infinite 1.6s;
+  animation: transition-circle 2s infinite 1.8s;
 }
 
 @keyframes transition-circle {
@@ -151,7 +189,11 @@
     height: 0px;
     opacity: 1;
   }
-
+  50% {
+    width: 30px;
+    height: 30px;
+    opacity: 0.5;
+  }
   100% {
     width: 35px;
     height: 35px;
diff --git a/src/views/dashboard/components/commonSelectChart.vue b/src/views/dashboard/components/commonSelectChart.vue
index 327de62..d9e611f 100644
--- a/src/views/dashboard/components/commonSelectChart.vue
+++ b/src/views/dashboard/components/commonSelectChart.vue
@@ -171,77 +171,63 @@
           });
         }
         this.seriesData = [
-        {
-          name:this.legendDefault[0],
-          type: "bar",
-          data: seriesData[1].data,
-          barWidth:20
-        },
-        {
-          name: this.legendDefault[1],
-          type: "line",
-          data: seriesData[2].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[0],
+            type: "bar",
+            data: seriesData[1].data,
+
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-        {
-          name: this.legendDefault[2],
-          type: "line",
-          data: seriesData[3].data.map(item => parseFloat(item)),
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
+          {
+            name: this.legendDefault[1],
+            type: "line",
+            data: seriesData[2].data.map((item) => parseFloat(item)),
           },
-          smooth: false, // 折线平滑
-          symbol: "circle", // 控制折线处小点
-        },
-      ];
-      this.xAxisData = seriesData[0].data;
-      this.legend = this.legendDefault
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          position: 'left',
-          axisLabel: {
-            formatter: "{value}",
-            fontSize: 12,
-            color: "#000",
+          {
+            name: this.legendDefault[2],
+            type: "line",
+            data: seriesData[3].data.map((item) => parseFloat(item)),
           },
-          axisLine: {
-            show: false,
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          // interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          position: 'right',
-          axisLabel: {
-            formatter: "{value}%",
-            fontSize: 12,
-            color: "#000",
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          // interval: 20,
-        },
-      ];
+        ];
+        this.xAxisData = seriesData[0].data;
+        this.legend = this.legendDefault;
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'left',
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     // interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     position: 'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     // interval: 20,
+        //   },
+        // ];
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutChartVerticalBar.vue b/src/views/dashboard/components/layoutChartVerticalBar.vue
index 8b2dc23..e871d27 100644
--- a/src/views/dashboard/components/layoutChartVerticalBar.vue
+++ b/src/views/dashboard/components/layoutChartVerticalBar.vue
@@ -51,20 +51,7 @@
     };
   },
   mounted() {
-    // this.fetchData(); // 后期接口改好直接用
-    setTimeout(() => {
-      //模拟数据
-      this.seriesData = [
-        { width:8,
-          data: [120, 200, 150, 80, 70, 110, 130],
-        },
-        {
-          width:1,
-          data: [200, 200, 200, 200, 200, 200, 200],
-        }
-      ];
-      this.yAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-    });
+    this.fetchData(); 
   },
   methods: {
     async fetchData() {
@@ -81,7 +68,7 @@
       data.forEach((element) => {
         this.seriesData[0].data.push(element.deviceCount);
         this.seriesData[1].data.push(max);
-        this.yAxisData.push(element.regionName);
+        this.yAxisData.push(this.type === "region" ? element.regionName + '-' +element.deviceCount : element.supplierName +'-' +element.deviceCount);
       });
     },
   },
diff --git a/src/views/dashboard/components/layoutMixChart.vue b/src/views/dashboard/components/layoutMixChart.vue
deleted file mode 100644
index b2bad49..0000000
--- a/src/views/dashboard/components/layoutMixChart.vue
+++ /dev/null
@@ -1,251 +0,0 @@
-<template>
-  <div class="chart-container">
-    <div class="chart-header">
-      <!--标题  -->
-      <span class="title"> 经销商订单同比/环比统计 </span>
-      <el-select v-model="value" placeholder="请选择" size="mini">
-        <el-option
-          v-for="item in options"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div>
-    <div class="chart-content" :style="{'height':height,'width':width}">
-      <!-- echarts内容 -->
-      <MixChart
-        :xAxisData="xAxisData"
-        :seriesData="seriesData"
-        :yAxisData="yAxisData"
-        :legend="legend"
-        width="600px"
-        height="400px"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import MixChart from "../../../components/echart/barChart/MixChart.vue";
-export default {
-  name: "layoutChartSelect",
-  components: {
-    MixChart,
-  },
-  props: {
-    name: {
-      type: String,
-      default: "",
-    },
-    width:{
-      type: String,
-      default: "500px"
-    },
-    height:{
-      type: String,
-      default: "250px"
-    }
-  },
-  data() {
-    return {
-      value: "12",
-      options: [
-        { value: "12", label: "近一年" },
-        { value: "1", label: "近一月" },
-      ],
-      seriesData: [],
-      xAxisData: [],
-      yAxisData: [],
-      legend: [],
-    };
-  },
-  mounted() {
-    setTimeout(() => {
-      this.seriesData = [
-        {
-          name: "Evaporation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3,
-          ],
-        },
-        {
-          name: "Precipitation",
-          type: "bar",
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " ml";
-            },
-          },
-          data: [
-            2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3,
-          ],
-        },
-        {
-          name: "Temperature",
-          type: "line",
-          yAxisIndex: 1,
-          tooltip: {
-            valueFormatter: function (value) {
-              return value + " °C";
-            },
-          },
-          data: [
-            2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-          ],
-        },
-      ];
-      this.xAxisData = ["北京", "上海", "天津", "河北", "山东", "四川", "深圳"];
-      this.yAxisData = [
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} ml",
-            fontSize: 12,
-            color:'#000'
-          },
-          axisLine: {
-            show: false,
-          },
-          splitLine: { //多条横线
-            show: true
-          },
-          interval: 20,
-        },
-        {
-          type: "value",
-          show: true,
-          axisLabel: {
-            formatter: "{value} °C",
-            fontSize: 12,
-            color:'#000'
-          },
-          splitLine: {
-            //多条横线
-            show: true,
-          },
-          axisLine: {
-            show: false,
-          },
-          interval: 20,
-        },
-      ];
-      this.legend = ["Evaporation", "Precipitation", "Temperature"];
-    });
-  },
-  watch: {
-    value(newVal) {
-      // 根据选择的选项获取不同的数据
-      if (newVal === "12") {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              2.0, 2.2, 3.3, 4.5, 6.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0, 6.2,
-            ],
-          },
-        ];
-      } else {
-        this.seriesData = [
-          {
-            name: "Evaporation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              22.0, 43.9, 17.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4,
-              3.3,
-            ],
-          },
-          {
-            name: "Precipitation",
-            type: "bar",
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " ml";
-              },
-            },
-            data: [
-              12.6, 15.9, 29.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0,
-              2.3,
-            ],
-          },
-          {
-            name: "Temperature",
-            type: "line",
-            yAxisIndex: 1,
-            tooltip: {
-              valueFormatter: function (value) {
-                return value + " °C";
-              },
-            },
-            data: [
-              42.0, 2.2, 3.3, 94.5, 36.3, 10.2, 20.3, 23.4, 23.0, 16.5, 12.0,
-              16.2,
-            ],
-          },
-        ];
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.chart-container {
-  .chart-header {
-    width: 600px;
-    align-items: center;
-    display: flex;
-    justify-content: space-between;
-  }
-  .chart-content {
-    // width: 600px;
-    // height: 400px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/dashboard/components/opportunityStatistics.vue b/src/views/dashboard/components/opportunityStatistics.vue
index f029f8a..68aa9c7 100644
--- a/src/views/dashboard/components/opportunityStatistics.vue
+++ b/src/views/dashboard/components/opportunityStatistics.vue
@@ -138,25 +138,25 @@
           },
         ];
         this.xAxisData = seriesData[0].data;
-        this.yAxisData = [
-          {
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-        ];
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        // ];
         this.legend = ['商机个数','商机转订单个数']
       });
     },
diff --git a/src/views/dashboard/components/supplierCommon.vue b/src/views/dashboard/components/supplierCommon.vue
index ae696dc..e9f478f 100644
--- a/src/views/dashboard/components/supplierCommon.vue
+++ b/src/views/dashboard/components/supplierCommon.vue
@@ -232,61 +232,53 @@
             name: this.legendDefault[0],
             type: "bar",
             data: preViewCount,
-            barWidth: 20,
           },
           {
             name: this.legendDefault[1],
             type: "line",
             data: passRatio.map(item => parseInt(item)),
-            smooth: false, // 折线平滑
-            symbol: "circle", // 控制折线处小点
-            tooltip: {
-            valueFormatter: function (value) {
-              return value + '%';
-            },
-          },
           },
         ];
         this.xAxisData = date;
-        this.yAxisData = [
-          {
-            name:this.legendDefault[0],
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-          {
-            name:this.legendDefault[1],
-            type: "value",
-            show: true,
-            positon:'right',
-            axisLabel: {
-              formatter: "{value}%",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-        ];
+        // this.yAxisData = [
+        //   {
+        //     name:this.legendDefault[0],
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        //   {
+        //     name:this.legendDefault[1],
+        //     type: "value",
+        //     show: true,
+        //     positon:'right',
+        //     axisLabel: {
+        //       formatter: "{value}%",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        // ];
         this.legend = this.legendDefault;
       });
     },
diff --git a/src/views/dashboard/components/supplierEvaluation.vue b/src/views/dashboard/components/supplierEvaluation.vue
index b1747c4..9a36402 100644
--- a/src/views/dashboard/components/supplierEvaluation.vue
+++ b/src/views/dashboard/components/supplierEvaluation.vue
@@ -169,42 +169,42 @@
           };
         });
         this.xAxisData = seriesData[5].data;
-        this.yAxisData = [
-          {
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            axisLine: {
-              show: false,
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            interval: 20,
-          },
-          {
-            type: "value",
-            show: true,
-            axisLabel: {
-              formatter: "{value}",
-              fontSize: 12,
-              color: "#000",
-            },
-            splitLine: {
-              //多条横线
-              show: true,
-            },
-            axisLine: {
-              show: false,
-            },
-            interval: 20,
-          },
-        ];
+        // this.yAxisData = [
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     interval: 20,
+        //   },
+        //   {
+        //     type: "value",
+        //     show: true,
+        //     axisLabel: {
+        //       formatter: "{value}",
+        //       fontSize: 12,
+        //       color: "#000",
+        //     },
+        //     splitLine: {
+        //       //多条横线
+        //       show: true,
+        //     },
+        //     axisLine: {
+        //       show: false,
+        //     },
+        //     interval: 20,
+        //   },
+        // ];
         this.legend = legend.slice(0,5);
       });
     },