调整项目框架
This commit is contained in:
@ -25,7 +25,7 @@
|
||||
<view class="top">
|
||||
▴2.89%
|
||||
</view>
|
||||
<view class="font22">
|
||||
<view class="num font22">
|
||||
1,567
|
||||
</view>
|
||||
</view>
|
||||
@ -43,7 +43,7 @@
|
||||
<view class="top">
|
||||
▴2.89%
|
||||
</view>
|
||||
<view class="font22">
|
||||
<view class="num font22">
|
||||
1,567
|
||||
</view>
|
||||
</view>
|
||||
@ -61,7 +61,7 @@
|
||||
<view class="top">
|
||||
▴2.89%
|
||||
</view>
|
||||
<view class="font22">
|
||||
<view class="num font22">
|
||||
1,567
|
||||
</view>
|
||||
</view>
|
||||
@ -79,7 +79,7 @@
|
||||
<view class="top">
|
||||
▴2.89%
|
||||
</view>
|
||||
<view class="font22">
|
||||
<view class="num font22">
|
||||
1,567
|
||||
</view>
|
||||
</view>
|
||||
@ -97,7 +97,7 @@
|
||||
<view class="top">
|
||||
▴2.89%
|
||||
</view>
|
||||
<view class="font22">
|
||||
<view class="num font22">
|
||||
1,567
|
||||
</view>
|
||||
</view>
|
||||
@ -115,7 +115,7 @@
|
||||
<view class="top">
|
||||
▴2.89%
|
||||
</view>
|
||||
<view class="font22">
|
||||
<view class="num font22">
|
||||
1,567
|
||||
</view>
|
||||
</view>
|
||||
@ -166,14 +166,6 @@
|
||||
<view class="t-icon t-icon-shengchangongdan contenticon"></view>
|
||||
<view class="contentname">生产工单</view>
|
||||
</view>
|
||||
<view class="content_module" @click="toSchedule()">
|
||||
<view class="t-icon t-icon-gongdanjindu contenticon"></view>
|
||||
<view class="contentname">工单进度</view>
|
||||
</view>
|
||||
<view class="content_module" @click="toMaterialYield()">
|
||||
<view class="t-icon t-icon-gongdanchucaishuai contenticon"></view>
|
||||
<view class="contentname">工单出材率</view>
|
||||
</view>
|
||||
<view class="content_module">
|
||||
<view class="t-icon t-icon-shengchanbaobiao contenticon"></view>
|
||||
<view class="contentname">生产报表</view>
|
||||
@ -187,11 +179,19 @@
|
||||
<view class="content_module">
|
||||
<view class="t-icon t-icon-paichengguanli contenticon"></view>
|
||||
<view class="contentname">排程管理</view>
|
||||
</view>
|
||||
<view class="content_module" @click="toSchedule()">
|
||||
<view class="t-icon t-icon-gongdanjindu contenticon"></view>
|
||||
<view class="contentname">工单进度</view>
|
||||
</view>
|
||||
<view class="content_module" @click="toMaterialYield()">
|
||||
<view class="t-icon t-icon-gongdanchucaishuai contenticon"></view>
|
||||
<view class="contentname">工单出材率</view>
|
||||
</view>
|
||||
<view class="content_module">
|
||||
<!-- <view class="content_module">
|
||||
<view class="t-icon t-icon-paichengshichang contenticon"></view>
|
||||
<view class="contentname">排程时长</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="content_box">
|
||||
@ -205,8 +205,8 @@
|
||||
<view class="t-icon t-icon-shebeizhuangtai contenticon"></view>
|
||||
<view class="contentname">设备状态</view>
|
||||
</view>
|
||||
<view class="content_module">
|
||||
<view class="t-icon t-icon-shebeibaoxiu contenticon" @click="toDeviceRepair()"></view>
|
||||
<view class="content_module" @click="toDeviceRepair()">
|
||||
<view class="t-icon t-icon-shebeibaoxiu contenticon"></view>
|
||||
<view class="contentname">设备报修</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -300,7 +300,7 @@
|
||||
.name{flex:1;}
|
||||
.accounticon{
|
||||
margin-right: 5px;
|
||||
color: #fff;
|
||||
color: $uni-text-color-inverse;
|
||||
font-size: 20px;
|
||||
}
|
||||
.notifyicon{font-size: 20px;padding-right: 20px;}
|
||||
@ -312,33 +312,43 @@
|
||||
.content_title{line-height: 25px;font-size: 16px;padding: 15px 0;}
|
||||
.device_data{display: flex;flex-wrap: wrap;
|
||||
.device_module{
|
||||
width: calc(50% - 12px); /* 计算每个块的宽度(根据需要调整)*/
|
||||
width: calc(50% - 6px); /* 计算每个块的宽度(根据需要调整)*/
|
||||
// background-color: #ccc; /* 设置背景色(根据需要调整)*/
|
||||
background: $uni-bg-color-primary;
|
||||
margin:6px;
|
||||
background-color: #ccc; /* 设置背景色(根据需要调整)*/
|
||||
padding: 10px;
|
||||
background: #1C2755;
|
||||
padding: 10px 14px;
|
||||
border-radius: 8px;
|
||||
display: flex;
|
||||
.module_left{width: 60%;
|
||||
.icon_background{width: 32px;height: 32px;background: #6576B7;border-radius: 8px; display: flex;align-items: center;justify-content: center;margin-bottom: 4px;}
|
||||
.icon_background{width: 32px;height: 32px;background: $uni-bg-color-info;border-radius: 8px; display: flex;align-items: center;justify-content: center;margin-bottom: 4px;}
|
||||
}
|
||||
.module_right{width: 40%;
|
||||
.top{float: right;font-size: 10px;padding: 2px 4px;background: rgba(103,194,58,0.3);border-radius: 4px;color: #67C23A;}
|
||||
.top{
|
||||
display: flex;flex-direction: column; font-size: 10px;padding: 2px 4px;background: rgba(103,194,58,0.3);border-radius: 4px;color: $uni-text-color-success;
|
||||
}
|
||||
.num{
|
||||
margin-top: 6px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.device_module:nth-child(even){
|
||||
margin-right: 0;
|
||||
}
|
||||
.device_module:nth-child(odd){
|
||||
margin-left: 0;
|
||||
}
|
||||
}
|
||||
.energy_data{padding: 12px; height: 64px; display: flex;align-items: center;background: #1C2755;border-radius: 8px;
|
||||
.energy_icon{color: #009688;font-size: 24px;margin-right: 8px;}
|
||||
.energy_data{padding: 12px; height: 64px; display: flex;align-items: center;background: $uni-bg-color-primary;border-radius: 8px;
|
||||
.energy_icon{color: $uni-text-color-primary;font-size: 24px;margin-right: 8px;}
|
||||
.energy_image{flex: 1;text-align: center;
|
||||
image{width: 86px;height: 32px;}
|
||||
}
|
||||
.energy_number{color: #FA3758;}
|
||||
.energy_number{color: $uni-text-color-danger;}
|
||||
}
|
||||
.content_data{
|
||||
// view{display: inline-block;width: 25%;}
|
||||
padding: 10px 0;display: flex;position: relative;align-items: center;text-align: center;height: 98px;
|
||||
padding: 10px 0;display: flex;position: relative;align-items: center;justify-content:flex-start;height: 98px;
|
||||
.content_module{
|
||||
width: 25%;margin: 10px 1%;height: 98px;display: flex;align-items: center;justify-content: center;flex-direction: column;background-color: #009688;border-radius: 8px;
|
||||
width: calc(25% - 7px);margin: 10px 4px;height: 98px;display: flex;align-items: center;justify-content: center;flex-direction: column;background-color: $uni-color-primary;border-radius: 8px;
|
||||
.contenticon{font-size: 24px;width: 32px;height: 32px;background-repeat: no-repeat;}
|
||||
.contentname{padding-top: 2px;font-size: 12px;}
|
||||
}
|
||||
|
@ -1,50 +1,49 @@
|
||||
<template>
|
||||
<!-- 工单出材率 -->
|
||||
<view class="page_padding font13">
|
||||
<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty">
|
||||
<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty" @click="toDetail(498)">
|
||||
<view class="list_top">
|
||||
<view class="top_left">
|
||||
工单号:{{item.name}}
|
||||
工单号:{{item.name}}
|
||||
</view>
|
||||
<view class="top_right">
|
||||
工单详情 <text class="iconfont icon-gengduo"></text>
|
||||
工单详情 <text class="arrow iconfont icon-gengduo"></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_content font13">
|
||||
<view class="list_centre">
|
||||
<view class="list_row">
|
||||
<view class="centre_left">
|
||||
<text>加工规格</text>
|
||||
<text>{{item.specs}}</text>
|
||||
</view>
|
||||
<view class="centre_right">
|
||||
生产中
|
||||
<text class="name">加工规格</text>
|
||||
<text class="text">{{item.specs}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_row">
|
||||
<view class="centre_left">
|
||||
<text>算法出材率</text>
|
||||
<text>{{item.algorithm}}%</text>
|
||||
<text class="name">算法出材率</text>
|
||||
<text class="text">{{item.algorithm}}%</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_below">
|
||||
<view class="below_left">
|
||||
<view class="">
|
||||
出材率
|
||||
</view>
|
||||
<view class="percentage font24">
|
||||
{{item.algorithm}}%
|
||||
</view>
|
||||
<view class="below_left">
|
||||
<view class="circle-progress">
|
||||
<view class="progressBg">
|
||||
<view class="progressBox">
|
||||
<view class="percentage font22">
|
||||
{{item.algorithm}}%
|
||||
</view>
|
||||
<view class="title font12">
|
||||
出材率
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="circle-progress__bar" :style="'--progress:'+item.algorithm+'%'"></view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="below_left">
|
||||
<view class="">
|
||||
算法出材率
|
||||
</view>
|
||||
<view class="percentage font24">
|
||||
{{item.reality}}%
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
<view class="card_right">
|
||||
<view class="status">生产中</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -57,7 +56,7 @@
|
||||
return {
|
||||
list:[{
|
||||
name:'SO202401111004',
|
||||
algorithm:'81.5',
|
||||
algorithm:'51.5',
|
||||
reality:'81.4',
|
||||
state:'生产中',
|
||||
specs:'4*9*3.66',
|
||||
@ -75,7 +74,7 @@
|
||||
number:'12.66m³'
|
||||
},{
|
||||
name:'SO202401111004',
|
||||
algorithm:'81.5',
|
||||
algorithm:'61.5',
|
||||
reality:'81.4',
|
||||
state:'生产中',
|
||||
specs:'4*9*3.66',
|
||||
@ -95,27 +94,28 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
toDetail(id){
|
||||
uni.navigateTo({
|
||||
url:'/pages/production/productionDetail?id='+id
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style scoped lang="scss">
|
||||
.detail_list{
|
||||
// .list_top{display: flex;padding: 12px 0;border-bottom: 1px solid #2D3A6F;margin-bottom: 8px;
|
||||
// .top_left{flex: 1;}
|
||||
// }
|
||||
.list_centre{
|
||||
.list_row{display: flex;padding-bottom: 12px;
|
||||
.centre_left{flex: 1;display: flex;
|
||||
text:first-child{width:80px;}
|
||||
.centre_left{
|
||||
flex: 1;
|
||||
.name{width:80px;display: inline-block;font-weight: bold;}
|
||||
}
|
||||
.centre_right{background: rgba(230,162,60,0.2);border-radius: 4px 4px 4px 4px;height: 20px;padding: 0 6px;color: #E6A23C;}
|
||||
}
|
||||
}
|
||||
.list_below{display: flex;text-align: center;padding: 20px 0;
|
||||
view{flex: 1;}
|
||||
.percentage{color: #00B68D;}
|
||||
.list_below{display: flex;text-align: center;padding: 20px 0;
|
||||
.below_left{flex: 1;display: flex;align-items: center;justify-content: center;}
|
||||
.percentage{color: $uni-text-color-inverse;}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
}
|
||||
</style>
|
@ -1,62 +1,77 @@
|
||||
<template>
|
||||
<!-- 工单进度管理 -->
|
||||
<view class="page_padding">
|
||||
<view class="detail_list contentboxsty font13">
|
||||
<view class="list_top">
|
||||
<view class="top_left">
|
||||
工单号:
|
||||
</view>
|
||||
<view class="top_right">
|
||||
工单详情
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_content">
|
||||
<view class="list_row">
|
||||
<view class="row_left">
|
||||
<view class="">开始时间:</view>
|
||||
<view class="">24-01-12 08:00</view>
|
||||
<view class="page_padding columnFlex">
|
||||
<view class="headerView" :class="headerFixed?'headerViewFixed':''">
|
||||
<searchView placeholder=" 搜索工单" />
|
||||
</view>
|
||||
<view class="flexBox">
|
||||
<view class="detail_list contentboxsty font13" v-for="(item,index) in list" :key="index">
|
||||
<view @click="toDetail(497)">
|
||||
<view class="list_top">
|
||||
<view class="top_left">
|
||||
工单号:{{item.sn}}
|
||||
</view>
|
||||
<view class="top_right">
|
||||
工单详情<text class="arrow iconfont icon-gengduo"></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row_right">
|
||||
生产中
|
||||
<view class="list_content">
|
||||
<view class="list_row">
|
||||
<text class="name">开始时间</text>
|
||||
<text class="text">24-01-12 08:00</text>
|
||||
</view>
|
||||
<view class="list_row padd_top12">
|
||||
<text class="name">计划完成</text>
|
||||
<text class="text">24-01-12 08:00</text>
|
||||
</view>
|
||||
<view class="padd_top12">
|
||||
<progressBar :total="100" :val="item.num" title="" />
|
||||
</view>
|
||||
<view class="card_right">
|
||||
<view class="status">生产中</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_row padd_top12">
|
||||
<view class="">计划完成:</view>
|
||||
<view class="">24-01-12 08:00</view>
|
||||
</view>
|
||||
<view class="padd_top12">
|
||||
<progressBar :total="100" :val="20" title="" />
|
||||
</view>
|
||||
</view>
|
||||
<!-- <annularProgressBar :progress_txt="20" :width="84" :height="69" title="出材率"/> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import progressBar from '/components/progressBar.vue'
|
||||
import annularProgressBar from '/components/chocolate-progress-bar/chocolate-progress-bar.vue'
|
||||
export default {
|
||||
components: {
|
||||
"progressBar":progressBar,
|
||||
"annularProgressBar":annularProgressBar,
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
list:[{name:''}]
|
||||
list:[
|
||||
{name:'',sn:"SO20240422000002",num:20},{name:'',sn:"SO20240422000002",num:70},{name:'',sn:"SO20240422000002",num:90},
|
||||
{name:'',sn:"SO20240422000002",num:20},{name:'',sn:"SO20240422000002",num:70},{name:'',sn:"SO20240422000002",num:90}
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
toDetail(id){
|
||||
uni.navigateTo({
|
||||
url:'/pages/production/productionDetail?id='+id
|
||||
})
|
||||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
<style scoped lang="scss">
|
||||
.page_padding{
|
||||
padding-top: 0;
|
||||
}
|
||||
.detail_list{
|
||||
.list_content{
|
||||
.list_row{display: flex;
|
||||
.row_left{display: flex;}
|
||||
.list_content{
|
||||
.list_row{
|
||||
.name{
|
||||
width: 65px;
|
||||
display: inline-block;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3,10 +3,9 @@
|
||||
<view class="iconfont icon-shouye" @click="toIndex()" style="height: 25px;position: absolute;top: 60px;width: 30px;"></view>
|
||||
<view class="login_top">
|
||||
<view class="login_logo">
|
||||
<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/meslogo.png" class="logopng"></image>
|
||||
<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/demu.png" class="demupng"></image>
|
||||
<image src="https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/loginLogo.png" class="demupng"></image>
|
||||
</view>
|
||||
<view class="">
|
||||
<view class="name">
|
||||
自动化MES管理系统
|
||||
</view>
|
||||
</view>
|
||||
@ -36,7 +35,7 @@
|
||||
<view class="getCaptcha">{{codename}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="" v-if="tab==1" style="color: #C4C4C4;font-size: 11px; padding-top: 14px;">
|
||||
<view class="" v-if="tab==1" style="color: #C4C4C4;font-size: 12px;padding-top: 14px;">
|
||||
记住密码
|
||||
</view>
|
||||
<view class="loginbut" @click="login()">
|
||||
@ -80,13 +79,12 @@
|
||||
this.$set(this,"tab",tab);
|
||||
},
|
||||
toIndex(){
|
||||
uni.navigateBack({
|
||||
delta: 2
|
||||
uni.reLaunch({
|
||||
url:'/pages/index/index'
|
||||
});
|
||||
},
|
||||
login(){
|
||||
this.$api.postFuncLoading('/user.login',{login_name:this.accountValue,password:this.passValue}).then(res=>{
|
||||
console.log(res)
|
||||
let obj = new Object();
|
||||
obj.mes_user_name=res.data.user.name;
|
||||
obj.mes_token=res.data.token;
|
||||
@ -105,19 +103,21 @@
|
||||
.login_page{
|
||||
padding: 0 32px;
|
||||
background: url('https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/background.png') no-repeat;
|
||||
background-position: center center;
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
height: 100vh;
|
||||
}
|
||||
.login_top{padding-top: 160px;padding-bottom: 32px;}
|
||||
.login_top{padding-top: 160px;padding-bottom: 32px;}
|
||||
.login_top .name{letter-spacing: 1.2px;background: linear-gradient(to right, #fff, rgba(255,255,255,0.1));
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
}
|
||||
.login_logo{display: flex;align-items: center;margin-bottom: 17px;}
|
||||
.logopng{width: 53px;height: 44px;}
|
||||
.demupng{width: 60px;height: 36px;}
|
||||
.demupng{width: 117px;height: 43px;}
|
||||
.login_centre{border-radius: 16px;background: #FFF;padding: 20px 24px 40px;}
|
||||
.login_switch{display: flex;}
|
||||
.login_name{flex: 1;text-align: center;
|
||||
padding-bottom: 5px;
|
||||
/* border-bottom: 1px solid #000; */
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.login_name:focus {
|
||||
@ -134,13 +134,13 @@
|
||||
bottom: -4px;
|
||||
z-index: 10;
|
||||
width: 30px;
|
||||
border-bottom: 3px solid #009688 ;
|
||||
border-bottom: 3px solid #009688;
|
||||
}
|
||||
.login_input{border-radius: 21.5px;background: #F3F5F9;margin-top: 12px;padding: 5px 15px;}
|
||||
.login_input{border-radius: 21.5px;background: #F3F5F9;margin-top: 12px;padding: 9px 15px;font-size: 14px;}
|
||||
.getCaptcha{border-radius: 21.5px;background: #009688;height: auto;color: white;display: flex;align-items: center;width: 40%;justify-content: center;}
|
||||
.flex_layout{display: flex;margin-top: 12px;}
|
||||
.login_code{margin-top: unset;width:60%;margin-right: 12px;}
|
||||
.loginbut{background: #009688;text-align: center;margin-top: 60px;margin-bottom: 18px;padding: 9px;border-radius: 66rpx;}
|
||||
.loginbut{background: #009688;text-align: center;margin-top: 40px;margin-bottom: 18px;padding: 9px;border-radius: 66rpx;}
|
||||
.persontc{
|
||||
border: none;
|
||||
margin: 0;
|
||||
|
@ -2,11 +2,11 @@
|
||||
<view class="person_page ">
|
||||
<view class="person_top">
|
||||
<view class="person_data">
|
||||
<!-- <view class="person_logo"> -->
|
||||
<view class="person_logo">
|
||||
<!-- <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar"> -->
|
||||
<image class="person_logo" :src="avatarUrl"></image>
|
||||
<!-- </button> -->
|
||||
<!-- </view> -->
|
||||
<image class="img" :src="avatarUrl"></image>
|
||||
<!-- </button> -->
|
||||
</view>
|
||||
<view class="person_name">
|
||||
<view class="name">
|
||||
<text class="font15">肖银奎</text>
|
||||
@ -75,6 +75,9 @@
|
||||
<view class="con_set">
|
||||
<view class="t-icon t-icon-xitongshezhi-gerenzhongxin personicon"></view>
|
||||
<view class="font13">系统设置</view>
|
||||
</view>
|
||||
<view class="login_out">
|
||||
<view class="font13">退出登录</view>
|
||||
</view>
|
||||
</view>
|
||||
<tab-bar :current-page="2"></tab-bar>
|
||||
@ -83,7 +86,7 @@
|
||||
|
||||
<script>
|
||||
import tabBar from "@/components/customTabBar/index";
|
||||
const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0';
|
||||
const defaultAvatarUrl = 'https://dm-auto.oss-cn-shanghai.aliyuncs.com/mes_wechat/avatar.png';
|
||||
export default {
|
||||
components:{
|
||||
tabBar
|
||||
@ -137,7 +140,18 @@
|
||||
.person_page{ padding: 14px;
|
||||
.person_top{margin-bottom:33px ;
|
||||
.person_data{display: flex;align-items: center;
|
||||
.person_logo{border-radius: 50%;width: 54px;height: 54px;margin:0 6px 0 4px;}
|
||||
.person_logo{
|
||||
border-radius: 50%;width: 54px;height: 54px;margin:0 6px 0 4px;position: relative;
|
||||
.img{
|
||||
height: 100%;width: 100%;
|
||||
}
|
||||
}
|
||||
.person_logo::before{
|
||||
content: '';position: absolute;right: 2px;bottom: 1px;z-index: 10;border: 1px solid $uni-bg-color-default; background: $uni-bg-color-whith;width: 10px;height: 10px;border-radius: 50%;
|
||||
}
|
||||
.person_logo::after{
|
||||
content: '';position: absolute;right: 4px;bottom: 3px;z-index: 20;background: $uni-bg-color-success;width: 8px;height: 8px;border-radius: 50%;
|
||||
}
|
||||
|
||||
.person_name{
|
||||
.name{display: flex;align-items: center;margin-bottom: 2px;
|
||||
@ -147,20 +161,26 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.person_content{
|
||||
.con_backlog{padding: 14px 10px 14px 15px;background: #1C2755;border-radius: 8px;margin-bottom: 12px;
|
||||
.backlog_data{display: flex; flex-wrap: wrap;margin-top: 7px;
|
||||
.backlog_module{width: 93px;height: 76px;display: flex;justify-content: center;flex-direction: column;align-items: center;border-radius: 8px;
|
||||
background: #6576B7;margin: 5px 6px;}
|
||||
.person_content{
|
||||
padding-bottom: 100px;
|
||||
.con_backlog{padding: 14px 10px;background: $uni-bg-color-primary;border-radius: 8px;margin-bottom: 12px;
|
||||
.backlog_data{
|
||||
display: flex;flex-wrap:wrap;margin-top:7px;
|
||||
.backlog_module{
|
||||
width: calc(33.33% - 12px);height: 76px;display: flex;justify-content: center;flex-direction: column;align-items: center;border-radius: 8px;
|
||||
background: $uni-color-info;margin: 5px 6px;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
.backlogicon{width: 32px;height: 32px;}
|
||||
.backlogname{
|
||||
font-size: $uni-font-size-sm;
|
||||
padding-top: 5px;}
|
||||
padding-top: 5px;
|
||||
}
|
||||
}
|
||||
}
|
||||
.con_account{
|
||||
border-radius: 8px;
|
||||
background: #1C2755;
|
||||
background: $uni-bg-color-primary;
|
||||
display: flex;
|
||||
height: 52px;
|
||||
align-items: center;
|
||||
@ -169,19 +189,32 @@
|
||||
|
||||
}
|
||||
.personicon{width: 24px;height: 24px;margin-right: 15px;}
|
||||
.con_data{border-radius: 8px;
|
||||
background: #1C2755;
|
||||
.con_data{
|
||||
border-radius: 8px;
|
||||
background: $uni-bg-color-primary;
|
||||
padding: 0 14px;
|
||||
margin-bottom: 12px;
|
||||
.con_module{display: flex;height: 49px;align-items: center;border-bottom: 1px solid #2D3A6F;}
|
||||
.con_module{display: flex;height: 49px;align-items: center;border-bottom: 1px solid $uni-border-color-primary;}
|
||||
}
|
||||
.con_set{border-radius: 8px;
|
||||
background: #1C2755;
|
||||
.con_set{
|
||||
border-radius: 8px;
|
||||
background: $uni-bg-color-primary;
|
||||
display: flex;
|
||||
height: 48px;
|
||||
align-items: center;
|
||||
padding: 0 14px;
|
||||
}
|
||||
padding: 0 14px;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.login_out{
|
||||
border-radius: 8px;
|
||||
background: $uni-bg-color-primary;
|
||||
display: flex;
|
||||
height: 48px;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 0 14px;
|
||||
color: $uni-text-color-danger;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
@ -5,8 +5,8 @@
|
||||
<view class="top_left">
|
||||
工单号 <text class="padd_left12">{{form.order_sn}}</text>
|
||||
</view>
|
||||
<view class="top_right font13">
|
||||
{{form.review_status_label}}
|
||||
<view class="top_right font12">
|
||||
{{form.active_status_label}}
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_content">
|
||||
@ -21,7 +21,7 @@
|
||||
</view>
|
||||
<view class="content_row">
|
||||
<text class="name">工单耗时</text>
|
||||
<text class="data">10h</text>
|
||||
<text class="data">{{form.processing_time}}</text>
|
||||
</view>
|
||||
<view class="content_row">
|
||||
<text class="name">加工规格</text>
|
||||
@ -29,11 +29,11 @@
|
||||
</view>
|
||||
<view class="content_row">
|
||||
<text class="name">规格料</text>
|
||||
<text class="data">13.01m³</text>
|
||||
<text class="data">{{form.cube}}m³</text>
|
||||
</view>
|
||||
<view class="content_row">
|
||||
<text class="name">生产负责</text>
|
||||
<text class="data">张三</text>
|
||||
<text class="data">{{form.creator_name}}</text>
|
||||
</view>
|
||||
<view class="content_row">
|
||||
<text class="name">加工等级</text>
|
||||
@ -49,7 +49,22 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="content_right">
|
||||
|
||||
<progressBar :total="100" :val="form.progress_rate" title="" />
|
||||
</view>
|
||||
<view class="progressView">
|
||||
<view class="circle-progress">
|
||||
<view class="progressBg">
|
||||
<view class="progressBox">
|
||||
<view class="percentage font22">
|
||||
{{form.yield_rate}}%
|
||||
</view>
|
||||
<view class="title font12">
|
||||
出材率
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="circle-progress__bar" :style="'--progress:'+form.yield_rate+'%'"></view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -64,16 +79,17 @@
|
||||
}
|
||||
},
|
||||
onLoad(option){
|
||||
console.log(option)
|
||||
this.detailData(option.id)
|
||||
},
|
||||
onShow(){
|
||||
// this.detailData()
|
||||
|
||||
},
|
||||
onReady() {
|
||||
|
||||
},
|
||||
methods: {
|
||||
detailData(id){
|
||||
this.$api.postFuncLoading('/order.info',{id:id}).then(res=>{
|
||||
console.log(res.data)
|
||||
this.form = res.data
|
||||
})
|
||||
},
|
||||
@ -83,11 +99,18 @@
|
||||
|
||||
<style lang="scss">
|
||||
.list_top{
|
||||
.top_right{background: #243168;border-radius: 4px 4px 4px 4px;width: 46px;height: 20px;text-align: center;}
|
||||
.top_right{background: #243168;border-radius: 4px;padding: 3px 10px; text-align: center;display: inline-block;}
|
||||
}
|
||||
.list_content{
|
||||
.list_content{
|
||||
.content_row{display: flex;padding:6px 0;
|
||||
.name{width: 90px;}
|
||||
.name{width: 90px;font-weight: bold;}
|
||||
}
|
||||
.content_right{padding: 6px 0;}
|
||||
.progressView{
|
||||
position: absolute;
|
||||
top: 12px;
|
||||
right:12px;
|
||||
z-index: 20;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@ -1,87 +1,162 @@
|
||||
<template>
|
||||
<!-- 生产工单 -->
|
||||
<view class="page_padding">
|
||||
<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty font13">
|
||||
<view @click="toDetail(item.id)">
|
||||
<view class="list_top">
|
||||
<view class="top_left">
|
||||
工单号:{{item.order_sn}}
|
||||
<view class="page_padding columnFlex">
|
||||
<view class="headerView" :class="headerFixed?'headerViewFixed':''">
|
||||
<searchView placeholder=" 搜索工单" />
|
||||
</view>
|
||||
<view class="flexBox">
|
||||
<!-- <scroll-view scroll-y="true" class="scrollView"> -->
|
||||
<view v-for="(item,index) in list" :key="index" class="detail_list contentboxsty font13">
|
||||
<view @click="toDetail(item.id)">
|
||||
<view class="list_top">
|
||||
<view class="top_left">
|
||||
工单号:{{item.order_sn}}
|
||||
</view>
|
||||
<view class="top_right">
|
||||
工单详情 <text class="arrow iconfont icon-gengduo"></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="top_right">
|
||||
工单详情 <text class="iconfont icon-gengduo"></text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_content font13">
|
||||
<view class="list_centre">
|
||||
<view class="centre_left">
|
||||
<view class="">
|
||||
算法出材率
|
||||
<view class="list_content font13">
|
||||
<view class="list_centre">
|
||||
<view class="centre_left">
|
||||
<view class="name font_bold">
|
||||
算法出材率
|
||||
</view>
|
||||
<view class="percentage font24">
|
||||
{{item.algorithm && item.algorithm!=''?item.algorithm+'':'0'}}%
|
||||
</view>
|
||||
</view>
|
||||
<view class="percentage font24">
|
||||
{{item.algorithm}}%
|
||||
<view class="centre_left">
|
||||
<view class="name font_bold">
|
||||
实际出材率
|
||||
</view>
|
||||
<view class="percentage font24">
|
||||
{{item.reality && item.reality!=''?item.reality:'0'}}%
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="centre_left">
|
||||
<view class="">
|
||||
实际出材率
|
||||
<view class="list_below">
|
||||
<view class="row">
|
||||
<view class="row_left">
|
||||
<text class="name">状态</text>
|
||||
<text class="text status">{{item.active_status_label}}</text>
|
||||
</view>
|
||||
<view class="row_right">
|
||||
<text class="name">加工规格</text>
|
||||
<text class="text">{{item.order_spec}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="percentage font24">
|
||||
{{item.reality}}%
|
||||
<view class="row">
|
||||
<view class="row_left">
|
||||
<text class="name">生产开始</text>
|
||||
<text class="text">{{item.plan_date}}</text>
|
||||
</view>
|
||||
<view class="row_right">
|
||||
<text class="name">工单耗时</text>
|
||||
<text class="text">{{item.progress_rate}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view class="row_left">
|
||||
<text class="name">工单数量</text>
|
||||
<text class="text">{{item.order_number}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list_below">
|
||||
<view class="row">
|
||||
<view class="row_left">
|
||||
<text>状态:</text>
|
||||
<text>{{item.review_status_label}}</text>
|
||||
</view>
|
||||
<view class="row_right">
|
||||
<text>加工规格:</text>
|
||||
<text>{{item.order_spec}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view class="row_left">
|
||||
<text>生产开始:</text>
|
||||
<text>{{item.plan_date}}</text>
|
||||
</view>
|
||||
<view class="row_right">
|
||||
<text>工单耗时:</text>
|
||||
<text>{{item.timeConsuming}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view class="row_left">
|
||||
<text>工单数量:</text>
|
||||
<text>{{item.order_number}}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<loadMore :noData="loadParams.noData" :loading="loadParams.loading" :loadEnd="loadParams.loadEnd" />
|
||||
<!-- </scroll-view> -->
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
<script>
|
||||
export default {
|
||||
components:{
|
||||
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
list:[]
|
||||
return {
|
||||
headerFixed:false,
|
||||
list:[],
|
||||
params:{
|
||||
page:1,
|
||||
pageSize:10,
|
||||
},
|
||||
loadParams:{
|
||||
noData:false,
|
||||
loading:false,
|
||||
loadEnd:false
|
||||
}
|
||||
}
|
||||
},
|
||||
onShow(){
|
||||
this.listData();
|
||||
|
||||
},
|
||||
onReady() {
|
||||
this.listData();
|
||||
},
|
||||
onPageScroll(e){
|
||||
if(e.scrollTop>30){
|
||||
this.headerFixed = true;
|
||||
}else{
|
||||
this.headerFixed = false;
|
||||
}
|
||||
},
|
||||
// 上拉刷新
|
||||
onPullDownRefresh(){
|
||||
this.params.page = 1;
|
||||
this.listData(2);
|
||||
},
|
||||
// 加载下一页
|
||||
onReachBottom(){
|
||||
if(!(this.loadParams.loadEnd || this.loadParams.noData)){
|
||||
this.loadParams.loading = true;
|
||||
this.params.page ++;
|
||||
this.listData();
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
listData(){
|
||||
this.$api.postFuncLoading('/order.list',{page: 1,pageSize: 15}).then(res=>{
|
||||
this.list = res.data.rows
|
||||
listData(type=1){
|
||||
if(this.params.page == 1){
|
||||
uni.showLoading({
|
||||
title: '加载中',
|
||||
mask: true
|
||||
})
|
||||
}
|
||||
this.$api.request('/order.list',this.params).then(res=>{
|
||||
console.log(res,566)
|
||||
if(type ==2){
|
||||
uni.stopPullDownRefresh();
|
||||
}
|
||||
setTimeout(function () {
|
||||
uni.hideLoading();
|
||||
}, 200);
|
||||
|
||||
this.loadParams.loading = false;
|
||||
if(res.data.rows.length ==0 && this.params.page == 1){
|
||||
this.loadParams.noData = true;
|
||||
}
|
||||
if(res.data.rows.length>0 && res.data.rows.length < this.params.pageSize){
|
||||
this.loadParams.loadEnd = true;
|
||||
}
|
||||
if(this.params.page == 1){
|
||||
this.list = res.data.rows;
|
||||
}else{
|
||||
this.list = this.list.concat(res.data.rows);
|
||||
}
|
||||
|
||||
}).catch(err=>{
|
||||
console.log('err',err)
|
||||
setTimeout(function () {
|
||||
uni.hideLoading();
|
||||
}, 200);
|
||||
})
|
||||
},
|
||||
//跳转工单详情
|
||||
toDetail(id){
|
||||
console.log(id)
|
||||
uni.navigateTo({
|
||||
url:'/pages/production/productionDetail?id='+id
|
||||
})
|
||||
@ -90,16 +165,34 @@
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.detail_list{
|
||||
<style scoped lang="scss">
|
||||
.page_padding{
|
||||
padding-top: 0;
|
||||
}
|
||||
.detail_list{
|
||||
.list_centre{display: flex;text-align: center;padding-bottom: 10px;
|
||||
view{flex: 1;}
|
||||
.percentage{color: #00B68D;}
|
||||
.percentage{color: $uni-text-color-primary;margin: 10px 0 0 0;}
|
||||
}
|
||||
.list_below{padding-bottom: 12px;
|
||||
.row{display: flex;padding-top: 10px;
|
||||
.row_left{ white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
|
||||
view{flex: 1;}
|
||||
.row_left{
|
||||
white-space: nowrap;overflow: hidden;text-overflow: ellipsis;
|
||||
padding-right: 4px;
|
||||
}
|
||||
.row_right{
|
||||
white-space: nowrap;overflow: hidden;text-overflow: ellipsis;
|
||||
padding-left: 4px;
|
||||
}
|
||||
view{flex: 1;}
|
||||
.row_left .name,.row_right .name{
|
||||
display: inline-block;
|
||||
width: 65px;
|
||||
font-weight: bold;
|
||||
}
|
||||
.status{
|
||||
color: $uni-text-color-warning;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user