From c55b9bf9d394fb918f76c200b401834f2f7aceea Mon Sep 17 00:00:00 2001
From: hzz <hzz>
Date: Fri, 15 Sep 2023 19:10:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E4=BC=9A=E5=A4=A7=E5=B1=8Fupdate=20?=
 =?UTF-8?q?=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E8=AE=BE=E5=A4=87=E9=A5=BC?=
 =?UTF-8?q?=E5=9B=BE=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/module/MicroExhibition.ts           | 38 +++++++++++++++----
 src/views/Mechanics/components/ringChart.vue  |  1 +
 .../MicroExhibition/components/BarChart.vue   | 28 ++++++++------
 .../MicroExhibition/components/BoardBar.vue   |  6 +--
 src/views/MicroExhibition/index.vue           |  4 +-
 5 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/src/store/module/MicroExhibition.ts b/src/store/module/MicroExhibition.ts
index 71b22b1..46b4a8a 100644
--- a/src/store/module/MicroExhibition.ts
+++ b/src/store/module/MicroExhibition.ts
@@ -72,13 +72,24 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
     },
     setcaijian(data) {
 
-      data.chart.series = data.chart.series.map((item) => {
+      data.chart.series = data.chart.series.map((item, index) => {
         item.type = 'bar'
         item.barMaxWidth = 30
         item.label = {
           show: true,
-          position: 'top'
+          position: 'top',
+          formatter: function (params) {
+            let unit = '';
+            if (params.name == '1190269') {
+              unit = '件'
+            } else if(params.name == '1050910'){
+              unit = '米'
+            }
+            return  params.value + unit;
+          }
         }
+
+
         return item
       })
       this.caijian = data;
@@ -90,7 +101,8 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
         item.barMaxWidth = 45
         item.label = {
           show: true,
-          position: 'top'
+          position: 'top',
+          formatter: '{c}只'
         }
         return item
       })
@@ -106,7 +118,17 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
         item.barMaxWidth = 30
         item.label = {
           show: true,
-          position: 'top'
+          position: 'top',
+          formatter: function (params) {
+            let unit = '';
+            let arr = ['RP2011001#', 'RP2011157', '10102109', '10102154']
+            if (arr.includes(params.name)) {
+              unit = '片'
+            } else if(params.name == '1021629'){
+              unit = '米'
+            }
+            return  params.value + unit;
+          }
         }
         return item
       })
@@ -122,7 +144,8 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
         item.barMaxWidth = 30
         item.label = {
           show: true,
-          position: 'top'
+          position: 'top',          
+          formatter: '{c}版'
         }
         return item
       })
@@ -139,7 +162,8 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
         item.barMaxWidth = 30
         item.label = {
           show: true,
-          position: 'top'
+          position: 'top',
+          formatter: '{c}件'
         }
         return item
       })
@@ -149,7 +173,7 @@ export const useMicroExhibitionStore = defineStore(Names.MicroExhibition, {
       let map = {
         '1170304': 'zuoyi',
         '1171902': 'zuoyi',
-        '10201557': 'zuoyi',        
+        '10201557': 'zuoyi',
         '1171701': 'zuoyi',
         '116023#': 'tuoxie',
         '104019420': 'banfang',
diff --git a/src/views/Mechanics/components/ringChart.vue b/src/views/Mechanics/components/ringChart.vue
index c9d20a6..d0b2ae7 100644
--- a/src/views/Mechanics/components/ringChart.vue
+++ b/src/views/Mechanics/components/ringChart.vue
@@ -45,6 +45,7 @@ const init = () => {
                 fontSize: 16,
             },
         },
+        color:['#7CFFB2','#4D9BFF'],
         series: [
             {
                 name: "",
diff --git a/src/views/MicroExhibition/components/BarChart.vue b/src/views/MicroExhibition/components/BarChart.vue
index f502161..14509a8 100644
--- a/src/views/MicroExhibition/components/BarChart.vue
+++ b/src/views/MicroExhibition/components/BarChart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script setup lang='ts'>
-import { ref, getCurrentInstance, onMounted,watch } from 'vue'
+import { ref, getCurrentInstance, onMounted, watch } from 'vue'
 
 
 const prop = defineProps({
@@ -13,7 +13,7 @@ const prop = defineProps({
     },
     seriesData: {
         type: Array,
-        default: [        ]
+        default: []
     }
 })
 
@@ -28,7 +28,7 @@ const setCharts = () => {
         // },
         backgroundColor: '#0E0E0E',
         legend: {
-            data: ['计划完成','实际完成'],
+            data: ['计划完成', '实际完成'],
         },
         grid:{
             left:'40',
@@ -43,23 +43,29 @@ const setCharts = () => {
             //     rotate: 45, //倾斜角度
             // },
         },
-        yAxis: {
-            type: 'value'
-        },
+        yAxis: [
+            {
+                type: 'value',
+                name: '日产量',
+                // axisLabel: {
+                //     formatter: '{value}%'
+                // }
+            }
+        ],
         series: prop.seriesData
     };
 
     charts.setOption(option);
 }
 
-watch(()=>prop.seriesData, (newVal, oldVal) => {
+watch(() => prop.seriesData, (newVal, oldVal) => {
     charts.setOption({
         series: newVal
     });
-},{deep:true})
-watch(()=>prop.xData, (newVal, oldVal) => {
+}, { deep: true })
+watch(() => prop.xData, (newVal, oldVal) => {
     charts.setOption({
-        
+
         xAxis: {
             type: 'category',
             data: prop.xData,
@@ -69,7 +75,7 @@ watch(()=>prop.xData, (newVal, oldVal) => {
             // },
         },
     });
-},{deep:true})
+}, { deep: true })
 onMounted(() => {
     setCharts()
 })
diff --git a/src/views/MicroExhibition/components/BoardBar.vue b/src/views/MicroExhibition/components/BoardBar.vue
index a7ed11a..7345774 100644
--- a/src/views/MicroExhibition/components/BoardBar.vue
+++ b/src/views/MicroExhibition/components/BoardBar.vue
@@ -36,8 +36,8 @@ const prop = defineProps({
         default: [        ]
     }
 })
-let header = ['序号', '设备名称', '设备编码', '稼动率', '状态']
-let columnWidth = [90, 290, 140, 120, 120];
+let header = ['序号', '设备名称', '设备编码','完成率', '稼动率', '状态']
+let columnWidth = [90, 290, 140, 120, 120,100];
 let sum = 850;
 
 let computedWidth = (width: number) => {
@@ -49,7 +49,7 @@ let config = reactive({
     oddRowBGC: '#000F1D',
     evenRowBGC: '#000F1D',
     wrap: [false, false, false, false, false],
-    columnWidth: [80, 290, 140, 120, 120],
+    columnWidth: [80, 290, 140, 120, 120,100],
     align: ['center', 'center', 'center', 'center', 'center', 'center'],
     rowNum: 2,
     waitTime: 3000,
diff --git a/src/views/MicroExhibition/index.vue b/src/views/MicroExhibition/index.vue
index badd4ac..ebc8175 100644
--- a/src/views/MicroExhibition/index.vue
+++ b/src/views/MicroExhibition/index.vue
@@ -124,8 +124,8 @@ let ringData = computed(() => {
     ]
 })
 let timer = null
-let dev_caijian_title = ['设备名称', '设备编码', '稼动率', '状态']
-let dev_tuoxie_title = ['设备编码', '稼动率', '状态']
+let dev_caijian_title = ['设备名称', '设备编码','完成率', '稼动率', '状态']
+let dev_tuoxie_title = ['设备编码','完成率', '稼动率', '状态']
 let dev_value = [
     ['全自动针梭两用铺布机', '待机', '40层', '1'],
     ['全自动9公分电脑裁床', '待机', '40层', '0'],