From 5ca038d888922e93bf45c7bd37f3c6dce849dcff Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 24 十二月 2021 11:36:02 +0800
Subject: [PATCH] update 调整监控依赖 从 common 迁移到 framework
---
ruoyi-ui/src/views/system/oss/index.vue | 163 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 117 insertions(+), 46 deletions(-)
diff --git a/ruoyi-ui/src/views/system/oss/index.vue b/ruoyi-ui/src/views/system/oss/index.vue
index ce888f6..fdfed16 100644
--- a/ruoyi-ui/src/views/system/oss/index.vue
+++ b/ruoyi-ui/src/views/system/oss/index.vue
@@ -10,6 +10,15 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="鍘熷悕" prop="originalName">
+ <el-input
+ v-model="queryParams.originalName"
+ placeholder="璇疯緭鍏ュ師鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="鏂囦欢鍚庣紑" prop="fileSuffix">
<el-input
v-model="queryParams.fileSuffix"
@@ -62,9 +71,19 @@
plain
icon="el-icon-plus"
size="mini"
- @click="handleAdd"
+ @click="handleFile"
v-hasPermi="['system:oss:upload']"
- >涓婁紶</el-button>
+ >涓婁紶鏂囦欢</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleImage"
+ v-hasPermi="['system:oss:upload']"
+ >涓婁紶鍥剧墖</el-button>
</el-col>
<el-col :span="1.5">
<el-button
@@ -77,15 +96,45 @@
v-hasPermi="['system:oss:remove']"
>鍒犻櫎</el-button>
</el-col>
+ <el-col :span="1.5">
+ <el-button
+ :type="previewListResource ? 'danger' : 'warning'"
+ plain
+ size="mini"
+ @click="handlePreviewListResource(!previewListResource)"
+ v-hasPermi="['system:oss:edit']"
+ >棰勮寮�鍏� : {{previewListResource ? "绂佺敤" : "鍚敤"}}</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="info"
+ plain
+ icon="el-icon-s-operation"
+ size="mini"
+ @click="handleOssConfig"
+ v-hasPermi="['system:oss:list']"
+ >閰嶇疆绠＄悊</el-button>
+ </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="ossList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浜戝瓨鍌ㄤ富閿�" align="center" prop="ossId" v-if="false"/>
+ <el-table-column label="瀵硅薄瀛樺偍涓婚敭" align="center" prop="ossId" v-if="false"/>
<el-table-column label="鏂囦欢鍚�" align="center" prop="fileName" />
- <el-table-column label="鏂囦欢鍚庣紑鍚�" align="center" prop="fileSuffix" />
- <el-table-column label="URL鍦板潃" align="center" prop="url" />
+ <el-table-column label="鍘熷悕" align="center" prop="originalName" />
+ <el-table-column label="鏂囦欢鍚庣紑" align="center" prop="fileSuffix" />
+ <el-table-column label="鏂囦欢灞曠ず" align="center" prop="url">
+ <template slot-scope="scope">
+ <el-image
+ v-if="previewListResource && checkFileSuffix(scope.row.fileSuffix)"
+ style="width: 100px; height: 100px;"
+ :src="scope.row.url"
+ :preview-src-list="[scope.row.url]"/>
+ <span v-text="scope.row.url"
+ v-if="!checkFileSuffix(scope.row.fileSuffix) || !previewListResource"/>
+ </template>
+ </el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
@@ -121,11 +170,12 @@
@pagination="getList"
/>
- <!-- 娣诲姞鎴栦慨鏀筄SS浜戝瓨鍌ㄥ璇濇 -->
+ <!-- 娣诲姞鎴栦慨鏀筄SS瀵硅薄瀛樺偍瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�">
- <imageUpload v-model="form.file"/>
+ <fileUpload v-model="form.file" v-if="type === 0"/>
+ <imageUpload v-model="form.file" v-if="type === 1"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -137,7 +187,7 @@
</template>
<script>
-import { listOss, delOss, addOss, downloadOss } from "@/api/system/oss";
+import { listOss, delOss, changePreviewListResource } from "@/api/system/oss";
export default {
name: "Oss",
@@ -159,12 +209,16 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
- // OSS浜戝瓨鍌ㄨ〃鏍兼暟鎹�
+ // OSS瀵硅薄瀛樺偍琛ㄦ牸鏁版嵁
ossList: [],
// 寮瑰嚭灞傛爣棰�
title: "",
+ // 寮瑰嚭灞傛爣棰�
+ type: 0,
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ // 棰勮鍒楄〃鍥剧墖
+ previewListResource: true,
// 鍒涘缓鏃堕棿鏃堕棿鑼冨洿
daterangeCreateTime: [],
// 鏌ヨ鍙傛暟
@@ -172,6 +226,7 @@
pageNum: 1,
pageSize: 10,
fileName: undefined,
+ originalName: undefined,
fileSuffix: undefined,
url: undefined,
createTime: undefined,
@@ -192,7 +247,7 @@
this.getList();
},
methods: {
- /** 鏌ヨOSS浜戝瓨鍌ㄥ垪琛� */
+ /** 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃 */
getList() {
this.loading = true;
this.queryParams.params = {};
@@ -200,10 +255,19 @@
this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
}
+ this.getConfigKey("sys.oss.previewListResource").then(response => {
+ this.previewListResource = response.msg === undefined ? true : response.msg === 'true';
+ });
listOss(this.queryParams).then(response => {
this.ossList = response.rows;
this.total = response.total;
this.loading = false;
+ });
+ },
+ checkFileSuffix(fileSuffix) {
+ let arr = ["png", "jpg", "jpeg"];
+ return arr.some(type => {
+ return fileSuffix.indexOf(type) > -1;
});
},
// 鍙栨秷鎸夐挳
@@ -214,16 +278,7 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
- ossId: undefined,
file: undefined,
- fileName: undefined,
- fileSuffix: undefined,
- url: undefined,
- createTime: undefined,
- createBy: undefined,
- updateTime: undefined,
- updateBy: undefined,
- service: undefined
};
this.resetForm("form");
},
@@ -244,42 +299,58 @@
this.single = selection.length!==1
this.multiple = !selection.length
},
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
+ /** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
+ handleOssConfig() {
+ this.$router.push({ path: '/system/oss-config/index'})
+ },
+ /** 鏂囦欢鎸夐挳鎿嶄綔 */
+ handleFile() {
this.reset();
this.open = true;
- this.title = "涓婁紶OSS浜戝瓨鍌�";
+ this.title = "涓婁紶鏂囦欢";
+ this.type = 0;
+ },
+ /** 鍥剧墖鎸夐挳鎿嶄綔 */
+ handleImage() {
+ this.reset();
+ this.open = true;
+ this.title = "涓婁紶鍥剧墖";
+ this.type = 1;
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate(valid => {
- if (valid) {
- this.buttonLoading = true;
- addOss(this.form).then(response => {
- this.msgSuccess("涓婁紶鎴愬姛");
- this.open = false;
- this.getList();
- }).finally(() => {
- this.buttonLoading = false;
- });
- }
- });
+ this.open = false;
+ this.getList();
+ },
+ /** 涓嬭浇鎸夐挳鎿嶄綔 */
+ handleDownload(row) {
+ this.$download.oss(row.ossId)
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ossIds = row.ossId || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎OSS浜戝瓨鍌ㄧ紪鍙蜂负"' + ossIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.loading = true;
- return delOss(ossIds);
- }).then(() => {
- this.loading = false;
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?').then(() => {
+ this.loading = true;
+ return delOss(ossIds);
+ }).then(() => {
+ this.loading = false;
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).finally(() => {
+ this.loading = false;
+ });
+ },
+ // 棰勮鍒楄〃鍥剧墖鐘舵�佷慨鏀�
+ handlePreviewListResource(previewListResource) {
+ let text = previewListResource ? "鍚敤" : "鍋滅敤";
+ this.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?').then(() => {
+ return changePreviewListResource(previewListResource);
+ }).then(() => {
+ this.getList()
+ this.$modal.msgSuccess(text + "鎴愬姛");
+ }).catch(() => {
+ this.previewListResource = previewListResource !== true;
+ })
}
}
};
--
Gitblit v1.9.3