From c7d2fb7b04ea184df7c03a615ccda9bd172bb527 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期三, 09 八月 2023 21:19:07 +0800
Subject: [PATCH] 家庭模块的三个图标
---
ruoyi-ui/src/views/secret/index.vue | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 55 insertions(+), 40 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 3d94ca3..42431b3 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -2,11 +2,11 @@
<div class="app-container" style="opacity: 1;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="鏃堕棿" >
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
- v-model="queryParams.happenTime"
+ v-model="dateRange"
style="width: 240px;"
- value-format="yyyy-MM-dd HH-MM"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
@@ -23,9 +23,9 @@
/>
</el-form-item>
- <el-form-item label="璐﹀彿" prop="useFor">
+ <el-form-item label="璐﹀彿" prop="accNo">
<el-input
- v-model="queryParams.useFor"
+ v-model="queryParams.accNo"
placeholder="璇疯緭鍏ヨ处鍙�"
clearable
style="width: 240px"
@@ -102,18 +102,18 @@
<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>
+ <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>
+ <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" >
@@ -128,22 +128,23 @@
<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>
@@ -186,11 +187,11 @@
<el-form ref="elForm" :model="formDat" :rules="rules" size="medium" label-width="100px">
<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="type">
<el-input v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" clearable :style="{width: '100%'}" ></el-input>
@@ -200,11 +201,11 @@
</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,7 +239,7 @@
<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"
@@ -283,7 +284,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -318,7 +319,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
- import {listSecret,enload,getEconomyInfo,delSecret, addSecret, uploadPic} from "@/api/secret/index";
+ import {listSecret,enload,delSecret, addSecret, uploadPic} from "@/api/secret/index";
export default {
name: "Role",
@@ -340,7 +341,7 @@
// 鎬绘潯鏁�
total: 0,
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
- economyList: [],
+ secretList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -366,10 +367,9 @@
type: undefined,
happenTime: undefined,
accNo:undefined,
- validityDate:undefined,
password:undefined,
- validityDate:undefined,
isFinger:undefined,
+ validityDate:undefined,
isFace:undefined,
isPrivate:undefined,
location:undefined,
@@ -386,7 +386,8 @@
pageSize: 10,
type:undefined,
accNo:undefined,
- createTime:undefined,
+ happenTime:undefined,
+ useFor:undefined,
},
// 琛ㄥ崟鍙傛暟
@@ -430,13 +431,14 @@
}],
validityDate: [{
- // required: true,
+ required: true,
message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
+
happenTime: [{
required: true,
- message: '璇烽�夋嫨鏈夋晥鏈�',
+ message: '璇烽�夋嫨鍙戠敓鏃堕棿',
trigger: 'change'
}],
@@ -524,6 +526,13 @@
);
},
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)
@@ -638,6 +647,12 @@
});
}
});
+ // 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ Object.keys(this.formDat).forEach(key => {
+ this.formDat[key] = '';
+ });
+ this.handleRemove(this.fileList[0]);
+ this.handleRemoveFile(this.fileListOther[0]);
},
requestUpload(params)
{
--
Gitblit v1.9.1