Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

@@ -286,7 +286,7 @@ import Public from "./public";
       ]),
       calcWidth() {
         return function (index) {
-          let width = "100px"
+          let width = "110px"
           switch (index) {
           case 0:
             width = "150px"

src/views/productionPlanning/customerForecastDemandReview/resourceContent/evaluation/char.vue

@@ -1,7 +1,7 @@
 <template>
     <div 
     :style="{height:Height,opacity:Opacity}"  
-    style="padding: 10px;margin: 10px;border: 1px solid #ccc;width: 100%;"></div>
+    style="padding: 10px;margin: 10px;border: 1px solid #ccc;width: 95%;"></div>
 </template>
 
 <script>
@@ -92,7 +92,7 @@ export default {
             let option = {
                 title:     {  text: this.Title},
                 tooltip:    { trigger: 'axis', axisPointer: { type: 'shadow' } },
-                legend:     { data: this.legendList,top:'%1',type:"scroll" },
+                legend:     { data: this.legendList,top:'%1',left: "10%",type:"scroll" },
                 grid:       { top: '19%', left: "3%", right: "3%", bottom: "1%", containLabel: true },
                 xAxis:      [{ type: "category", data: this.weeksList }],
                 yAxis:      [{ type: "value" }],