From fae5df1d3f1ae875ac546cacfb4744b2e8230ca2 Mon Sep 17 00:00:00 2001
From: yz3456 <2753272399@qq.com>
Date: 星期一, 29 七月 2024 11:07:24 +0800
Subject: [PATCH] 修改了bug
---
ruoyi-ui/src/views/secret/index.vue | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index b17def3..010bc0e 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container" style="opacity: 1;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-
+
<el-form-item label="鏃堕棿" prop="happenTime">
<el-date-picker
v-model="dateRange"
@@ -29,7 +29,7 @@
@keyup.enter.native="handleQuery"
/>
-->
-
+
<el-select v-model="queryParams.type" placeholder="璇烽�夋嫨绫诲埆" clearable
style="width: 200px;
height: 35px;
@@ -68,7 +68,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"
@@ -178,7 +178,7 @@
</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
@@ -224,8 +224,8 @@
></el-date-picker>
</el-form-item>
<el-form-item label="绫诲埆" prop="type">
-
-
+
+
<el-select v-model="formDat.type" placeholder="璇疯緭鍏ョ被鍒�" allow-create
filterable clearable :style="{width: '100%'}" >
<el-option v-for="(item, index) in typeOpt" :key="index" :label="item.label" :value="item.value"
@@ -320,7 +320,7 @@
style="margin-left: 10px"
size="small"
type="success"
-
+
@click="picUpload"
>涓婁紶鍒版湇鍔″櫒</el-button>
<h4 class="form-header">鍏朵粬闄勪欢 </h4>
@@ -337,8 +337,8 @@
:http-request="requestUpload1"
:show-file-list="true"
>
-
-
+
+
<i slot="default" class="el-icon-plus"></i>
<div slot="file" slot-scope="{file}">
<!-- 娣诲姞video鍏冪礌鐢ㄤ簬鏄剧ず瑙嗛 -->
@@ -351,11 +351,11 @@
></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>
-
+
<span class="el-upload-list__item-actions">
<span class="el-upload-list__item-name">{{ file.name }}</span>
<span
@@ -364,19 +364,19 @@
>
<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"
@@ -405,7 +405,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涓鍏ユ帴鍙ｅ嚱鏁� --鎺ュソ浜�
@@ -416,6 +416,7 @@
dicts: ['sys_normal_disable'],
data() {
return {
+ userId: undefined,
// 閬僵灞�
disabled: false,
loading: true,
@@ -448,7 +449,7 @@
// 鏁版嵁鑼冨洿閫夐」
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:[],
@@ -560,26 +561,33 @@
}
],
typeOpt: [
-
+
]
};
},
created() {
this.getList();
this.getCateInfo();
-
+ this.getInfo()
},
methods: {
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
getCateInfo()
{
let _this = this
_this.typeOpt = []
-
+
getCategory().then(response=>{
console.log(response.data)
// alert(9801)
-
+
response.data.map(elem=>{
_this.typeOpt.push({"label":elem, "value":elem})
})
@@ -654,9 +662,9 @@
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);
+ this.$delete(this.uploadFileList1,i);
}
}
},
@@ -696,7 +704,7 @@
deptCheckStrictly: true,
remark: undefined
};
- this.resetForm("form");
+ this.resetForm("elForm");
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -781,10 +789,10 @@
this.handleRemoveFile(this.fileListOther[0]);
}
},
-
+
handleChange(file, fileList1) {
//瀹氫箟涓�涓叏灞�鏁扮粍uploadFileList鏉ュ仛瀛樺偍
-
+
// this.uploadFileList.push(file.raw);
console.log("=========5555=========")
console.log(file)
@@ -807,7 +815,7 @@
},
fileUpload(){
// var file = params.file;
-
+
var formData = new FormData();
this.$refs.upload1.submit();
// formData.append('uploadFile', file);
@@ -817,18 +825,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()
{
@@ -843,7 +851,7 @@
//console.log(this.uploadFileList)
this.uploadFileList.forEach((elem)=>{
formData.append("files", elem)
-
+
})
//alert(90)
let _this = this
@@ -853,7 +861,7 @@
_this.formDat.url = _this.formDat.url+","+response.fileNames
_this.uploadFileList = []
_this.$modal.msgSuccess("鍥剧墖涓婁紶鎴愬姛");
-
+
});
},
requestUpload(params) {
@@ -901,8 +909,10 @@
var formData = new FormData();
formData.append('excelImport', file);
let _this = this
- alert(file)
+ console.log(formData,'2132132123123123121')
+ // alert(file)
enload(formData).then(response => {
+
_this.getList();
Message({ message: "瀵煎叆鎴愬姛", type: 'warning' })
--
Gitblit v1.9.1