suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

工作台页面调整

Browse Source
dev-scheduling
zhangdi 1 month ago
parent e8212536e8
commit 80d5f90b15
9 changed files with 193 additions and 187 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. 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. 131
      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

6
src/views/logisticsManagement/components/addPackingDialog.vue
Unescape View File

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

2
src/views/logisticsManagement/components/unbindDialog.vue
Unescape View File

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

2
src/views/wel/components/efficiency.vue
Unescape View File

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

29
src/views/wel/components/notice.vue
Unescape View File

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

131
src/views/wel/components/orderDetail.vue
Unescape View File

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

3
src/views/wel/components/quickAccess.vue
Unescape View File

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

4
src/views/wel/components/statisticsData.vue
Unescape View File

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

5
src/views/wel/components/statisticsTable.vue
Unescape View File

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

2
src/views/wel/index.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <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-base2 v-if="setting.styleRadio=='2'"></work-base2> -->
<work-base></work-base> <work-base></work-base>

Write Preview
Loading…
Cancel
Save