From c0b7131a4213e7b1485c63fcad88d8d2d146c96c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期六, 20 四月 2024 11:01:30 +0800
Subject: [PATCH] 修改了4/20这周除了备忘录以外的错误
---
ruoyi-ui/src/views/secret/index.vue | 409 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 310 insertions(+), 99 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 4bb1c78..eb149c4 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -4,29 +4,59 @@
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
- v-model="queryParams.happenTime"
- style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ v-model="dateRange"
+ style="width: 240px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
</el-form-item>
+
<el-form-item label="绫诲埆" prop="type">
- <el-input
+ <!-- <el-input
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
+ @keyup.enter.native="handleQuery"
+ />
+ -->
+
+ <el-select v-model="queryParams.type" placeholder="璇烽�夋嫨绫诲埆" clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;" allow-create
+ filterable clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="璐﹀彿" prop="accNo">
+ <el-input
+ v-model="queryParams.accNo"
+ placeholder="璇疯緭鍏ヨ处鍙�"
+ clearable
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
-
- <el-form-item label="璐﹀彿" prop="useFor">
+ <el-form-item label="鏈熼檺" prop="timeLimit">
<el-input
- v-model="queryParams.useFor"
- placeholder="璇疯緭鍏ヨ处鍙�"
+ v-model="queryParams.timeLimit"
+ placeholder="璇疯緭鍏ユ湡闄�"
clearable
style="width: 240px"
@keyup.enter.native="handleQuery"
@@ -81,7 +111,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
class="upload-demo"
@@ -90,7 +120,7 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top" >瀵煎叆</el-button>
</el-upload>
</el-col>
@@ -98,26 +128,26 @@
</el-row>
- <el-table v-loading="loading" :data="secretList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" @row-click="handleCheck" :row-class-name="tableRowClassName" style="background: #FFEFF2; border-radius: 14px 14px 14px 14px;">
+ <el-table v-loading="loading" :data="secretList" :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 label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="120"/>
- <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.happenTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
+ <el-table-column label="鍙戠敓鏃堕棿" prop="happenTime" sortable width="150" align="center">
+ <template slot-scope="scope">{{scope.row.happenTime? scope.row.happenTime: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="绫诲瀷" prop="type" sortable width="100" />
+ <el-table-column label="绫诲埆" prop="type" sortable width="100" />
<el-table-column label="璐﹀彿" prop="accNo" sortable width="100" />
- <el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="100" align="center">
- <template slot-scope="scope">{{scope.row.createTime? scope.row.createTime: '鈥斺�斺�斺��'}}</template>
+ <el-table-column label="鏈夋晥鏈�" prop="validityDate" sortable width="150" align="center">
+ <template slot-scope="scope">{{scope.row.validityDate? scope.row.validityDate: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="瀵嗙爜" prop="password" sortable width="100" />
- <el-table-column label="鏄惁寮�鍚寚绾�" prop="isFinger" sortable width="120" >
+ <el-table-column label="鏄惁寮�鍚寚绾�" prop="isFinger" sortable width="130" >
<template slot-scope="scope">{{scope.row.isFinger===1 ?'鏄�': '鍚�'}}</template>
</el-table-column>>
- <el-table-column label="鏄惁寮�鍚汉鑴�" prop="isFace" sortable width="120" >
+ <el-table-column label="鏄惁寮�鍚汉鑴�" prop="isFace" sortable width="130" >
<template slot-scope="scope">{{scope.row.isFace===1 ?'鏄�': '鍚�'}}</template>
</el-table-column>
<el-table-column label="绉佹湁/鍏湁" prop="isPrivate" sortable width="100" >
- <template slot-scope="scope">{{scope.row.isFace===1 ?'绉佹湁': '鍏湁'}}</template>
+ <template slot-scope="scope">{{scope.row.isPrivate===1 ?'绉佹湁': '鍏湁'}}</template>
</el-table-column>
<el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="100" >
<template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
@@ -128,27 +158,29 @@
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
<div @click="handleCheck(scope.row)">
- <img
- class="el-upload-list__item-thumbnail"
- src="../../assets/images/deviceLis.png"
- alt=""
- style="width: 35px; height: 35px;"
- fit="cover"
- v-if="scope.row.url !== ','"
- >
- <img
- 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>
+ <img
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 35px; height: 35px;"
+ fit="cover"
+ 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"
+
+ ></div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <div class="button-container">
<el-button
size="mini"
type="text"
@@ -167,6 +199,7 @@
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
</el-dropdown>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -185,26 +218,30 @@
<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="happenTime">
- <el-date-picker
- v-model='formDat.happenTime'
- type='date'
- placeholder='閫夋嫨鏃ユ湡'
+ <el-form-item label="鍙戠敓鏃堕棿" prop="happenTime">
+ <el-date-picker v-model="formDat.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="type">
- <el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>
+
+
+ <el-select v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" allow-create
+ filterable clearable :style="{width: '100%'}" >
+ <el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
+ ></el-option>
+ </el-select>
</el-form-item>
<el-form-item label="璐﹀彿" prop="accNo">
<el-input v-model="formDat.accNo" placeholder="璇疯緭鍏ヨ处鍙�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
<el-form-item label="鏈夋晥鏈�" prop="validityDate">
- <el-date-picker
+ <el-input
v-model='formDat.validityDate'
type='date'
- placeholder='閫夋嫨鏃ユ湡'
- ></el-date-picker>
+ placeholder='閫夋嫨鏈夋晥鏈�'
+ ></el-input>
</el-form-item>
<el-form-item label="瀵嗙爜" prop="password">
<el-input v-model="formDat.password" placeholder="璇疯緭鍏ュ瘑鐮�" clearable :style="{width: '100%'}" ></el-input>
@@ -238,15 +275,18 @@
<el-input v-model="formDat.remark" placeholder="璇疯緭鍏ュ娉�" clearable :style="{width: '100%'}" ></el-input>
</el-form-item>
- <h4 class="form-header">鐩稿叧鍥剧墖 </h4>
+ <h4 class="form-header">鐩稿叧鍥剧墖</h4>
<el-upload
action="#"
list-type="picture-card"
multiple
- :http-request="requestUpload"
- :file-list="fileList"
+ :http-request="requestUpload"
+ :file-list="fileList"
+ :on-change="handleChange"
+ :auto-upload="false"
+ ref="upload"
>
- <i slot="default" class="el-icon-plus"></i>
+ <i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<img
class="el-upload-list__item-thumbnail"
@@ -276,6 +316,13 @@
</div>
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
@@ -283,16 +330,60 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
- :http-request="requestUpload"
- :show-file-list="true"
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
+ :http-request="requestUpload1"
+ :show-file-list="true"
>
- <el-button type="primary">涓婁紶</el-button>
- <template #tip>
- <div class="el-upload__tip">
- </div>
- </template>
- </el-upload>
+
+
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
@@ -318,7 +409,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
- import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
+ import {listSecret,enload,delSecret, addSecret, uploadPic,getCategory} from "@/api/secret/index";
export default {
name: "Role",
@@ -340,7 +431,7 @@
// 鎬绘潯鏁�
total: 0,
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
- economyList: [],
+ secretList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -354,26 +445,31 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ // 鏁版嵁鑼冨洿閫夐」
+ 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:[
-
- ],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
+ fileListOther:[],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
happenTime: undefined,
accNo:undefined,
password:undefined,
- validityDate:undefined,
isFinger:undefined,
+ validityDate:undefined,
isFace:undefined,
isPrivate:undefined,
location:undefined,
remark: undefined,
- url: undefined,
+ url: "",
},
// 鑿滃崟鍒楄〃
menuOptions: [],
@@ -386,6 +482,7 @@
type:undefined,
accNo:undefined,
happenTime:undefined,
+ timeLimit:undefined,
},
// 琛ㄥ崟鍙傛暟
@@ -429,13 +526,14 @@
}],
validityDate: [{
- // required: true,
+ required: true,
message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
+
happenTime: [{
required: true,
- message: '璇烽�夋嫨鏈夋晥鏈�',
+ message: '璇烽�夋嫨鍙戠敓鏃堕棿',
trigger: 'change'
}],
@@ -460,16 +558,36 @@
value: '1',
label: '绉佹湁',
}
+ ],
+ typeOpt: [
+
]
};
},
created() {
this.getList();
- this.getCateInfor()
+ this.getCateInfo();
+
},
methods: {
+ getCateInfo()
+ {
+ let _this = this
+ _this.typeOpt = []
+ getCategory().then(response=>{
+ console.log(response.data)
+ // alert(9801)
+
+ response.data.map(elem=>{
+ _this.typeOpt.push({"label":elem, "value":elem})
+ })
+ // response.data.itemValues.replace("{","").replace("}","").split(",").map(elem=>{
+ // _this.typeOptions.push({"label":elem.split(":")[0], "value":elem.split(":")[0]})
+ // })
+ })
+ },
//鍩洪噾/鍙拌处鐨勯�夋嫨
getSrc1(type) {
if (type === 0) {
@@ -523,10 +641,23 @@
);
},
handleRemove(file) {
+ for(let i = 0; i < this.fileList.length; i++)
+ {
+ if(this.fileList[i].url==file.url)
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+ }
+ },
+ handleRemoveFile(file) {
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
+ {
this.$delete(this.fileListOther,i);
+ this.$delete(this.uploadFileList1,i);
+ }
}
},
@@ -572,6 +703,7 @@
this.queryParams.pageNum = 1;
this.getList();
},
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.dateRange = [];
@@ -620,13 +752,13 @@
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
+ // let ul = this.fileList.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // let uls = this.fileListOther.map(function (elem){
+ // return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
+ // }).join(",")
+ // this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -637,30 +769,101 @@
});
}
});
+ // 娓呯┖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]);
+ }
},
- requestUpload(params)
- {
- var file = params.file;
- var formData = new FormData();
- formData.append('uploadFile', file);
- let _this = this
- uploadPic(formData).then(response => {
- let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
+ handleChange(file, fileList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
- if(_this.fot.includes(pth) === true)
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ //alert(file)
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
+ },
+ handleChange1(file, fileOtherList1) {
+ //瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
+ // this.uploadFileList.push(file.raw);
+ console.log("=========5555=========")
+ //console.log(file)
+ // console.log(this.uploadFileList)
+ // this.fileList = fileList
+ },
+ fileUpload(){
+ // var file = params.file;
+
+ var formData = new FormData();
+ this.$refs.upload1.submit();
+ // formData.append('uploadFile', file);
+ if(this.uploadFileList1.length==0){
+ this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
+ return
+ }
+ 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()
+ {
+ var formData = new FormData();
+ //alert(976)
+ //this.$refs.upload.submit();
+ //alert(8)
+ //alert(this.uploadFileList.length)
+ if(this.uploadFileList.length==0){
+ this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
+ return}
+ //console.log(this.uploadFileList)
+ this.uploadFileList.forEach((elem)=>{
+ formData.append("files", elem)
+
+ })
+ //alert(90)
+ let _this = this
+ //alert(9)
+ uploadPic(formData).then(response => {
+ // alert("dds")
+ _this.formDat.url = _this.formDat.url+","+response.fileNames
+ _this.uploadFileList = []
+ _this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
+
+ });
+ },
+ requestUpload(params) {
+ //alert(98)
+ // this.uploadFileList.push(params.file);
+ },
+ requestUpload1(params)
{
- _this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
- }
-
- else{
- _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
- }
- })
-
- },
+ // this.uploadFileList1.push(params.file);
+ },
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
@@ -698,8 +901,10 @@
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
- alert(file)
+ console.log(formData,'2132132123123123121')
+ // alert(file)
enload(formData).then(response => {
+
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
@@ -723,4 +928,10 @@
background: #FFEFF2;
}
+ .el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+ }
+ .button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+ }
</style>
--
Gitblit v1.9.1