20220917-syy

ant-design-vue-jeecg/src/components/procedure/basicAction.vue

@@ -1,8 +1,12 @@
 <template>
+<!--  动作组件-->
   <div style="width: 96%;margin:0 auto 30px;border: 1px solid #e8e8e8;">
     <h2>基础动作</h2>
-    <div v-for="(item,index) in tableModel" :key="index" style="padding: 20px">
-      <h3 v-if="tableModel.length>0">动作{{index+1}}</h3>
+    <div style="padding:15px 20px" v-if="tableModel.length == 0">
+      暂无数据!
+    </div>
+    <div v-for="(item,index) in tableModel" :key="index" style="padding: 20px 20px 0 10px" v-else>
+      <h3>动作{{index+1}}</h3>
 <!--      <div style="padding: 15px 25px;display: flex;justify-content: space-between" >-->
 <!--        <img :src="img == ''?img1:img" style="width:30%;">-->
 <!--        <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>-->
@@ -30,7 +34,7 @@
 <!--          </tr>-->
 <!--        </table>-->
 <!--      </div>-->
-      <el-descriptions class="margin-top" :column="4" border style="margin: 30px 0;width:100%">
+      <el-descriptions class="margin-top" :column="4" border style="margin: 15px 0;width:100%">
         <el-descriptions-item>
           <template slot="label"><i class="el-icon-receiving"></i>频率</template>
           {{item.freq}}
@@ -66,7 +70,6 @@
         img1:require('@/assets/9-2.png'),// 默认图片
         mp4:'',//视频地址
         tableModel:[],
-        flag:true,
         visible: false,
         confirmLoading: false,
         validatorRules: {
@@ -78,9 +81,6 @@
       //正确给 tableModel 赋值的 方法
       model: function(newVal,oldVal){
         this.tableModel = newVal;
-        if(this.tableModel.length == 1){
-          this.flag = false
-        }
       }
     },
       }

ant-design-vue-jeecg/src/components/procedure/processAccessories.vue

@@ -1,11 +1,14 @@
 <template>
+<!--  面料组件-->
   <div style="width: 96%;margin:0 auto 30px;border: 1px solid #e8e8e8;">
     <h2>工序面料</h2>
-      <div style="padding: 20px">
-        <h3 v-if="tableModel.length>0">面料1</h3>
-        <div v-for="(item,index) in tableModel" :key="index">
+    <div style="padding:15px 20px" v-if="tableModel.length == 0">
+      暂无数据!
+    </div>
+      <div style="padding: 10px 20px" v-else>
+        <div v-for="(item,index) in tableModel" :key="index" style="margin-bottom:20px ">
 
-          <h3 v-if="index>0">面料{{index+1}}</h3>
+          <h3 style="margin-bottom: 0">面料{{index+1}}</h3>
           <!--      <div style="padding: 15px 25px;display: flex;justify-content: space-between">-->
           <!--    <img :src="img == ''?img1:img" style="width:30%;">-->
           <!--    <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>-->

ant-design-vue-jeecg/src/components/procedure/processFabric.vue

@@ -1,10 +1,13 @@
 <template>
+<!--  辅料组件-->
   <div style="width: 96%;margin:0 auto 30px;border: 1px solid #e8e8e8;">
     <h2>工序辅料</h2>
-      <div style="padding: 20px;" v-for="(item,index) in tableModel" :key="index">
-        <p style="font-size: 18px;" v-if="!flag">辅料信息</p>
-       <p style="font-size: 16px;margin-bottom: 0" v-if="flag">辅料{{index+1}}信息</p>
-        <el-descriptions class="margin-top" :column="3" border style="margin: 30px 0">
+    <div style="padding:15px 20px" v-if="tableModel.length == 0">
+      暂无数据!
+    </div>
+      <div style="padding: 20px 20px 0 20px;" v-for="(item,index) in tableModel" :key="index" v-else>
+       <p style="font-size: 16px;margin-bottom: 0">辅料{{index+1}}信息</p>
+        <el-descriptions class="margin-top" :column="3" border style="margin: 20px 0">
           <el-descriptions-item>
             <template slot="label"><i class="el-icon-receiving"></i>类型id</template>
             {{item.typeId}}
@@ -76,7 +79,6 @@
         mp4:'',//视频地址
         tableModel:[],
         id:'',
-        flag:true,
         visible: false,
         confirmLoading: false,
         validatorRules: {
@@ -108,9 +110,6 @@
               updateTime: null,}
           ]
         }
-        if(this.tableModel.length == 1){
-          this.flag = false
-        }
       },
     },
     methods: {

ant-design-vue-jeecg/src/components/procedure/zyProcess.vue

@@ -1,6 +1,8 @@
 <template>
-  <div style="">
-    <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;" class="coin">
+<!--  工序组件-->
+  <div style="width: 96%;margin:0 auto 30px;border: 1px solid #e8e8e8;">
+    <h2>工序辅料</h2>
+    <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;margin-bottom: 20px;padding:30px 20px 0 20px" class="coin">
 <!--      <img :src="data.image?data.image:img1" style="width:32%;">-->
       <img :src="img1" style="width:32%;max-height: 300px">
       <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
@@ -12,12 +14,12 @@
         </tr>
         <tr>
           <td><span>工序等级：</span>{{data.grade}}</td>
-          <td><span>面料代码：</span>{{data.fabricNum}}</td>
-          <td><span>面料等级：</span>{{data.fabricGrade}}</td>
+          <td><span>面料代码：</span>{{data.fabricNum}}A01</td>
+          <td><span>面料等级：</span>{{data.fabricGrade}}A级</td>
           <td><span>针距(厘米)：</span>{{data.needlePitch}}</td>
         </tr>
         <tr>
-          <td><span>机器名称：</span>{{data.machineId}}</td>
+          <td><span>机器名称：</span>{{data.machineId}}裁床</td>
           <td><span>手工宽放：</span>{{data.manualWide}}</td>
           <td><span>手工时间：</span>{{data.manualTime}}</td>
           <td><span>设备转速：</span>{{data.machineSpeed}}</td>
@@ -30,12 +32,12 @@
         </tr>
         <tr>
           <td><span>绑包时间：</span>{{data.bundleTime}}</td>
-          <td><span>部件表名：</span>{{data.componentId}}</td>
-          <td><span>是否瓶颈：</span>{{data.isBottleneck}}</td>
+          <td><span>部件表名：</span>{{data.componentId}}zy_process</td>
+          <td><span>是否瓶颈：</span>{{data.isBottleneck}}否</td>
           <td><span>企业名称：</span>{{data.enterpriseId}}</td>
         </tr>
         <tr>
-          <td><span>工具名称：</span>{{data.toolId}}</td>
+          <td><span>工具名称：</span>{{data.toolId}}裁床</td>
           <td><span>款式名称：</span>{{data.styleId}}</td>
           <td><span>工段代码：</span>{{data.worksectionCode}}</td>
           <td><span>合同号：</span>{{data.totalManualTmu}}</td>
@@ -48,7 +50,7 @@
         </tr>
       </table>
     </div>
-    <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between">
+    <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between;padding: 10px 20px">
       <video v-if="data.vedio" :src="video" 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>
@@ -94,4 +96,5 @@
   .table{border-color:#d9d9d9;border-radius: 3px}
   .table td{padding: 10px 20px;max-width: 380px; }
   .table td span{color: #333}
+  h2{text-align: left;border-bottom: 1px solid #e8e8e8;padding: 20px;background: rgba(247,247,247,1);margin: 0;}
 </style>

ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue

@@ -9,6 +9,7 @@
     <h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1>
     <zyProcess :data="processData" style="border: 1px solid #e8e8e8;padding: 30px 25px;margin-bottom:30px;"></zyProcess>
     <processFabric :model ="fabricData" style="padding:0 20px;border: 1px solid #e8e8e8;"></processFabric>
+<!--    <processAccessories :model ="fabricData" style="padding:0 20px;border: 1px solid #e8e8e8;"></processAccessories>-->
   </a-modal>
 </template>
 
@@ -16,12 +17,13 @@
 
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+import processAccessories from '@/components/procedure/processAccessories'
 import processFabric from '@/components/procedure/processFabric'
 import zyProcess from '@/components/procedure/zyProcess'
   export default {
     name: 'ZyProcessFabricFormDetail',
     components: {
-      processFabric,zyProcess
+      processAccessories,zyProcess,processFabric
     },
     data () {
       return {

ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue

@@ -6,7 +6,7 @@
     :width='1200'
     @ok="handleOk"
     @cancel="handleCancel">
-    <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;">黄淮学院服装智能制造管理平台 - <span>基础动作</span></h1>
+    <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;">黄淮学院服装智能制造管理平台</h1>
       <basicAction :model="model"></basicAction>
   </a-modal>
 </template>

ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="">
     <a-modal
-      title="标准作业指导书"
+      title="基本工序-详情"
       :visible="visible"
       :confirm-loading="confirmLoading"
       :width='1400'
@@ -9,11 +9,12 @@
       @cancel="handleCancel"
       style="display:flex;"
     >
-      <div style="width: 96%;margin:0 auto 40px;padding-bottom: 30px">
-        <h1 style="text-align: center;margin-bottom: 0px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1>
+      <h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px">黄淮学院服装智能制造管理平台</h1>
+
+
 <!--        基本工序-->
-        <zyProcess :data="ProcessData" style="border: 1px solid #e8e8e8;border-top: none;padding: 30px 25px"></zyProcess>
-      </div>
+        <zyProcess :data="ProcessData"></zyProcess>
+
       <!--      <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">-->
       <!--          <table  border="1" style="width: 100%;height:50px;margin-top:-1%;" >-->