mork

src/config/mork01.js

@@ -46,6 +46,20 @@ export const getAllBigScreen = () => {
                 "dd_status": "完成"
             }
         ],
+        bzsituation: [
+            {
+                "bz_situation": "1",
+                "bz_proportion": "0.26"
+            },
+            {
+                "bz_situation": "2",
+                "bz_proportion": "0.19"
+            },
+            {
+                "bz_situation": "3",
+                "bz_proportion": "0.54"
+            }
+        ],
         fhsituation: {
             'enter_proportion': 120,
             'out_proportion': 80,

src/config/mork02.js

@@ -0,0 +1,228 @@
+/* eslint-disable */
+export const getAllBigScreen = () => {
+    let res = {
+        "dddatebase": [
+            {
+                "customer": "海宁晶科（浙江）",
+                "production_materials": "BF190UT4H1",
+                "large_model": "DK81F",
+                "small_model": "BKB01",
+                "batch_number": "00250621001",
+                "weight": "5",
+                "dd_status": "1"
+            },
+            {
+                "customer": "海宁晶科（浙江）",
+                "production_materials": "WM697TC53A29B1",
+                "large_model": "DK93TF",
+                "small_model": "TKB373",
+                "batch_number": "00250623034",
+                "weight": "4",
+                "dd_status": "1"
+            },
+            {
+                "customer": "海宁晶科（浙江）",
+                "production_materials": "WM697TC53A29B1",
+                "large_model": "DK93TF",
+                "small_model": "TKB373",
+                "batch_number": "00250623034",
+                "weight": "186",
+                "dd_status": "1"
+            },
+            {
+                "customer": "海宁晶科（浙江）",
+                "production_materials": "WM697TC53A29B1",
+                "large_model": "DK93TF",
+                "small_model": "TKB373",
+                "batch_number": "00250623034",
+                "weight": "186",
+                "dd_status": "1"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "BF107UT4H1",
+                "large_model": "DK81F",
+                "small_model": "BKB71",
+                "batch_number": "00250620028",
+                "weight": "11",
+                "dd_status": "2"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "BF107UT4H1",
+                "large_model": "DK81F",
+                "small_model": "BKB71",
+                "batch_number": "00250620028",
+                "weight": "17",
+                "dd_status": "2"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "WM695TC59A4",
+                "large_model": "DK93TF",
+                "small_model": "TKB381",
+                "batch_number": "00250620015",
+                "weight": "84",
+                "dd_status": "2"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "WM697TC59A4",
+                "large_model": "DK93TF",
+                "small_model": "TKB381",
+                "batch_number": "00250620015",
+                "weight": "30",
+                "dd_status": "2"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "WM697TC59A4",
+                "large_model": "DK93TF",
+                "small_model": "TKB381",
+                "batch_number": "00250620015",
+                "weight": "30",
+                "dd_status": "2"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "WM697TC59A4",
+                "large_model": "DK93TF",
+                "small_model": "TKB381",
+                "batch_number": "00250620015",
+                "weight": "30",
+                "dd_status": "3"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "WM695TC59A4",
+                "large_model": "DK93TF",
+                "small_model": "TKB381",
+                "batch_number": "00250620015",
+                "weight": "30",
+                "dd_status": "1"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "WM830TC59A4",
+                "large_model": "DK93TF",
+                "small_model": "TKB529",
+                "batch_number": "00250620016",
+                "weight": "72",
+                "dd_status": "3"
+            },
+            {
+                "customer": "海宁晶科（尖山）二期",
+                "production_materials": "JSJK-2",
+                "large_model": "DK72EF-5",
+                "small_model": "NKLB16",
+                "batch_number": "00250621253",
+                "weight": "12",
+                "dd_status": "3"
+            },
+            {
+                "customer": "山西晶科",
+                "production_materials": "WM870TC56G08A3",
+                "large_model": "DK93TF",
+                "small_model": "TKB551",
+                "batch_number": "00250624144",
+                "weight": "20",
+                "dd_status": "3"
+            },
+            {
+                "customer": "山西晶科",
+                "production_materials": "WM870TC53A29B1",
+                "large_model": "DK93TF",
+                "small_model": "TKB551",
+                "batch_number": "00250624145",
+                "weight": "20",
+                "dd_status": "3"
+            },
+            {
+                "customer": "山西晶科",
+                "production_materials": "NL489C68K9B",
+                "large_model": "DK72EF",
+                "small_model": "NKLB190",
+                "batch_number": "00250623203",
+                "weight": "4",
+                "dd_status": "1"
+            },
+            {
+                "customer": "眉山通威",
+                "production_materials": "WM769N18",
+                "large_model": "DK93T",
+                "small_model": "H658TC52C5",
+                "batch_number": "00250623028",
+                "weight": "160",
+                "dd_status": "2"
+            },
+            {
+                "customer": "眉山通威",
+                "production_materials": "WM769N18",
+                "large_model": "DK93T",
+                "small_model": "H658TC52C5",
+                "batch_number": "00250623028",
+                "weight": "160",
+                "dd_status": "3"
+            },
+            {
+                "customer": "眉山通威",
+                "production_materials": "NL553C68K9B",
+                "large_model": "DK72E",
+                "small_model": "TWL04",
+                "batch_number": "00250620026",
+                "weight": "10",
+                "dd_status": "1"
+            },
+            {
+                "customer": "眉山通威",
+                "production_materials": "NL553C68K9B",
+                "large_model": "DK72E",
+                "small_model": "TWL04",
+                "batch_number": "00250624003",
+                "weight": "310",
+                "dd_status": "3"
+            },
+            {
+                "customer": "眉山通威",
+                "production_materials": "NL553C68K9B",
+                "large_model": "DK72E",
+                "small_model": "TWL04",
+                "batch_number": "00250624003",
+                "weight": "310",
+                "dd_status": "3"
+            },
+            {
+                "customer": "眉山通威",
+                "production_materials": "NL657C68K9B7",
+                "large_model": "DK72E",
+                "small_model": "TWL04",
+                "batch_number": "00250623029",
+                "weight": "30",
+                "dd_status": "1"
+            }
+        ],
+        "fhsituation": {
+            "enter_proportion": "0.38",
+            "out_proportion": "0.62"
+        },
+        "bzsituation": [
+            {
+                "bz_situation": "1",
+                "bz_proportion": "0.26"
+            },
+            {
+                "bz_situation": "2",
+                "bz_proportion": "0.19"
+            },
+            {
+                "bz_situation": "3",
+                "bz_proportion": "0.54"
+            }
+        ],
+        "drbzsituation": {
+            "plan_weight": "1721.0",
+            "finish_weight": "934.0"
+        }
+    }
+    return res
+}

src/pages_960/Setup.vue

@@ -46,7 +46,7 @@ export default {
         setTime: this.setTime * 1000
       }
       this.$store.dispatch('setConfig', obj)
-      this.$router.push('/wxdk')
+      this.$router.push('/index')
       let element = document.documentElement
       if (!(document.fullscreenElement || document.mozFullscreenElement || document.webkitFullscreenElement || document.msFullscreenElement)) {
         if (element.requestFullscreen) {

src/pages_960/modules/home/index2.vue

@@ -36,7 +36,7 @@
                           </div> -->
                           <div class="scroll-ul_1_div">{{e.large_model}}</div>
                           <div class="scroll-ul_1_div">{{e.small_model}}</div>
-                          <div class="scroll-ul_1_div">{{e.lable_batch}}</div>
+                          <div class="scroll-ul_1_div">{{e.batch_number}}</div>
                           <div class="scroll-ul_1_div">{{e.weight}}</div>
                           <div class="scroll-ul_1_div">{{e.dd_status}}</div>
                           </li>
@@ -67,7 +67,7 @@
                 <div class="title_wraper">
                   <p>当日包装完成情况</p>
                 </div>
-                <div class="content_wraper">
+                <div class="content_wraper content_wraper_2">
                   <div class="w_wraper">
                       <div ref="echartsRef2" style="width: 100%; height: 100%;"></div>
                   </div>
@@ -89,7 +89,7 @@
                         <ul class="scroll-ul_2">
                           <li v-for="(e, i) in dataList2" :key="i">
                           <div class="scroll-ul_2_div">{{e.customer}}</div>
-                          <div class="scroll-ul_2_div">{{e.batch}}</div>
+                          <div class="scroll-ul_2_div">{{e.batch_number}}</div>
                           <div class="scroll-ul_2_div">{{e.dd_status}}</div>
                           </li>
                         </ul>
@@ -105,7 +105,7 @@
 </template>
 
 <script>
-import { getAllBigScreen } from '@js/mork01.js'
+import { getAllBigScreen } from '@js/mork02.js'
 // import { getAllBigScreen } from '@js/getData2.js'
 export default {
   data () {
@@ -114,6 +114,7 @@ export default {
       timer: null,
       // chart2Timer: null,
       curList: [], // 当日出入
+      bzfhArr: [], // 包装发货
       historyList: [], // 历史分析
       statisList: [], // 当日生产统计
       loadList: [], // 当日车间上下料
@@ -209,9 +210,10 @@ export default {
       //   this.chart2Timer = null
       // }
       this.fhobj = res.fhsituation // 成品包装发货情况
-      this.curList = [...res.drbzsituation] // 当日包装完成情况
+      this.bzfhArr = res.bzsituation // 成品-包装发货情况
+      this.curList = res.drbzsituation // 当日包装完成情况
       this.dataList1 = [...res.dddatebase] // 滚动1-订单数据
-      this.dataList2 = [...res.ypsituation] // 滚动2-（样品）包装发货进度
+      this.dataList2 = [...res.dddatebase] // 滚动2-（样品）包装发货进度
       this.setEchart1()
       this.setEchart2()
       this.setEchart3()
@@ -231,7 +233,7 @@ export default {
         legend: {
           // orient: 'vertical',
           orient: 'horizontal',
-          top: '-1%',
+          top: '4%',
           // right: 0,
           textStyle: {
             color: '#fff',
@@ -271,159 +273,71 @@ export default {
       this.myChart1.setOption(option, true)
     },
     setEchart2 () {
-      let barName = []
+      let data = [
-      let barData1 = []
+        {
-      let barData2 = []
+          value: this.curList.plan_weight,
-      this.curList.map(el => {
+          name: '计划重量'
-        barName.push(el.material_name)
-        barData1.push(el.plan_weight)
-        barData2.push(el.finish_weight)
-      })
-      let option = {
-        grid: {
-          top: 20,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          containLabel: true
         },
+        {
+          value: this.curList.finish_weight,
+          name: '已完成重量'
+        }
+      ]
+      var option = {
         legend: {
-          icon: 'rect',
+          // orient: 'vertical',
-          top: '0',
+          orient: 'horizontal',
-          right: '0',
+          top: '4%',
+          // right: 0,
           textStyle: {
-            color: '#9BB9DD',
+            color: '#fff',
-            fontSize: 8,
+            fontWeight: 'bold',
-            lineHeight: 8
+            fontSize: 12
           },
-          itemGap: 15,
+          itemGap: 10.86,
-          itemWidth: 4,
+          itemWidth: 14.16,
-          itemHeight: 4,
+          itemHeight: 7.38,
-          data: [{name: '计划重量', itemStyle: {color: '#67D470'}}, {name: '已完成重量', itemStyle: {color: '#1980EA'}}]
+          // data: dataName
-        },
+          data: ['计划重量', '已完成重量']
-        xAxis: {
-          type: 'category',
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: true,
-            lineStyle: {
-              width: 1,
-              color: '#3C5787'
-            }
-          },
-          axisLabel: {
-            interval: 0,
-            color: '#7591B2',
-            fontSize: 8,
-            lineHeight: 6,
-            margin: 5
-          },
-          data: barName
-        },
-        yAxis: {
-          type: 'value',
-          // name: '单位：块',
-          axisLine: {
-            show: false
-          },
-          splitNumber: 4,
-          axisTick: {
-            show: false
-          },
-          axisLabel: {
-            color: '#B5C5D4',
-            fontSize: 6
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              type: [2, 1],
-              color: '#455C86'
-            }
-          }
         },
+        color: ['#32c5ff', '#f7b502'],
         series: [
           {
-            name: '计划重量',
+            type: 'pie',
-            type: 'bar',
+            radius: ['43%', '70%'],
-            barWidth: '10',
+            label: {
-            itemStyle: {
+              normal: {
-              color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                show: false,
-                {
+                // position: 'inner',
-                  offset: 1,
+                formatter: '{d}%',
-                  color: 'rgba(103,212,112,0.2)'
+                textStyle: {
-                },
+                  color: '#fff',
-                {
+                  fontWeight: 'bold',
-                  offset: 0.08,
+                  fontSize: 12
-                  color: 'rgba(103,212,112,0.9)'
-                },
-                {
-                  offset: 0,
-                  color: 'rgba(255,255,255,0.9)'
                 }
-              ])
+              }
             },
-            data: barData1
+            labelLine: {
-          },
+              show: true
-          {
-            name: '已完成重量',
-            type: 'bar',
-            barWidth: '10',
-            itemStyle: {
-              color: new this.$echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                {
-                  offset: 1,
-                  color: 'rgba(25,128,234,0.2)'
-                },
-                {
-                  offset: 0.08,
-                  color: 'rgba(25,128,234,0.9)'
-                },
-                {
-                  offset: 0,
-                  color: 'rgba(255,255,255,0.9)'
-                }
-              ])
             },
-            data: barData2
+            data: data
-          }
-        ],
-        dataZoom: [
-          {
-            xAxisIndex: 0, // 这里是从X轴的0刻度开始
-            show: false, // 是否显示滑动条，不影响使用
-            type: 'slider', // 这个 dataZoom 组件是 slider 型 dataZoom 组件
-            startValue: 0, // 从头开始。
-            endValue: 3 // 展示到第几个。
           }
         ]
       }
       this.myChart2.setOption(option, true)
-      // this.chart2Timer = setInterval(() => {
-      //   if (option.dataZoom[0].endValue >= barData1.length - 1) {
-      //     option.dataZoom[0].endValue = 3
-      //     option.dataZoom[0].startValue = 0
-      //   } else {
-      //     option.dataZoom[0].endValue = option.dataZoom[0].endValue + 1
-      //     option.dataZoom[0].startValue = option.dataZoom[0].startValue + 1
-      //   }
-      //   this.myChart2.setOption(option, true)
-      // }, 2000)
     },
     setEchart3 () {
       let data = [
         {
-          value: this.fhobj.start_proportion,
+          value: this.bzfhArr[0].bz_proportion,
           name: '未开始'
         },
         {
-          value: this.fhobj.doing_proportion,
+          value: this.bzfhArr[1].bz_proportion,
           name: '进行中'
         },
         {
-          value: this.fhobj.finish_proportion,
+          value: this.bzfhArr[2].bz_proportion,
           name: '已完成'
         }
       ]
@@ -431,7 +345,7 @@ export default {
         legend: {
           // orient: 'vertical',
           orient: 'horizontal',
-          top: '-1%',
+          top: '4%',
           // right: 0,
           textStyle: {
             color: '#fff',
@@ -547,9 +461,11 @@ export default {
   &:last-child
     // margin-bottom 0
   &:nth-child(1), &:nth-child(6)
-    width 40%
+    width 34%
-  &:nth-child(2), &:nth-child(3)
+  &:nth-child(2)
-    width 30%
+    width 17%
+  &:nth-child(3)
+    width 49%
 .item_wraper_1
   // height calc((200% - 20px) / 3)
 .title_wraper