From dfec0257c8a662fec8e3f27667355f9b1ca09a20 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期二, 30 五月 2023 09:50:38 +0800
Subject: [PATCH] 解决api配置冲突
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 9 +++++++--
Source/UBCS-WEB/vue.config.js | 7 -------
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 6dc2619..189b7b1 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -3,10 +3,11 @@
:visible.sync="dialogVisible"
v-dialogDrag
top="0vh"
- title="鎻愮ず"
+ :title="title"
class="avue-dialog avue-dialog--top"
:width="dialogOptions.width"
append-to-body
+ v-if="dialogVisible"
>
<avue-form
v-model="form"
@@ -39,7 +40,7 @@
</span>
</template>
</avue-form>
- <FindLike ref="findLike" v-if="dialogVisible"></FindLike>
+ <FindLike ref="findLike"></FindLike>
<div class="avue-dialog__footer" v-if="type !== 'detail'">
<el-button @click="close()">鍙� 娑�</el-button>
<el-button @click="close()" type="primary" :loading="submitBtnLoading">纭� 瀹�</el-button>
@@ -75,6 +76,10 @@
type: {
type: String,
default: 'add'
+ },
+ title: {
+ type: String,
+ default: '琛ㄥ崟妯℃澘'
}
},
data() {
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 81c05fb..f2b7e3d 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,17 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
-<<<<<<< HEAD
// target: 'http://localhost:37000',
//target: 'http://192.168.3.7:37000',
target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
-=======
- target: 'http://localhost:37000',
- // target: 'http://192.168.3.7:37000',
- // target: 'http://dev.vci-tech.com:37000',
- //target: 'http://192.168.1.51:37000/',
->>>>>>> 1a5351f560e5833cc10127f8188c627b54146478
//杩滅▼婕旂ず鏈嶅姟鍦板潃,鍙敤浜庣洿鎺ュ惎鍔ㄩ」鐩�
// target: 'https://saber.bladex.vip/api',
ws: true,
--
Gitblit v1.9.3