From b7eedb41516a6ab02526e64177331a9669f4d3cb Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 26 十二月 2024 15:54:23 +0800
Subject: [PATCH] 修改冲突
---
src/main.js | 2 +-
src/components/view/index-index.vue | 2 --
2 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue
index 7c824e6..a5075c7 100644
--- a/src/components/view/index-index.vue
+++ b/src/components/view/index-index.vue
@@ -315,8 +315,6 @@
</el-col>
<el-col :xs="24" :sm="24" :md="10" :lg="10" :xl="10">
<div class="right-1 card" v-if="getNumberFourTypes">
- <div class="right-1-item">
- <div class="right-1 card">
<div class="right-1-item" @click="openNotice">
<div class="img">
<img src="../../../static/img/index-0.svg" alt="">
diff --git a/src/main.js b/src/main.js
index 2e86d84..70f1d88 100644
--- a/src/main.js
+++ b/src/main.js
@@ -22,7 +22,7 @@
//鏈湴
// Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80";
// const javaApi = 'http://127.0.0.1:8001';
-const javaApi = 'http://172.20.10.5:8001';
+// const javaApi = 'http://172.20.10.5:8001';
//閫氫俊娴嬭瘯搴�
// Vue.prototype.LOCATIONVUE = "http://10.1.13.77:8080";
--
Gitblit v1.9.3