From 6afb98b81fa4b4b3223d53d42a891fb89862d38b Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期一, 14 八月 2023 16:36:29 +0800
Subject: [PATCH] 新增家谱图，完善各模块新增时的电子文件上传功能，在上传期间显示正在上传
---
ruoyi-ui/src/views/bignote/index.vue | 16
ruoyi-ui/src/views/contacts/index.vue | 10
ruoyi-ui/src/api/root/index.js | 10
ruoyi-ui/src/views/economy/index.vue | 9
ruoyi-ui/src/views/pet/index.vue | 12
ruoyi-ui/src/views/secret/index.vue | 9
ruoyi-ui/src/views/wish/index.vue | 62 +++--
ruoyi-ui/src/views/collection/index.vue | 10
ruoyi-ui/src/views/healthy/index.vue | 10
ruoyi-ui/src/views/doctor/index.vue | 23 -
ruoyi-ui/src/views/honor/index.vue | 119 ++--------
ruoyi-ui/src/views/mindMap/index.vue | 89 ++++++++
ruoyi-ui/src/assets/images/zhang.png | 0
ruoyi-ui/src/views/self/show.vue | 129 ++++++++---
ruoyi-ui/src/api/selfeconomy/index.js | 9
ruoyi-ui/src/views/genealogy/index.vue | 40 +--
ruoyi-ui/src/views/device/index.vue | 9
ruoyi-ui/src/views/clean/index.vue | 9
ruoyi-ui/src/views/homeRoot/index.vue | 33 ++
ruoyi-ui/src/assets/images/bkg.png | 0
ruoyi-ui/src/views/healthy/healthyInfo.vue | 1
ruoyi-ui/src/views/selfeconomy/index.vue | 10
ruoyi-ui/src/views/note/index.vue | 10
23 files changed, 378 insertions(+), 251 deletions(-)
diff --git a/ruoyi-ui/src/api/root/index.js b/ruoyi-ui/src/api/root/index.js
index 733a221..bb39886 100644
--- a/ruoyi-ui/src/api/root/index.js
+++ b/ruoyi-ui/src/api/root/index.js
@@ -38,4 +38,14 @@
})
}
+// 鑾峰彇瀹舵牴缃戞墍鏈夋垚鍛�
+export function listRootAll(query) {
+
+ return request({
+ url: '/self/user/all',
+ method: 'get',
+ params: query
+ })
+}
+
diff --git a/ruoyi-ui/src/api/selfeconomy/index.js b/ruoyi-ui/src/api/selfeconomy/index.js
index 0d8be64..76f474b 100644
--- a/ruoyi-ui/src/api/selfeconomy/index.js
+++ b/ruoyi-ui/src/api/selfeconomy/index.js
@@ -72,11 +72,4 @@
})
}
-//涓婁紶鏂囦欢
-export function uploadPic(data) {
- return request({
- url: '/common/upload',
- method: 'post',
- data: data
- })
-}
+
diff --git a/ruoyi-ui/src/assets/images/bkg.png b/ruoyi-ui/src/assets/images/bkg.png
new file mode 100644
index 0000000..6913c16
--- /dev/null
+++ b/ruoyi-ui/src/assets/images/bkg.png
Binary files differ
diff --git a/ruoyi-ui/src/assets/images/zhang.png b/ruoyi-ui/src/assets/images/zhang.png
new file mode 100644
index 0000000..094051f
--- /dev/null
+++ b/ruoyi-ui/src/assets/images/zhang.png
Binary files differ
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 6c4f9ba..36c445f 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -253,7 +253,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -365,13 +366,11 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:[".jpg",".jif"],
- fileList:[
- ],
- fileListOther:[
-
- ],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
// type: undefined,
title: undefined,
@@ -616,10 +615,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index f8978cf..130e9a8 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -236,7 +236,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -352,6 +353,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
kind: undefined,
@@ -624,10 +626,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 52b9b8d..fa6664f 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -323,7 +323,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -443,7 +444,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鏀惰棌涓庤崳瑾夎褰�
id:undefined,
@@ -779,10 +780,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index 6213394..8dddbb0 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -295,7 +295,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -411,7 +412,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//閫氳褰�
id:undefined,
@@ -720,10 +721,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index a379220..2742998 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -249,7 +249,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -365,6 +366,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
// type: undefined,
content: undefined,
@@ -636,10 +638,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 9400674..1ba9c05 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -111,15 +111,6 @@
</el-form-item>
</el-form>
<div>
-<!-- <div style="width: 100px;-->
-<!-- height: 24px;-->
-<!-- font-size: 18px;-->
-<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!-- font-weight: 400;-->
-<!-- color: #000000;-->
-<!-- line-height: 21px;-->
-<!-- ">瀹跺涵灏忓尰鐢�</div>-->
-
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -320,7 +311,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -438,7 +430,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//灏卞尰璁板綍
id:undefined,
@@ -528,11 +520,7 @@
},
created() {
this.getList();
- // this.getCateInfor();
this.getTypeOptions();
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
},
methods: {
// 鍙栨秷鎸夐挳
@@ -766,10 +754,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index fbb61c6..371aa1c 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -227,7 +227,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -343,6 +344,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
createTime: undefined,
@@ -639,10 +641,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index c5601bb..394e113 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -207,7 +207,7 @@
</el-table>
<pagination
- v-show="total"
+ v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -486,22 +486,24 @@
this.listRoot = response.data.data;
// alert(this.listRoot)
this.total = response.data.length;
+ this.pageNum=1;
+ this.pageSize=10;
// alert(this.total)
this.loading = false;
}
);
},
/** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
-
- response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- })
- })
- },
+ // getCateInfor()
+ // {
+ // let _this = this
+ // getCategory().then(response=>{
+ //
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ // })
+ // },
//韬唤閫夋嫨
getSrc(identity) {
if (identity === '1'){
@@ -669,22 +671,6 @@
}
},
- /** 瀵煎叆鎿嶄綔*/
- // handleEnport(params){
- // var file = params.file;
- // var formData = new FormData();
- // formData.append('excelImport', file);
- // let _this = this
- // enload(formData).then(response => {
- // _this.getList();
- // Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- //
- // }).catch(err)
- // {
- // Message({ message: "瀵煎叆澶辫触", type: 'error' })
- // }
- //
- // }
}
};
</script>
diff --git a/ruoyi-ui/src/views/healthy/healthyInfo.vue b/ruoyi-ui/src/views/healthy/healthyInfo.vue
index 8a344c4..7a634b1 100644
--- a/ruoyi-ui/src/views/healthy/healthyInfo.vue
+++ b/ruoyi-ui/src/views/healthy/healthyInfo.vue
@@ -130,7 +130,6 @@
</el-upload>
-
<el-form-item size="large">
<el-button v-if="isShow" type="primary" @click="submitForm" :disabled="dsb">淇敼</el-button>
</el-form-item>
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index 00c621d..b1c4e13 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -221,7 +221,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -337,6 +338,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
createTime: undefined,
@@ -547,6 +549,7 @@
handlePictureCardPreview(file) {
+
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
@@ -588,10 +591,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/homeRoot/index.vue b/ruoyi-ui/src/views/homeRoot/index.vue
index 2d294c1..c664157 100644
--- a/ruoyi-ui/src/views/homeRoot/index.vue
+++ b/ruoyi-ui/src/views/homeRoot/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div class="container">
- <h1 style="font-size:21px;padding-top:30px">鏃╀笂濂斤紒
+ <h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}
<el-dropdown style="float:right">
<span class="el-dropdown-link">
<img src="../../assets/images/Frame.png">
@@ -188,11 +188,14 @@
<script>
import {listRoot} from "@/api/root/index";
+import { getUserProfile } from "@/api/system/user";
export default {
name: "index",
data(){
return{
+ user: {},
+ greeting: "",
imageSrc: require('../../assets/images/Group 407.png') ,
dropdownList: [
{ name: '鍙樉绀虹涓�浠�', src: 'Group 407.png' },
@@ -301,10 +304,8 @@
},
created() {
- // this.getCateInfor()
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
+ this.setGreeting();
+ this.getUser();
},
mounted() {
this.getList(1);
@@ -331,8 +332,6 @@
}
},
generation_1(){
-
-
// alert(127)
// this.getList(1)
listRoot(1).then(response => {
@@ -423,7 +422,27 @@
}
);
},
+ setGreeting() {
+ const currentTime = new Date();
+ const currentHour = currentTime.getHours();
+ if (currentHour < 12) {
+ this.greeting = "鏃╀笂濂�";
+ } else if (currentHour < 14) {
+ this.greeting = "涓崍濂�";
+ } else if (currentHour < 18) {
+ this.greeting = "涓嬪崍濂�";
+ } else {
+ this.greeting = "鏅氫笂濂�";
+ }
+ },
+
+ getUser() {
+ getUserProfile().then(response => {
+ this.user = response.data;
+
+ });
+ }
}
}
</script>
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index 7dfa5f6..96ba9d9 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -15,39 +15,7 @@
@keyup.enter.native="handleQuery">
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
- <!-- <el-input
- v-model="searchVal"
- placeholder="鍦ㄢ�滈�氳褰曗�濅腑鎼滅储"
- clearable
- style="width: 240px"
- @input="inputChange">
- <i slot="prefix" class="el-input__icon el-icon-search"></i>
- </el-input>
- <div class="outer-table">
- 姝ょ埗缁勪欢寮曠敤瀛愮粍浠秚ablemax
- <tablemax label="myLabel" :tableData="contactList">
- <template v-slot:table>
- <el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button @click="handleCheck(scope.row)" type="text" size="small"
- >璋冪敤</el-button
- >
- </template>
- </el-table-column>
- </template>
- </tablemax>
- </div>-->
- <!-- v-model="queryParams.id"
-
- v-model:phone="queryParams.phone"
- v-model:wx="queryParams.wx"
- v-model:qq="queryParams.qq"
- v-model:twitter="queryParams.twitter"
- v-model:isAlways="queryParams.isAlways"
- v-model:remark="queryParams.remark"
- @keyup.enter.native="handleQuery"
- -->
</el-form-item>
<el-form-item label="鍚嶇О" prop="name">
@@ -103,15 +71,6 @@
</el-form-item>
</el-form>
<div>
-<!-- <div style="width: 171px;-->
-<!-- height: 28px;-->
-<!-- font-size: 21px;-->
-<!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
-<!-- font-weight: 400;-->
-<!-- color: #000000;-->
-<!-- line-height: 25px;-->
-<!-- ">璇佷欢銆佽崳瑾夈�佽祫璐�</div>-->
-
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -177,29 +136,11 @@
<el-table v-loading="loading" :data="honorList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<el-table-column fixed label="搴忓彿" sortable type="index" align="center" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="60"/>
-<!-- <el-table-column label="鏃堕棿" prop="createTime" sortable width="120" align="center">-->
-
-<!-- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>-->
-<!-- </el-table-column>-->
<el-table-column label="绫诲埆" prop="type" sortable :show-overflow-tooltip="true" width="120" align="center" >
<!-- <template slot-scope="scope">{{scope.row.type? scope.row.type: '鈥斺�斺�斺��'}}</template>-->
<template slot-scope="scope">{{ getSrc1(scope.row.type) }}</template>
</el-table-column>
- <el-table-column label="鍚嶇О" prop="name" sortable :show-overflow-tooltip="true" width="120" align="center" >
-<!-- <template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>-->
-<!-- <template slot-scope="scope">-->
-<!-- <template v-if="formDat.name===1">{{ getSrc(scope.row.name) }}</template>-->
-<!-- <template v-if="scope.row.name == 1">鍑虹敓璇�</template>-->
-<!-- <template v-else-if="scope.row.name == 2">瀛︾敓璇�</template>-->
-<!-- <template v-else-if="scope.row.name == 3">姣曚笟璇�</template>-->
-<!-- <template v-else-if="scope.row.name == 4">缁撳璇�</template>-->
-<!-- <template v-else-if="scope.row.name == 5">鎴峰彛绨�</template>-->
-<!-- <template v-else-if="scope.row.name == 6">鐙敓瀛愬コ璇�</template>-->
-<!-- <template v-else-if="scope.row.name == 7">楂樼骇鑱岀О</template>-->
-<!-- <template v-else-if="scope.row.name == 8">鎶ょ収</template>-->
-<!-- <template v-else-if="scope.row.name == 9">閫氳璇�</template>-->
-<!-- <template v-else>{{ scope.row.name }}</template>-->
-<!-- </template>-->
+ <el-table-column label="鍚嶇О" prop="name" sortable width="120" align="center" >
<template slot-scope="scope">{{scope.row.name? scope.row.name: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="璇佸彿/涓撲笟" prop="idNo" sortable width="170" align="center" >
@@ -282,14 +223,6 @@
<!-- 娣诲姞璇佷功銆佽崳瑾夈�佽祫璐ㄩ厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
-
-<!-- <el-form-item label="鏃堕棿" prop="createTime">-->
-<!-- <el-input v-model="formDat.createTime" type='date' placeholder='閫夋嫨鏃ユ湡' clearable :style="{width: '100%'}" >-->
-<!-- </el-input>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">-->
-<!-- <el-date-picker v-model='formDat.happenTime' type='date' placeholder='閫夋嫨鏃ユ湡'></el-date-picker>-->
-<!-- </el-form-item>-->
<el-form-item label="绫诲埆" prop="type">
<el-select v-model="formDat.type" placeholder="璇烽�夋嫨绫诲埆" clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOption" :key="index" :label="item.label" :value="item.value"
@@ -338,7 +271,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -456,7 +390,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鑽ｈ獕璇佷功璁板綍
id:undefined,
@@ -554,9 +488,6 @@
created() {
this.getList();
this.getTypeOptions();
- // for (let i = 0; i < this.contactList.length; i++) {
- // this.formDat[i] = this.contactList[i];
- // }
},
methods: {
// 鍙栨秷鎸夐挳
@@ -625,20 +556,20 @@
},
/** 鏌ヨ绫诲埆淇℃伅 */
- getCateInfor()
- {
- let _this = this
- getCategory().then(response=>{
-
- // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
- // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
- response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
- const label = elem.split(":")[0].trim();
- const value = parseInt(elem.split(":")[1].trim());
- _this.typeOptions.push({ "label": label, "value": value });
- })
- })
- },
+ // getCateInfor()
+ // {
+ // let _this = this
+ // getCategory().then(response=>{
+ //
+ // // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // response.data.itemValues.replace("{", "").replace("}", "").split(",").map(elem => {
+ // const label = elem.split(":")[0].trim();
+ // const value = parseInt(elem.split(":")[1].trim());
+ // _this.typeOptions.push({ "label": label, "value": value });
+ // })
+ // })
+ // },
//绫诲埆閫夋嫨
getSrc1(type){
if(type===0){
@@ -821,10 +752,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -883,6 +815,15 @@
}).catch(() => { Message({ message: "瀵煎叆澶辫触", type: 'error' })});
}
+ },
+ watch: {
+ type(value) {
+ if (value === '') {
+ this.showInput = true;
+ } else {
+ this.showInput = false;
+ }
+ }
}
};
</script>
diff --git a/ruoyi-ui/src/views/mindMap/index.vue b/ruoyi-ui/src/views/mindMap/index.vue
new file mode 100644
index 0000000..d43ecd7
--- /dev/null
+++ b/ruoyi-ui/src/views/mindMap/index.vue
@@ -0,0 +1,89 @@
+<template>
+ <div class="app-container">
+ <h1 style="font-size: 21px;">{{ greeting +'锛�' + user.userName }}</h1>
+ <div class="image-container">
+ <img class="top-image" src="../../assets/images/zhang.png" alt="Top Image">
+ <img class="bottom-image" src="../../assets/images/bkg.png" alt="Bottom Image">
+ </div>
+ </div>
+</template>
+
+<script>
+import { getUserProfile } from "@/api/system/user";
+import { listRootAll } from "@/api/root/index";
+export default {
+ name: "index",
+ data() {
+ return {
+ user: {},
+ greeting: "",
+ rootList:[]
+ };
+ },
+ mounted() {
+ this.setGreeting();
+ this.getUser();
+ },
+ methods: {
+ setGreeting() {
+ const currentTime = new Date();
+ const currentHour = currentTime.getHours();
+
+ if (currentHour < 12) {
+ this.greeting = "鏃╀笂濂�";
+ } else if (currentHour < 14) {
+ this.greeting = "涓崍濂�";
+ } else if (currentHour < 18) {
+ this.greeting = "涓嬪崍濂�";
+ } else {
+ this.greeting = "鏅氫笂濂�";
+ }
+ },
+
+ getUser() {
+ getUserProfile().then(response => {
+ this.user = response.data;
+ });
+ listRootAll().then(response =>{
+ this.rootList =response.data;
+ console.log(this.rootList)
+ })
+
+ }
+ }
+
+}
+</script>
+
+<style scoped>
+.app-container{
+ background-color: #FEF7FC;
+}
+
+.image-container {
+ position: relative;
+ width: 100%;
+ height: 100%;
+}
+
+
+.top-image {
+ width: 50%;
+ /*height: 100%;*/
+ object-fit: cover;
+ position: absolute;
+ top: 0;
+ right: 0;
+ opacity: 1;
+}
+
+.bottom-image {
+ z-index: 1; /* 璁剧疆搴曞眰鍥剧墖鐨勫眰绾т负1 */
+ width: 100%;
+ height: 100%;
+ /*position: absolute;*/
+ top: 0;
+}
+
+
+</style>
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index 6028f27..d81b6a9 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -246,7 +246,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -361,7 +362,7 @@
],
dsb:true,
- btn:false,
+ uploading: false,
formDat: {
type: undefined,
title: undefined,
@@ -620,10 +621,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 94ecec1..d86c503 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -260,7 +260,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -298,7 +299,8 @@
:http-request="requestUpload"
:file-list="fileListOther"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -397,6 +399,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
name: undefined,
@@ -728,10 +731,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 49ba28a..42ca6cb 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -247,7 +247,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -363,6 +364,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
happenTime: undefined,
@@ -665,10 +667,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index 9bd7f95..df1df64 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -118,37 +118,50 @@
</div>
<div style="padding-left:30px;padding-top:30px">
<el-col :span="6" :data="individualList">
- <div class="block" :model="individualList" >
- <el-col v-model="individualList.img" prop="img">
- <el-avatar shape="square" style="width: 200px;height: 150px;" >
+ <div class="block" :model="individualList">
+ <div v-if="!isEditing">
+ <el-avatar shape="square" style="width: 200px; height: 150px;">
<el-image
- :src="'http://47.93.189.255:8080/'+ individualList.img"
+ class="el-upload-list__item-thumbnail"
+ v-if="!individualList.img"
+ src="default-avatar-url"
:fit="fit"
- style="width: 100%;height: 100%;"
+ style="width: 100%; height: 100%;"
+ ></el-image>
+ <el-image
+ v-else
+ :src="'http://47.93.189.255:8080/' + individualList.img"
+ :fit="fit"
+ style="width: 100%; height: 100%;"
></el-image>
</el-avatar>
-<!-- <el-upload-->
-<!-- action="#"-->
-<!-- list-type="picture-card"-->
-<!-- multiple-->
-<!-- :http-request="requestUpload"-->
-<!-- :file-list="fileList"-->
-<!-- >-->
-<!-- <i slot="default" class="el-icon-plus"></i>-->
-<!-- <div slot="file" slot-scope="{file}">-->
-<!-- <img-->
-<!-- class="el-upload-list__item-thumbnail"-->
-<!-- :src="file.url"-->
-<!-- alt=""-->
-<!-- style="width: 147px; height: 147px"-->
-<!-- fit="cover"-->
-<!-- :preview-src-list="[file.url]"-->
-<!-- >-->
-<!-- </div>-->
-<!-- </el-upload>-->
- </el-col>
+ </div>
+ <el-upload v-else
+ class="upload-demo"
+ action="#"
+ :auto-upload="false"
+ :http-request="requestUpload"
+ :limit="1"
+ :file-list="fileList"
+ >
+ <el-avatar shape="square" style="width: 200px; height: 150px;">
+ <el-image
+ class="el-upload-list__item-thumbnail"
+ v-if="!individualList.img"
+ src="default-avatar-url"
+ :fit="fit"
+ style="width: 100%; height: 100%;"
+ ></el-image>
+ <el-image
+ v-else
+ :src="'http://47.93.189.255:8080/' + individualList.img"
+ :fit="fit"
+ style="width: 100%; height: 100%;"
+ ></el-image>
+ </el-avatar>
+ </el-upload>
+ <div class="edit-text" v-if="isEditing" @click="uploadImage">鐐瑰嚮鏇存崲鍥剧墖</div>
</div>
-
</el-col>
</div>
@@ -278,13 +291,13 @@
<el-table-column label="寮�濮嬫棩鏈�" prop="startDate" sortable width="250" align="center" >
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.startDate }}</template>
- <template v-else><el-input v-model="scope.row.startDate"></el-input></template>
+ <template v-else><el-input v-model="scope.row.startDate" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
</template>
</el-table-column>
<el-table-column label="缁撴潫鏃ユ湡" prop="endDate" sortable width="250" align="center" >
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.endDate }}</template>
- <template v-else><el-input v-model="scope.row.endDate"></el-input></template>
+ <template v-else><el-input v-model="scope.row.endDate" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
</template>
</el-table-column>
<el-table-column label="涓昏瀛︿範缁忓巻銆佸伐浣滃崟浣嶅強浠昏亴鎯呭喌" prop="content" sortable width="350" align="center" >
@@ -404,13 +417,13 @@
<el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="230" align="center">
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
- <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
+ <template v-else><el-input v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
</template>
</el-table-column>
<el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable width="230" align="center">
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template>
- <template v-else><el-input v-model="scope.row.endTime"></el-input></template>
+ <template v-else><el-input v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -439,13 +452,13 @@
<el-table-column label="寮�濮嬫椂闂�" prop="startTime" sortable width="200" align="center">
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.startTime }}</template>
- <template v-else><el-input v-model="scope.row.startTime"></el-input></template>
+ <template v-else><el-input v-model="scope.row.startTime" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
</template>
</el-table-column>
<el-table-column label="缁撴潫鏃堕棿" prop="endTime" sortable width="200" align="center">
<template slot-scope="scope">
<template v-if="!scope.row.isEdit">{{ scope.row.endTime }}</template>
- <template v-else><el-input v-model="scope.row.endTime"></el-input></template>
+ <template v-else><el-input v-model="scope.row.endTime" type="date" placeholder="閫夋嫨鏃ユ湡"></el-input></template>
</template>
</el-table-column>
<el-table-column label="鎵�鍒板浗瀹舵垨鑰呭湴鍖�" prop="destination" sortable width="300" align="center" >
@@ -733,7 +746,7 @@
//涓汉淇℃伅鏁版嵁
individualList:[],
isEditing: false,
- // fit:['fill'],
+ fit:['cover'],
// 涓汉缁忓巻鏁版嵁
experienceList: [],
// isEdit:true,
@@ -1001,6 +1014,11 @@
this.formDat[key] = '';
});
},
+ handleUploadSuccess(response, file) {
+ // 澶勭悊鏂囦欢涓婁紶鎴愬姛鍚庣殑鍥炶皟
+ this.individualList.img = response.url;
+ },
+
//涓嬫媺
handleChange(activeNames) {
// console.log(val);
@@ -1409,6 +1427,7 @@
this.btn=false
this.isShow_2=false
this.isShow=true
+ this.isEditing = false
});
} else {
this.$modal.msgSuccess("淇敼澶辫触");
@@ -1419,6 +1438,50 @@
// 鍒锋柊椤甸潰
// window.location.reload();
},
+ uploadImage() {
+ const inputElement = document.createElement("input");
+ inputElement.type = "file";
+ inputElement.accept = "image/*";
+ inputElement.style.display = "none";
+ document.body.appendChild(inputElement);
+
+ inputElement.addEventListener("change", () => {
+ const file = inputElement.files[0];
+ if (file) {
+ const formData = new FormData();
+ formData.append("image", file);
+
+ // 璋冪敤uploadPic鎺ュ彛涓婁紶鍥剧墖
+ axios.post("/common/upload", formData, {
+ headers: {
+ "Content-Type": "multipart/form-data"
+ }
+ }).then(response => {
+ // 涓婁紶鎴愬姛锛岃幏鍙栨柊鍥剧墖鐨刄RL
+ const newImageUrl = response.data.img;
+
+ // 鍋囪individualList鏄竴涓璞★紝鏇存柊individualList.img
+ this.individualList.img = newImageUrl;
+
+ // 鍋囪fileList鏄竴涓暟缁勶紝鏇存柊fileList涓搴旂殑鍥剧墖URL
+ // const index = this.fileList.findIndex(item => item.id === fileId);
+ // this.fileList[index].url = newImageUrl;
+
+ // 娓呴櫎input鍏冪礌骞剁Щ闄や簨浠剁洃鍚�
+ document.body.removeChild(inputElement);
+ inputElement.removeEventListener("change", null);
+ }).catch(error => {
+ console.error("涓婁紶澶辫触:", error);
+ // 娓呴櫎input鍏冪礌骞剁Щ闄や簨浠剁洃鍚�
+ document.body.removeChild(inputElement);
+ inputElement.removeEventListener("change", null);
+ });
+ }
+ });
+
+ // 瑙﹀彂鐐瑰嚮浜嬩欢锛屾樉绀烘枃浠堕�夋嫨瀵硅瘽妗�
+ inputElement.click();
+ },
//涓昏缁忓巻
saveRowExperienceList(row) {
this.$refs['elForm'].validate(valid => {
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 74c539b..8a08a6e 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -296,7 +296,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -416,7 +417,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -715,10 +716,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 7f6704e..381adc7 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -68,7 +68,6 @@
@keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
-
<el-form-item label="鐞嗘兂鏍囬" prop="title">
<el-input
v-model="queryParams.title"
@@ -79,7 +78,6 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
<el-form-item label="鍙楁儬浜�" prop="beneficiary" >
<el-input
v-model="queryParams.beneficiary"
@@ -90,7 +88,6 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
-
<el-form-item label="缁ф壙浜�" prop="heir">
<el-input
v-model="queryParams.heir"
@@ -101,26 +98,35 @@
<i slot="prefix" class="el-input__icon el-icon-search"></i>
</el-input>
</el-form-item>
- <el-cntainer>
- <el-col :span="9" >
- <el-form-item>
- <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
- border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
- </el-form-item>
- </el-col>
- </el-cntainer>
+ <el-form-item label="濮嬩簬浣曞洜" prop="cause">
+ <el-input
+ v-model="queryParams.cause"
+ placeholder="璇疯緭鍏ュ師鍥�"
+ clearable
+ style="width: 240px"
+ @keyup.enter.native="handleQuery">
+ <i slot="prefix" class="el-input__icon el-icon-search"></i>
+ </el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁鏈夋晥" prop="isEffective">
+ <el-select v-model="queryParams.isEffective" placeholder="璇烽�夋嫨鏄惁鏈夋晥" clearable
+ style="width: 240px" @keyup.enter.native="handleQuery">
+ <el-option v-for="item in typeOptions"
+ :key="item.value" :label="item.label" :value="item.value"/>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
+ <el-button size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
+ border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
+ </el-form-item>
+
+
</el-form>
+
<div>
- <!-- <div style="width: 100px;-->
- <!-- height: 24px;-->
- <!-- font-size: 18px;-->
- <!-- font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
- <!-- font-weight: 400;-->
- <!-- color: #000000;-->
- <!-- line-height: 21px;-->
- <!-- ">鏀惰棌鍜岃崳瑾�</div>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -325,7 +331,8 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <i slot="default" class="el-icon-plus"></i>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
+ <i v-if="!uploading" slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -444,7 +451,7 @@
dsb:true,
btn:false,
fit:['fill'],
-
+ uploading: false,
formDat: {
//鐧惧勾蹇冩効璁板綍
id:undefined,
@@ -470,6 +477,8 @@
title:undefined,
heir:undefined,
beneficiary:undefined,
+ cause:undefined,
+ isEffective:undefined
// happenTime:undefined,
},
// searchVal:"",
@@ -532,7 +541,7 @@
},
created() {
this.getList();
- this.getCateInfor()
+ // this.getCateInfor()
// for (let i = 0; i < this.contactList.length; i++) {
// this.formDat[i] = this.contactList[i];
// }
@@ -755,10 +764,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
--
Gitblit v1.9.1