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/bignote/index.vue | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index d52b55f..e4f5f59 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;
@@ -63,23 +63,23 @@
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ </el-form-item><el-form-item>
+ <el-button size="mini" @click="handleQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
border-radius: 6px 6px 6px 6px;opacity:1; " >鎼滅储</el-button>
- <el-button size="mini" @click="resetQuery" style=" width: 65px; height: 32px;background: #FFDDE3;
+ <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-item>
+
</el-form>
- <div style="width: 72px;
-height: 24px;
-font-size: 18px;
-font-family: Microsoft YaHei-Regular, Microsoft YaHei;
-font-weight: 400;
-color: #000000;
-line-height: 21px;
-">瀹跺ぇ浜嬭</div>
+<!-- <div style="width: 72px;-->
+<!--height: 24px;-->
+<!--font-size: 18px;-->
+<!--font-family: Microsoft YaHei-Regular, Microsoft YaHei;-->
+<!--font-weight: 400;-->
+<!--color: #000000;-->
+<!--line-height: 21px;-->
+<!--">瀹跺ぇ浜嬭</div>-->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -160,24 +160,26 @@
</el-table-column>
<!-- <el-table-column label="瀹跺涵鍙�" prop="familyId" sortable width="100" /> -->
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="160" >
+ <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 !== null"
- >
- <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 === null"
- >
+ <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 !== null "
+ >
+ <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 === null"
+ ></div>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -287,11 +289,11 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
- <el-button type="primary">Click to upload</el-button>
+ <el-button type="primary">鐐瑰嚮涓婁紶</el-button>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -557,7 +559,20 @@
});
},
-
+ 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;
@@ -582,6 +597,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