yu
/
CostumingPlatform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20220917-syy

Browse Source
zhc4dev
暖暖 2 years ago
parent 9209eb86b2
commit 6a5aca28e3
6 changed files with 36 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      ant-design-vue-jeecg/src/components/procedure/basicAction.vue
  2. 24
      ant-design-vue-jeecg/src/components/procedure/processFabric.vue
  3. 2
      ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
  4. 38
      ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
  5. 12
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
  6. 20
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue

29
ant-design-vue-jeecg/src/components/procedure/basicAction.vue
Unescape View File

@ -1,16 +1,12 @@
<template> <template>
<div> <div>
<div v-for="(item,index) in tableModel" :key="index"> <div v-for="(item,index) in tableModel" :key="index">
<h3 v-if="index>0">动作{{index+1}}</h3> <h3 v-if="flag">动作{{index+1}}</h3>
<div style="padding: 15px 25px;display: flex;justify-content: space-between" > <div style="padding: 15px 25px;display: flex;justify-content: space-between" >
<img :src="img == ''?img1:img" style="width:30%;"> <img :src="img == ''?img1:img" style="width:30%;">
<video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/> <video v-if="mp4 != ''" :src="mp4" style="border:1px solid #d9d9d9;width:30%;"/>
<p v-else style="padding-top: 20px"> 暂无视频</p> <p v-else style="padding-top: 20px"> 暂无视频</p>
<table border="1" style="width:30%;font-size:14px;margin-bottom: 20px;" class="table" > <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> <tr>
<td style="text-align: center">频率:</td> <td style="text-align: center">频率:</td>
<td>{{item.freq}}</td> <td>{{item.freq}}</td>
@ -33,21 +29,12 @@
</tr> </tr>
</table> </table>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'basicAction', name: 'basicAction',
// props: {
// model: {
// type: Array,
// default() {
// return []
// }
// }},
props:['model'], props:['model'],
data () { data () {
return { return {
@ -55,6 +42,7 @@
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址 mp4:'',//视频地址
tableModel:[], tableModel:[],
flag:true,
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
@ -65,17 +53,10 @@
watch: { watch: {
//正确给 tableModel 赋值的 方法 //正确给 tableModel 赋值的 方法
model: function(newVal,oldVal){ model: function(newVal,oldVal){
if(Array.isArray(newVal)){ this.tableModel = newVal;
this.tableModel = newVal; if(this.tableModel.length == 1){
}else{ this.flag = false
this.tableModel.push(newVal)
} }
newVal && this.getTableModel();
}
},
methods: {
getTableModel(){
//执行其他逻辑
} }
}, },
} }

24
ant-design-vue-jeecg/src/components/procedure/processFabric.vue
Unescape View File

@ -1,7 +1,5 @@
<template> <template>
<div> <div>
<!-- <div v-for="(item,index) in tableModel" :key="index">-->
<!-- <h3>辅料{{index+1}}</h3>-->
<div style="padding: 15px 25px;"> <div style="padding: 15px 25px;">
<el-descriptions class="margin-top" :column="3" border style="margin-top: 50px"> <el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">
<el-descriptions-item> <el-descriptions-item>
@ -44,32 +42,36 @@
<script> <script>
export default { export default {
name: 'processFabric', name: 'processFabric',
props:['model'], props:['model','fabricId'],
data () { data () {
return { return {
img:'',//图片地址 img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址 mp4:'',//视频地址
tableModel:[], tableModel:[],
id:'',
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
}, },
}}, }},
created() { created() {
console.log(this.id)
}, },
watch: { watch: {
//正确给 cData 赋值的 方法 //正确给 cData 赋值的 方法
model: function(newVal,oldVal){ model: function(newVal,oldVal){
// if(Array.isArray(newVal)){
// this.tableModel = newVal;
// }else{
// this.tableModel.push(newVal)
this.tableModel= newVal this.tableModel= newVal
console.log('组件页面') },
console.log(this.tableModel) fabricId: function(newVal,oldVal){
// } this.id = newVal
// newVal && this.getTableModel(); // this.$http.get('/accessories/zyAccessories/queryById?id='+this.id).then(
// res=>{
// // this.model = res.result
// console.log(this.id)
// console.log(res)
// console.log(res.result)
// })
} }
}, },
methods: { methods: {

2
ant-design-vue-jeecg/src/components/procedure/zyProcess.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div style="padding: 15px 25px;"> <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: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%;">
<table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table"> <table border="1" style="width: 66%;height:100%;font-size:14px;margin-bottom: 20px" class="table">

38
ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesFormDetail.vue
Unescape View File

@ -9,40 +9,6 @@
@cancel="handleCancel" @cancel="handleCancel"
> >
<h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px;">黄淮学院服装智能制造管理平台 - <span>辅料管理</span></h1> <h1 style="text-align: center;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px;">黄淮学院服装智能制造管理平台 - <span>辅料管理</span></h1>
<!-- <el-descriptions class="margin-top" :column="3" border style="margin-top: 50px">-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-receiving"></i>类型id</template>-->
<!-- {{model.typeId}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-coin"></i>编号</template>-->
<!-- {{model.nums}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-postcard"></i>名称</template>-->
<!-- {{model.contents}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-copy-document"></i>图片</template>-->
<!-- {{model.picture}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-price-tag"></i>材质</template>-->
<!-- {{model.material}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-files"></i>规格</template>-->
<!-- {{model.specs}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-takeaway-box"></i>库存量</template>-->
<!-- {{model.store}}-->
<!-- </el-descriptions-item>-->
<!-- <el-descriptions-item>-->
<!-- <template slot="label"><i class="el-icon-location-outline"></i>供货商</template>-->
<!-- {{model.supplierInfo}}-->
<!-- </el-descriptions-item>-->
<!-- </el-descriptions>-->
<processFabric :model="model"></processFabric> <processFabric :model="model"></processFabric>
</a-modal> </a-modal>
</div> </div>
@ -74,10 +40,8 @@ import processFabric from '@/components/procedure/processFabric'
this.$http.get('/accessories/zyAccessories/queryById?id='+id).then( this.$http.get('/accessories/zyAccessories/queryById?id='+id).then(
res=>{ res=>{
this.model = res.result this.model = res.result
console.log('详情页面')
console.log(this.model)
}) })
}, },
handleOk() { handleOk() {
this.ModalText = 'The modal will be closed after two seconds'; this.ModalText = 'The modal will be closed after two seconds';
this.confirmLoading = true; this.confirmLoading = true;

12
ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
Unescape View File

@ -23,8 +23,7 @@ import basicAction from '@/components/procedure/basicAction'
}, },
data () { data () {
return { return {
model:{ model:[],
},
id:'', id:'',
img:'',//图片地址 img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
@ -38,11 +37,12 @@ import basicAction from '@/components/procedure/basicAction'
methods: { methods: {
showModal(id) { showModal(id) {
this.visible = true; this.visible = true;
this.$http.get('base/zyClothAction/queryById?id='+id).then( this.$http.get('/base/zyClothAction/queryById?id='+id).then(
res=>{ res=>{
this.model = res.result
console.log('this.model') if(this.model.length == 0){
console.log(this.model) this.model.push(res.result)
}
} }
) )
}, },

20
ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div style="">
<a-modal <a-modal
title="标准作业指导书" title="标准作业指导书"
:visible="visible" :visible="visible"
@ -9,10 +9,10 @@
@cancel="handleCancel" @cancel="handleCancel"
style="display:flex;" style="display:flex;"
> >
<div style="width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 30px"> <div style="width: 96%;margin:0 auto 40px;padding-bottom: 30px">
<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: 0px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>基本工序</span></h1>
<!-- 基本工序--> <!-- 基本工序-->
<zyProcess :data="ProcessData"></zyProcess> <zyProcess :data="ProcessData" style="border: 1px solid #e8e8e8;border-top: none;padding: 30px 25px"></zyProcess>
</div> </div>
<!-- <a-card :title="`动作`+(index+1)" v-for="(item,index) in data.zyClothAction" :key="item.id" :headStyle="headStyle">--> <!-- <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">--> <!-- <div style="width:100%;height:20px;display:flex;font-size:18px">-->
@ -29,16 +29,16 @@
<!-- </a-card>--> <!-- </a-card>-->
<!-- 基础动作--> <!-- 基础动作-->
<div class="coin"> <div class="coin">
<h2>基础动作</h2> <h2 style="padding: 20px">基础动作</h2>
<basicAction :model="basicActionData"></basicAction> <basicAction :model="basicActionData" style="padding:20px;"></basicAction>
</div> </div>
<div class="coin"> <div class="coin">
<h2>工序面料</h2> <h2>工序面料</h2>
<processAccessories :model="accessoriesData"></processAccessories> <processAccessories :model="accessoriesData" style="padding:0 20px"></processAccessories>
</div> </div>
<div class="coin"> <div class="coin">
<h2>工序辅料</h2> <h2>工序辅料</h2>
<processFabric :model="fabricData"></processFabric> <processFabric :model="fabricData" style="padding:0 20px"></processFabric>
</div> </div>
</a-modal> </a-modal>
</div> </div>
@ -108,6 +108,6 @@
.table{border-color:#d9d9d9;border-radius: 3px} .table{border-color:#d9d9d9;border-radius: 3px}
.table td{padding: 10px 20px;max-width: 380px;white-space:nowrap} .table td{padding: 10px 20px;max-width: 380px;white-space:nowrap}
.table td span{color: #333} .table td span{color: #333}
.coin{width: 96%;margin:0 auto 30px;border-bottom: 1px solid #e8e8e8;} .coin{width: 96%;margin:0 auto 30px;border: 1px solid #e8e8e8;}
.coin h2{text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px} .coin h2{text-align: left;border-bottom: 1px solid #e8e8e8;padding: 20px;background: rgba(247,247,247,1);margin: 0;}
</style> </style>
Write Preview
Loading…
Cancel
Save