From e3637bb4f69492e89521efd24fb4fdc0da6071de Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期二, 11 六月 2024 14:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_web
---
ruoyi-ui/src/views/clean/index.vue | 147 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 112 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 6612526..da60d35 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -65,7 +65,7 @@
</el-form-item>
</el-form>
- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8" v-if="userId != 2">
<el-col :span="1.5">
<el-button
type="primary"
@@ -170,7 +170,7 @@
></div>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width">
+ <el-table-column label="鎿嶄綔" align="center" width="250" class-name="small-padding fixed-width" v-if="userId != 2">
<template slot-scope="scope" v-if="scope.row.roleId !== 1">
<div class="button-container">
<el-button
@@ -257,6 +257,7 @@
:on-change="handleChange"
:auto-upload="false"
ref="upload"
+
>
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{ file }">
@@ -287,26 +288,80 @@
</span>
</div>
</el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+
+ @click="picUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
<el-upload
action=""
:file-list="fileListOther"
class="upload-demo"
multiple
-
+ ref="upload1"
+ :on-change="handleChange1"
+ :auto-upload="false"
+ list-type="picture-card"
: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 v-if="uploading" class="upload-status">姝ｅ湪涓婁紶...</div> -->
+ <!-- <template #tip>
<div class="el-upload__tip">
</div>
</template>
- </el-upload>
+ </el-upload> -->
+ <i slot="default" class="el-icon-plus"></i>
+ <div slot="file" slot-scope="{file}">
+ <!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
+ <video
+ v-if="file.url.includes('.mp4')"
+ class="el-upload-list__item-thumbnail"
+ :src="file.url"
+ style="width: 147px; height: 147px"
+ fit="cover"
+ ></video>
+ <img v-else
+ class="el-upload-list__item-thumbnail"
+ src="../../assets/images/deviceLis.png"
+ alt=""
+ style="width: 100%; height: 100%"
+ fit="cover"></img>
+ <span class="el-upload-list__item-actions">
+ <span class="el-upload-list__item-name">{{ file.name }}</span>
+ <!-- <span
+ class="el-upload-list__item-preview"
+ @click="handleFileCardPreview(file)"
+ >
+ <i class="el-icon-zoom-in"></i>
+ </span> -->
+
+ <span
+
+ class="el-upload-list__item-delete"
+ @click="handleRemoveFile(file)"
+ >
+ <i class="el-icon-delete"></i>
+ </span>
+ </span>
+
+ </div>
+
+
+ </el-upload>
+ <el-button
+ style="margin-left: 10px"
+ size="small"
+ type="success"
+ @click="fileUpload"
+ >涓婁紶鍒版湇鍔″櫒</el-button>
</el-form>
<h4 class="form-header"> </h4>
@@ -327,7 +382,7 @@
<script>
import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
+import {getInfo} from "@/api/login";
//鍦╯ystem/note/index.js涓鍏ユ帴鍙ｅ嚱鏁�
@@ -338,6 +393,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -370,9 +426,12 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
-
+
fileList:[
],
+ fileList1:[],
+ uploadFileList: [],
+ uploadFileList1: [],
fileListOther:[
],
@@ -388,7 +447,7 @@
location: undefined,
remark: undefined,
happenTime: undefined,
- url: undefined,
+ url: "",
},
// 鑿滃崟鍒楄〃
@@ -458,10 +517,16 @@
created() {
this.getList();
this.getCateInfor()
-
+ this.getInfo()
},
methods: {
- //
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
getSrc1(kind) {
if (kind === 0) {
return '淇濇磥'
@@ -528,7 +593,11 @@
for(let i = 0; i < this.fileList.length; i++)
{
if(this.fileList[i].url==file.url)
- this.$delete(this.fileList,i);
+ {
+ this.$delete(this.fileList,i);
+ this.$delete(this.uploadFileList,i);
+ }
+
}
},
@@ -563,7 +632,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -617,19 +686,18 @@
for(let i = 0; i < this.fileListOther.length; i++)
{
if(this.fileListOther[i].url==file.url)
+ {
+
this.$delete(this.fileListOther,i);
+ this.$delete(this.uploadFileList1,i);
+
+ }
}
},
/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
submitDataScope: function() {
- let ul = this.fileList.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- let uls = this.fileListOther.map(function (elem){
- return elem.url.replace(process.env.VUE_APP_BASE_TRUE_API,"")
- }).join(",")
- this.formDat.url = ul+","+uls
+
this.$refs["elForm"].validate(valid => {
if (valid) {
@@ -655,27 +723,32 @@
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
+ this.uploadFileList.push(file.raw);
+ this.fileList.push({name:file.name,url:file.url})
+ //alert(fileList1.length)
//console.log(file)
// console.log(this.uploadFileList)
// this.fileList = fileList
},
handleChange1(file, fileOtherList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
+ this.uploadFileList1.push(file.raw);
+ this.fileListOther.push({name:file.name,url:file.url})
//console.log(file)
// console.log(this.uploadFileList)
// this.fileList = fileList
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
- this.$refs.upload1.submit();
+ //this.$refs.upload1.submit();
// formData.append('uploadFile', file);
if(this.uploadFileList1.length==0){
this.$modal.msgSuccess("鏂囨。涓婁紶鍒楄〃涓嶈兘涓虹┖!");
@@ -683,30 +756,33 @@
}
this.uploadFileList1.forEach((elem)=>{
formData.append("files", elem)
-
+
})
-
+
let _this = this
-
+
this.uploading = true;
uploadPic(formData).then(response => {
_this.uploadFileList1 = []
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.$modal.msgSuccess("鏂囦欢涓婁紶鎴愬姛!");
})
-
+
},
picUpload()
{
+ //alert(89)
var formData = new FormData();
- this.$refs.upload.submit();
+ //alert(this.uploadFileList.length)
+ console.log(this.uploadFileList)
+ //this.$refs.upload.submit();
if(this.uploadFileList.length==0){
this.$modal.msgSuccess("鍥剧墖涓婁紶鍒楄〃涓嶈兘涓虹┖锛�");
return}
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -714,18 +790,19 @@
uploadPic(formData).then(response => {
// alert("dds")
_this.formDat.url = _this.formDat.url+","+response.fileNames
+ //alert( _this.formDat.url)
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
-
- this.uploadFileList.push(params.file);
+
+ // this.uploadFileList.push(params.file);
},
requestUpload1(params)
{
- this.uploadFileList1.push(params.file);
+ // this.uploadFileList1.push(params.file);
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
--
Gitblit v1.9.1