From 92e57c0b6bda819b23b2f25cd5eb14b45ec275f6 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期二, 10 十月 2023 17:56:05 +0800
Subject: [PATCH] 家大事记修改
---
ruoyi-ui/src/views/bignote/index.vue | 10 ++---
ruoyi-ui/src/views/bignote/familyeventInfo.vue | 52 ++++++++++++++++----------
2 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/familyeventInfo.vue b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
index 59adf31..cb007b3 100644
--- a/ruoyi-ui/src/views/bignote/familyeventInfo.vue
+++ b/ruoyi-ui/src/views/bignote/familyeventInfo.vue
@@ -27,8 +27,9 @@
</el-input>
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input v-model="formData.happenTime" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�" type="date" clearable :style="{width: '100%'}" :disabled="dsb">
- </el-input>
+ <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" :disabled="dsb" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
@@ -49,8 +50,6 @@
:file-list="fileList"
:disabled="!btn"
:class="{ hide: !btn }"
-
-
>
<div v-if="uploading1" class="upload-status">姝ｅ湪涓婁紶...</div>
<i v-if="!uploading1" slot="default" class="el-icon-plus"></i>
@@ -170,12 +169,14 @@
return {
cdi:"瀹跺涵澶т簨璁颁俊鎭�",
udi:"瀹跺涵澶т簨璁颁慨鏀�",
- fot:[".jpg",".jif","png"],
+
fileList:[
],
fileListOther:[
],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
dsb:true,
btn:false,
isShow:true,
@@ -190,6 +191,7 @@
url: undefined,
},
dialogImageUrl: '',
+ url1:undefined,
dialogVisible: false,
disabled: false,
rules: {
@@ -244,28 +246,38 @@
if (id) {
this.loading = true;
getFamilyeventInfo(id).then((response) => {
+ console.log("涓婇潰");
+ console.log(this.btn);
this.formData = response.data;
- let paths = response.data.url.split(",");
- for(let i = 0; i < paths.length; i++)
- {
- if(paths[i]!="") {
+ const url = this.formData.url;
+ // const url1 = url.replace(/^http:/, 'https:');
+ const url1 = url.replace(/http:\/\/47\.93\.189\.255:8080\//g, '');
+ this.formData.url = url1; // 鏇存柊 formData 瀵硅薄涓殑 url 瀛楁
+ console.log(url);
+ console.log(url1); // 杈撳嚭淇敼鍚庣殑 https URL
+ let paths = this.formData.url.split(","); // 淇姝ゅ
+ for (let i = 0; i < paths.length; i++) {
+ if (paths[i] !== "") {
+ let pth = paths[i].substr(paths[i].length - 4);
- let pth = paths[i].substr(paths[i].length - 4, paths[i].length)
+ if (this.fot.includes(pth)) {
- if (_this.fot.includes(pth) === true)
- _this.fileList.push({name:paths[i],url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
- else {
- // alert(paths[i])
- let nms = paths[i].split("\/")
- let nm = nms[nms.length - 1]
- _this.fileListOther.push({name:nm, url: process.env.VUE_APP_BASE_TRUE_API+paths[i]})
+ let nms = paths[i].split("/");
+ let nm = nms[nms.length - 1];
+
+ this.fileList.push({ name: nm, url: "http://www.bendudu.com/" + paths[i] });
+ console.log(this.fileList)
+ } else {
+ // alert(paths[i]);
+ let nms = paths[i].split("/");
+ let nm = nms[nms.length - 1];
+ this.fileListOther.push({ name: nm, url: process.env.VUE_APP_BASE_TRUE_API + paths[i] });
+
}
}
}
- this.loading = false;
});
- this.getCateInfor()
-
+ this.loading = false;
}
},
mounted() {},
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 0ffa7b8..dee4067 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -237,11 +237,9 @@
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-input
- v-model='formDat.happenTime'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
- ></el-input>
+ <el-date-picker v-model="formData.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -560,7 +558,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
const id = row.id;
- let jd = true
+ let jd = true;
this.$router.push({
path:"/familymodel/bignote/familyeventInfo/" + id,
--
Gitblit v1.9.1