工作台页面调整

dev-scheduling
zhangdi 1 month ago
parent e8212536e8
commit 80d5f90b15
  1. 6
      src/views/logisticsManagement/components/addPackingDialog.vue
  2. 2
      src/views/logisticsManagement/components/unbindDialog.vue
  3. 2
      src/views/wel/components/efficiency.vue
  4. 29
      src/views/wel/components/notice.vue
  5. 327
      src/views/wel/components/orderDetail.vue
  6. 3
      src/views/wel/components/quickAccess.vue
  7. 4
      src/views/wel/components/statisticsData.vue
  8. 5
      src/views/wel/components/statisticsTable.vue
  9. 2
      src/views/wel/index.vue

@ -1,6 +1,6 @@
<template>
<el-dialog
title="解绑配送"
title="新增"
append-to-body
:modelValue="openShow"
width="30%"
@ -14,14 +14,14 @@
placeholder="请扫描箱条码"
/>
</el-form-item>
<el-form-item label="订单号:" prop="orderNo">
<el-form-item label="流程卡号:" prop="orderNo">
<el-input
v-model="form.orderNo"
@keyup.enter.prevent="changeOrderCode"
placeholder="请扫描箱条码"
/>
</el-form-item>
<el-form-item label="流程卡号:" prop="orderNo">
<el-form-item label="" prop="orderNo">
<el-tag
:key="tag"
v-for="tag in orderIdList"

@ -1,6 +1,6 @@
<template>
<el-dialog
title="新增配送"
title="解绑"
append-to-body
:modelValue="openShow"
width="30%"

@ -133,7 +133,7 @@ export default {
.bar_chart_box{
width: 100%;
height: 240px;
height: 150px;
margin-top: 10px;
}
}

@ -1,9 +1,9 @@
<template>
<div class="notice_box">
<div class="title_box">
<!-- <div class="title_box">
<span class="title">通知中心</span>
<!-- <span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="loadMore">查看更多</span> -->
</div>
<span style="color: #409EFF;font-size: 14px;cursor: pointer;" @click="loadMore">查看更多</span>
</div> -->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="我的待办" name="backlog">
<div class="back_box">
@ -21,9 +21,9 @@
</div>
</div>
<!-- <div class="btn_box">查看更多</div> -->
<el-button v-if="backlogData.length >= 3" type="primary" @click="handleMore(1)">查看更多</el-button>
<!-- <el-button v-if="backlogData.length >= 3" type="primary" @click="handleMore(1)">查看更多</el-button> -->
</el-tab-pane>
<el-tab-pane label="消息通知" name="notice">
<!-- <el-tab-pane label="消息通知" name="notice">
<div class="back_box">
<div class="back_item" v-for="item in noticeArr" :key="item.id">
<div class="back_top">
@ -38,9 +38,9 @@
</div>
</div>
<!-- <div class="btn_box">查看更多</div> -->
<el-button v-if="noticeArr.length >= 3" type="primary" @click="handleMore(2)">查看更多</el-button>
</el-tab-pane>
</el-tab-pane> -->
</el-tabs>
<!-- <div class="notice_data">
<div class="notice_data_item" v-for="item in noticeArr" :key="item.content">
@ -75,12 +75,12 @@ export default {
content:"张伟提交的转外协申请,等待您的审批",
createTime:"2026-03-05 09:05:05",
},
{
id:'1963789019681054722',
title:"审批请求待处理",
content:"张伟提交的转外协申请,等待您的审批",
createTime:"2024-03-05 09:05:05",
},
// {
// id:'1963789019681054722',
// title:"",
// content:"",
// createTime:"2024-03-05 09:05:05",
// },
// {
// id:'1963789019681054722',
// title:"",
@ -168,6 +168,7 @@ export default {
.back_item{
border-bottom: 1px solid #eee;
margin-bottom: 10px;
font-size: 14px;
.back_top{
display: flex;
justify-content: space-between;

@ -1,191 +1,194 @@
<template>
<div class="order_box">
<div class="title_bar">车间订单</div>
<div class="pie_box">
<div class="pie_box_item" >
<div class="btn_box">
<span class="btn first" :class="activeIndex == 1 ? 'active' : ''" @click="changeChart(1)">热表</span>
<span class="btn second" :class="activeIndex == 2 ? 'active' : ''" @click="changeChart(2)">烧结</span>
</div>
<div ref="rb_chart" v-show="activeIndex == 1" class="chart_box"></div>
<div ref="sj_chart" v-show="activeIndex == 2" class="chart_box"></div>
</div>
<div class="order_box">
<div class="title_bar">车间订单</div>
<div class="pie_box">
<div class="pie_box_item">
<div class="btn_box">
<span class="btn first" :class="activeIndex == 1 ? 'active' : ''" @click="changeChart(1)"
>热表</span
>
<span class="btn second" :class="activeIndex == 2 ? 'active' : ''" @click="changeChart(2)"
>烧结</span
>
</div>
<div ref="rb_chart" v-show="activeIndex == 1" class="chart_box"></div>
<div ref="sj_chart" v-show="activeIndex == 2" class="chart_box"></div>
</div>
</div>
</div>
</template>
<script>
export default {
data() {
return {
activeIndex:1
data() {
return {
activeIndex: 1,
};
},
mounted() {
this.$nextTick(() => {
this.initRbEcharts();
});
},
methods: {
changeChart(type) {
this.activeIndex = type;
this.$nextTick(() => {
if (type == 1) {
this.initRbEcharts();
} else {
this.initSjEcharts();
}
});
},
mounted() {
this.$nextTick(() =>{
this.initRbEcharts()
})
},
methods: {
changeChart(type){
this.activeIndex = type
this.$nextTick(() =>{
if(type == 1){
this.initRbEcharts()
}else{
this.initSjEcharts()
}
})
initRbEcharts() {
var myChart = this.$echarts.init(this.$refs.rb_chart);
let option = {
tooltip: {
trigger: 'item',
formatter: '{b} : {c} <br/> 占比:{d}%',
},
initRbEcharts() {
var myChart = this.$echarts.init(this.$refs.rb_chart);
let option = {
tooltip: {
trigger: 'item',
formatter: '{b} : {c} <br/> 占比:{d}%'
},
legend: {
// top: '-2%',
left: '15%',
top:'center',
orient: "vertical"
},
series: [
{
top: '10%',
type: 'pie',
radius: ['65%', '95%'],
avoidLabelOverlap: false,
padAngle: 5,
itemStyle: {
borderRadius: 5
},
label: {
show: false,
position: 'center'
},
labelLine: {
show: false
},
// data: this.problemArr
data:[
{ value: 8, name: '在制品',itemStyle: {color:'#3B82F6'}},
{ value: 2, name: '加工中',itemStyle: {color:'#E6A23C'} },
{ value: 2, name: '检验中',itemStyle: {color:'#EF4444'} },
{ value: 2, name: '已完成',itemStyle: {color:'#22C55E'} },
]
}
]
};
myChart.setOption(option);
legend: {
top: '-2%',
left: '1%',
// top: 'center',
orient: 'vertical',
},
initSjEcharts() {
var myChart = this.$echarts.init(this.$refs.sj_chart);
let option = {
tooltip: {
trigger: 'item',
formatter: '{b} : {c} <br/> 占比:{d}%'
},
legend: {
// top: '-2%',
left: '15%',
top:'center',
orient: "vertical"
},
series: [
{
top: '10%',
type: 'pie',
radius: ['65%', '95%'],
avoidLabelOverlap: false,
padAngle: 5,
itemStyle: {
borderRadius: 5
},
label: {
show: false,
position: 'center'
},
labelLine: {
show: false
},
// data: this.problemArr
data:[
{ value: 20, name: '在制品',itemStyle: {color:'#3B82F6'}},
{ value: 28, name: '未齐套',itemStyle: {color:'#ff7a45'}},
{ value: 14, name: '已齐套', itemStyle: {color:'#20c5f6'}},
{ value: 42, name: '加工中',itemStyle: {color:'#E6A23C'} },
{ value: 13, name: '检验中',itemStyle: {color:'#EF4444'} },
{ value: 25, name: '已完成',itemStyle: {color:'#22C55E'} },
]
}
]
};
myChart.setOption(option);
series: [
{
top: '0%',
type: 'pie',
radius: ['70%', '95%'],
avoidLabelOverlap: false,
padAngle: 5,
itemStyle: {
borderRadius: 5,
},
label: {
show: false,
position: 'center',
},
labelLine: {
show: false,
},
// data: this.problemArr
data: [
{ value: 8, name: '在制品', itemStyle: { color: '#3B82F6' } },
{ value: 2, name: '加工中', itemStyle: { color: '#E6A23C' } },
{ value: 2, name: '检验中', itemStyle: { color: '#EF4444' } },
{ value: 2, name: '已完成', itemStyle: { color: '#22C55E' } },
],
},
],
};
myChart.setOption(option);
},
initSjEcharts() {
var myChart = this.$echarts.init(this.$refs.sj_chart);
let option = {
tooltip: {
trigger: 'item',
formatter: '{b} : {c} <br/> 占比:{d}%',
},
}
}
legend: {
top: '-2%',
left: '1%',
// top:'center',
orient: 'vertical',
},
series: [
{
top: '0%',
type: 'pie',
radius: ['65%', '95%'],
avoidLabelOverlap: false,
padAngle: 5,
itemStyle: {
borderRadius: 5,
},
label: {
show: false,
position: 'center',
},
labelLine: {
show: false,
},
// data: this.problemArr
data: [
{ value: 20, name: '在制品', itemStyle: { color: '#3B82F6' } },
{ value: 28, name: '未齐套', itemStyle: { color: '#ff7a45' } },
{ value: 14, name: '已齐套', itemStyle: { color: '#20c5f6' } },
{ value: 42, name: '加工中', itemStyle: { color: '#E6A23C' } },
{ value: 13, name: '检验中', itemStyle: { color: '#EF4444' } },
{ value: 25, name: '已完成', itemStyle: { color: '#22C55E' } },
],
},
],
};
myChart.setOption(option);
},
},
};
</script>
<style lang="scss" scoped>
.order_box {
padding: 20px;
padding: 20px;
.title_bar {
font-weight: 550;
}
.title_bar {
font-weight: 550;
}
.pie_box {
width: 100%;
height: 200px;
display: flex;
justify-content: space-between;
.pie_box_item {
width: 100%;
height: 100%;
padding: 10px;
.pie_box {
width: 100%;
height: 200px;
display: flex;
justify-content: space-between;
.btn_box{
width: 100%;
display: flex;
justify-content: flex-end;
.pie_box_item {
width: 100%;
height: 100%;
padding: 10px;
.btn{
padding: 5px 15px;
border: 1px solid #eee;
cursor: pointer;
font-size: 14px;
.btn_box {
width: 100%;
display: flex;
justify-content: flex-end;
margin-top: -30px;
&.first{
border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
border-right: none;
}
.btn {
padding: 5px 15px;
border: 1px solid #eee;
cursor: pointer;
font-size: 14px;
&.second{
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
}
&.first {
border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
border-right: none;
}
&.second {
border-top-right-radius: 6px;
border-bottom-right-radius: 6px;
}
&.active{
color: rgb(64, 158, 255);
}
}
}
&.active {
color: rgb(64, 158, 255);
}
}
}
.title{
font-weight: 500;
}
.title {
font-weight: 500;
}
.chart_box{
width: 100%;
height: 210px;
margin-top: 10px;
}
}
.chart_box {
width: 100%;
height: 210px;
margin-top: 10px;
}
}
}
}
</style>

@ -60,7 +60,7 @@ export default {
.access_box{
display: flex;
flex-wrap: wrap;
margin-top: 10px;
// margin-top: 10px;
.access_box_item{
display: flex;
@ -69,6 +69,7 @@ export default {
align-items: center;
justify-content: center;
margin-block: 10px;
font-size:14px;
cursor: pointer;
img{

@ -24,7 +24,7 @@ export default {
{name:'烧结生产批数',num:'10'},
{name:'厂内批数',num:'6'},
{name:'外协批数',num:'2'},
{name:'绩效零件批数',num:'0'},
// {name:'',num:'0'},
{name:'入库批数',num:'10'},
],
}
@ -47,7 +47,7 @@ export default {
border-bottom: 1px solid #eee;
.data_box_item {
width: 16%;
width: 20%;
display: flex;
align-items: center;
justify-content: center;

@ -38,7 +38,7 @@ export default {
<style lang="scss" scoped>
.statics_box {
padding: 20px;
padding: 10px 20px 20px 20px;
height: 50%;
.title {
@ -48,7 +48,7 @@ export default {
.table_box {
display: flex;
flex-wrap: wrap;
margin-top: 10px;
// margin-top: 10px;
.table_box_item {
display: flex;
@ -57,6 +57,7 @@ export default {
align-items: center;
justify-content: center;
margin-block: 10px;
font-size: 14px;
cursor: pointer;
img {

@ -1,5 +1,5 @@
<template>
<div style="width: 100%;height: 100%;">
<div style="width: 100%;height: 100%;transform-origin: center;">
<!-- <work-base2 v-if="setting.styleRadio=='2'"></work-base2> -->
<work-base></work-base>

Loading…
Cancel
Save