push

src/pages/Kanban.vue

@@ -126,9 +126,9 @@
               </li>
             </ul>
           </div>
-          <div class="b-l-box fl">
+          <!-- <div class="b-l-box fl">
             <div id="xEchartContainer1" style="width:480px;height:336px"></div>
-          </div>
+          </div> -->
         </div>
         <div class="left_content_height content_block fl item-wrapper">
           <!-- <div class="corner corner1"></div>
@@ -138,7 +138,8 @@
           <!-- <div class="block_h2" style="width: 2.3rem">
             <h2>周订单数</h2>
           </div> -->
-          <div>
+          <!-- <div id="xEchartContainer1" style="width:100%;height:336px"></div> -->
+          <!-- <div>
             <h2 class="title">周订单数</h2>
             <div class="mid_block_3_2">
               <div class="count_h">
@@ -160,10 +161,13 @@
                 </div>
               </div>
             </div>
-          </div>
-          <div class="rbox">
-            <h2 class="title">周订单数</h2>
-            <div id="xEchartContainer2" style="width:620px;height:280px;margin-top: -40px"></div>
+          </div> -->
+          <div class="fl">
+            <div class="block_h2">
+              <h2>今日与累计预警数量对比</h2>
+            </div>
+            <div id="xEchartContainer1" style="width:830px;height:320px;margin-top: -20px"></div>
+            <!-- <div id="xEchartContainer2" style="width:620px;height:280px;margin-top: -40px"></div> -->
           </div>
         </div>
       </div>
@@ -338,7 +342,7 @@ export default {
       //   {device_name: 'L15-2', devicestatus_name: '专机故障报警', update_date: '12:10:12'}
       // ],
       // arr5: [
-      //   ['product', '昨日', '今日'],
+      //   ['product', '累计', '今日'],
       //   ['盘管双斜口', 3, 5],
       //   ['直管双斜口', 2, 8],
       //   ['盘管无屑', 10, 6],
@@ -395,13 +399,13 @@ export default {
           {value: this.jo3.sumproducing_qty, name: '生产中数量'},
           {value: this.jo3.sumfinishproduce_qty, name: '已完成数量'}
         ]
-        res.result.arr7.forEach((el) => {
-          this.xdata2.push(el.date)
-          this.ydata2.push(el.count)
-        })
+        // res.result.arr7.forEach((el) => {
+        //   this.xdata2.push(el.date)
+        //   this.ydata2.push(el.count)
+        // })
         this._getEchart()
         this._getEchart1()
-        this._getEchart2()
+        // this._getEchart2()
       } else {
         // this.toast(res.desc)
       }
@@ -469,16 +473,16 @@ export default {
           source: data
         },
         color: ['#0755F1', '#F6B042'],
-        title: {
-          text: '今日与昨日预警数量对比', // 标题
-          textStyle: {
-            color: '#F3953E',
-            fontSize: '20'
-          }
-        },
+        // title: {
+        //   text: '今日与累计预警数量对比', // 标题
+        //   textStyle: {
+        //     color: '#F3953E',
+        //     fontSize: '20'
+        //   }
+        // },
         legend: {
           // itemGap: 25,
-          data: ['昨日', '今日'],
+          data: ['累计', '今日'],
           align: 'right',
           top: 20,
           right: 20,
@@ -940,12 +944,12 @@ export default {
     line-height .56rem
 .content-block-scroll-ul2
   li
-    width 3.6rem
+    // width 3.6rem
     // &:nth-child(2n)
     //   background rgba(10, 78, 130, 0.5)
     span
       display inline-block
-      width 33.3%
+      width 20%
       text-align center
       line-height .56rem
 .b-l-box