From 4bb9f72e6caf2a1a5d54d62cca3bcba2ad2de825 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期四, 24 八月 2023 22:37:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-ui/src/views/clean/index.vue | 105 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 45 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 83e2ead..3394499 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -116,7 +116,7 @@
<el-table v-loading="loading" :data="cleanList" :row-key="getRowId" ref="multipleTable" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<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="80"/>
+ <el-table-column fixed label="搴忓彿" sortable type="index" :index="(queryParams.pageNum-1)*queryParams.pageSize+1" width="80"/>
<el-table-column label="绫诲瀷" prop="kind" sortable width="120" >
<template slot-scope="scope">
@@ -125,35 +125,36 @@
</el-table-column>
<el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="150" />
<el-table-column label="绫诲埆" prop="type" sortable width="100" />
- <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="100" />
- <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="120" />
- <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="100" />
- <el-table-column label="鍙戠敓鏃堕棿" align="center" sortable prop="happenTime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.happenTime) }}</span>
- </template>
+ <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="120" />
+ <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="150" />
+ <el-table-column label="鏀剧疆鍦扮偣" prop="place" sortable width="120" />
+ <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="remark" sortable width="100" />
- <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="100" >
- <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"
- >
- </template>
- </el-table-column>
+ <el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
+
+ <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 === '' || 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
@@ -205,10 +206,10 @@
</el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker
+ <el-input
v-model='formDat.happenTime'
- type='createDate'
- placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
+ type='date'
+ placeholder='閫夋嫨鏃ユ湡'></el-input>
</el-form-item>
<el-form-item label="淇濇磥鏂规硶" prop="method">
<el-input v-model="formDat.method" placeholder="璇疯緭鍏ヤ繚娲佹柟娉�" clearable :style="{width: '100%'}" >
@@ -235,7 +236,7 @@
:http-request="requestUpload"
:file-list="fileList"
>
- <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"
@@ -272,11 +273,12 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
+ :on-remove="handleRemoveFile"
:http-request="requestUpload"
:show-file-list="true"
>
<el-button type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div>
<template #tip>
<div class="el-upload__tip">
</div>
@@ -351,6 +353,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
kind: undefined,
@@ -490,12 +493,13 @@
},
handleRemove(file) {
- for(let i = 0; i < this.fileListOther.length; i++)
+ for(let i = 0; i < this.fileList.length; i++)
{
- if(this.fileListOther[i].url==file.url)
- this.$delete(this.fileListOther,i);
+ if(this.fileList[i].url==file.url)
+ this.$delete(this.fileList,i);
}
},
+
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
@@ -578,13 +582,12 @@
this.dialogVisible = true;
},
handleRemoveFile(file,) {
-
- for(let i = 0; i < this.fileListOther.length; i++)
- {
- if(this.fileListOther[i].url==file.url)
- this.$delete(this.fileListOther,i);
- }
-},
+ for(let i = 0; i < this.fileListOther.length; i++)
+ {
+ if(this.fileListOther[i].url==file.url)
+ this.$delete(this.fileListOther,i);
+ }
+ },
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
@@ -605,6 +608,17 @@
});
}
});
+ // 娓呯┖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)
{
@@ -612,10 +626,11 @@
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
--
Gitblit v1.9.1