diff --git a/pages/ProductManage/SboProcess.vue b/pages/ProductManage/SboProcess.vue
index 239d03a..e09a9c0 100644
--- a/pages/ProductManage/SboProcess.vue
+++ b/pages/ProductManage/SboProcess.vue
@@ -1,19 +1,189 @@
-
-
+
+
+
+
+
+
+ 设备
+
+
+
+
+
+
+
+ 母卷
+
+
+
+
+
+
+
+
+
+
+
+ | 状态 |
+ 工单号 |
+ 母卷号 |
+ 机台编码 |
+ 产品编码 |
+ 理论长度 |
+ 开始时间 |
+ 结束时间 |
+ 总重量 |
+ 车号 |
+ 生产区域 |
+ 更新时间 |
+
+
+
+
+ | {{e.status_name}} |
+ {{e.mfg_order_name}} |
+ {{e.container_name}} |
+ {{e.point_code}} |
+ {{e.pcsn}} |
+ {{e.theory_height}} |
+ {{e.realstart_time}} |
+ {{e.realend_time}} |
+ {{e.productin_qty}} |
+ {{e.agvno}} |
+ {{e.product_area}} |
+ {{e.update_time}} |
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/ProductManage/SboProdProgress.vue b/pages/ProductManage/SboProdProgress.vue
index adf4b87..a4942d9 100644
--- a/pages/ProductManage/SboProdProgress.vue
+++ b/pages/ProductManage/SboProdProgress.vue
@@ -8,7 +8,7 @@
设备
-
+
@@ -16,7 +16,13 @@
母卷
-
+
+
+
+
+ 区域
+
+
@@ -50,30 +56,62 @@
-
+
-
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 862b171..6749fdf 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -4,7 +4,7 @@
{{$store.getters.userName}}
- 欢迎进入扬州晶澳手持系统!
+ 欢迎进入铜箔手持系统!
@@ -24,7 +24,7 @@
export default {
data() {
return {
- menu: [{url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/task/painttask', name: '任务生成'}, {url: '/pages/task/sitemanage', name: '站点管理'}, {url: '/pages/task/pointrelease', name: '点位取放货确认'}, {url: '/pages/task/taskmanage', name: '任务管理'}, {url: '/pages/task/zlmanage', name: '指令管理'}]
+ menu: [{url: '/pages/ProductManage/SboProdProgress', name: '生箔生产进度'}, {url: '/pages/ProductManage/EmptyPipeInStore', name: '空管入库'}, {url: '/pages/ProductManage/ZjCasing', name: '子卷套管'}, {url: '/pages/ProductManage/ZjDelivery', name: '子卷配送'}, {url: '/pages/ProductManage/ZjOutStore', name: '子卷出站'}, {url: '/pages/task/painttask', name: '任务生成'}, {url: '/pages/task/sitemanage', name: '站点管理'}, {url: '/pages/task/pointrelease', name: '点位取放货确认'}, {url: '/pages/task/taskmanage', name: '任务管理'}, {url: '/pages/task/zlmanage', name: '指令管理'}]
};
},
mounted () {
@@ -41,13 +41,13 @@
toPage (url) {
uni.redirectTo({
url: url
- })
- },
- Quit () {
- this.$store.dispatch('delUserInfo')
+ })
+ },
+ Quit () {
+ this.$store.dispatch('delUserInfo')
uni.redirectTo({
url: '/pages/login/login'
- })
+ })
}
}
}
@@ -64,27 +64,27 @@
_fj()
_wh(100%,160rpx)
padding 0 30rpx
- background-color $red
+ background-color $red
_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
border-radius 12rpx
margin-bottom 20rpx
.userInfo
_fj(,flex-start,column)
.p1
- _font(34rpx,1,#fff)
+ _font(34rpx,1,#fff)
padding-bottom 18rpx
-.p2
+.p2
_font(26rpx,1,#fff)
.exit
_fj()
- height 47rpx
- padding 0 15rpx
- border 1px solid #FF967C
+ height 47rpx
+ padding 0 15rpx
+ border 1px solid #FF967C
border-radius 20rpx
.icon-exit
- _wh(22rpx, 22rpx)
+ _wh(22rpx, 22rpx)
_bis('../../static/image/exit.png',22rpx)
-.exit-text
+.exit-text
_font(24rpx,47rpx,#fff,,right)
padding-left 10rpx
.menu-wrap
@@ -94,7 +94,7 @@
_fj(center)
_wh(30%, 120rpx)
margin-bottom 40rpx
- border 1px solid #e74f1a
+ border 1px solid #e74f1a
border-radius 5px
_font(26rpx, 60rpx,#e74f1a,,center)
&:nth-child(3n+2)
diff --git a/utils/getData1.js b/utils/getData1.js
index 3891bb1..1b63cd0 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -1,3 +1,5 @@
+import request from './request.js'
+
// 生箔生产进度
// 1.1生产区域下拉框查询
export const queryProductArea = (type) => request({