From 018b6f9dbbaed096f3adb1c370956eb87581e85a Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期一, 04 十二月 2023 09:31:42 +0800
Subject: [PATCH] 修改视频专网
---
src/views/system/oss/index.vue | 125 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 42 deletions(-)
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index b6ea088..786012e 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -25,11 +25,11 @@
<el-button type="primary" plain icon="Upload" @click="handleFile" v-if="isContains(useUserStore().permissions, 'system:oss:upload')">涓婁紶鏂囦欢</el-button>
</el-col>
- <el-col :span="1.5">
- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-if="isContains(useUserStore().permissions, 'system:oss:remove')">
- 鍒犻櫎
- </el-button>
- </el-col>
+ <!-- <el-col :span="1.5">-->
+ <!-- <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-if="isContains(useUserStore().permissions, 'system:oss:remove')">-->
+ <!-- 鍒犻櫎-->
+ <!-- </el-button>-->
+ <!-- </el-col>-->
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
@@ -41,9 +41,10 @@
@header-click="handleHeaderCLick"
v-if="showTable"
>
- <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="index" />
+ <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="鍘熷悕" align="center" prop="originalName" />
- <el-table-column label="涓婁紶浜�" align="center" prop="createByName" />
+ <el-table-column label="涓婁紶鏃堕棿" align="center" prop="createTime" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="鏌ョ湅鎻愬彇鐮�" placement="top">
@@ -65,9 +66,9 @@
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="ossFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�">
- <fileUpload ref="childFile" @closePopup="getList()" v-model="form.file" v-if="type === 0" />
+ <fileUpload ref="childFile" @closePopup="getList();lookPawsd($event)" v-model="form.file" v-if="type === 0" />
<imageUpload v-model="form.file" v-if="type === 1" />
- <video-upload v-model="form.file" v-if="type === 2" />"
+ <video-upload v-model="form.file" v-if="type === 2" />
</el-form-item>
</el-form>
<template #footer>
@@ -78,12 +79,17 @@
</template>
</el-dialog>
<el-dialog :title="titleDownload" v-model="visibleCode" width="500px" append-to-body>
+ <p style="color: red">鎻愬彇鐮佸皢浼氬湪24灏忔椂鍚庡け鏁堣灏藉揩涓嬭浇!</p>
<span v-show="titleDownload=='鏌ョ湅鎻愬彇鐮�'">{{testtxt}}</span>
- <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload!='鏌ョ湅鎻愬彇鐮�'" v-model="pasTxt" v-if="isContains(useUserStore().permissions, 'system:oss:download')" placeholder="璇疯緭鍏ユ枃浠舵彁鍙栫爜"></el-input>
- <el-button link type="primary" v-show="titleDownload!='鏌ョ湅鎻愬彇鐮�'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">涓嬭浇</el-button>
+ <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" v-model="pasTxt" v-if="isContains(useUserStore().permissions, 'system:oss:download')" placeholder="璇疯緭鍏ユ枃浠舵彁鍙栫爜"></el-input>
+ <el-input style="margin: 10px 0" ref="inputRef" :style="inputSty" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" v-model="pasTxt" placeholder="璇疯緭鍏ユ枃浠舵彁鍙栫爜"></el-input>
+ <!-- <el-button link type="primary" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">涓嬭浇</el-button>-->
+ <!-- <el-button link type="primary" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" icon="Delete" @click="delFile()" >鍒犻櫎</el-button>-->
<template #footer>
<div class="dialog-footer">
- <el-button type="primary" @click="visibleCode = false">纭� 瀹�</el-button>
+ <el-button link type="primary" v-show="titleDownload=='杈撳叆鎻愬彇鐮�'" icon="Download" @click="handleDownloadFile()" v-if="isContains(useUserStore().permissions, 'system:oss:download')">涓嬭浇</el-button>
+ <el-button link type="primary" v-show="titleDownload=='璇疯緭鍏ユ彁鍙栫爜'" icon="Delete" @click="delFile()" >鍒犻櫎</el-button>
+ <!-- <el-button type="primary" @click="visibleCode = false">纭� 瀹�</el-button>-->
<el-button @click="visibleCode = false">鍙� 娑�</el-button>
</div>
</template>
@@ -96,7 +102,7 @@
import { OssForm, OssQuery, OssVO } from "@/api/system/oss/types";
import { to as tos } from "await-to-js";
import useUserStore from "@/store/modules/user";
-import { setToken } from "@/utils/auth";
+import { getToken, setToken } from "@/utils/auth";
import usePermissionStore from "@/store/modules/permission";
import { isHttp } from "@/utils/validate";
import router from '@/router';
@@ -127,6 +133,7 @@
const inputSty =ref<any>()
const currentIp = ref('')
const childFile = ref<any>()
+const figType = ref<any>()
// 榛樿鎺掑簭
const defaultSort = ref({ prop: 'createTime', order: 'ascending' });
@@ -281,6 +288,13 @@
await childFile.value.handleCilck()
dialog.visible = false;
}
+const lookPawsd = async (row: OssVO) => {
+ console.log(row, row.ossId);
+ testtxt.value = row.password;
+ titleDownload.value = '鏌ョ湅鎻愬彇鐮�'
+ pasTxt.value = ''
+ visibleCode.value = true
+}
const handleCode = async (row: OssVO) => {
console.log(row, row.ossId);
@@ -314,6 +328,13 @@
downIds.value = ref(row.ossId)
console.log(toRaw(downIds.value.value));
}
+const delFile=async () => {
+ let oss = figType.value+'/'+ pasTxt.value;
+ await delOss(oss).finally(() => loading.value = false);
+ await getList();
+ proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ visibleCode.value = false
+}
const handleDownloadFile = ()=>{
console.log(downIds.value);
if (pasTxt.value){
@@ -325,20 +346,31 @@
}
// inputRef.value.style.border = '1px solid red'
}
-
+ visibleCode.value=false
}
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: OssVO) => {
- const ossIds = row?.ossId || ids.value;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?');
- loading.value = true;
- await delOss(ossIds).finally(() => loading.value = false);
- await getList();
- proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ let ossIds = row?.ossId || ids.value;
+ titleDownload.value = '璇疯緭鍏ユ彁鍙栫爜'
+ pasTxt.value = ''
+ inputSty.value ={
+ border: '1px solid blue',
+ borderRadius: '5px'
+ }
+ visibleCode.value = true
+ figType.value = ossIds
+ console.log(figType);
+ // await proxy?.$modal.confirm('鏄惁纭鍒犻櫎OSS瀵硅薄瀛樺偍缂栧彿涓�"' + ossIds + '"鐨勬暟鎹」?');
+ // loading.value = true;
+ // ossIds = ossIds+'/'+pasTxt.value;
+ // await delOss(ossIds).finally(() => loading.value = false);
+ // await getList();
+ // proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
const refreshPage = async () => {
const accessRoutes = await usePermissionStore().generateRoutes();
+ console.log(accessRoutes,'accessRoutes',router);
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
accessRoutes.forEach((route) => {
if (!isHttp(route.path)) {
@@ -350,6 +382,7 @@
const isContains = (arr: string | any[], value: any) => {
return arr.includes(value);
};
+
const setAddUser = async (val: any | number | (string | number)[]) => {
console.log(val);
const res = await createUser(val)
@@ -357,11 +390,12 @@
if (res.code==200){
const data = res.data;
setToken(data.access_token);
- await getList()
- // await refreshPage()
-
const [err] = await tos(useUserStore().getInfo());
console.log('useUserStore', useUserStore,err);
+ await getList()
+
+ // await refreshPage()
+
console.log('permissions', useUserStore().permissions,'system:oss:upload');
// token.value = data.access_token;
}
@@ -375,32 +409,39 @@
// });
onBeforeMount( async () => {
console.log('绗竴',useUserStore().permissions);
- try {
- // 浣跨敤fetch API鑾峰彇褰撳墠IP鍦板潃
- await fetch('https://api.ipify.org/?format=json')
- .then(response => response.json())
- .then(async data => {
- currentIp.value = data.ip;
- let obj = {
- username: data.ip
- }
- await setAddUser(obj)
- })
- .catch(error => {
- console.error('鑾峰彇IP鍦板潃澶辫触锛�', error);
- });
- } catch (error) {
- console.log(error);
- }
+ // try {
+ // // 浣跨敤fetch API鑾峰彇褰撳墠IP鍦板潃
+ // await fetch('https://api.ipify.org/?format=json')
+ // .then(response => response.json())
+ // .then(async data => {
+ // currentIp.value = data.ip;
+ // let obj = {
+ // username: data.ip
+ // }
+ // await setAddUser(obj)
+ // })
+ // .catch(error => {
+ // console.error('鑾峰彇IP鍦板潃澶辫触锛�', error);
+ // });
+ // } catch (error) {
+ // console.log(error);
+ // }
})
onMounted(async () => {
- console.log('绗簩',useUserStore().permissions);
+ console.log('绗簩aaaaaaa',useUserStore().permissions);
// 绛夊緟 useUserStore() 鏂规硶鐨� getInfo() 鏂规硶杩斿洖缁撴灉骞惰祴鍊肩粰 err 鍙橀噺
// const [err] = await tos(useUserStore().getInfo());
+ if (getToken()){
+ console.log('鏈塼oken');
+ await getList();
+ }else {
+ console.log('鏃爐oken');
+ router.push('/login')
+ }
// 璋冪敤 getList() 鏂规硶
- // await getList();
+
})
</script>
--
Gitblit v1.8.0