From 1aa5be564d5df56297355a2e71ae4ff6c7df0042 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 09 十月 2023 10:03:23 +0800
Subject: [PATCH] ss
---
ruoyi-ui/src/views/bignote/index.vue | 166 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 114 insertions(+), 52 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index 4bb4892..0ffa7b8 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -48,7 +48,7 @@
/>
</el-form-item>
- <el-form-item label="鏃堕棿">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
style="width: 197px;
@@ -147,20 +147,22 @@
<el-table v-loading="loading" :data="familyList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
- <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
- <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
+ <el-table-column label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80px"/>
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="200px" align="center">
<template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="浜虹墿" prop="people" sortable width="100" />
- <el-table-column label="鍦扮偣" prop="address" sortable width="100" />
- <el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150" />
-
- <el-table-column label="澶囨敞" prop="remark" sortable width="100" >
+ <el-table-column label="浜虹墿" prop="people" sortable width="150px" />
+ <el-table-column label="鍦扮偣" prop="address" sortable width="150px" />
+ <el-table-column label="澶т簨鏍囬" prop="title" sortable :show-overflow-tooltip="true" width="150px" />
+ <el-table-column label="鏄惁鏄湰瀹跺涵璁板綍" prop="ownData" sortable width="150px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
+ <el-table-column label="澶囨敞" prop="remark" sortable width="150px" >
<template slot-scope="scope">{{scope.row.remark? scope.row.remark: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> -->
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="150px" align="center">
<template slot-scope="scope" >
<div @click="handleCheck(scope.row)">
@@ -170,15 +172,16 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== ',' "
+ v-if="!(scope.row.url === '' || scope.row.url === ',' || scope.row.url === null)"
>
<img
+ v-else
class="el-upload-list__item-thumbnail"
src="../../assets/images/deviceA.png"
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url === ','"
+
></div>
</template>
</el-table-column>
@@ -234,11 +237,11 @@
</el-form-item>
<el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
- <el-date-picker
+ <el-input
v-model='formDat.happenTime'
type='date'
placeholder='閫夋嫨鏃ユ湡'
- ></el-date-picker>
+ ></el-input>
</el-form-item>
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
@@ -247,39 +250,39 @@
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
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: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
+ <div slot="file" slot-scope="{ file }">
+ <template v-if="fileList">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%; object-fit: cover;"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ </template>
<span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
-
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
-
-
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -289,11 +292,13 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
- :http-request="requestUpload"
+ :on-remove="handleRemoveFile"
+ :http-request="requestUpload1"
:show-file-list="true"
>
- <el-button type="primary">Click to upload</el-button>
+
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -363,14 +368,13 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
- 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'],
+ fileList:[],
+ fileListOther:[],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
// type: undefined,
title: undefined,
@@ -440,6 +444,13 @@
},
methods: {
+
+ isImage(fileType) {
+ return fileType.startsWith('image/');
+ },
+ isInFot(fileName) {
+ return this.fot.includes(fileName);
+ },
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -559,7 +570,21 @@
});
},
+ handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
+ }
+ },
+ handleRemoveFile(file) {
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
@@ -580,21 +605,34 @@
addFamilyevent(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ for(let i = 0; i <= this.fileList.length; i++)
+ {
+ this.handleRemove(this.fileList[0]);
+ }
+ for(let i = 0; i < this.fileListOther.length; i++){
+ this.handleRemoveFile(this.fileListOther[0]);
+ }
this.getList();
});
}
});
+
},
- requestUpload(params)
- {
+ requestUpload(params) {
+
var file = params.file;
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading1 = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading1 = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -602,9 +640,33 @@
}
else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+ },
+ requestUpload1(params)
+ {
+ var file = params.file;
+ 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})
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ //
+ // }
})
},
--
Gitblit v1.9.1