From 6669c680f79663fc220935d61c3f3f6eee078e7c Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期日, 21 七月 2024 16:56:03 +0800
Subject: [PATCH] 修改了报错
---
ruoyi-ui/src/views/collection/index.vue | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 72dc517..063c56e 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -126,7 +126,7 @@
<!-- line-height: 21px;-->
<!-- ">鏀惰棌鍜岃崳瑾�</div>-->
- <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"
@@ -242,7 +242,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
@@ -374,7 +374,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -403,7 +403,7 @@
></video>
<img v-else
class="el-upload-list__item-thumbnail"
- :src="file.url"
+ src="../../assets/images/deviceLis.png"
alt=""
style="width: 100%; height: 100%"
fit="cover"></img>
@@ -416,9 +416,9 @@
>
<i class="el-icon-zoom-in"></i>
</span>
-
+
<span
-
+
class="el-upload-list__item-delete"
@click="handleRemoveFile(file)"
>
@@ -459,7 +459,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";
//瀵煎叆鎺ュ彛鍑芥暟
@@ -473,6 +473,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
@@ -607,8 +608,16 @@
created() {
this.getList();
this.getTypeOptions();
+ this.getInfo()
},
methods: {
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
// 鍙栨秷鎸夐挳
cancelData() {
this.open = false;
@@ -712,7 +721,7 @@
this.$delete(this.fileList,i);
this.$delete(this.uploadFileList,i);
}
-
+
}
},
handleRemoveFile(file) {
@@ -720,10 +729,10 @@
{
if(this.fileListOther[i].url==file.url)
{
-
+
this.$delete(this.fileListOther,i);
this.$delete(this.uploadFileList1,i);
-
+
}
}
},
@@ -758,7 +767,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -828,6 +837,7 @@
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
// 娓呯┖formDat瀵硅薄鐨勬暟鎹�
+ this.newOption = '';
Object.keys(this.formDat).forEach(key => {
this.formDat[key] = '';
});
@@ -842,10 +852,22 @@
});
}
});
+ // 娓呯┖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]);
+ }
},
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -868,7 +890,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -878,18 +900,18 @@
}
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()
{
@@ -904,7 +926,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -914,7 +936,7 @@
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
--
Gitblit v1.9.1