From 840e3bb178febdc22aef72b365d96b58de57135f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 19 Nov 2024 13:18:41 +0800
Subject: [PATCH] 1

---
 src/views/SmartScreen/ProdScreen/charts/chart1.vue     |  9 ++++-----
 src/views/SmartScreen/ProdScreen/charts/chart2.vue     |  8 ++++----
 src/views/SmartScreen/ProdScreen/charts/chart3.vue     |  8 ++++----
 src/views/SmartScreen/ProdScreen/charts/chart4.vue     |  2 +-
 src/views/SmartScreen/ProdScreen/charts/chart5.vue     |  5 +++--
 src/views/SmartScreen/ProdScreen/charts/chart6.vue     |  2 +-
 src/views/SmartScreen/ProdScreen/charts/chart7.vue     |  5 ++++-
 src/views/SmartScreen/ProdScreen/components/logo.vue   |  6 +++---
 src/views/SmartScreen/ProdScreen/index.css             |  2 +-
 src/views/SmartScreen/ProdScreen/index.vue             |  8 ++++----
 .../LineWarehouse/LineWarehouseLog/index.vue           | 10 +++++++++-
 11 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/views/SmartScreen/ProdScreen/charts/chart1.vue b/src/views/SmartScreen/ProdScreen/charts/chart1.vue
index 1c5e74a..17020b1 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart1.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart1.vue
@@ -2,15 +2,14 @@
 <template>
     <div>
         <div class="title">{{ title }}</div>
-        <el-table height="900" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
-            <el-table-column type="index" width="50" align="center" />
-            <el-table-column width="80px" prop="groupCode" label="组编号" :show-overflow-tooltip="true" />
-            <el-table-column width="200px" label="零件完成数（计划/报工）" :show-overflow-tooltip="true">
+        <el-table height="700" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+            <el-table-column width="80px" prop="groupCode" label="组" :show-overflow-tooltip="true" />
+            <el-table-column width="120px" label="报工/计划" :show-overflow-tooltip="true">
                 <template #default="scope">
                     {{ ` ${scope.row.reportQuantity} /  ${scope.row.planQuantity}` }}
                 </template>
             </el-table-column>
-            <el-table-column min-width="260px" label="零件生产总进度" align="center">
+            <el-table-column min-width="260px" label="生产进度" align="center">
                 <template #default="scope">
                     <el-progress :text-inside="true" :stroke-width="24" :percentage="getPercentage(scope.row)" :color="getProgressColor(scope.row)" />
                 </template>
diff --git a/src/views/SmartScreen/ProdScreen/charts/chart2.vue b/src/views/SmartScreen/ProdScreen/charts/chart2.vue
index 46128e1..b1fb853 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart2.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart2.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     },
     height: {
         type: String,
-        default: '450px'
+        default: '350px'
     }
 })
 const options = {
@@ -66,9 +66,9 @@ const options = {
             data: [],
             label: {
                 show: true,
-                position: 'top',
+                position: 'inside',
                 textBorderColor: '#fff',
-                textBorderWidth: 1,
+                textBorderWidth: 0,
                 color: '#fff'
             }
         },
@@ -80,7 +80,7 @@ const options = {
                 show: true,
                 position: 'top',
                 textBorderColor: '#fff',
-                textBorderWidth: 1,
+                textBorderWidth: 0,
                 color: '#fff'
             }
         }
diff --git a/src/views/SmartScreen/ProdScreen/charts/chart3.vue b/src/views/SmartScreen/ProdScreen/charts/chart3.vue
index 0746c50..7bfad7b 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart3.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart3.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     },
     height: {
         type: String,
-        default: '450px'
+        default: '350px'
     }
 })
 const options = {
@@ -66,9 +66,9 @@ const options = {
             data: [],
             label: {
                 show: true,
-                position: 'top',
+                position: 'inside',
                 textBorderColor: '#fff',
-                textBorderWidth: 1,
+                textBorderWidth: 0,
                 color: '#fff'
             }
         },
@@ -80,7 +80,7 @@ const options = {
                 show: true,
                 position: 'top',
                 textBorderColor: '#fff',
-                textBorderWidth: 1,
+                textBorderWidth: 0,
                 color: '#fff'
             }
         }
diff --git a/src/views/SmartScreen/ProdScreen/charts/chart4.vue b/src/views/SmartScreen/ProdScreen/charts/chart4.vue
index b4466e9..1077384 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart4.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart4.vue
@@ -2,7 +2,7 @@
 <template>
     <div>
         <div class="title">今日异常工单</div>
-        <el-table height="450" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
+        <el-table height="350" :data="dataList" v-loading="loading" ref="tableRef" highlight-current-row @mouseover.native="clearScroll" @mouseleave.native="createScroll">
             <el-table-column prop="workorder" label="工单号" :show-overflow-tooltip="true" />
             <el-table-column prop="description" label="描述" :show-overflow-tooltip="true" />
         </el-table>
diff --git a/src/views/SmartScreen/ProdScreen/charts/chart5.vue b/src/views/SmartScreen/ProdScreen/charts/chart5.vue
index 9b2f0d5..5c2d877 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart5.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart5.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     },
     height: {
         type: String,
-        default: '450px'
+        default: '350px'
     }
 })
 const options = {
@@ -28,7 +28,8 @@ const options = {
     },
     legend: {
         type: 'scroll',
-        top: 20,
+        top: 10,
+        right: 10,
         textStyle: {
             color: '#fff'
         }
diff --git a/src/views/SmartScreen/ProdScreen/charts/chart6.vue b/src/views/SmartScreen/ProdScreen/charts/chart6.vue
index b029c92..fd8c227 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart6.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart6.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     },
     height: {
         type: String,
-        default: '450px'
+        default: '350px'
     }
 })
 const options = {
diff --git a/src/views/SmartScreen/ProdScreen/charts/chart7.vue b/src/views/SmartScreen/ProdScreen/charts/chart7.vue
index 6973c56..1fccb8a 100644
--- a/src/views/SmartScreen/ProdScreen/charts/chart7.vue
+++ b/src/views/SmartScreen/ProdScreen/charts/chart7.vue
@@ -18,7 +18,7 @@ const props = defineProps({
     },
     height: {
         type: String,
-        default: '400px'
+        default: '300px'
     }
 })
 let options = {
@@ -53,6 +53,9 @@ let options = {
     },
     // 图例
     legend: {
+        type: 'scroll',
+        icon: 'circle',
+        top: 'top',
         data: ['本月每天产量', '1组', '2组', '3组', '4组', '5组', '6组', '7组', '8组', '9组', '10组', '11组', '12组', '13组', '14组', '15组', '16组', '17组', '18组', '内1', '内2']
     },
     series: [
diff --git a/src/views/SmartScreen/ProdScreen/components/logo.vue b/src/views/SmartScreen/ProdScreen/components/logo.vue
index 7bacb8c..66a5b74 100644
--- a/src/views/SmartScreen/ProdScreen/components/logo.vue
+++ b/src/views/SmartScreen/ProdScreen/components/logo.vue
@@ -24,13 +24,13 @@ import imgUrl from '@/assets/logo/logo.png'
     justify-content: center;
 }
 .logo {
-    width: 50px;
-    height: 50px;
+    width: 40px;
+    height: 40px;
 }
 .text {
     margin-left: 10px;
     text-align: center;
     /* line-height: 25px; */
-    font-size: 36px;
+    font-size: 24px;
 }
 </style>
diff --git a/src/views/SmartScreen/ProdScreen/index.css b/src/views/SmartScreen/ProdScreen/index.css
index 588838f..2197669 100644
--- a/src/views/SmartScreen/ProdScreen/index.css
+++ b/src/views/SmartScreen/ProdScreen/index.css
@@ -52,6 +52,6 @@ body{
 	flex-direction: column;
 }
 .box{
-    min-height: 450px;
+    min-height: 350px;
 	padding: 20px;
 }
\ No newline at end of file
diff --git a/src/views/SmartScreen/ProdScreen/index.vue b/src/views/SmartScreen/ProdScreen/index.vue
index 9e6efdb..1cf2a59 100644
--- a/src/views/SmartScreen/ProdScreen/index.vue
+++ b/src/views/SmartScreen/ProdScreen/index.vue
@@ -187,25 +187,25 @@ const { proxy } = getCurrentInstance()
     margin-bottom: 10px;
 }
 .top {
-    height: 140px;
+    height: 80px;
     background-color: rgba(60, 232, 248, 0.1);
 }
 .num-item {
     /* border: #0072ff 1px solid; */
     padding: 10px;
     width: 100%;
-    height: 140px;
+    height: 80px;
     display: flex;
     flex-direction: column;
     align-items: center;
     justify-content: center;
 }
 .num-title {
-    font-size: 24px;
+    font-size: 20px;
     font-weight: bold;
 }
 .num-value {
-    font-size: 36px;
+    font-size: 24px;
     font-weight: 800;
     -webkit-background-clip: text; /* 仅将背景应用于文本 */
     -webkit-text-fill-color: transparent; /* 设置文本颜色为透明 */
diff --git a/src/views/materialMangement/LineWarehouse/LineWarehouseLog/index.vue b/src/views/materialMangement/LineWarehouse/LineWarehouseLog/index.vue
index 582b14f..a00aaf9 100644
--- a/src/views/materialMangement/LineWarehouse/LineWarehouseLog/index.vue
+++ b/src/views/materialMangement/LineWarehouse/LineWarehouseLog/index.vue
@@ -26,7 +26,15 @@
             <el-table-column prop="lineCode" label="线别" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('lineCode')" />
             <el-table-column prop="materialCode" label="物料编号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialCode')" />
             <el-table-column prop="materialName" label="物料名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('materialName')" />
-            <el-table-column prop="action" label="操作" align="center" v-if="columns.showColumn('action')" />
+            <el-table-column prop="action" label="操作" align="center" v-if="columns.showColumn('action')">
+                <template #default="scope">
+                    <el-tag v-if="scope.row.action == 1" type="primary">出库</el-tag>
+                    <el-tag v-if="scope.row.action == 2" type="warning">取消出库</el-tag>
+                    <el-tag v-if="scope.row.action == 3" type="success">入库</el-tag>
+                    <el-tag v-if="scope.row.action == 4" type="warning">取消入库</el-tag>
+                    <el-tag v-if="scope.row.action == -1" type="danger">异常</el-tag>
+                </template>
+            </el-table-column>
             <el-table-column prop="quantity" label="数量" align="center" v-if="columns.showColumn('quantity')" />
             <el-table-column prop="remark" label="备注" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('remark')" />
             <el-table-column prop="createdBy" label="创建人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdBy')" />