Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/screens/screen-components/WeiDianZiCheJianGongGao.vue

src/views/screens/screen-components/BanZuChuQinTongJi.vue

@@ -40,7 +40,7 @@ onMounted(async () => {
         `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.deptNum}</span>`,
         `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.answerNum}</span>`,
         `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.practicalNum}</span>`,
-        `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.attendanceRate}</span>`,
+        `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.attendanceRate}%</span>`,
       ];
       bigData.push(row);
     });

src/views/screens/screen-components/ProductionSituation.vue

@@ -45,6 +45,11 @@ onMounted(async () => {
       {
         data: res?.data?.map((item: any) => item.number),
         type: "bar",
+        label: {
+          show: true,          // 开启显示
+          position: 'top',     // 标签位置（top/inside/outside等）
+          formatter: res?.data?.map((item: any) => item.number)     // 显示数据值（{c} 代表当前数据值）
+        }
       },
     ],
   };

src/views/screens/screen-components/ShengChanJiHuaQingKuang.vue

@@ -33,6 +33,7 @@ onMounted(async () => {
       number: `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>生产数量</span>`,
       operationName: `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>工序名称</span>`,
       stationName: `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>工位名称</span>`,
+      state: `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>状态</span>`,
     };
 
     let bigData: any[] = [];
@@ -44,6 +45,7 @@ onMounted(async () => {
         `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.number}</span>`,
         `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.operationName}</span>`,
         `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px'>${item.stationName}</span>`,
+        `<span style='font-size:${bigScreenData.value.fontSize * 1.5}px;color: #00a680'>执行中</span>`,
       ];
       bigData.push(row);
     });
@@ -53,7 +55,7 @@ onMounted(async () => {
       data: bigData,
       index: true,
       rowNum: 10,
-      columnWidth: [50, 130, 160, 220, 120],
+      columnWidth: [50, 130, 160, 160, 120, 160, 120],
       align: ["left"],
       carousel: "page",
     };