From b15d6923c609e80712a553388da48e6373aa086c Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 27 二月 2024 18:57:16 +0800
Subject: [PATCH] 修改了代码
---
ruoyi-ui/src/views/self/show.vue | 14 ++++++++++----
ruoyi-ui/src/views/travel/index.vue | 1 +
ruoyi-ui/vue.config.js | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 237dbb5..8041a0e 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -8,7 +8,8 @@
</el-backtop>
<h1 style="font-size:21px;padding-top:30px;display: flex;">
<span>涓汉璁颁簨鏈�</span>
- <div class="button-container" >
+ <div class="button-container" ></div>
+ <!-- <div class="button-container" >
<el-button
size="mini"
style="background: #E0EEFE;
@@ -36,7 +37,7 @@
v-print="'#printable-content'"
v-hasPermi="['family:note:export']"
>鎵撳嵃</el-button>
- </div>
+ </div> -->
<div style="display: flex; align-items: center;">
<el-button size="mini" type="text" @click="toMemo" v-hasPermi="['person:information:memo']" style="margin-left: 20px">
<div class="form" ><el-icon style="padding-right:100px;"></el-icon>
@@ -348,7 +349,7 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScopem">淇� 瀛�</el-button>
- <el-button @click="cancelData">鍙� 娑�</el-button>
+ <el-button @click="cancelDataPer">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -1160,6 +1161,7 @@
methods: {
// 鍙栨秷鎸夐挳
cancelData() {
+ alert(23)
this.dialogVisible.open = false;
this.dialogVisible.relation1 = false;
this.dialogVisible.certificate =false;
@@ -1167,6 +1169,7 @@
this.dialogVisible.autobiography=false;
this.isEdit1 = false;
this.reset();
+ alert(32)
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
@@ -1580,7 +1583,10 @@
saveAs(blob, filename)
})
},
-
+ cancelDataPer()
+ {
+ this.open = false
+ },
/** 鏌ヨ鑷紶淇℃伅 */
getAutobiographyInfor()
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index 2fdc27e..2bbe8ac 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -770,6 +770,7 @@
listTravelPrice(this.queryParams).then(response => {
this.travelpriceList = response.data.data;
+ console.log("0000")
console.log(this.travelpriceList)
this.total = response.data.total;
this.loading = false;
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 4bb1e04..53e4e48 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `https://192.168.1.3:8080/`,
+ //target: `https://192.168.1.3:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1