1

src/views/statisticalanalysis/components/echart/echarts.js

@@ -497,8 +497,8 @@ export const collectionStatistics = {
   // backgroundColor: '#F5F7FA',
   grid: {
     top: "10%",
-    left: "2%",
-    right: "0%",
+    left: "5%",
+    right: "5%",
     bottom: "15%", //也可设置left和right设置距离来控制图表的大小
   },
   tooltip: {
@@ -558,7 +558,7 @@ export const collectionStatistics = {
       },
 
       axisLine: {
-        show: false,
+        show: true,
         lineStyle: {
           color: "#000000",
         },
@@ -572,26 +572,27 @@ export const collectionStatistics = {
     },
     {
       type: "value",
-      gridIndex: 0,
-      min: 50,
-      max: 100,
-      splitNumber: 8,
-      splitLine: {
-        show: false,
+      name: "",
+      nameTextStyle: {
+        color: "#000000",
       },
-      axisLine: {
+      splitLine: {
         show: false,
       },
       axisTick: {
         show: false,
       },
-      axisLabel: {
-        show: false,
+
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: "#000000",
+        },
       },
-      splitArea: {
+      axisLabel: {
         show: true,
-        areaStyle: {
-          // color: ["rgba(250,250,250,0.0)", "rgba(250,250,250,0.05)"]
+        textStyle: {
+          color: "#000000",
         },
       },
     },
@@ -600,6 +601,7 @@ export const collectionStatistics = {
     {
       name: "环比",
       type: "line",
+      yAxisIndex: 1,
       smooth: false, //平滑曲线显示
       showAllSymbol: true, //显示所有图形。
       symbol: "circle", //标记的图形为实心圆
@@ -631,6 +633,7 @@ export const collectionStatistics = {
       name: "",
       type: "bar",
       barWidth: 18,
+      yAxisIndex: 0,
       itemStyle: {
         color: {
           type: "linear",

src/views/statisticalanalysis/components/echart/index.vue

@@ -40,7 +40,7 @@ export default {
     collectionStatistics.series[1].data = this.option.data2;
     // collectionStatistics.series[1].name = this.option.kg;
     // collectionStatistics.legend.data[1] = this.option.kg;
-    // collectionStatistics.yAxis[0].name = this.option.kg;
+    collectionStatistics.yAxis[0].name = this.option.kg;
     // 生成柱状图
     this.myChart.setOption(collectionStatistics);
     // 监听页面缩放 防止dom重复渲染
@@ -61,7 +61,7 @@ export default {
         collectionStatistics.series[1].data = newVal.data2;
         // collectionStatistics.series[1].name = newVal.kg;
         // collectionStatistics.legend.data[1] = newVal.kg;
-        // collectionStatistics.yAxis[0].name = newVal.kg;
+        collectionStatistics.yAxis[0].name = newVal.kg;
         this.myChart.setOption(collectionStatistics);
       },
     },

src/views/statisticalanalysis/components/echart/statisticsHeader.vue

@@ -565,8 +565,8 @@ export default {
           font-family: Helvetica, "Microsoft YaHei";
         }
         .btn-icon-only {
-          width: 32px;
-          height: 32px;
+          width: 24px;
+          height: 24px;
           cursor: pointer;
         }
       }

src/views/statisticalanalysis/specialgoods/index.vue

@@ -18,7 +18,7 @@
         :eledata="eledata"
         with-setting
         :withSetting="false"
-        :withExport="false"
+        :withExport="true"
         @getFormData="getFormData"
       />
     </div>
@@ -311,6 +311,9 @@ export default {
       }
     },
     getFormData(data) {
+      this.tableData.time = [];
+      this.tableData.data1 = [];
+      this.tableData.data2 = [];
       if (this.action === 2) {
         let option = [
           {
@@ -374,11 +377,19 @@ export default {
             this.tableData.data1 = [];
           });
           let ar = [];
+          this.tableData.data1.push(0);
           for (let index = 0; index < this.tableData.data2.length; index++) {
-            const element =
-              (this.tableData.data2[index + 1] - this.tableData.data2[index]) /
-              this.tableData.data2[index];
-            this.tableData.data1.push(element);
+            // const element =
+            //   (this.tableData.data2[index + 1] - this.tableData.data2[index]) /
+            //   this.tableData.data2[index];
+            // console.log(element);
+            if (index > 0) {
+              const element =
+                (this.tableData.data2[index] -
+                  this.tableData.data2[index - 1]) /
+                this.tableData.data2[index - 1];
+              this.tableData.data1.push(element.toFixed(2));
+            }
           }
           // this.tableData = returnData.listValues;
           // console.log(this.tableData[0])