From 4b1fbea0d8099259ea7d0ef10bd7633c3bc62f2e Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 17 十二月 2024 17:43:08 +0800
Subject: [PATCH] 修改了对应的bug
---
ruoyi-ui/src/views/marry/index.vue | 4 ++--
ruoyi-ui/src/views/meeting/replay.vue | 28 +++++++++++++++++++++-------
ruoyi-ui/src/views/note/memo.vue | 2 +-
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 2 +-
ruoyi-ui/src/views/healthy/healthYear.vue | 2 +-
5 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 9510146..6e4f83f 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -507,7 +507,7 @@
// this.dialogFileUrl = 'https://47.93.189.255:8080/profile/upload/2023/03/19/test7_20230319222030A007.jpg'
if(this.dialogFileUrl.includes("47.93.189.255")==true)
this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
- //alert(this.dialogFileUrl)
+ // alert(this.dialogFileUrl)
const Base64 = require('js-base64').Base64
this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 945fffe..09755ab 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -1014,7 +1014,7 @@
open1:false,
open2:false,
open3:false,
- allBasicInfo:["鍩烘湰鎯呭喌","鐢熸椿涔犳儻","鎶ょ悊鏌ヤ綋","鐜板湪鍋ュ悍闂"],
+ allBasicInfo:["鍩烘湰鎯呭喌","鐢熸椿涔犳儻","鎶ょ悊鏌ヤ綋","鐜板湪鍋ュ悍鎯呭喌"],
dictionary: {},
// 閬僵灞�
editMode: false, // 鏄惁澶勪簬缂栬緫妯″紡
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index ff18923..6adaecd 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -276,10 +276,10 @@
<template v-slot:title>
<h2 style="font-size:16px ">鍓嶄换鎯呭喌</h2>
<div class="title-wrapper">
- <div>
+ <!-- <div>
<el-button class="button" size="mini" type="text" @click="handleAdd">
<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></el-button>
- </div>
+ </div> -->
</div>
diff --git a/ruoyi-ui/src/views/meeting/replay.vue b/ruoyi-ui/src/views/meeting/replay.vue
index fb58f90..cb45c84 100644
--- a/ruoyi-ui/src/views/meeting/replay.vue
+++ b/ruoyi-ui/src/views/meeting/replay.vue
@@ -32,10 +32,10 @@
</el-form>
- <el-row :gutter="25" v-loading="loading">
- <el-col :span="6" v-for="(item,i) in replayList" :style="margin">
+ <el-row :gutter="25" min-width="1800" v-loading="loading">
+ <el-col :span="6" :xs=24 :sm=12 :lg=8 :xl=6 v-for="(item,i) in replayList" :style="margin">
<div class="module">
- <span class="span1">{{ item.title }}</span>
+ <span class="span1 spanStyle">{{ item.title }}</span>
<span class="span2">{{ item.startTime }}</span>
<el-button class="huifang" type="primary" plain @click="show(item.id)">鍥炴斁</el-button>
<!-- <div class="tubiao"><i class="el-icon-view">10000</i></div> -->
@@ -117,7 +117,7 @@
replayList:[],
queryParams: {
pageNum: 1,
- pageSize: 8,
+ pageSize: 9,
title: undefined,
applyPerson: undefined,
contactPerson: undefined,
@@ -225,7 +225,8 @@
}
.module {
- width: 100%;
+
+ width: 400px;
height: 160px;
background-color: rgb(255, 255, 255);
border-color: red;
@@ -243,14 +244,17 @@
}
.span1 {
- float: left;
+ /* float: left; */
font-size: 20px;
margin-top: 5%;
margin-left: 3%;
}
.span2 {
- float: right;
+ /* float: right; */
+ position: absolute;
+ right:2px;
+ top:40px;
font-size: 20px;
margin-top: 5%;
margin-right: 3%;
@@ -278,4 +282,14 @@
.video{
object-fit: cover;
}
+.spanStyle {
+ white-space: normal;
+ position: absolute;
+
+ height: 30px;
+ width: 385px;
+ overflow: hidden; /*瓒呭嚭鐨勬枃鏈殣钘�*/
+ text-overflow: ellipsis; /* 婧㈠嚭鐢ㄧ渷鐣ュ彿*/
+
+}
</style>
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index 65612a3..4694e93 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -520,7 +520,7 @@
this.dialogFileUrl = file.url;
if(this.dialogFileUrl.includes("47.93.189.255")==true)
this.dialogFileUrl = this.dialogFileUrl.replace("47.93.189.255","www.bendudu.com")
- //alert(this.dialogFileUrl)
+ alert(this.dialogFileUrl)
const Base64 = require('js-base64').Base64
this.desurl = process.env.VUE_APP_BASE_OTHER_API+"preview/"+'onlinePreview?url='+encodeURIComponent(Base64.encode(this.dialogFileUrl));
--
Gitblit v1.9.1