From b482e6081bfe182421be331ab190de1e1307e72f Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 20 六月 2024 11:49:48 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b2-standard.vue | 4 +++-
src/main.js | 3 +--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/components/view/b2-standard.vue b/src/components/view/b2-standard.vue
index 0884527..cf1527d 100644
--- a/src/components/view/b2-standard.vue
+++ b/src/components/view/b2-standard.vue
@@ -231,6 +231,7 @@
@select="upProductSelect" @select-all="handleAll" class="productTable" header-row-class-name="header-class">
<el-table-column type="selection" width="50">
</el-table-column>
+ <el-table-column prop="sample" label="浜у搧" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip></el-table-column>
<!-- <el-table-column prop="inspectionItemClassify" label="妫�楠岄」绫诲瀷" width="120" show-overflow-tooltip></el-table-column> -->
@@ -428,6 +429,7 @@
header-row-class-name="header-class" :row-key="row=>row.id" @filter-change="filterHandler" highlight-current-row>
<el-table-column type="selection" width="50">
</el-table-column>
+ <el-table-column prop="sample" label="浜у搧" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="model" label="鍨嬪彿" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip :filters="filters0"
:filter-multiple="false" column-key="inspectionItem" filter-placement="bottom-start"></el-table-column>
@@ -703,7 +705,7 @@
getNodeParent(val) {
if (val.parent != null) {
if(val.data.children === null){
- this.selectTree += ' - ' + val.label + ' - ' + ''
+ this.selectTree += ' - ' + val.label + ' - ' + 'null'
}else{
this.selectTree += ' - ' + val.label
}
diff --git a/src/main.js b/src/main.js
index 1325d46..4293cee 100644
--- a/src/main.js
+++ b/src/main.js
@@ -16,8 +16,7 @@
// Vue.prototype.PROJECT = '瑁呭鐢电紗'
//鏈湴
Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
-// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://192.168.0.104:8001';
+const javaApi = 'http://127.0.0.1:8001';
//浜�
// Vue.prototype.LOCATIONVUE = "http://114.132.189.42:8080";
--
Gitblit v1.9.3