From 90b6b8c9e342d07e8a7121d732900287d997a8b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 03 三月 2025 22:57:35 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/marry/index.vue | 10 +++++-----
ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue | 4 ++--
ruoyi-ui/src/views/meeting/replay.vue | 10 +++++-----
ruoyi-ui/vue.config.js | 2 +-
ruoyi-ui/src/views/selfeconomy/index.vue | 18 +++++++++---------
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 2d3a5e0..023a33c 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -126,7 +126,7 @@
<el-container >
<el-col >
<el-form ref="elForm" :model="marryList" :rules="rules" size="medium" label-position="left"
- v-loading="loading" :data="marryList" @selection-change="handleSelectionChange" >
+ :data="marryList" @selection-change="handleSelectionChange" >
<el-row :span="16">
<el-form-item label="濮撳悕" prop="spouseName" label-width="40px">
<el-input v-model="marryList.spouseName" placeholder="" clearable :style="{width: '100%'}" :disabled="dsb">
@@ -179,7 +179,7 @@
</div>
<div style="padding-left:100px;padding-top:15px;width: 30%;">
<el-container>
- <el-col v-loading="loading" :data="marryList" @selection-change="handleSelectionChange">
+ <el-col :data="marryList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="marryList" :rules="rules" size="medium" label-position="left">
<el-row :span="16">
<el-form-item label="鎬у埆" prop="spouseSex" label-width="40px">
@@ -284,7 +284,7 @@
</div>
</template>
- <el-table v-loading="loading" :data="oldSpouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table :data="oldSpouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column label="濮撳悕" prop="name" sortable width="160" align="center" >
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.name }}</template>
@@ -380,7 +380,7 @@
<el-container >
<el-col >
<el-form ref="elForm" :model="marryList" :rules="rules" size="medium" label-position="left"
- v-loading="loading" :data="marryList" @selection-change="handleSelectionChange" >
+ :data="marryList" @selection-change="handleSelectionChange" >
<el-row :span="16">
<el-form-item label="鐢熻偛鎯呭喌" prop="bearStatus" label-width="80px">
<template v-if="!isEditing">
@@ -437,7 +437,7 @@
</div>
<div style="padding-left:200px; padding-top: 58px; ">
<el-container>
- <el-col v-loading="loading" :data="marryList" @selection-change="handleSelectionChange">
+ <el-col :data="marryList" @selection-change="handleSelectionChange">
<el-form ref="elForm" :model="marryList" :rules="rules" size="medium" label-position="left" >
<el-row :span="16" >
diff --git a/ruoyi-ui/src/views/meeting/replay.vue b/ruoyi-ui/src/views/meeting/replay.vue
index cb45c84..272993c 100644
--- a/ruoyi-ui/src/views/meeting/replay.vue
+++ b/ruoyi-ui/src/views/meeting/replay.vue
@@ -225,7 +225,7 @@
}
.module {
-
+
width: 400px;
height: 160px;
background-color: rgb(255, 255, 255);
@@ -253,7 +253,7 @@
.span2 {
/* float: right; */
position: absolute;
- right:2px;
+ right:68px;
top:40px;
font-size: 20px;
margin-top: 5%;
@@ -264,7 +264,7 @@
.huifang{
position: absolute ;
bottom: 20px;
- right: 10px;
+ right: 68px;
font-size: 18px;
}
@@ -285,11 +285,11 @@
.spanStyle {
white-space: normal;
position: absolute;
-
+
height: 30px;
width: 385px;
overflow: hidden; /*瓒呭嚭鐨勬枃鏈殣钘�*/
text-overflow: ellipsis; /* 婧㈠嚭鐢ㄧ渷鐣ュ彿*/
-
+
}
</style>
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 88d13b9..66cd28a 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -172,7 +172,7 @@
<el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+ <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
<template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -262,8 +262,8 @@
/>
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @click.native="handleDialogClick">
- <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
+ <el-dialog :title="title" :visible.sync="open" width="840px" append-to-body @click.native="handleDialogClick">
+ <el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="120px">
<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
<!-- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
<!-- </el-form-item>-->
@@ -294,8 +294,8 @@
<el-input v-model="formDat.propertyRight" placeholder="璇疯緭鍏ヤ骇鏉�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange">
- <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢" clearable :style="{width: '100%'}" >
+ <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange">
+ <el-select ref="multiSelect" v-model="formDat.isChange" placeholder="璇烽�夋嫨鍙樻洿/娉ㄩ攢/璐拱" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
></el-option>
</el-select>
@@ -498,7 +498,7 @@
<el-table-column label="鏈熼檺" prop="timeLimit" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.timeLimit? scope.row.timeLimit: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鍙樻洿/娉ㄩ攢" prop="isChange" sortable width="140" align="center">
+ <el-table-column label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" sortable width="140" align="center">
<template slot-scope="scope">{{scope.row.isChange? scope.row.isChange: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="浜ф潈" prop="propertyRight" sortable width="110" align="center">
@@ -737,7 +737,7 @@
}],
isChange: [{
required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
trigger: 'blur'
}],
price: [{
@@ -939,7 +939,7 @@
this.loading1 = true;
let userId = this.$store.state.user.userId
// alert(userId)
-
+
showShareUser(userId, 2026).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
@@ -1141,7 +1141,7 @@
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
- this.open2 = false;
+ this.open2 = false;
this.$router.push("/self/selfeconomy/selfeconomyInfo/" + id);
},
/** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
index 510ebd1..7add9d9 100644
--- a/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/selfeconomyInfo.vue
@@ -54,7 +54,7 @@
</el-form-item>
</el-cow>
<el-cow >
- <el-form-item label="鍙樻洿/娉ㄩ攢" prop="isChange" label-width="100px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
+ <el-form-item label="鍙樻洿/娉ㄩ攢/璐拱" prop="isChange" label-width="120px" style="background: #FAD1E0;border-radius: 7px 7px 7px 7px;opacity: 1;">
<el-select v-model="formData.isChange" placeholder="璇烽�夋嫨 " clearable :style="{width: '100%'}" :disabled="dsb" >
<el-option v-for="(item, index) in typeOptions1" :key="index" :label="item.label" :value="item.value"
></el-option>
@@ -299,7 +299,7 @@
}],
isChange: [{
required: true,
- message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢',
+ message: '璇疯緭鍏ュ彉鏇�/娉ㄩ攢/璐拱',
trigger: 'blur'
}],
price: [{
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index dee0f77..60b6c8c 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -36,7 +36,7 @@
proxy: {
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- // target: `https://10.39.18.174:8080/`,
+ // target: `https://10.39.18.174:8080/`,
// target: `https://192.168.1.4:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
--
Gitblit v1.9.1