提交代码

This commit is contained in:
‘tuzi0421
2024-03-13 16:07:11 +08:00
parent d022e33da9
commit e37d0e4112
34 changed files with 1933 additions and 206 deletions

View File

@ -3,8 +3,8 @@
<view class="container home">
<view class="home_head">
<view class="iconfont icon-chaojiguanliyuan accounticon"></view>
<view class="name" @click="toLogin()">未登录</view>
<!-- <view class="name">Ykxiao 超级管理员</view> -->
<view class="name" v-if="userName==''" @click="toLogin()">未登录</view>
<view class="name" v-else>{{userName}} </view>
<view class="iconfont icon-xiaoxitongzhi notifyicon" @click="toMessage()"></view>
<view class="iconfont icon-shezhi setupicon"></view>
</view>
@ -199,7 +199,7 @@
<view class="content_data">
<view class="content_module" @click="toEquipmentManage()">
<view class="t-icon t-icon-shebeiguanli contenticon"></view>
<view class="contentname">设备设置</view>
<view class="contentname">设备管理</view>
</view>
<view class="content_module" @click="toDeviceStatus()">
<view class="t-icon t-icon-shebeizhuangtai contenticon"></view>
@ -225,9 +225,21 @@
},
data() {
return {
userName: '',
}
},
// onLoad() {
// this.userName = uni.getStorageSync('demu_mes_user_name')
// },
onShow(){
this.userName = uni.getStorageSync('demu_mes_user_name')
},
// created() {
// },
mounted() {
this.userName = uni.getStorageSync('demu_mes_user_name')
},
methods: {
//
toLogin(){
@ -283,7 +295,7 @@
<style lang="scss">
.home {height: 100vh;padding: 0 10px;font-size: 14px;
.home {padding: 0 10px;font-size: 14px;
.home_head{height: 40px;display: flex;position: relative;align-items: center;padding-bottom: 5px;
.name{flex:1;}
.accounticon{
@ -323,6 +335,7 @@
.energy_number{color: #FA3758;}
}
.content_data{
// view{display: inline-block;width: 25%;}
padding: 10px 0;display: flex;position: relative;align-items: center;text-align: center;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;

View File

@ -7,35 +7,44 @@
工单号:{{item.name}}
</view>
<view class="top_right">
工单详情
工单详情 <text class="iconfont icon-gengduo"></text>
</view>
</view>
<view class="list_content">
<view class="list_content font13">
<view class="list_centre">
<view class="centre_left">
加工规格:{{item.specs}}
<view class="list_row">
<view class="centre_left">
<text>加工规格</text>
<text>{{item.specs}}</text>
</view>
<view class="centre_right">
生产中
</view>
</view>
<view class="centre_right">
生产中
<view class="list_row">
<view class="centre_left">
<text>算法出材率</text>
<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>
<view class="below_left">
<!-- <view class="below_left">
<view class="">
算法出材率
</view>
<view class="percentage font24">
{{item.reality}}%
</view>
</view>
</view> -->
</view>
</view>
</view>
@ -96,8 +105,13 @@
// .list_top{display: flex;padding: 12px 0;border-bottom: 1px solid #2D3A6F;margin-bottom: 8px;
// .top_left{flex: 1;}
// }
.list_centre{display: flex;
.centre_left{flex: 1;}
.list_centre{
.list_row{display: flex;padding-bottom: 12px;
.centre_left{flex: 1;display: flex;
text:first-child{width:80px;}
}
.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;}

View File

@ -24,7 +24,7 @@
</view>
<view class="con_but">
<view class="but_rat"><view class="t-icon t-icon-shenpizhida icon22"></view>审批</view>
<view class="but_del"><view class="t-icon t-icon-shezhi icon22 paddrigth5"></view>删除</view>
<view class="but_del"><view class="t-icon t-icon-shezhi icon22 padd_rigth5"></view>删除</view>
</view>
</view>
</view>

View File

@ -1,7 +1,7 @@
<template>
<!-- 工单进度管理 -->
<view class="pagepaddings">
<view class="detail_list contentboxsty">
<view class="detail_list contentboxsty font13">
<view class="list_top">
<view class="top_left">
工单号:
@ -14,7 +14,7 @@
<view class="list_row">
<view class="row_left">
<view class="">开始时间</view>
<view class=""></view>
<view class="">24-01-12 08:00</view>
</view>
<view class="row_right">
生产中
@ -22,13 +22,13 @@
</view>
<view class="list_row padd_top12">
<view class="">计划完成</view>
<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="出材率"/>
<!-- <annularProgressBar :progress_txt="20" :width="84" :height="69" title="出材率"/> -->
</view>
</view>
</template>
@ -55,7 +55,9 @@
<style lang="scss">
.detail_list{
.list_content{
.list_row{display: flex;}
.list_row{display: flex;
.row_left{display: flex;}
}
}
}
</style>