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

20220913-syy

Browse Source
zhc4dev
暖暖 2 years ago
parent 6db5496fa4
commit 3027467b3b
7 changed files with 210 additions and 93 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. 54
      ant-design-vue-jeecg/src/components/procedure/basicAction.vue
  2. 56
      ant-design-vue-jeecg/src/components/procedure/processAccessories.vue
  3. 55
      ant-design-vue-jeecg/src/components/procedure/processFabric.vue
  4. 20
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
  5. 22
      ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
  6. 5
      ant-design-vue-jeecg/src/views/process/modules/ZyClothActionFormDetail.vue
  7. 37
      ant-design-vue-jeecg/src/views/process/modules/ZyProcessDetail.vue

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

@ -1,53 +1,60 @@
<template> <template>
<div style="padding: 15px 25px;display: flex;justify-content: space-between"> <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%;"> <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>--> <!-- <tr>-->
<!-- <td style="text-align: center">添加人:</td>--> <!-- <td style="text-align: center">添加人:</td>-->
<!-- <td>{{model.addPeople}}</td>--> <!-- <td>{{model.addPeople}}</td>-->
<!-- </tr>--> <!-- </tr>-->
<tr> <tr>
<td style="text-align: center">频率:</td> <td style="text-align: center">频率:</td>
<td>{{tableModel.freq}}</td> <td>{{item.freq}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">描述:</td> <td style="text-align: center">描述:</td>
<td>{{tableModel.descr}}</td> <td>{{item.descr}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">机器TMU:</td> <td style="text-align: center">机器TMU:</td>
<td>{{tableModel.machineTmu}}</td> <td>{{item.machineTmu}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">手工TMU:</td> <td style="text-align: center">手工TMU:</td>
<td>{{tableModel.machineTmu}}</td> <td>{{item.machineTmu}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">编号:</td> <td style="text-align: center">编号:</td>
<td>{{tableModel.nums}}</td> <td>{{item.nums}}</td>
</tr> </tr>
</table> </table>
</div> </div>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
name: 'basicAction', name: 'basicAction',
// props:{ // props: {
// tableModel:{ // model: {
// type:Array, // type: Array,
// default: () =>({}) // default() {
// return []
// } // }
// }, // }},
props:['tableModel'], props:['model'],
data () { data () {
return { return {
model:{
},
img:'',//图片地址 img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址 mp4:'',//视频地址
tableModel:[],
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
@ -55,7 +62,22 @@
}}, }},
created() { created() {
}, },
methods: {} watch: {
//正确给 tableModel 赋值的 方法
model: function(newVal,oldVal){
if(Array.isArray(newVal)){
this.tableModel = newVal;
}else{
this.tableModel.push(newVal)
}
newVal && this.getTableModel();
}
},
methods: {
getTableModel(){
//执行其他逻辑
}
},
} }
</script> </script>
<style scoped> <style scoped>

56
ant-design-vue-jeecg/src/components/procedure/processAccessories.vue
Unescape View File

@ -1,36 +1,60 @@
<template> <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"> <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="font-size:14px;" class="table" > <!-- <table border="1" style="font-size:14px;" class="table" >-->
<tr> <!-- <tr>-->
<td style="text-align: center">工序:</td> <!-- <td style="text-align: center">工序:</td>-->
<td>{{tableModel.processId}}</td> <!-- <td>{{item.processId}}</td>-->
</tr> <!-- </tr>-->
<tr> <!-- <tr>-->
<td style="text-align: center">面料:</td> <!-- <td style="text-align: center">面料:</td>-->
<td>{{tableModel.accessoriesId}}</td> <!-- <td>{{item.accessoriesId}}</td>-->
</tr> <!-- </tr>-->
</table> <!-- </table>-->
</div>
</div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
name: 'processAccessories', name: 'processAccessories',
props:['tableModel'], props:['model'],
data () { data () {
return { return {
model:{
},
img:'',//图片地址 img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址 mp4:'',//视频地址
tableModel:[],
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
}, },
}}, }},
created() {
},
watch: {
//正确给 cData 赋值的 方法
model: function(newVal,oldVal){
if(Array.isArray(newVal)){
this.tableModel = newVal;
console.log('面料组件')
console.log(this.tableModel)
}else{
this.tableModel.push(newVal)
}
newVal && this.getTableModel();
}
},
methods: {
getTableModel(){
//执行其他逻辑
}
},
} }
</script> </script>
<style scoped> <style scoped>

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

@ -1,45 +1,68 @@
<template> <template>
<div>
<div v-for="(item,index) in tableModel" :key="index">
<h3>辅料{{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="font-size:14px;" class="table" > <table border="1" style="font-size:14px;" class="table" >
<tr> <tr>
<td style="text-align: center">工序:</td> <td style="text-align: center">编号:</td>
<td>{{tableModel.processId}}</td> <td>{{item.nums}}</td>
<td style="text-align: center">名称:</td>
<td>{{item.contents}}</td>
<td style="text-align: center">图片:</td>
<td>{{item.picture}}</td>
<td style="text-align: center">材质:</td>
<td>{{item.material}}</td>
</tr> </tr>
<tr> <tr>
<td style="text-align: center">辅料:</td> <td style="text-align: center">规格:</td>
<td>{{tableModel.fabricId}}</td> <td>{{item.specs}}</td>
<td style="text-align: center">库存量:</td>
<td>{{item.store}}</td>
<td style="text-align: center">供货商:</td>
<td colspan="3">{{item.supplierInfo}}</td>
</tr> </tr>
</table> </table>
</div> </div>
</div>
</div>
</template> </template>
<script> <script>
export default { export default {
name: 'processFabric', name: 'processFabric',
props:['tableModel'], props:['model'],
data () { data () {
return { return {
model:{
},
img:'',//图片地址 img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址 mp4:'',//视频地址
tableModel:[],
visible: false, visible: false,
confirmLoading: false, confirmLoading: false,
validatorRules: { validatorRules: {
}, },
}}, }},
created() { created() {
console.log('this.tableModel')
console.log(this.tableModel)
}, },
mounted() { watch: {
console.log('this.tableModel') //正确给 cData 赋值的 方法
console.log(this.tableModel) model: function(newVal,oldVal){
if(Array.isArray(newVal)){
this.tableModel = newVal;
}else{
this.tableModel.push(newVal)
}
newVal && this.getTableModel();
} }
},
methods: {
getTableModel(){
//执行其他逻辑
}
},
} }
</script> </script>
<style scoped> <style scoped>

20
ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessAccessoriesFormDetail.vue
Unescape View File

@ -7,7 +7,22 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序面料</span></h1> <h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序面料</span></h1>
<processAccessories :tableModel="model"></processAccessories> <!-- <processAccessories :model="model"></processAccessories>-->
<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>{{model.processId}}</td>
</tr>
<tr>
<td style="text-align: center">面料:</td>
<td>{{model.accessoriesId}}</td>
</tr>
</table>
</div>
</a-modal> </a-modal>
</template> </template>
@ -25,6 +40,9 @@ import processAccessories from '@/components/procedure/processAccessories'
return { return {
code:'', code:'',
id:'', id:'',
img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址
model:{ model:{
}, },
visible:false, visible:false,

22
ant-design-vue-jeecg/src/views/cloths/modules/ZyProcessFabricFormDetail.vue
Unescape View File

@ -7,7 +7,22 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @cancel="handleCancel">
<h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1> <h1 style="text-align: center;margin-bottom: 50px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px;font-size: 22px">黄淮学院服装智能制造管理平台 - <span>工序辅料</span></h1>
<processFabric :tableModel="model"></processFabric> <!-- <processFabric :model="model"></processFabric>-->
<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>{{model.processId}}</td>
</tr>
<tr>
<td style="text-align: center">面料:</td>
<td>{{model.fabricId}}</td>
</tr>
</table>
</div>
</a-modal> </a-modal>
</template> </template>
@ -25,6 +40,9 @@ import processFabric from '@/components/procedure/processFabric'
return { return {
code:'', code:'',
id:'', id:'',
img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址
model:{ model:{
}, },
visible:false, visible:false,
@ -44,7 +62,7 @@ import processFabric from '@/components/procedure/processFabric'
methods: { methods: {
showModal(id) { showModal(id) {
this.visible = true; this.visible = true;
this.$http.get('pro/zyProcessFabric/queryById?id='+id).then( this.$http.get('/pro/zyProcessFabric/queryById?id='+id).then(
res=>{ res=>{
this.model = res.result this.model = res.result
} }

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

@ -7,7 +7,7 @@
@ok="handleOk" @ok="handleOk"
@cancel="handleCancel"> @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;">黄淮学院服装智能制造管理平台 - <span>基础动作</span></h1>
<basicAction :tableModel="model"></basicAction> <basicAction :model="model"></basicAction>
</a-modal> </a-modal>
</template> </template>
@ -25,6 +25,7 @@ import basicAction from '@/components/procedure/basicAction'
return { return {
model:{ model:{
}, },
id:'',
img:'',//图片地址 img:'',//图片地址
img1:require('@/assets/9-2.png'),// 默认图片 img1:require('@/assets/9-2.png'),// 默认图片
mp4:'',//视频地址 mp4:'',//视频地址
@ -40,6 +41,8 @@ import basicAction from '@/components/procedure/basicAction'
this.$http.get('base/zyClothAction/queryById?id='+id).then( this.$http.get('base/zyClothAction/queryById?id='+id).then(
res=>{ res=>{
this.model = res.result this.model = res.result
console.log('this.model')
console.log(this.model)
} }
) )
}, },

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

@ -28,24 +28,28 @@
<!-- </div>--> <!-- </div>-->
<!-- </a-card>--> <!-- </a-card>-->
<!-- 基础动作--> <!-- 基础动作-->
<div style="width: 96%;margin:0 auto 30px"> <div class="coin">
<h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">基础动作</h2> <h2>基础动作</h2>
<basicAction :tableModel="basicActionData"></basicAction> <basicAction :model="basicActionData"></basicAction>
</div> </div>
<div style="width: 96%;margin:0 auto 30px"> <div class="coin">
<h2 style="text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px">工序面料</h2> <h2>工序面料</h2>
<processFabric :tableModel="accessoriesData"></processFabric> <processAccessories :model="accessoriesData"></processAccessories>
</div>
<div class="coin">
<h2>工序辅料</h2>
<processFabric :model="fabricData"></processFabric>
</div> </div>
</a-modal> </a-modal>
</div> </div>
</template> </template>
<script> <script>
import zyProcess from '@/components/procedure/zyProcess' import zyProcess from '@/components/procedure/zyProcess'
import basicAction from '@/components/procedure/basicAction' import basicAction from '@/components/procedure/basicAction'
import processAccessories from '@/components/procedure/processAccessories'
import processFabric from '@/components/procedure/processFabric' import processFabric from '@/components/procedure/processFabric'
export default { export default {
components:{zyProcess,basicAction,processFabric}, components:{zyProcess,basicAction,processAccessories,processFabric},
data() { data() {
return{ return{
ModalText: 'Content of the modal', ModalText: 'Content of the modal',
@ -56,9 +60,10 @@
img1:require('@/assets/9-2.png'),//默认图片 img1:require('@/assets/9-2.png'),//默认图片
mp4:'', mp4:'',
data:{}, data:{},
ProcessData:{}, ProcessData:{},//基本工序相关数据
basicActionData:[], basicActionData:[],//基础动作相关数据
accessoriesData:[], accessoriesData:[],//面料相关数据
fabricData:[],//辅料相关数据
headStyle:{ headStyle:{
height:'10px' height:'10px'
}, },
@ -73,11 +78,13 @@
res=>{ res=>{
this.data = res.result this.data = res.result
this.ProcessData = res.result.zyProcess this.ProcessData = res.result.zyProcess
this.basicActionData = res.result.zyProcessAction this.basicActionData = res.result.zyClothActions
this.accessoriesData = res.result.zyProcessAccessories this.accessoriesData = res.result.zyFabrics
console.log('this.data') this.fabricData = res.result.zyAccessories
console.log('工序详情页')
console.log(this.data) console.log(this.data)
console.log(this.accessoriesData) console.log(this.accessoriesData)
console.log(this.fabricData)
this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image; this.img = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.image;
this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio; this.mp4 = "http://10.100.200.112/jeecg-boot/sys/common/static/"+this.data.vedio;
} }
@ -101,4 +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 h2{text-align: left;margin-bottom: 30px;border-bottom: 1px solid #e8e8e8;padding-bottom: 20px}
</style> </style>
Write Preview
Loading…
Cancel
Save