From a4bf5189fb732d9060f7e6bc1b81916c9f5bd647 Mon Sep 17 00:00:00 2001
From: zhangxuanming <2260476558@qq.com>
Date: Mon, 20 Jan 2025 18:21:20 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=A6=96=E9=A1=B5=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E5=B7=A5=E5=8D=95=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=B7=A5=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/pro/workorder.js |  11 +++-
 src/views/index.vue          | 103 +++++++++++++++++++++--------------
 2 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/src/api/mes/pro/workorder.js b/src/api/mes/pro/workorder.js
index 4ad8dd0..a559de1 100644
--- a/src/api/mes/pro/workorder.js
+++ b/src/api/mes/pro/workorder.js
@@ -66,4 +66,13 @@ export function dofinish(workorderId){
     url: '/mes/pro/workorder/'+workorderId,
     method: 'put'
   })
-}
\ No newline at end of file
+}
+
+// 首页查询生产工单列表
+export function getHomeList(query) {
+  return request({
+    url: '/mes/pro/workorder/getHomeList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/views/index.vue b/src/views/index.vue
index 882f4b0..8d11f94 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -8,43 +8,59 @@
             <div slot="header" class="clearfix">
                 <span>生产进度</span>
             </div>
-            <el-table
-                v-loading="loading"
-                :data="workorderList"
-                row-key="workorderId"
-                default-expand-all
-                :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-                >
-                <el-table-column label="工单编码" width="180" prop="workorderCode" >
-                    <template slot-scope="scope">
-                    <el-button
-                        size="mini"
-                        type="text"
-                        @click="handleView(scope.row)"
-                        v-hasPermi="['mes:pro:workorder:query']"
-                    >{{scope.row.workorderCode}}</el-button>
-                    </template>
-                </el-table-column>
-                <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />            
-                <el-table-column label="客户名称" align="center" prop="clientName" :show-overflow-tooltip="true"/>
-                <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
-                <el-table-column label="产品名称" width="250px" align="center" prop="productName" :show-overflow-tooltip="true"/>
-                <el-table-column label="规格型号" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
-                <el-table-column label="单位" align="center" prop="unitOfMeasure" />
-                <el-table-column label="生产进度" align="center" width="200px" >
-                    <template slot-scope="scope">
-                        <el-progress :text-inside="true" :stroke-width="20" :percentage="parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))>100?100:parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))"></el-progress>
-                    </template>
-                </el-table-column>            
-                <el-table-column label="需求日期" align="center" prop="requestDate" width="180">
-                    <template slot-scope="scope">
-                    <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                </el-table-column>         
-            </el-table>
+          <el-table
+            v-loading="loading"
+            :data="workorderList"
+            row-key="workorderId"
+            default-expand-all
+            :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+            <el-table-column label="工单编码" width="180" prop="workorderCode" >
+              <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  @click="handleView(scope.row)"
+                  v-hasPermi="['mes:pro:workorder:query']"
+                >{{scope.row.workorderCode}}</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="订单编号" width="140" align="center" prop="sourceCode" />
+            <el-table-column label="工单名称" width="140" align="center" prop="workorderName" :show-overflow-tooltip="true"/>
+            <el-table-column label="产品编号" width="120" align="center" prop="productCode" />
+            <el-table-column label="产品名称" width="250px" align="center" prop="productName" :show-overflow-tooltip="true"/>
+            <el-table-column label="规格型号" width="140" align="center" prop="productSpc" :show-overflow-tooltip="true"/>
+            <el-table-column label="单位" width="140" align="center" prop="unitOfMeasure" />
+            <!--                <el-table-column label="生产进度" align="center" width="200px" >-->
+            <!--                    <template slot-scope="scope">-->
+            <!--                        <el-progress :text-inside="true" :stroke-width="20" :percentage="parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))>100?100:parseFloat(((scope.row.quantityProduced/scope.row.quantity*100).toFixed(2)))"></el-progress>-->
+            <!--                    </template>-->
+            <!--                </el-table-column>-->
+            <el-table-column label="需求日期" width="140" align="center" prop="requestDate">
+              <template slot-scope="scope">
+                <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="工序进度" align="center" width="500">
+              <template slot-scope="scope">
+                <div style="display: flex;">
+                  <span v-for="(item, index) in scope.row.routeHomg">
+                    <span style="display: flex">
+                      <span style="line-height: 70px; text-align: center;color: #5e75ff" v-if="index != 0">--------</span>
+                      <span style="display: flex; flex-direction: column;margin: 0 5px">
+                        <el-progress :height="70" :width="70" type="circle" :percentage="(item.completeNumber/item.total)*100" :color="colors"></el-progress>
+                        <el-tooltip class="item" effect="dark" :content="item.processName" placement="bottom">
+                          <span style="display: inline-block;width: 65px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap">{{ item.processName }}</span>
+                        </el-tooltip>
+                      </span>
+                    </span>
+                  </span>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
         </el-card>
     </el-row>
-    
+
     <el-row style="background:#fff;padding:16px 16px 0; margin-bottom:32px;">
       <line-chart :chart-data="lineChartData" />
     </el-row>
@@ -67,12 +83,12 @@
       </el-col>
     </el-row>
 
-    
+
   </div>
 </template>
 
 <script>
-import { listWorkorder } from "@/api/mes/pro/workorder";
+import {getHomeList} from "@/api/mes/pro/workorder";
 import PanelGroup from './dashboard/PanelGroup'
 import LineChart from './dashboard/LineChart'
 import RaddarChart from './dashboard/RaddarChart'
@@ -112,7 +128,14 @@ export default {
         loading: true,
         queryParams: {status:'CONFIRMED'},
         workorderList: [],
-        lineChartData: lineChartData.newVisitis
+        lineChartData: lineChartData.newVisitis,
+      colors: [
+        {color: '#f56c6c', percentage: 20},
+        {color: '#e6a23c', percentage: 40},
+        {color: '#5cb87a', percentage: 60},
+        {color: '#1989fa', percentage: 80},
+        {color: '#6f7ad3', percentage: 100}
+      ]
     }
   },
   created(){
@@ -121,8 +144,8 @@ export default {
   methods: {
     getList() {
       this.loading = true;
-      listWorkorder(this.queryParams).then(response => {
-        this.workorderList = response.rows;
+      getHomeList(this.queryParams).then(response => {
+        this.workorderList = response.data;
         this.loading = false;
       });
     },