From 9fc6cc4a803a3bcec6a60da768a0c5d4c5878b71 Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Thu, 8 Sep 2022 18:24:48 +0800
Subject: [PATCH] =?UTF-8?q?20220908-syy-=E5=9F=BA=E6=9C=AC=E5=B7=A5?=
 =?UTF-8?q?=E5=BA=8F-=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/procedure/basicAction.vue  | 11 +++++++--
 .../components/procedure/processFabric.vue    |  9 ++++++++
 .../src/components/procedure/zyProcess.vue    | 12 +++++-----
 .../views/process/modules/ZyProcessDetail.vue | 23 ++++++++++++++++---
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
index 641b5ce5..9eefdb9f 100644
--- a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
@@ -34,6 +34,12 @@
 <script>
   export default {
     name: 'basicAction',
+    // props:{
+    //   tableModel:{
+    //     type:Array,
+    //     default: () =>({})
+    //   }
+    //   },
     props:['tableModel'],
     data () {
       return {
@@ -47,8 +53,9 @@
         validatorRules: {
         },
       }},
-    methods: {
-    }
+    created() {
+    },
+    methods: {}
       }
 </script>
 <style scoped>
diff --git a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
index f06fad2f..5e251fdb 100644
--- a/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/processFabric.vue
@@ -31,6 +31,15 @@
         validatorRules: {
         },
       }},
+    created() {
+      console.log('this.tableModel')
+      console.log(this.tableModel)
+    },
+    mounted() {
+      console.log('this.tableModel')
+      console.log(this.tableModel)
+
+    }
   }
 </script>
 <style scoped>
diff --git a/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue b/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
index c7de3d5b..46708f3f 100644
--- a/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
+++ b/ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="padding: 15px 25px;">
     <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;" class="coin">
-      <img :src="img == ''?img:img1" style="width:32%;">
+      <img :src="data.image?data.image:img1" style="width:32%;">
       <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
         <tr>
           <td><span>工序代码：</span>{{data.processCode}}</td>
@@ -19,12 +19,12 @@
           <td><span>机器名称：</span>{{data.machineId}}</td>
           <td><span>手工宽放：</span>{{data.manualWide}}</td>
           <td><span>手工时间：</span>{{data.manualTime}}</td>
-          <td><span>机器转速：</span>{{data.machineSpeed}}</td>
+          <td><span>设备转速：</span>{{data.machineSpeed}}</td>
         </tr>
         <tr>
-          <td><span>机器宽放：</span>{{data.machineWide}}</td>
-          <td><span>机器时间：</span>{{data.machineTime}}</td>
-          <td><span>机器浮于：</span>{{data.machineFloat}}</td>
+          <td><span>设备宽放：</span>{{data.machineWide}}</td>
+          <td><span>设备时间：</span>{{data.machineTime}}</td>
+          <td><span>设备浮于：</span>{{data.machineFloat}}</td>
           <td><span>绑包宽放：</span>{{data.bundleWide}}</td>
         </tr>
         <tr>
@@ -48,7 +48,7 @@
       </table>
     </div>
     <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between">
-      <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:32%;"/>
+      <video v-if="data.vedio" :src="data.vedio" style="border:1px solid #d9d9d9;width:32%;"/>
       <p v-else style="padding-top: 20px"> 暂无视频</p>
       <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
         <tr>
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
index 7270de0b..b986e14b 100644
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
@@ -11,7 +11,8 @@
     >
       <div style="width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 30px">
         <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1>
-        <!--组件--><zyProcess :data="data"></zyProcess>
+<!--        基本工序-->
+        <zyProcess :data="ProcessData"></zyProcess>
       </div>
       <!--      <a-card :title="`动作`+(index+1)" v-for="(item,index) in data.zyClothAction" :key="item.id" :headStyle="headStyle">-->
       <!--        <div style="width:100%;height:20px;display:flex;font-size:18px">-->
@@ -26,16 +27,25 @@
       <!--          </table>-->
       <!--        </div>-->
       <!--      </a-card>-->
+<!--      基础动作-->
       <div style="width: 96%;margin:0 auto 30px">
         <h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">基础动作</h2>
+        <basicAction :tableModel="basicActionData"></basicAction>
       </div>
+      <div style="width: 96%;margin:0 auto 30px">
+        <h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">工序面料</h2>
+        <processFabric :tableModel="accessoriesData"></processFabric>
+      </div>
+
     </a-modal>
   </div>
 </template>
 <script>
   import zyProcess from '@/components/procedure/zyProcess'
+  import basicAction from '@/components/procedure/basicAction'
+  import processFabric from '@/components/procedure/processFabric'
   export default {
-    components:{zyProcess},
+    components:{zyProcess,basicAction,processFabric},
     data() {
       return{
         ModalText: 'Content of the modal',
@@ -46,9 +56,12 @@
         img1:require('@/assets/9-2.png'),//默认图片
         mp4:'',
         data:{},
+        ProcessData:{},
+        basicActionData:[],
+        accessoriesData:[],
         headStyle:{
           height:'10px'
-        }
+        },
       }
     },
     created(){
@@ -59,8 +72,12 @@
         this.$http.get('/base/zyProcess/queryById?id='+id).then(
           res=>{
             this.data = res.result
+            this.ProcessData = res.result.zyProcess
+            this.basicActionData = res.result.zyProcessAction
+            this.accessoriesData = res.result.zyProcessAccessories
             console.log('this.data')
             console.log(this.data)
+            console.log(this.accessoriesData)
             this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
             this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
           }