20220907-syy-基础动作-详情

zhc4dev
暖暖 2 years ago
parent 8b3268e488
commit 1ffbf52928
  1. 58
      ant-design-vue-jeecg/src/components/procedure/basicAction.vue
  2. 19
      ant-design-vue-jeecg/src/views/process/ZyClothActionList.vue
  3. 63
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.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>

@ -29,9 +29,9 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('zy_cloth_action')">导出</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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!-- <a-button type="primary" icon="import">导入</a-button>--> <!-- <a-button type="primary" icon="import">导入</a-button>-->
<!-- </a-upload>--> <!-- </a-upload>-->
<!-- 高级查询区域 --> <!-- 高级查询区域 -->
<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
@ -88,7 +88,7 @@
<a-divider type="vertical" /> <a-divider type="vertical" />
<a @click="handleDetail(record)">详情</a> <a @click="handleDetail(record.id)">详情</a>
<a-divider type="vertical" /> <a-divider type="vertical" />
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a> <a>删除</a>
@ -100,6 +100,7 @@
</div> </div>
<zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal> <zy-cloth-action-modal ref="modalForm" @ok="modalFormOk"></zy-cloth-action-modal>
<ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>
</a-card> </a-card>
</template> </template>
@ -109,12 +110,13 @@
import { mixinDevice } from '@/utils/mixin' import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ZyClothActionModal from './modules/ZyClothActionModal' import ZyClothActionModal from './modules/ZyClothActionModal'
import ZyClothActionFormDetail from './modules/ZyClothActionFormDetail'
export default { export default {
name: 'ZyClothActionList', name: 'ZyClothActionList',
mixins:[JeecgListMixin, mixinDevice], mixins:[JeecgListMixin, mixinDevice],
components: { components: {
ZyClothActionModal ZyClothActionModal,ZyClothActionFormDetail
}, },
data () { data () {
return { return {
@ -198,7 +200,7 @@
} }
}, },
created() { created() {
this.getSuperFieldList(); this.getSuperFieldList();
}, },
computed: { computed: {
importExcelUrl: function(){ importExcelUrl: function(){
@ -217,10 +219,13 @@
fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''}) fieldList.push({type:'int',value:'manualTmu',text:'手工TMU',dictCode:''})
fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''}) fieldList.push({type:'string',value:'nums',text:'编号',dictCode:''})
this.superFieldList = fieldList this.superFieldList = fieldList
},
handleDetail(id){
this.$refs.ZyClothActionFormDetail.showModal(id)
} }
} }
} }
</script> </script>
<style scoped> <style scoped lang="less">
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>

@ -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>
Loading…
Cancel
Save