From 7b6c3dc450c20525ddb64bbd9a20c3f0976ea147 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 七月 2024 18:11:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/tool/value-table.vue | 2 ++
src/main.js | 2 +-
src/components/do/b1-inspect-order-plan/Inspection.vue | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index eeaebea..0467e3d 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -497,7 +497,7 @@
ref="wareTableData"
border
v-loading="wareTableDataLoading"
- style="width: 100%;margin-bottom: 30px;" align="center">
+ style="width: 100%;margin-bottom: 30px;" align="center" v-show="wareForm.inspectionItemSubclass!='20(甯告俯)'&&wareForm.inspectionItemSubclass!='20'||(wareForm.inspectionItemSubclass=='20(甯告俯)'&&wareForm.inspectionItem==1)||(wareForm.inspectionItemSubclass=='20'&&wareForm.inspectionItem==numOptions.length)">
<el-table-column
label="搴忓彿"
type="index"
@@ -787,7 +787,6 @@
import ValueTable from '../../tool/value-table.vue'
import file from '../../../util/file'
import excelFunction from '../../../util/excelFountion'
-import { number } from 'echarts'
export default {
props: ['sonLaboratory', 'orderId', 'state'],
components: {
@@ -1175,6 +1174,7 @@
})
})
},
+ // 澶氱嚎绋�
startWorker() {
if (this.worker) {
this.stopWorker(); // 纭繚涔嬪墠鐨� Worker 宸插仠姝�
diff --git a/src/components/tool/value-table.vue b/src/components/tool/value-table.vue
index 3fa5c3c..08b369c 100644
--- a/src/components/tool/value-table.vue
+++ b/src/components/tool/value-table.vue
@@ -648,6 +648,8 @@
item.width = 160
} else if (item.value.length === 6){
item.width = 150
+ } else if (item.value.length === 2){
+ item.width = this.data.sort === false && item.label.includes('Hours') ? 52 : 86
} else {
item.width = this.data.sort === false && item.label.includes('Hours') ? 46 : 86
}
diff --git a/src/main.js b/src/main.js
index 1ce1506..f1ef892 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,7 +21,7 @@
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
// 寮狅細192.168.45.249
-const javaApi = 'http://172.20.10.5:8001';
+const javaApi = 'http://192.168.45.249:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3