From 337fb435db8657e41d0425dabef40bd7baaa0632 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 19 七月 2024 14:41:50 +0800
Subject: [PATCH] 修改工时管理
---
src/components/tool/value-table.vue | 2 +-
src/main.js | 2 +-
src/components/do/b1-inspect-order-plan/Inspection.vue | 11 +++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 4e6cafe..28d912b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -2231,6 +2231,7 @@
return
},
saveInsContext() {
+ console.log(1111,this.param)
if(this.param){
this.$axios.post(this.$api.insOrderPlan.saveInsContext, {
param: JSON.stringify(this.param)
@@ -2255,6 +2256,16 @@
}
}
}
+ this.dataAcquisitionEidt = 0
+ if(this.param){
+ for (let key in this.param) {
+ this.param[key].equipValue.forEach(m=>{
+ if(m.isItADataAcquisitionDevice){
+ this.dataAcquisitionEidt++
+ }
+ })
+ }
+ }
this.saveInsContext()
},
getAuthorizedPerson() {
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 6310c76..1688891 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -627,7 +627,7 @@
if (this.isShowZero) {
this.tableData.map(item => {
Object.keys(item).forEach(val => {
- if (item[val] === null && !val.includes('Hours')) {
+ if (item[val] === null && val.includes('Hours')) {
item[val] = '/'
}
})
diff --git a/src/main.js b/src/main.js
index aaa8ba8..ce6e72e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,7 +20,7 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.4:8001';
+const javaApi = 'http://172.20.10.5:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3