From bd40473c9c634005bc7e62e7fc901bcd8b598fa0 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 02 二月 2024 15:20:26 +0800
Subject: [PATCH] 提交了修改
---
ruoyi-ui/src/views/clean/index.vue | 106 +++++++++++++++++++++++++++++++---------------------
1 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 45a1965..f41f833 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -109,7 +109,7 @@
v-hasPermi="['family:note:export']"
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.2">
+ <el-col :span="1.5">
<el-upload
action=""
class="upload-demo"
@@ -118,7 +118,7 @@
>
<el-button size="mini" type="primary"
plain
- icon="el-icon-plus" >瀵煎叆</el-button>
+ icon="el-icon-top" >瀵煎叆</el-button>
</el-upload>
</el-col>
@@ -130,21 +130,21 @@
<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="120" />
- <el-table-column label="鏉愭枡瀛樻斁鍦�" prop="location" sortable width="150" />
+ <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="ownData" sortable width="150px" >
+ <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">
@@ -170,26 +170,30 @@
></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
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['familymodel:clean:info']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:clean:info']">
- <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+ <div class="button-container">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ :disabled="!scope.row.ownData"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['familymodel:clean:info']"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ :disabled="!scope.row.ownData"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:role:remove']"
+ >鍒犻櫎</el-button>
+ <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['familymodel:clean:info']">
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right" @click="handleCheck(scope.row)">鏌ョ湅璇︽儏</el-button>
- </el-dropdown>
+ </el-dropdown>
+ </div>
</template>
</el-table-column>
</el-table>
@@ -325,6 +329,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'],
@@ -360,7 +365,9 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+
fileList:[
],
fileListOther:[
@@ -484,14 +491,21 @@
this.queryParams.happenEndTime = this.dateRange.length > 0 && this.dateRange[1]
// console.log(this.queryParams)
+ let _this = this
// listProperty(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
listClean(this.queryParams).then(response => {
// alert(123)
// console.log(response.data)
- this.cleanList = response.data.data;
+ if(response.msg=="鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�")
+ {
+ _this.$modal.msgSuccess("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ _this.loading = false;
+ }else{
+ _this.cleanList = response.data.data;
- this.total = response.data.total;
- this.loading = false;
+ _this.total = response.data.total;
+ _this.loading = false;
+ }
}
);
},
@@ -717,25 +731,25 @@
/** 瀵煎叆鎿嶄綔*/
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>
- <style>
+<style scoped>
.el-table__row.statistics-warning-row {
background: #E0EEFE;
@@ -744,4 +758,10 @@
background: #FFEFF2;
}
+ .el-table__cell {
+ font-size: 14px; /* 璁剧疆瀛椾綋澶у皬 */
+ }
+ .button-container {
+ display: inline-flex; /* 璁剧疆鎸夐挳瀹瑰櫒涓鸿鍐呭厓绱� */
+ }
</style>
--
Gitblit v1.9.1