From f9196b257aff465909b77f7cacb0d4e9d962c4f7 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期六, 18 五月 2024 16:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/bignote/index.vue | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index b734e4f..5522618 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -310,7 +310,7 @@
:http-request="requestUpload1"
:show-file-list="true"
>
-<i slot="default" class="el-icon-plus"></i>
+ <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
<video
@@ -322,7 +322,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- :src="file.url"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 100%; height: 100%"
fit="cover"></img>
@@ -335,9 +335,9 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
-
+
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
@@ -383,6 +383,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
import {listFamilyevent,enload, delFamilyevent , addFamilyevent , uploadPic} from "@/api/bignote/index";
+import {getInfo} from "@/api/login";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -406,7 +407,7 @@
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
familyList: [],
-
+
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -496,9 +497,16 @@
created() {
this.getList();
// this.getCateInfor()
+ this.getInfo()
},
methods: {
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response)
+ })
+ },
isImage(fileType) {
return fileType.startsWith('image/');
@@ -583,7 +591,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -640,9 +648,6 @@
this.$delete(this.fileList,i);
this.$delete(this.uploadFileList,i);
}
-
- //alert(this.formData.url)
-
}
// let ul = this.fileList.map(function (elem){
// return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
@@ -658,13 +663,12 @@
{
if(this.fileListOther[i].url==file.url)
{
-
this.$delete(this.fileListOther,i);
this.$delete(this.uploadFileList1,i);
-
}
}
},
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
@@ -705,7 +709,7 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -738,18 +742,18 @@
}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
})
-
+
},
picUpload()
{
@@ -764,14 +768,18 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
+ // console.log(formData,'465456456')
//alert(90)
let _this = this
//alert(9)
uploadPic(formData).then(response => {
// alert("dds")
+ // console.log(response,'123123123')
+ // console.log(_this.formDat.url,'666')
_this.formDat.url = _this.formDat.url+","+response.fileNames
+ // alert(_this.formDat.url)
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
--
Gitblit v1.9.1