From 1870c6d392aada4cd48fb148a12c5bd6e2838159 Mon Sep 17 00:00:00 2001
From: linwenling <3256558519@qq.com>
Date: 星期日, 22 十月 2023 23:31:48 +0800
Subject: [PATCH] 1022 修正保洁收纳导入
---
ruoyi-ui/src/views/clean/index.vue | 200 ++++++++++++++++++++++++++++++++------------------
1 files changed, 128 insertions(+), 72 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 9ce6887..bf961a1 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -6,7 +6,10 @@
v-model="queryParams.kind"
placeholder="鎵�鏈夌被鍨�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
>
<el-option
v-for="dict in typeOptions"
@@ -20,7 +23,10 @@
v-model="queryParams.suitable"
placeholder="璇疯緭鍏ラ�傜敤浜�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -29,7 +35,10 @@
v-model="queryParams.type"
placeholder="璇疯緭鍏ョ被鍒�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -38,7 +47,10 @@
v-model="queryParams.method"
placeholder="璇疯緭鍏ヤ繚娲佹柟娉�"
clearable
- style="width: 240px"
+ style="width: 200px;
+ height: 35px;
+ border-radius: 16px 16px 16px 16px;
+ opacity: 0.5;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -118,20 +130,23 @@
<el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
<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" >
+ <el-table-column label="绫诲瀷" prop="kind" sortable width="80px" >
<template slot-scope="scope">
{{ getSrc1(scope.row.kind) }}
</template>
</el-table-column>
- <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="150" />
+ <el-table-column label="閫傜敤浜�" prop="suitable" sortable :show-overflow-tooltip="true" width="110px" />
<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="鍙戠敓鏃堕棿" prop="happenTime" sortable width="100" align="center">
+ <el-table-column label="淇濇磥鏂规硶" prop="method" sortable width="120" />
+ <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="140" />
+ <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="remark" sortable width="70px" />
+ <el-table-column label="鏈搴褰�" prop="ownData" sortable width="110px" >
+ <template slot-scope="scope">{{scope.row.ownData === 0 ? '鍚�': '鏄�'}}</template>
+ </el-table-column>
<el-table-column label="鐢靛瓙鏂囦欢" prop="url" width="180" align="center">
<template slot-scope="scope" >
@@ -142,15 +157,16 @@
alt=""
style="width: 35px; height: 35px;"
fit="cover"
- v-if="scope.row.url !== ',' "
+ 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"
- v-if="scope.row.url === ','"
+
></div>
</template>
</el-table-column>
@@ -205,10 +221,9 @@
</el-input>
</el-form-item>
<el-form-item label="鏃堕棿" prop="happenTime">
- <el-date-picker
- v-model='formDat.happenTime'
- type='createDate'
- placeholder='閫夋嫨鏃ユ湡'></el-date-picker>
+ <el-date-picker v-model="formDat.happenTime" type="date" placeholder="璇烽�夋嫨鏃ユ湡"
+ :editable="false" :clearable="false" :style="{width: '100%'}" value-format="yyyy-MM-dd"
+ ></el-date-picker>
</el-form-item>
<el-form-item label="淇濇磥鏂规硶" prop="method">
<el-input v-model="formDat.method" placeholder="璇疯緭鍏ヤ繚娲佹柟娉�" clearable :style="{width: '100%'}" >
@@ -230,39 +245,39 @@
<h4 class="form-header">鐩稿叧鍥剧墖 </h4>
<el-upload
action="#"
+ accept="image/jpeg, image/png,image/jpg, image/WMF,image/gif"
list-type="picture-card"
multiple
:http-request="requestUpload"
:file-list="fileList"
>
<i slot="default" class="el-icon-plus"></i>
- <div slot="file" slot-scope="{file}">
- <img
- class="el-upload-list__item-thumbnail"
- :src="file.url"
- alt=""
- style="width: 126px; height: 126px"
- fit="cover"
- :preview-src-list="[file.url]"
- >
+ <div slot="file" slot-scope="{ file }">
+ <template v-if="fileList">
+ <img
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ alt=""
+ style="width: 100%; height: 100%; object-fit: cover;"
+ fit="cover"
+ :preview-src-list="[file.url]"
+ >
+ </template>
<span class="el-upload-list__item-actions">
- <span
- class="el-upload-list__item-preview"
- @click="handlePictureCardPreview(file)"
- >
- <i class="el-icon-zoom-in"></i>
- </span>
-
- <span
- v-if="!disabled"
- class="el-upload-list__item-delete"
- @click="handleRemove(file)"
- >
- <i class="el-icon-delete"></i>
- </span>
- </span>
-
-
+ <span
+ class="el-upload-list__item-preview"
+ @click="handlePictureCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span>
+ <span
+ v-if="!disabled"
+ class="el-upload-list__item-delete"
+ @click="handleRemove(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
</div>
</el-upload>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -272,11 +287,13 @@
class="upload-demo"
multiple
- :on-remove="handleRemove"
- :http-request="requestUpload"
+ :on-remove="handleRemoveFile"
+ :http-request="requestUpload1"
: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>
@@ -308,6 +325,7 @@
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
import {listClean,enload,delClean, addClean, uploadPic} from "@/api/clean/index";
+ import {Message} from "element-ui";
export default {
name: "Role",
dicts: ['sys_normal_disable'],
@@ -351,6 +369,7 @@
],
dsb:true,
btn:false,
+ uploading: false,
formDat: {
type: undefined,
kind: undefined,
@@ -490,12 +509,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 +598,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() {
@@ -601,21 +620,34 @@
addClean(this.formDat).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ // 娓呯┖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]);
+ }
this.getList();
});
}
});
+
},
- requestUpload(params)
- {
+ requestUpload(params) {
+
var file = params.file;
var formData = new FormData();
formData.append('uploadFile', file);
let _this = this
-
+ this.uploading1 = true;
uploadPic(formData).then(response => {
let pth = response.data.originalFilename.substr(response.data.originalFilename.length-4, response.data.originalFilename.length)
-
+ this.uploading1 = false;
+ this.$modal.msgSuccess("涓婁紶鎴愬姛");
if(_this.fot.includes(pth) === true)
{
_this.fileList.push({name:response.data.fileName, "url":response.data.url})
@@ -623,16 +655,40 @@
}
else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+
+ }
+ })
+ },
+ requestUpload1(params)
+ {
+ var file = params.file;
+ 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})
_this.fileListOther.push({name:response.data.fileName, url:response.data.url})
}
+
+ // else{
+ // _this.fileListOther.push({name:response.data.fileName, url:response.data.url})
+ //
+ // }
})
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const Ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璧勪骇缂栧彿涓�"' + Ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(function() {
return delClean(Ids);
}).then(() => {
this.getList();
@@ -662,21 +718,21 @@
/** 瀵煎叆鎿嶄綔*/
handleEnport(params){
- var file = params.file;
- var formData = new FormData();
- formData.append('excelImport', file);
- let _this = this
- alert(file)
- enload(formData).then(response => {
- _this.getList();
- Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
+ var file = params.file;
+ var formData = new FormData();
+ formData.append('excelImport', file);
+ let _this = this
+ enload(formData).then(response => {
+ _this.getList();
+ Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
- }).catch(err)
- {
- Message({ message: "瀵煎叆澶辫触", type: 'error' })
- }
+ }).catch(err)
+ {
+ Message({ message: "瀵煎叆澶辫触", type: 'error' })
+ }
}
+
}
};
</script>
--
Gitblit v1.9.1