@@ -278,7 +302,7 @@ export default {
data() {
return {
apiObj: null,
- params: { mgroup: "" ,submit_time__isnull:true,with_mlogb:'yes',
+ params: { mgroup: "" ,submit_time__isnull:true,with_mlogb:'yes',with_mlogbw:'out',
query: " { id,is_fix,equipment, material_out_name, equipment_name, reminder_interval_list ,mstate_json,belong_dept_name, mgroup_name,handle_user_name,work_start_time,work_end_time,submit_time,oinfo_json,mlogb_full,submit_user_name}"
},
query: {submit_time__isnull:true},
@@ -350,9 +374,11 @@ export default {
}
}
},
- detailClose() {
+ detailClose(data) {
this.dialog.detail = false;
- this.$refs.table.refresh();
+ if(data){}else{
+ this.$refs.table.refresh();
+ }
},
table_monitor(row){
let that= this;
@@ -514,7 +540,7 @@ export default {
},
handleSaveSuccess2(data) {
console.log(data);
- this.dialog.save = true;
+ this.dialog.save2 = false;
this.$refs.table.refresh();
this.mlogId = data;
this.dialog.detail = true;
diff --git a/src/views/wpm_bx/monitor_detail.vue b/src/views/wpm_bx/monitor_detail.vue
index 45189607..b1c87c24 100644
--- a/src/views/wpm_bx/monitor_detail.vue
+++ b/src/views/wpm_bx/monitor_detail.vue
@@ -9,7 +9,7 @@
>
-
+
{
if(res.length>0){
that.mpointList = res;
- that.activeName = res[0].name;
+ that.activeName = res[0].nickname;
that.params.mpoint = res[0].id;
that.apiObj = that.$API.enm.mplogx;
that.handleClick();
@@ -113,10 +113,9 @@ export default {
})
},
handleClick(val){
- console.log('handleClick',val)
let that = this;
that.mpointList.forEach(item=>{
- if(item.name == that.activeName){
+ if(item.nickname == that.activeName){
that.query.mpoint = item.id;
that.query.page = 1;
that.option.title.text = that.activeName;
@@ -128,11 +127,22 @@ export default {
params.timex__lte = that.endTime;
params.page = 0;
that.$API.enm.mplogx.req(params).then((res) => {
+ let xAxisData = [],seriesData = [];
res.forEach(item=>{
- that.option.xAxis.data.push(item.timex);
+ xAxisData.unshift(item.timex);
let value = Number(item.val_float).toFixed(3);
- that.option.series.data.push(value);
+ seriesData.unshift(value);
})
+ function getMinValue(arr) {
+ return Math.min.apply(null, arr);
+ }
+ if(that.activeName.indexOf("温度") != -1){
+ let minNum = getMinValue(seriesData);
+ console.log(minNum);
+ that.option.yAxis.min = minNum;
+ }
+ that.option.xAxis.data = xAxisData;
+ that.option.series.data = seriesData;
})
}
})
diff --git a/src/views/wpm_bx/wprList.vue b/src/views/wpm_bx/wprList.vue
index b0aec277..67320515 100644
--- a/src/views/wpm_bx/wprList.vue
+++ b/src/views/wpm_bx/wprList.vue
@@ -136,6 +136,7 @@ export default {
methods: {
open(mode) {
let that = this;
+ that.wprList = [];
this.mode = mode;
this.params.wm = this.wm;
this.visible = true;
@@ -288,7 +289,7 @@ export default {
for(let key in row.oinfo){
oinfo.push(row.oinfo[key])
}
- let data = {sigao:'',duibian:'',moban:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofromName,ofrom_batch:that.ofromBatch};
+ let data = {sigao:'',duibian:'',moban:'',hengya:'',istest:'否',number:row.number,name:name,ofrom_name:that.ofromName,ofrom_batch:that.ofromBatch};
if(that.route_code=='zhuangmo'||that.route_code=='zlybcl'||that.route_code=='tuomoceliang'||that.route_code=='reyatuihuo'||that.route_code=='banduangunyuan'){
params.label_template_name = '脱膜测量单件标签模板';
}else{
@@ -298,6 +299,8 @@ export default {
oinfo.forEach((item)=>{
if(item.name=="丝高"){
data.sigao = item.val;
+ }else if(item.name=="横压"){
+ data.hengya = item.val;
}else if(item.name=="对边"){
data.duibian = item.val;
}else if(item.name=="模具号"){
diff --git a/src/views/wpm_gx/handover.vue b/src/views/wpm_gx/handover.vue
index 63def9bc..d09272b7 100644
--- a/src/views/wpm_gx/handover.vue
+++ b/src/views/wpm_gx/handover.vue
@@ -251,8 +251,14 @@
-
+
-
+ >
+
@@ -379,6 +385,12 @@ export default {
},
route_code: "",
// setNameVisible: false,
+ titleMap: {
+ add: "新增交接记录",
+ edit: "编辑交接记录",
+ show: "查看交接记录",
+ },
+ mode: "add"
};
},
mounted() {
@@ -410,6 +422,7 @@ export default {
//添加
table_add(type) {
this.dialog.save = true;
+ this.mode = "add";
this.type = type;
this.$nextTick(() => {
this.$refs.saveDialog.open("add",'',10);
@@ -419,6 +432,7 @@ export default {
let that = this;
that.type = 10;
that.codeText = codeText;
+ that.mode = "add";
that.dialog.save = true;
that.$nextTick(() => {
that.$refs.saveDialog.open("add",codeText,10);
@@ -429,6 +443,7 @@ export default {
this.type = 20;
that.codeText2 = codeText2;
this.dialog.save = true;
+ that.mode = "add";
this.$nextTick(() => {
this.$refs.saveDialog.open("add",codeText2,10);
});
@@ -437,6 +452,7 @@ export default {
table_edit(row) {
this.type=row.type;
this.dialog.save = true;
+ this.mode = "edit";
this.$nextTick(() => {
this.$refs.saveDialog.open("edit").setData(row);
});
@@ -444,6 +460,7 @@ export default {
table_show(row){
this.type=row.type;
this.dialog.save = true;
+ this.mode = "show";
this.$nextTick(() => {
this.$refs.saveDialog.open("show").setData(row);
});
@@ -561,7 +578,7 @@ export default {
//本地更新数据
//新增岗位后更新数据
handleSaveSuccess(data, mode) {
- this.dialog.save = true;
+ this.dialog.save = false;
this.$refs.table.refresh();
},
},
diff --git a/src/views/wpm_gx/handover_form.vue b/src/views/wpm_gx/handover_form.vue
index 9291f587..330cd0d8 100644
--- a/src/views/wpm_gx/handover_form.vue
+++ b/src/views/wpm_gx/handover_form.vue
@@ -1,217 +1,218 @@
-
-
-
-
- 手动添加
-
-
-
-
-
-
- {{ totalCount }}
-
-
- {{ form.batch }}
-
-
-
-
+
+
+
+
-
-
-
- 不合格
- 返工
- {{ scope.row.batch }}({{ scope.row.material_name }})
- {{ scope.row.defect_name }}
-
-
-
-
+ 手动添加
+
-
-
-
-
-
-
-
-
-
-
- {{ listItem.count_cando }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+ {{ totalCount }}
+
+
+ {{ form.batch }}
+
+
+
+
+
+
+
+
+ 不合格
+ 返工
+ {{ scope.row.batch }}({{ scope.row.material_name }})
+ {{ scope.row.defect_name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ listItem.count_cando }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ item.name }}
-
- 确定
- 取消
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+ 取消
+
+
+
+
+
+
+