Merge branch 'refs/heads/xinyan' into test

src/views/adManage/sb/chartComponents/dataTendency.vue

@@ -245,7 +245,7 @@ async function initLine() {
     yAxisIndex: index,
     itemStyle: { color: option.series.type == 'bar' ? '#0085ff' : metric.color, borderRadius: [6, 6, 6, 6] },
     lineStyle: { color: metric.color },
-    barWidth: '10%',
+    barMaxWidth: '16px',
     areaStyle:
       index !== 0
         ? {
@@ -297,7 +297,7 @@ function changeMetric() {
       yAxisIndex: index,
       itemStyle: { color: metric.color, borderRadius: [6, 6, 6, 6] },
       lineStyle: { color: metric.color },
-      barWidth: '10%',
+      barMaxWidth: '16px',
     };
 
     if (baseConfig.type != 'bar') {

src/views/adManage/sd/chartComponents/dataTendency.vue

@@ -245,7 +245,7 @@ async function initLine() {
     yAxisIndex: index,
     itemStyle: { color: option.series.type == 'bar' ? '#0085ff' : metric.color, borderRadius: [6, 6, 6, 6] },
     lineStyle: { color: metric.color },
-    barWidth: '16px',
+    barMaxWidth: '16px',
     areaStyle:
       index !== 0
         ? {
@@ -297,7 +297,7 @@ function changeMetric() {
       yAxisIndex: index,
       itemStyle: { color: metric.color, borderRadius: [6, 6, 6, 6] },
       lineStyle: { color: metric.color },
-      barWidth: '16px',
+      barMaxWidth: '16px',
     };
 
     if (baseConfig.type != 'bar') {

src/views/adManage/sp/chartComponents/dataTendency.vue

@@ -116,7 +116,7 @@ const option: any = {
         x: 'Name',
         y: '',
       },
-      barWidth: '186px',
+      barWidth: '16px',
       yAxisIndex: 0,
       itemStyle: {
         color: '',
@@ -245,7 +245,7 @@ async function initLine() {
     yAxisIndex: index,
     itemStyle: { color: option.series.type == 'bar' ? '#0085ff' : metric.color, borderRadius: [6, 6, 6, 6] },
     lineStyle: { color: metric.color },
-    barWidth: '16px',
+    barMaxWidth: '16px',
     areaStyle:
       index !== 0
         ? {
@@ -297,7 +297,7 @@ function changeMetric() {
       yAxisIndex: index,
       itemStyle: { color: metric.color, borderRadius: [6, 6, 6, 6] },
       lineStyle: { color: metric.color },
-      barWidth: '16px',
+      barMaxWidth: '16px',
     };
 
     if (baseConfig.type != 'bar') {

src/views/productCenter/productAnalysis/components/DateTendency/index.vue

@@ -311,7 +311,7 @@ async function initLine() {
     yAxisIndex: index,
     itemStyle: { color: index === 0 ? '#0085ff' : metric.color, borderRadius: [6, 6, 6, 6] },
     lineStyle: { color: metric.color },
-    barWidth: '16px',
+    barMaxWidth: '16px',
     areaStyle:
       index !== 0
         ? {
@@ -368,7 +368,7 @@ function changeMetric() {
       yAxisIndex: index,
       itemStyle: { color: metric.color, borderRadius: [6, 6, 6, 6] },
       lineStyle: { color: metric.color },
-      barWidth: '16px',
+      barMaxWidth: '16px',
     };
 
     if (baseConfig.type != 'bar') {

src/views/productCenter/productList/components/DateTendency/index.vue

@@ -224,7 +224,7 @@ async function initLine() {
     yAxisIndex: index,
     itemStyle: { color: option.series.type == 'bar' ? '#0085ff' : metric.color, borderRadius: [6, 6, 6, 6] },
     lineStyle: { color: metric.color },
-    barWidth: '16px',
+    barMaxWidth: '16px',
     areaStyle:
       index !== 0
         ? {
@@ -309,7 +309,7 @@ function changeMetric() {
       yAxisIndex: index,
       itemStyle: { color: metric.color, borderRadius: [6, 6, 6, 6] },
       lineStyle: { color: metric.color },
-      barWidth: '16px',
+      barMaxWidth: '16px',
     };
 
     if (baseConfig != 'bar') {

src/views/reportManage/TaskManage/index.vue

@@ -787,7 +787,7 @@ onMounted(() => {
       <vxe-grid ref="xGrid" :cell-style="cellStyle" :header-cell-style="headerCellStyle" stripe v-bind="gridOptions"
                 v-on="gridEvents" @edit-actived="handleEditActived" @edit-closed="handleEditClosed">
         <template #toolbar_buttons>
-          <el-button :icon="Plus" plain type="primary" @click="dialogFormVisible = true"> 添加任务</el-button>
+          <el-button :icon="Plus"  type="primary" @click="dialogFormVisible = true"> 添加任务</el-button>
           <!--<el-button plain type="success" @click="saveEvent">保存</el-button>-->
           <el-button :disabled="isDeleteDisabled" :icon="Delete" plain type="danger" @click="removeEvent">删除
           </el-button>

src/views/reportManage/dataCenter/combinedDisplay/components/chartDateTendency/index.vue

@@ -107,7 +107,7 @@ const option: any = {
         x: 'data_datetime',
         y: '',
       },
-      barWidth: '18px',
+      barMaxWidth: '18px',
       yAxisIndex: 0,
       itemStyle: {
         color: '',
@@ -122,7 +122,7 @@ const option: any = {
         x: 'data_datetime',
         y: '',
       },
-      barWidth: '18px',
+      barMaxWidth: '18px',
       yAxisIndex: 0,
       itemStyle: {
         color: '',

src/views/reportManage/dataCenter/normalDisplay/components/DateTendency/index.vue

@@ -206,7 +206,7 @@ async function initLine() {
     yAxisIndex: index,
     itemStyle: { color: index === 0 ? '#0085ff' : metric.color, borderRadius: [6, 6, 6, 6] },
     lineStyle: { color: metric.color },
-    barWidth: '16px',
+    barMaxWidth: '16px',
     areaStyle: index !== 0 ? {
       color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
         { offset: 0, color: metric.color + '53' },