From 798db047afc6346e96460f00b6fb30576bcfd328 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 16:01:27 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 4 ++--
src/components/view/b1-inspection-order.vue | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/view/b1-inspection-order.vue b/src/components/view/b1-inspection-order.vue
index d0f19b0..8d285c2 100644
--- a/src/components/view/b1-inspection-order.vue
+++ b/src/components/view/b1-inspection-order.vue
@@ -121,7 +121,7 @@
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">涓嬪崟浜猴細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="componentData.entity.value1" @keyup.enter.native="refreshTable()"></el-input></div>
+ v-model="componentData.entity.name" @keyup.enter.native="refreshTable()"></el-input></div>
</div>
<div class="search_thing" style="width: 20%;" v-if="more">
<div class="search_label">宸ョ▼鍚嶇О锛�</div>
@@ -273,7 +273,7 @@
sampleModel: null,
sampleCode: null,
state: 0,
- value1:null,
+ name:null,
engineering:null,
production:null,
orderBy: {
diff --git a/src/main.js b/src/main.js
index 1bd2650..580b072 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@
// const javaApi = 'http://10.20.102.168:8001';//寮�
// const javaApi = 'http://172.20.10.3:8001';//濮�
// const javaApi = 'http://192.168.11.2:8001';//鏌�
-// const javaApi = 'http://127.0.0.1:8001';//鏅�
-const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
+ const javaApi = 'http://127.0.0.1:8001';//鏅�
+// const javaApi = 'http://114.132.189.42:1234';//娴嬭瘯鏈�
//鑳滀簯鏈嶅姟鍣�
// Vue.prototype.LOCATIONVUE = "http://syxt.shxiao2.cn";
// const javaApi = 'http://122.114.52.69:8001';
--
Gitblit v1.9.3