From 43279616cd0f67c6ebcfef8e6e1f111244d1d5eb Mon Sep 17 00:00:00 2001
From: liudan <18634735655@163.com>
Date: Mon, 12 Jun 2023 22:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.hbuilderx/launch.json | 16 +++
pages.json | 17 +++
pages/allprocess/allprocess.vue | 223 ++++++++++++++++++++++++++++++
pages/processList/processList.vue | 2 +-
pages/taskList/taskList.vue | 80 ++++++++++-
static/t3.png | Bin 0 -> 2052 bytes
static/t33.png | Bin 0 -> 1926 bytes
7 files changed, 332 insertions(+), 6 deletions(-)
create mode 100644 .hbuilderx/launch.json
create mode 100644 pages/allprocess/allprocess.vue
create mode 100644 static/t3.png
create mode 100644 static/t33.png
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..582561b
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置,configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
+ "version": "0.0",
+ "configurations": [{
+ "app-plus" :
+ {
+ "launchtype" : "local"
+ },
+ "default" :
+ {
+ "launchtype" : "local"
+ },
+ "type" : "uniCloud"
+ }
+ ]
+}
diff --git a/pages.json b/pages.json
index 7094c63..7795814 100644
--- a/pages.json
+++ b/pages.json
@@ -50,6 +50,17 @@
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "pages/allprocess/allprocess",
+ "style" :
+ {
+ "navigationBarTitleText": "工序",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom",
+ "onReachBottomDistance": 100
+ }
+
}
],
"globalStyle": {
@@ -81,6 +92,12 @@
"text": "待检测",
"iconPath": "static/t2.png",
"selectedIconPath": "static/t22.png"
+ },
+ {
+ "pagePath": "pages/allprocess/allprocess",
+ "text": "工序",
+ "iconPath": "static/t33.png",
+ "selectedIconPath": "static/t3.png"
}
]
}
diff --git a/pages/allprocess/allprocess.vue b/pages/allprocess/allprocess.vue
new file mode 100644
index 0000000..2e83ceb
--- /dev/null
+++ b/pages/allprocess/allprocess.vue
@@ -0,0 +1,223 @@
+
+
+
+
+
+ ...
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 名称:{{item.name}}
+
+
+
+
+
+ 编码:{{info.code?info.code:'-'}}
+
+
+ 数量:{{item.num}}
+
+
+
+
+ 状态:{{ item.status == 1 ? '未完成' : (item.status == 2 ? '进行中' : '已完成')}}
+
+
+ 开始
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
diff --git a/pages/processList/processList.vue b/pages/processList/processList.vue
index c95e016..5374c80 100644
--- a/pages/processList/processList.vue
+++ b/pages/processList/processList.vue
@@ -159,7 +159,7 @@
background: #F6F6F6;
border-radius: 4upx;
padding:25upx 20upx;
- margin-top:30upx;
+ // margin-top:30upx;
.rowItem{
margin-bottom:25upx;
display: flex;
diff --git a/pages/taskList/taskList.vue b/pages/taskList/taskList.vue
index 84dba3e..215f432 100644
--- a/pages/taskList/taskList.vue
+++ b/pages/taskList/taskList.vue
@@ -14,7 +14,55 @@
-
+
+
+
+
+
+
+
+
+
+
+ 炉号:{{i.heat_number?i.heat_number:'-'}}
+
+
+ 状态:{{i.status == 1 ? '未完成' : '已完成'}}
+
+
+
+ 编号:{{i.art_number}}
+
+
+ 当前工序:{{i.procedure}}
+
+
+
+ 数量:{{i.total}}
+
+
+ 面次:{{i.face}}
+
+
+
+
+ 计划完成时间:{{i.real_time ? i.real_time : '-'}}
+
+
+ 查看详情
+
+
+
+ 备注:{{i.remake}}
+
+
+
+
+
@@ -70,17 +118,36 @@
data() {
return {
taskList:[],
- show:false
+ show:false,
+ list1:[],
+ taskListFinish:[]
};
},
methods:{
+ tabClick(val){
+ console.log(val.name.substr(5))
+ if(val){
+ let str = val.name.substr(5);
+ let arr = this.taskList.filter(item=>{
+ if(str.indexOf(item.name)!=-1){
+ return item
+ }
+ })
+ this.taskListFinish =arr[0].list
+ }
+
+ },
close() {
this.show = false
},
getData(){
getTaskList().then(res=>{
- console.log(res,"000")
- this.taskList = res.data
+ this.taskList = res.data;
+ let arr = res.data;
+ this.taskListFinish = res.data[0].list
+ arr.forEach(item=>{
+ this.list1.push({name:'机器编号:'+item.name+'#'})
+ })
})
},
changeUser(){
@@ -136,6 +203,9 @@
font-weight: 400;
color: #333333;
}
+ &>:first-child{
+ margin-top:0upx !important;
+ }
.item{
background: #F6F6F6;
border-radius: 4upx;
diff --git a/static/t3.png b/static/t3.png
new file mode 100644
index 0000000000000000000000000000000000000000..9101f24d9e7002ce55658c4e053d21bb775434e4
GIT binary patch
literal 2052
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