From 5a643d05479504adca94d23abbbbbfccf2283f0c Mon Sep 17 00:00:00 2001
From: Tcsm <1377977403@qq.com>
Date: 星期日, 30 七月 2023 17:11:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/collection/index.vue | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 5ebd0d9..17b8402 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -51,16 +51,20 @@
-->
</el-form-item>
- <el-form-item label="鏃堕棿" style="padding-left:190px">
+ <el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
- style="width: 240px"
- value-format="yyyy-MM-dd HH-MM"
+ style="width: 197px;
+ height: 30px;
+ background: #FFFFFF;
+ border-radius: 14px 14px 14px 14px;
+ opacity: 0.5;
+ border: 1px solid rgba(0,0,0,0.25);"
+ value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery"
></el-date-picker>
</el-form-item>
@@ -201,7 +205,7 @@
<template slot-scope="scope">{{scope.row.source? scope.row.source: '鈥斺�斺�斺��'}}</template>
</el-table-column>
- <el-table-column label="鎷ユ湁鑰�" prop="owner" sortable width="110" align="center">
+ <el-table-column label="鎸佹湁鑰�" prop="owner" sortable width="110" align="center">
<template slot-scope="scope">{{scope.row.owner? scope.row.owner: '鈥斺�斺�斺��'}}</template>
</el-table-column>
@@ -217,22 +221,24 @@
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<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 === 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" >
@@ -280,8 +286,11 @@
<!-- 娣诲姞鏀惰棌涓庤崳瑾変俊鎭厤缃璇濇 -->
<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-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="鑾峰緱鏃堕棿" prop="happenTime">
- <el-input v-model="formDat.happenTime" placeholder="璇疯緭鍏ヨ幏寰楁椂闂�" clearable :style="{width: '100%'}" ></el-input>
+ <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%'}" >
@@ -297,8 +306,8 @@
<el-input v-model="formDat.source" placeholder="璇疯緭鍏ユ潵婧�" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
- <el-form-item label="鎷ユ湁鑰�" prop="owner">
- <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ嫢鏈夎��" clearable :style="{width: '100%'}" >
+ <el-form-item label="鎸佹湁鑰�" prop="owner">
+ <el-input v-model="formDat.owner" placeholder="璇疯緭鍏ユ寔鏈夎��" clearable :style="{width: '100%'}" >
</el-input>
</el-form-item>
<el-form-item label="浠锋牸" prop="price">
@@ -359,7 +368,7 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
@@ -469,7 +478,7 @@
type:undefined,
owner:undefined,
location:undefined,
- happenTime:undefined,
+ // happenTime:undefined,
},
// searchVal:"",
@@ -488,8 +497,8 @@
trigger: 'blur'
}],
happenTime: [{
- // required: true,
- message: '璇疯緭鍏ユ椂闂�',
+ required: true,
+ message: '璇烽�夋嫨鏃堕棿',
trigger: 'blur'
}],
name: [{
@@ -578,7 +587,10 @@
/** 鏌ヨ璁板綍鍒楄〃 */
getList() {
this.loading = true;
- // console.log(this.queryParams)
+ console.log(this.queryParams)
+ this.queryParams.happenStartTime = this.dateRange.length > 0 && this.dateRange[0]
+ this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
+
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listCollection(this.queryParams).then(response => {
// alert(123)
@@ -622,7 +634,18 @@
}
},
handleRemove(file) {
- alert(323)
+ 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);
+ }
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -734,6 +757,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