Merge branch '王立生' of sckj/mz-cloud into master

ruoyi-ui/src/components/xxtjEcharts/EchartsBox5/index.vue

@@ -256,6 +256,7 @@ export default {
             itemStyle: {
               normal: {
                 lineStyle: {
+                  width: 3,
                   type: "dashed", //线条样式
                   color: {
                     //设置渐变
@@ -278,9 +279,21 @@ export default {
                   },
                 },
                 label: {
-                  show: true,
-                  position: "center", // 文字显示的位置
+
+                    color: 'green',
+                    show: true,
+                    position: 'middle',
+                    //position: ['100%', '-10'],
+                    formatter: '指标线：'+zbz,
+                    textStyle: {
+                      color: 'red',//标注线终点文字颜色
+                      fontSize:16,
+                      fontWeight:400,
+                      padding: [0, 0, 0, 0],//文字间距
+                    }
+
                 },
+
               },
             },
             data: [
@@ -330,7 +343,8 @@ export default {
             let min=Math.ceil(value.min);
             if (zbz<min)
               min=zbz;
-            return  min;
+
+            return  0;
           },
           max: function(value) {//取最大值向上取整为最大刻度
             let max=Math.ceil(value.max);