Merge remote-tracking branch 'origin/master'

src/views/kanban/Packagingline/index.vue

@@ -297,7 +297,15 @@
                             </div>
                             <div class="titlename">小时效率分析</div>
                         </div>
-                        <div id="echart5" style="margin: auto; width: 570px; height:304.15px"></div>
+                        <div class="Totalnumber">
+                            <div class="number1">
+                                设备总数
+                            </div>
+                            <div class="number2">
+                                4625
+                            </div>
+                        </div>
+                        <div id="echart5" style="margin: auto; width: 570px; height:304.15px;"></div>
                     </div>
 
                 </div>
@@ -433,15 +441,6 @@ export default {
         },
         getdatalist() {
             const _this = this;
-            getOverallInfo({
-                ymdType: moment().format(_this.selectxtclasses),
-                typeCode: 'material',
-                factoryCode: 'ds_' + _this.selectxt,
-            }).then((response) => {
-                if (response) {
-                    _this.ordermessage = response;
-                }
-            });
             getCheckProjectsPie({
                 ymdType: moment().format(_this.selectxtclasses),
                 typeCode: 'material',
@@ -521,15 +520,15 @@ export default {
             var fontColor = '#D0DEEE';
             var option5 = {
                 // backgroundColor: '#424956',
-                title: {
+                // title: {
-                    text: '请求数',
+                //     text: '请求数',
-                    textStyle: {
+                //     textStyle: {
-                        fontWeight: 'normal',
+                //         fontWeight: 'normal',
-                        fontSize: 16,
+                //         fontSize: 16,
-                        color: '#F1F1F3'
+                //         color: '#F1F1F3'
-                    },
+                //     },
-                    left: '6%'
+                //     left: '6%'
-                },
+                // },
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {
@@ -539,22 +538,35 @@ export default {
                     }
                 },
                 legend: {
-                    icon: 'rect',
+                    // itemWidth: 14,
-                    itemWidth: 14,
+                    // itemHeight: 5,
-                    itemHeight: 5,
+                    // itemGap: 13,
-                    itemGap: 13,
+                    // data: ['移动', '电信', '联通'],
-                    data: ['移动', '电信', '联通'],
+                    // right: '4%',
+                    // textStyle: {
+                    //     fontSize: 12,
+                    //     color: '#292f39'
+                    // },
+                    show: true,
                     right: '4%',
+                    y: '10',
+                    icon: 'stack',
+                    itemWidth: 10,
+                    itemHeight: 10,
                     textStyle: {
-                        fontSize: 12,
+                        color: '#D0DEEE'
-                        color: '#292f39'
+                    },
-                    }
+
+                    // nameTextStyle:{
+                    //         color: '#D0DEEE'
+                    //     },
+                    data: ['移动', '电信', '联通'],
                 },
                 grid: {
                     left: '3%',
                     right: '4%',
-                    bottom: '0%',
+                    bottom: '2%',
-                    top: '7%',
+                    top: '20%',
                     containLabel: true
                 },
                 xAxis: [{
@@ -1291,6 +1303,28 @@ export default {
                     }
                 }
             }
+
+            .Totalnumber {
+                width: 299px;
+                height: 49px;
+                background: url("../../../assets/images/packagingline/bg-title5.png") no-repeat;
+                background-size: 100% 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-around;
+
+                .number1 {
+                    font-size: 14px;
+                    color: #FFFFFF;
+                    line-height: 20px;
+                }
+
+                .number2 {
+                    font-weight: 500;
+                    font-size: 24px;
+                    color: #2ACFFF;
+                }
+            }
         }
     }
 }