Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

成品线看板修改

Browse Source
master
Yangwl 1 year ago
parent 108c28999f
commit 0dce33b14f
4 changed files with 125 additions and 114 deletions
Show Stats Download Patch File Download Diff File

8
src/views/kanban/finishproduct/BottomRightTable1.vue
Unescape Escape View File

@ -1,10 +1,11 @@
<template> <template>
<div class="bottom-right-table-1"> <div class="bottom-right-table-1">
<dv-border-box-6> <dv-border-box-13 :key="borderBoxKey">
<div class="table-name"> <div class="table-name">
<dv-scroll-board :config="getScrollBoardConfig()" /> <dv-scroll-board :config="getScrollBoardConfig()" />
<!-- <dv-scroll-board :config="getScrollBoardConfig()" />-->
</div> </div>
</dv-border-box-6> </dv-border-box-13>
</div> </div>
</template> </template>
@ -19,6 +20,7 @@ export default {
}, },
data () { data () {
return { return {
borderBoxKey: 1, // 初始化一个key值
config:{ config:{
header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'], header: ['工单号', '产线名称', '产品名称', '生产数量', '单位'],
data: [ data: [
@ -37,6 +39,7 @@ export default {
tableData(newVal) { tableData(newVal) {
console.log("newVal-",newVal) console.log("newVal-",newVal)
this.config.data = this.formatTableData(newVal); this.config.data = this.formatTableData(newVal);
this.borderBoxKey += 1;
} }
}, },
methods: { methods: {
@ -100,5 +103,6 @@ export default {
.dv-scroll-board { .dv-scroll-board {
height: calc(~"100% - 0px"); height: calc(~"100% - 0px");
} }
} }
</style> </style>

16
src/views/kanban/finishproduct/TopMiddleCmp.vue
Unescape Escape View File

@ -87,15 +87,15 @@ export default {
<style scoped> <style scoped>
.top-middle-cmp { .top-middle-cmp {
position: relative; position: relative;
padding: 0 50px; padding: 0 0px;
box-sizing: border-box; box-sizing: border-box;
.chart-name { /*.chart-name {*/
position: absolute; /* position: absolute;*/
right: 70px; /* right: 70px;*/
text-align: right; /* text-align: right;*/
font-size: 20px; /* font-size: 20px;*/
top: 10px; /* top: 10px;*/
} /*}*/
} }
</style> </style>

189
src/views/kanban/finishproduct/index.vue
Unescape Escape View File

@ -1,32 +1,47 @@
<template> <template>
<div id="data-view"> <v-scale-screen width="1920" height="1080" :fullScreen="true">
<dv-full-screen-container> <div class="app-container home" style="">
<div class="main-header"> <div class="head">
<div class="mh-left"> <div class="head-content">
<div class="title">成品包装线生产看板</div>
</div>
<div class="head-logo">
<img src="../../../assets/images/logo.png" alt="" /> <img src="../../../assets/images/logo.png" alt="" />
</div> </div>
<div class="mh-middle">成品包装线生产看板</div> <div class="back">
<div class="mh-right">{{currentDateTime}} <el-button
@click="back()"
type="primary"
icon="el-icon-s-home"
></el-button>
</div> </div>
</div> </div>
<div class="content-top">
<dv-border-box-1 class="main-container"> <div class="timebox">
<div class="time">
{{ currentDateTime }}
</div>
</div>
</div>
<div class="content">
<div class="mc-top"> <div class="mc-top">
<div class="mc-left">
<Top-Left-Cmp :data="valueForTopLeftCmp"/> <Top-Left-Cmp :data="valueForTopLeftCmp"/>
<Top-Middle-Cmp :data="valueForTopMiddleCmp" /> </div>
<Top-right-Cmp /> <div class="mc-middle">
</div>
<div class="mc-right">
<Top-Middle-Cmp :data="valueForTopMiddleCmp" style="height: 100%;"/>
</div>
</div> </div>
<div class="mc-bottom"> <div class="mc-bottom">
<BottomRightTable1 :tableData="BottomRightTableValue"/> <BottomRightTable1 :tableData="BottomRightTableValue" style="height: 600px; margin-top: 50px"/>
<!-- 设置 .mc-bottom 的高度，你可以根据实际情况调整 -->
</div>
</div> </div>
<!-- <div class="mc-bottom">-->
<!-- <BottomRightTable1 v-for="index in 4" :key="index+4" :tableIndex="index" :tableData="BottomRightTable2Value"/>-->
<!-- </div>-->
</dv-border-box-1>
</dv-full-screen-container>
</div> </div>
</v-scale-screen>
</template> </template>
<script> <script>
@ -104,100 +119,92 @@ export default {
} }
</script> </script>
<style lang="less"> <style lang="scss" scoped>
#data-view {
.app-container {
padding: 0px 24px;
color: #fff;
}
.home {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: #030409; background: url("../../../assets/images/bg-finishproduct.png") no-repeat;
color: #fff;
#dv-full-screen-container {
background-image: url("../../../assets/images/bg-finishproduct.png");
background-size: 100% 100%; background-size: 100% 100%;
box-shadow: 0 0 3px blue; background-color: #050711;
display: flex; .head {
flex-direction: column; width: 100%;
} height: 74px;
position: relative;
.main-header { .head-content {
height: 80px; height: 74px;
display: flex; background-image: url("../../../assets/images/bg-head.png");
justify-content: space-between; background-repeat: no-repeat;
align-items: flex-end; background-size: 100% 100%;
text-align: center;
.mh-left { .title {
margin-top: 10px; font-size: 42px;
font-weight: 400;
color: #ffffff;
} }
.mh-middle {
font-size: 30px;
} }
.head-logo {
.mh-left, .mh-right { position: absolute;
width: 200px; left: 0px;
top: 1px;
img {
height: 38px;
// width: ;
} }
} }
.back {
.main-container { position: absolute;
height: calc(~"100% - 80px"); right: 0px;
margin-left:0px; top: 5px;
.mc-top, .mc-bottom ,mc-bottom-1 {
box-sizing: border-box;
padding: 30px;
display: flex;
} }
.mc-top {
height: 40%;
} }
.content-top {
display: flex;
justify-content: space-between;
position: relative;
.timebox {
width: 480px;
height: 100px;
.mc-bottom-1, .mc-bottom-2 { background-size: 100% 100%;
height: 100%; text-align: center;
position: absolute;
top: -17px;
right: 0px;
.time {
font-size: 30px;
font-weight: 400;
color: #ffffff;
line-height: 71px;
} }
.top-left-cmp, .bottom-left-container {
width: 32%;
} }
.top-middle-cmp, .top-right-cmp {
width: 34%;
} }
.content {
.bottom-left-container { margin-top: 63px;
position: relative; display: block;
justify-content: space-between;
.border-box-content { .mc-top {
height: 100%;
width: 100%;
display: flex; display: flex;
.mc-left {
flex: 2; // 占据剩余的空间
} }
.mcb-decoration-1, .mcb-decoration-2 { .mc-middle {
position: absolute; flex: 1; // 占据剩余的空间
left: 50%;
margin-left: -2px;
} }
.mc-right {
.mcb-decoration-1 { flex: 2; // 占据剩余的空间
top: 5%;
transform: rotate(180deg);
} }
.mcb-decoration-2 {
top: 50%;
} }
.bottom-left-chart-1, .bottom-left-chart-2 {
width: 50%;
height: 100%;
}
} }
.bottom-right-container {
width: 68%;
padding-left: 30px;
box-sizing: border-box;
display: flex;
}
}
} }
</style> </style>

8
src/views/mes/unitprice/index.vue
Unescape Escape View File

@ -106,9 +106,9 @@
<el-table-column label="物料描述" align="center" prop="productName" /> <el-table-column label="物料描述" align="center" prop="productName" />
<el-table-column label="产线编码" align="center" prop="lineCode" /> <el-table-column label="产线编码" align="center" prop="lineCode" />
<el-table-column label="产线名称" align="center" prop="lineName" /> <el-table-column label="产线名称" align="center" prop="lineName" />
<el-table-column label="子工序编码" align="center" prop="childprocessCode" /> <el-table-column label="子工序编码" align="center" prop="childprocessCode" />
<el-table-column label="子工序名称" align="center" prop="childprocessName" /> <el-table-column label="子工序名称" align="center" prop="childprocessName" />
<el-table-column label="工序单价（元/pc）" align="center" prop="attr1" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
@ -256,7 +256,7 @@
<div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div> <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip"> <div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip" slot="tip"> <div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据 <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的数据
</div> </div>
<span>仅允许导入xls、xlsx格式文件。</span> <span>仅允许导入xls、xlsx格式文件。</span>
<el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link> <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
@ -340,7 +340,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()}, headers: {poolName: localStorage.getItem("USER_POOL_NAME_CURRENT"), Authorization: "Bearer " + getToken()},
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + "/mes/unitprice/importData" url: process.env.VUE_APP_BASE_API + "/mes/unitPrice/importData"
}, },
// 查询参数 // 查询参数
queryParams: { queryParams: {
@ -543,7 +543,7 @@ export default {
/** 导入按钮操作 */ /** 导入按钮操作 */
handleImport() { handleImport() {
this.upload.title = "子工序导入"; this.upload.title = "导入";
this.upload.open = true; this.upload.open = true;
}, },

Write Preview
Loading…
Cancel
Save