装配进度

digital-management-system/src/main/java/com/zehong/system/domain/track/TProductDevice.java

@@ -42,6 +42,8 @@ public class TProductDevice extends BaseEntity
     /** 创建人 */
     private Long createId;
 
+    private String speed;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -115,6 +117,14 @@ public class TProductDevice extends BaseEntity
         return createId;
     }
 
+    public String getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(String speed) {
+        this.speed = speed;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

digital-management-system/src/main/resources/mapper/track/TProductDeviceMapper.xml

@@ -28,7 +28,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             device.create_time,
             device.create_id,
             ins.batch_no as batchNo,
-            (select nick_name from sys_user us where us.user_id = device.create_id) as createBy
+            (select nick_name from sys_user us where us.user_id = device.create_id) as createBy,
+            (
+                select
+                    concat(
+                      if(count(md.id)=0,0,
+                       round((select count(dm.id) from t_product_device_mark dm where dm.device_id = device.id)/count(md.id))*100
+                      )
+                    ,'%')
+                from
+                    t_product_inspect_detail ind,t_product_mark_detail md
+                where ind.type_id = md.mark_id and ind.type = 3 and ind.inspect_id = device.inspect_id
+            )as speed
         FROM
             t_product_device device
         LEFT JOIN t_product_inspect ins ON ins.id = device.inspect_id

digital-management-web/src/views/track/device/components/MarkInfo.vue

@@ -131,9 +131,11 @@
     methods:{
       getExecuteDetail(){
         listDetail({inspectId:this.inspectId,type:3}).then(res =>{
-          this.getMarkInfo(res.rows[0].typeId);
-          this.queryParams.markId = res.rows[0].typeId;
-          this.getMarkDetail();
+          if(res.code == 200 && res.rows.length > 0){
+            this.getMarkInfo(res.rows[0].typeId);
+            this.queryParams.markId = res.rows[0].typeId;
+            this.getMarkDetail();
+          }
         })
       },
       //模版信息

digital-management-web/src/views/track/device/index.vue

@@ -93,6 +93,7 @@
       <el-table-column label="设备编号" align="center" prop="deviceNo" />
       <el-table-column label="设备名称" align="center" prop="title" />
       <el-table-column label="设备状态" align="center" prop="status" :formatter="statusFormat" />
+      <el-table-column label="装配进度" align="center" prop="speed" />
       <el-table-column label="创建时间" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>