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 | 223 +++++++++++++++++++++++++++++--------------------------
1 files changed, 119 insertions(+), 104 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 179c6fe..42431b3 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -1,12 +1,12 @@
<template>
<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="寮�濮嬫棩鏈�"
@@ -22,10 +22,10 @@
@keyup.enter.native="handleQuery"
/>
</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"
@@ -37,7 +37,7 @@
<el-button size="mini" @click="resetQuery" style=" width: 65px;height: 32px; background: #FFDDE3; border-radius:6px 6px 6px 6px;opacity: 1;">閲嶇疆</el-button>
</el-form-item>
</el-form>
-
+
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -49,7 +49,7 @@
v-hasPermi="['system:role:add']"
>鏂板</el-button>
</el-col>
-
+
<el-col :span="1.5">
<el-button
type="danger"
@@ -91,35 +91,35 @@
<el-button size="mini" type="primary"
plain
icon="el-icon-plus" >瀵煎叆</el-button>
-
+
</el-upload>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</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-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" >
<template slot-scope="scope">{{scope.row.isFace===1 ?'绉佹湁': '鍏湁'}}</template>
</el-table-column>
- <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="100" >
+ <el-table-column label="瀛樻斁浣嶇疆" prop="location" sortable width="100" >
<template slot-scope="scope">{{scope.row.location? scope.row.location: '鈥斺�斺�斺��'}}</template>
</el-table-column>
<el-table-column label="澶囨敞" prop="remark" sortable width="100" >
@@ -127,25 +127,27 @@
</el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" align="center" sortable width="110" >
<template slot-scope="scope" >
- <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 @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 === '' || 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">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<el-button
@@ -164,12 +166,12 @@
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:economy:info']">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
-
+
</el-dropdown>
</template>
</el-table-column>
</el-table>
-
+
<pagination
v-show="total>0"
:total="total"
@@ -178,18 +180,18 @@
@pagination="getList"
style="background: #FEF7FC;"
/>
-
+
<!-- 娣诲姞鎴栦慨鏀硅祫浜т俊鎭厤缃璇濇 -->
<!-- 璁惧鍚嶇О銆佹椂闂淬�佽喘涔颁汉銆佷簨椤瑰唴瀹广�佸瓨鏀惧湴鐐广�佸娉ㄣ�佺數瀛愭枃浠� -->
<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
+ <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>
@@ -197,13 +199,13 @@
<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>
@@ -226,7 +228,7 @@
></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="瀛樻斁浣嶇疆" prop="location">
<el-input v-model="formDat.location" placeholder="璇疯緭鍏ュ瓨鏀句綅缃�" clearable :style="{width: '100%'}" >
@@ -236,8 +238,8 @@
<el-form-item label="澶囨敞" prop="remark">
<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"
@@ -262,7 +264,7 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
v-if="!disabled"
class="el-upload-list__item-delete"
@@ -271,8 +273,8 @@
<i class="el-icon-delete"></i>
</span>
</span>
-
-
+
+
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -281,8 +283,8 @@
:file-list="fileListOther"
class="upload-demo"
multiple
-
- :on-remove="handleRemove"
+
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -292,33 +294,33 @@
</div>
</template>
</el-upload>
-
+
</el-form>
<h4 class="form-header"> </h4>
-
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
<el-button @click="cancelData">鍙� 娑�</el-button>
</div>
</el-dialog>
-
+
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-
+
</el-dialog>
-
+
</div>
</template>
-
+
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-
-
+
+
+
//鍦╯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",
dicts: ['sys_normal_disable'],
@@ -339,7 +341,7 @@
// 鎬绘潯鏁�
total: 0,
// 瀹跺ぇ浜嬭琛ㄦ牸鏁版嵁
- economyList: [],
+ secretList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -357,7 +359,7 @@
fileList:[
],
fileListOther:[
-
+
],
dsb:true,
btn:false,
@@ -365,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,
@@ -385,8 +386,9 @@
pageSize: 10,
type:undefined,
accNo:undefined,
- createTime:undefined,
-
+ happenTime:undefined,
+ useFor:undefined,
+
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -401,7 +403,7 @@
message: '璇疯緭鍏ュ瘑鐮�',
trigger: 'blur'
}],
-
+
accNo: [{
required: true,
message: '璇疯緭鍏ヨ处鍙�',
@@ -429,13 +431,14 @@
}],
validityDate: [{
- // required: true,
+ required: true,
message: '璇烽�夋嫨鏈夋晥鏈�',
trigger: 'change'
}],
+
happenTime: [{
required: true,
- message: '璇烽�夋嫨鏈夋晥鏈�',
+ message: '璇烽�夋嫨鍙戠敓鏃堕棿',
trigger: 'change'
}],
@@ -466,10 +469,10 @@
created() {
this.getList();
this.getCateInfor()
-
+
},
methods: {
-
+
//鍩洪噾/鍙拌处鐨勯�夋嫨
getSrc1(type) {
if (type === 0) {
@@ -478,7 +481,7 @@
return '鍙拌处'
}
},
-
+
getSrc2(kind) {
if (kind == 0) {
return '鐜伴噾'
@@ -486,13 +489,13 @@
return '鑷姩鎵ｅ垝'
}
},
-
+
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
this.reset();
},
-
+
//闅旇鍙樿壊
tableRowClassName({ row, rowIndex }) {
if (rowIndex % 2 == 0) {
@@ -501,18 +504,18 @@
return "statistics-warning-row";
}
},
-
+
/** 鏌ヨ瑙掕壊鍒楄〃 */
//鍒楄〃鏄剧ず瀹跺ぇ浜嬭
-
-
+
+
getList() {
this.loading = true;
this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-
+
listSecret(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
@@ -523,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)
@@ -585,15 +595,15 @@
this.single = selection.length!=1
this.multiple = !selection.length
},
-
+
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
this.open = true;
this.title = "娣诲姞钘忓績瀵嗚";
},
-
-
+
+
/** 鏌ョ湅璇︾粏淇℃伅 */
handleCheck(row){
const id = row.id;
@@ -603,7 +613,7 @@
handleUpdate(row) {
const id = row.id;
let jd = true
-
+
this.$router.push({
path:"/self/secret/secretInfo/" + id,
query:{
@@ -611,15 +621,15 @@
}
});
},
-
-
+
+
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url;
this.dialogVisible = true;
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
-
+
let ul = this.fileList.map(function (elem){
return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
}).join(",")
@@ -629,7 +639,7 @@
this.formDat.url = ul+","+uls
this.$refs["elForm"].validate(valid => {
if (valid) {
-
+
addSecret(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -637,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)
{
@@ -644,22 +660,22 @@
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)
-
+
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
-
+
}
-
+
else{
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
-
+
}
})
-
+
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -674,7 +690,7 @@
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const Ids = this.ids;
-
+
if(Ids.length==0)
{
this.download('/zSecret/export', {
@@ -689,7 +705,7 @@
,
handleExportTemplate(){
this.download('/zSecret/model', {
-
+
}, `zSecret_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎿嶄綔*/
@@ -702,26 +718,25 @@
enload(formData).then(response => {
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
-
+
}).catch(err)
{
Message({ message: "瀵煎叆澶辫触", type: 'error' })
}
-
+
}
}
-
+
};
</script>
-
+
<style>
.el-table__row.statistics-warning-row {
background: #E0EEFE;
-
+
}
.el-table__row.statistics-warning-row1 {
background: #FFEFF2;
-
+
}
</style>
-
\ No newline at end of file
--
Gitblit v1.9.1