11.14

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

@@ -1,34 +1,58 @@
 <template>
-  <div>
-    <div v-for="(item,index) in tableModel" :key="index">
-      <h3 v-if="flag">动作{{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%;"/>
-        <p v-else style="padding-top: 20px"> 暂无视频</p>
-        <table border="1" style="width:30%;font-size:14px;margin-bottom: 20px;" class="table" >
-          <tr>
-            <td style="text-align: center">频率:</td>
-            <td>{{item.freq}}</td>
-          </tr>
-          <tr>
-            <td style="text-align: center">描述:</td>
-            <td>{{item.descr}}</td>
-          </tr>
-          <tr>
-            <td style="text-align: center">机器TMU:</td>
-            <td>{{item.machineTmu}}</td>
-          </tr>
-          <tr>
-            <td style="text-align: center">手工TMU:</td>
-            <td>{{item.machineTmu}}</td>
-          </tr>
-          <tr>
-            <td style="text-align: center">编号:</td>
-            <td>{{item.nums}}</td>
-          </tr>
-        </table>
-      </div>
+  <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 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%;"/>-->
+<!--        <p v-else style="padding-top: 20px"> 暂无视频</p>-->
+<!--        <table border="1" style="width:30%;font-size:14px;margin-bottom: 20px;" class="table" >-->
+<!--          <tr>-->
+<!--            <td style="text-align: center">频率:</td>-->
+<!--            <td>{{item.freq}}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td style="text-align: center">描述:</td>-->
+<!--            <td>{{item.descr}}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td style="text-align: center">机器TMU:</td>-->
+<!--            <td>{{item.machineTmu}}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td style="text-align: center">手工TMU:</td>-->
+<!--            <td>{{item.machineTmu}}</td>-->
+<!--          </tr>-->
+<!--          <tr>-->
+<!--            <td style="text-align: center">编号:</td>-->
+<!--            <td>{{item.nums}}</td>-->
+<!--          </tr>-->
+<!--        </table>-->
+<!--      </div>-->
+      <el-descriptions class="margin-top" :column="4" border style="margin: 30px 0;width:100%">
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-receiving"></i>频率</template>
+          {{item.freq}}
+        </el-descriptions-item>
+
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-postcard"></i>机器TMU</template>
+          {{item.machineTmu}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-copy-document"></i>手工TMU</template>
+          {{item.machineTmu}}
+        </el-descriptions-item>
+              <el-descriptions-item>
+          <template slot="label"><i class="el-icon-copy-document"></i>编号</template>
+          {{item.nums}}
+        </el-descriptions-item>
+        <el-descriptions-item>
+          <template slot="label"><i class="el-icon-coin"></i>描述</template>
+          {{item.descr}}
+        </el-descriptions-item>
+      </el-descriptions>
     </div>
   </div>
 </template>
@@ -65,4 +89,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/components/procedure/processAccessories.vue

@@ -1,23 +1,104 @@
 <template>
-  <div>
-    <div v-for="(item,index) in tableModel" :key="index">
-      <h3 v-if="index>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%;"/>-->
-<!--    <p v-else style="padding-top: 20px"> 暂无视频</p>-->
-<!--    <table border="1" style="font-size:14px;" class="table" >-->
-<!--      <tr>-->
-<!--        <td style="text-align: center">工序:</td>-->
-<!--        <td>{{item.processId}}</td>-->
-<!--      </tr>-->
-<!--      <tr>-->
-<!--        <td style="text-align: center">面料:</td>-->
-<!--        <td>{{item.accessoriesId}}</td>-->
-<!--      </tr>-->
-<!--    </table>-->
-  </div>
-  </div>
+  <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">
+
+          <h3 v-if="index>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%;"/>-->
+          <!--    <p v-else style="padding-top: 20px"> 暂无视频</p>-->
+          <!--    <table border="1" style="font-size:14px;" class="table" >-->
+          <!--      <tr>-->
+          <!--        <td style="text-align: center">工序:</td>-->
+          <!--        <td>{{item.processId}}</td>-->
+          <!--      </tr>-->
+          <!--      <tr>-->
+          <!--        <td style="text-align: center">面料:</td>-->
+          <!--        <td>{{item.accessoriesId}}</td>-->
+          <!--      </tr>-->
+          <!--    </table>-->
+          <!--  </div>-->
+          <div style="display: flex;justify-content: space-between">
+            <div style="width: 20%;display: flex;align-items: center;justify-content: center">
+              <img :src="img1" style="width:60%;">
+            </div>
+            <div style="width: 75%">
+              <el-descriptions class="margin-top" :column="3" border style="margin: 30px 0;width:100%">
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-receiving"></i>类型</template>
+                  {{item.brandId}}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-coin"></i>编号</template>
+                  {{item.fabricNumber}}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-postcard"></i>名称</template>
+                  {{item.name}}
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-copy-document"></i>颜色</template>
+                  {{item.color}}
+                </el-descriptions-item>
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-price-tag"></i>花样</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-files"></i>材质</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-takeaway-box"></i>厚度</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-location-outline"></i>单价</template>
+                  {{item.retailPrice}}
+                </el-descriptions-item>
+
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-receiving"></i>零售价</template>
+                  {{item.retailPrice}}
+                </el-descriptions-item>
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-coin"></i>品牌</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-postcard"></i>计量单位</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-copy-document"></i>密度</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-price-tag"></i>幅宽</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-files"></i>所在地区</template>
+                  {{item.location}}
+                </el-descriptions-item>
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-takeaway-box"></i>状态</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+                <!--        <el-descriptions-item>-->
+                <!--          <template slot="label"><i class="el-icon-location-outline"></i>等级</template>-->
+                <!--          {{item.fabricNumber}}-->
+                <!--        </el-descriptions-item>-->
+              </el-descriptions>
+            </div>
+          </div>
+
+        </div>
+      </div>
+
   </div>
 </template>
 <script>
@@ -27,7 +108,7 @@
     data () {
       return {
         img:'',//图片地址
-        img1:require('@/assets/9-2.png'),// 默认图片
+        img1:require('@/assets/accessories1.webp'),// 默认图片
         mp4:'',//视频地址
         tableModel:[],
         visible: false,
@@ -61,4 +142,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/components/procedure/processFabric.vue

@@ -1,6 +1,7 @@
 <template>
-  <div style="">
-      <div style="padding: 15px 0;" v-for="(item,index) in tableModel" :key="index">
+  <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">
@@ -125,4 +126,5 @@
   .table td span{color: #333}
    /deep/ .ant-modal-body{min-height: 450px;}
   .margin-top i{margin-right: 5px}
+  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/components/procedure/zyProcess.vue

@@ -1,7 +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">
-      <img :src="data.image?data.image:img1" style="width:32%;">
+<!--      <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">
         <tr>
           <td><span>工序代码：</span>{{data.processCode}}</td>
@@ -48,7 +49,8 @@
       </table>
     </div>
     <div style="width:100%;height:100%;display: flex;align-items: start;justify-content: space-between">
-      <video v-if="data.vedio" :src="data.vedio" style="border:1px solid #d9d9d9;width:32%;"/>
+      <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>
       <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">
         <tr>
@@ -75,10 +77,15 @@
     data () {
       return {
         img:'',
-        img1:require('@/assets/9-2.png'),//默认图片
-        mp4:'',
+        img1:require('@/assets/16.2.png'),//默认图片
+        mp4:require('@/assets/9-2.png'),
+        video:require('@/assets/video/FormatFactoryPart2.mp4'),
       }
       },
+    mounted() {
+      console.log('this.data')
+      console.log(this.data.image)
+    },
     methods: {
     }
   }

ant-design-vue-jeecg/src/views/mall/orders/modules/ZyOrdersGoodsDetail.vue

@@ -60,7 +60,9 @@
             </a-descriptions>
           </a-col>
           <a-col :span="3" rowSpan="2" style="padding-top: 40px;">
-            <img :src="getImgView(goods.image)" style="width: 100%;"/>
+<!--            <img :src="getImgView(goods.image)" style="width: 100%;"/>-->
+            <img :src='img' style="width: 100%;">
+
           </a-col>
         </a-row>
         <a-divider />
@@ -95,6 +97,7 @@
     },
     data () {
       return {
+        img:require('@/assets/16.2.png'),
         ModalText: 'Content of the modal',
         selectId:'2',
         data:{},

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

@@ -28,18 +28,18 @@
       <!--        </div>-->
       <!--      </a-card>-->
 <!--      基础动作-->
-      <div class="coin">
-        <h2 style="padding: 20px">基础动作</h2>
-        <basicAction :model="basicActionData" style="padding:20px;"></basicAction>
-      </div>
-      <div class="coin">
-        <h2>工序面料</h2>
-        <processAccessories :model="accessoriesData" style="padding:0 20px"></processAccessories>
-      </div>
-      <div class="coin">
-        <h2>工序辅料</h2>
-        <processFabric :model="fabricData" style="padding:0 20px"></processFabric>
-      </div>
+<!--      <div class="coin">-->
+
+        <basicAction :model="basicActionData"></basicAction>
+<!--      </div>-->
+<!--      <div class="coin">-->
+
+        <processAccessories :model="accessoriesData"></processAccessories>
+<!--      </div>-->
+<!--      <div class="coin">-->
+
+        <processFabric :model="fabricData"></processFabric>
+<!--      </div>-->
     </a-modal>
   </div>
 </template>

ant-design-vue-jeecg/src/views/zyworkoperation/modules/ZyWorkOperationDetail.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div style="padding: 20px 0 50px 0">
     <a-modal
       title="标准作业指导书"
       :visible="visible"
@@ -9,8 +9,8 @@
       @cancel="handleCancel"
       style="display:flex;"
     >
-      <div style="height:300px;width: 100%;display:flex;">
-           <table border="1" style="width: 85%;height:100%;font-size:14px;text-align: center;">
+      <div style="width: 100%;display:flex;">
+           <table  border="1" style="width: 85%;height:100%;font-size:14px;">
              <tr>
                <td><span style="font-weight:bold;">方案名称：</span>{{data.devicequalifyingid}}</td>
                <td  colspan="2"><span style="font-weight:bold;">工单编号：</span>{{data.workCode}}</td>
@@ -68,12 +68,14 @@
 
               </tr>
               <tr>
-                   <td><span style="font-weight:bold;">合计(机器秒)：</span>{{data.totalMachine}}</td>
+                   <td colspan="5"><span style="font-weight:bold;">合计(机器秒)：</span>{{data.totalMachine}}</td>
               </tr>
             </table>
-            <div style="width:14.9%;height:100%;">
-                <img :src="data.image" style="width:90%;height:75%;margin:5% 0 0 10%;">
-                <video :src="data.video" style="border:1px solid #213;width:80%;height:30%;margin:0 0 0 15%"/>
+            <div style="width:14.9%;display: flex;flex-direction: column;align-items: center;justify-content: space-between">
+<!--                <img :src="data.image" style="width:90%;height:75%;margin:5% 0 0 10%;">-->
+<!--                <video :src="data.video" style="border:1px solid #213;width:80%;height:30%;margin:0 0 0 15%"/>-->
+              <img :src="img" style="width:90%;max-height:60%;">
+                <video :src="video" style="width:90%;"/>
             </div>
       </div>
     </a-modal>
@@ -90,7 +92,7 @@ export default {
       data:{},
       headStyle:{
         height:'10px'
-      }
+      },img:require('@/assets/16.2.png'),video:require('@/assets/video/FormatFactoryPart8.mp4')
         }
     },
     created(){
@@ -120,4 +122,9 @@ export default {
     },
   },
 }
-</script>
+</script>
+<style scoped>
+  table{border-color:#d9d9d9;border-radius: 3px}
+  table td{padding: 10px 20px;max-width: 380px; }
+  table td span{color: #333}
+</style>