From 1ffbf529281553fbfab258fb5f90b4ea969d370b Mon Sep 17 00:00:00 2001
From: shenyuan <shenyuan2825@163.com>
Date: Wed, 7 Sep 2022 10:26:53 +0800
Subject: [PATCH] =?UTF-8?q?20220907-syy-=E5=9F=BA=E7=A1=80=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C-=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  | 58 +++++++++++++++++
 .../src/views/process/ZyClothActionList.vue   | 19 +++---
 .../modules/ZyClothActionFormDetail.vue       | 63 +++++++++++++++++++
 3 files changed, 133 insertions(+), 7 deletions(-)
 create mode 100644 ant-design-vue-jeecg/src/components/procedure/basicAction.vue
 create mode 100644 ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue

diff --git a/ant-design-vue-jeecg/src/components/procedure/basicAction.vue b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
new file mode 100644
index 00000000..641b5ce5
--- /dev/null
+++ b/ant-design-vue-jeecg/src/components/procedure/basicAction.vue
@@ -0,0 +1,58 @@
+<template>
+  <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>{{model.addPeople}}</td>-->
+        <!--          </tr>-->
+        <tr>
+          <td style="text-align: center">频率:</td>
+          <td>{{tableModel.freq}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">描述:</td>
+          <td>{{tableModel.descr}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">机器TMU:</td>
+          <td>{{tableModel.machineTmu}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">手工TMU:</td>
+          <td>{{tableModel.machineTmu}}</td>
+        </tr>
+        <tr>
+          <td style="text-align: center">编号:</td>
+          <td>{{tableModel.nums}}</td>
+        </tr>
+      </table>
+  </div>
+</template>
+<script>
+  export default {
+    name: 'basicAction',
+    props:['tableModel'],
+    data () {
+      return {
+        model:{
+        },
+        img:'',//图片地址
+        img1:require('@/assets/9-2.png'),// 默认图片
+        mp4:'',//视频地址
+        visible: false,
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }},
+    methods: {
+    }
+      }
+</script>
+<style scoped>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px; }
+  .table td span{color: #333}
+</style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue b/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
index bbe1717c..4701f83c 100644
--- a/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
+++ b/ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
@@ -29,9 +29,9 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</a-button>
-<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-<!--        <a-button type="primary" icon="import">导入</a-button>-->
-<!--      </a-upload>-->
+      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+      <!--        <a-button type="primary" icon="import">导入</a-button>-->
+      <!--      </a-upload>-->
       <!-- 高级查询区域 -->
       <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
       <a-dropdown v-if="selectedRowKeys.length > 0">
@@ -88,7 +88,7 @@
 
           <a-divider type="vertical" />
 
-                <a @click="handleDetail(record)">详情</a>
+                <a @click="handleDetail(record.id)">详情</a>
               <a-divider type="vertical" />
                 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                   <a>删除</a>
@@ -100,6 +100,7 @@
     </div>
 
     <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>
+    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>
   </a-card>
 </template>
 
@@ -109,12 +110,13 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ZyClothActionModal from './modules/ZyClothActionModal'
+  import ZyClothActionFormDetail from './modules/ZyClothActionFormDetail'
 
   export default {
     name: 'ZyClothActionList',
     mixins:[JeecgListMixin, mixinDevice],
     components: {
-      ZyClothActionModal
+      ZyClothActionModal,ZyClothActionFormDetail
     },
     data () {
       return {
@@ -198,7 +200,7 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){
@@ -217,10 +219,13 @@
         fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
         fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
         this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
       }
     }
   }
 </script>
-<style scoped>
+<style scoped lang="less">
   @import '~@assets/less/common.less';
 </style>
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
new file mode 100644
index 00000000..0f0a0de4
--- /dev/null
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
@@ -0,0 +1,63 @@
+<template>
+  <a-modal
+    title="基础动作-详情"
+    :visible="visible"
+    :confirm-loading="confirmLoading"
+    :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>
+      <basicAction :tableModel="model"></basicAction>
+  </a-modal>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+import basicAction from '@/components/procedure/basicAction'
+  export default {
+    name: 'ZyClothActionFormDetail',
+    components: {
+      basicAction
+    },
+    data () {
+      return {
+        model:{
+         },
+        img:'',//图片地址
+        img1:require('@/assets/9-2.png'),// 默认图片
+        mp4:'',//视频地址
+        visible: false,
+        confirmLoading: false,
+        validatorRules: {
+        },
+      }
+    },
+    methods: {
+      showModal(id) {
+        this.visible = true;
+        this.$http.get('base/zyClothAction/queryById?id='+id).then(
+          res=>{
+            this.model = res.result
+          }
+        )
+      },
+      handleOk() {
+        this.confirmLoading = true;
+        setTimeout(() => {
+          this.visible = false;
+          this.confirmLoading = false;
+        }, 1);
+      },
+      handleCancel() {
+        this.visible = false;
+      },
+    }
+  }
+</script>
+<style scoped>
+  .table{border-color:#d9d9d9;border-radius: 3px}
+  .table td{padding: 10px 20px;max-width: 380px; }
+  .table td span{color: #333}
+</style>
\ No newline at end of file