From b2ff79644a1ac74fc1f3ef3867e9e77f392eb7fa Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 09 十一月 2023 10:28:18 +0800
Subject: [PATCH] 修改视频专网
---
src/views/index.vue | 153 +++++++++++++-------------------------------------
1 files changed, 41 insertions(+), 112 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index 33c0ed7..cb759dd 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -4,29 +4,11 @@
<div class="mb-[10px]" v-show="showSearch">
<el-card shadow="hover">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
- <!-- <el-form-item label="鏂囦欢鍚�" prop="fileName">-->
- <!-- <el-input v-model="queryParams.fileName" placeholder="璇疯緭鍏ユ枃浠跺悕" clearable style="width: 200px" @keyup.enter="handleQuery" />-->
- <!-- </el-form-item>-->
+
<el-form-item label="鍘熷悕" prop="originalName">
<el-input v-model="queryParams.originalName" placeholder="璇疯緭鍏ュ師鍚�" clearable style="width: 200px" @keyup.enter="handleQuery" />
</el-form-item>
- <el-form-item label="鏂囦欢鍚庣紑" prop="fileSuffix">
- <el-input v-model="queryParams.fileSuffix" placeholder="璇疯緭鍏ユ枃浠跺悗缂�" clearable style="width: 200px" @keyup.enter="handleQuery" />
- </el-form-item>
- <!-- <el-form-item label="鍒涘缓鏃堕棿">-->
- <!-- <el-date-picker-->
- <!-- v-model="dateRangeCreateTime"-->
- <!-- value-format="YYYY-MM-DD HH:mm:ss"-->
- <!-- type="daterange"-->
- <!-- range-separator="-"-->
- <!-- start-placeholder="寮�濮嬫棩鏈�"-->
- <!-- end-placeholder="缁撴潫鏃ユ湡"-->
- <!-- :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"-->
- <!-- ></el-date-picker>-->
- <!-- </el-form-item>-->
- <!-- <el-form-item label="鏈嶅姟鍟�" prop="service">-->
- <!-- <el-input v-model="queryParams.service" placeholder="璇疯緭鍏ユ湇鍔″晢" clearable style="width: 200px" @keyup.enter="handleQuery" />-->
- <!-- </el-form-item>-->
+
<el-form-item>
<el-button type="primary" icon="search" @click="handleQuery">鎼滅储</el-button>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
@@ -42,35 +24,15 @@
<el-col :span="1.5">
<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="primary" plain icon="Upload" @click="handleImage" v-if="isContains(useUserStore().permissions, 'system:oss:upload')">涓婁紶鍥剧墖</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" plain icon="Upload" @click="handleVideo" 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="previewListResource ? 'danger' : 'warning'"-->
- <!-- plain-->
- <!-- @click="handlePreviewListResource(!previewListResource)"-->
- <!-- v-hasPermi="['system:oss:edit']"-->
- <!-- >棰勮寮�鍏� :-->
- <!-- {{-->
- <!-- previewListResource ? "绂佺敤" : "鍚敤" }}</el-button-->
- <!-- >-->
- <!-- </el-col>-->
- <el-col :span="1.5">
- <el-button type="info" plain icon="Operation" @click="handleOssConfig" v-hasPermi="['system:oss:lists']">閰嶇疆绠＄悊</el-button>
- </el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
</template>
-
<el-table
v-loading="loading"
:data="ossList"
@@ -80,29 +42,8 @@
v-if="showTable"
>
<el-table-column type="selection" width="55" align="center" />
- <!-- <el-table-column label="瀵硅薄瀛樺偍涓婚敭" align="center" prop="ossId" v-if="true" />-->
- <!-- <el-table-column label="鏂囦欢鍚�" align="center" prop="fileName" />-->
<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 #default="scope">-->
- <!-- <ImagePreview-->
- <!-- v-if="previewListResource && checkFileSuffix(scope.row.fileSuffix)"-->
- <!-- :width="100"-->
- <!-- :height="100"-->
- <!-- :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" sortable="custom">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
<el-table-column label="涓婁紶浜�" align="center" prop="createByName" />
- <!-- <el-table-column label="鏈嶅姟鍟�" align="center" prop="service" sortable="custom" />-->
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="鏌ョ湅鎻愬彇鐮�" placement="top">
@@ -124,7 +65,7 @@
<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 v-model="form.file" v-if="type === 0" />
+ <fileUpload ref="childFile" @closePopup="getList()" 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" />"
</el-form-item>
@@ -152,17 +93,13 @@
<script setup name="Oss" lang="ts">
import { listOss, delOss, createUser, examineIds } from "@/api/system/oss";
-import ImagePreview from "@/components/ImagePreview/index.vue";
import { OssForm, OssQuery, OssVO } from "@/api/system/oss/types";
-import { getInfo } from "@/api/login";
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 { any } from "vue-types";
-
-const router = useRouter();
+import router from '@/router';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const ossList = ref<OssVO[]>([]);
@@ -189,6 +126,7 @@
const inputRef = ref<any>()
const inputSty =ref<any>()
const currentIp = ref('')
+const childFile = ref<any>()
// 榛樿鎺掑簭
const defaultSort = ref({ prop: 'createTime', order: 'ascending' });
@@ -317,9 +255,6 @@
getList();
}
/** 浠诲姟鏃ュ織鍒楄〃鏌ヨ */
-const handleOssConfig = () => {
- router.push('/system/oss-config/index')
-}
/** 鏂囦欢鎸夐挳鎿嶄綔 */
const handleFile = () => {
reset();
@@ -341,9 +276,10 @@
dialog.title = "涓婁紶瑙嗛";
}
/** 鎻愪氦鎸夐挳 */
-const submitForm = () => {
+
+const submitForm = async () => {
+ await childFile.value.handleCilck()
dialog.visible = false;
- getList();
}
const handleCode = async (row: OssVO) => {
console.log(row, row.ossId);
@@ -392,15 +328,6 @@
}
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
-const handlePreviewListResource = async (preview: boolean) => {
- let text = preview ? "鍚敤" : "鍋滅敤";
- try {
- await proxy?.$modal.confirm('纭瑕�"' + text + '""棰勮鍒楄〃鍥剧墖"閰嶇疆鍚�?');
- await proxy?.updateConfigByKey("sys.oss.previewListResource", preview);
- await getList()
- proxy?.$modal.msgSuccess(text + "鎴愬姛");
- } catch { return }
-}
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
const handleDelete = async (row?: OssVO) => {
const ossIds = row?.ossId || ids.value;
@@ -411,9 +338,8 @@
proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}
const refreshPage = async () => {
- // const [err] = await tos(useUserStore().getInfo());
- // console.log(err);
const accessRoutes = await usePermissionStore().generateRoutes();
+ console.log(accessRoutes,'accessRoutes',router);
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
accessRoutes.forEach((route) => {
if (!isHttp(route.path)) {
@@ -425,6 +351,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)
@@ -432,15 +359,13 @@
if (res.code==200){
const data = res.data;
setToken(data.access_token);
- await refreshPage()
+ const [err] = await tos(useUserStore().getInfo());
+ console.log('useUserStore', useUserStore,err);
await getList()
- await nextTick(async () => {
- const [err] = await tos(useUserStore().getInfo());
- console.log('useUserStore', useUserStore,err);
+
+ // await refreshPage()
+
console.log('permissions', useUserStore().permissions,'system:oss:upload');
-
- })
-
// token.value = data.access_token;
}
}
@@ -453,32 +378,36 @@
// });
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()){
+ await getList();
+ }else {
+ router.push('/login')
+ }
// 璋冪敤 getList() 鏂规硶
- // await getList();
+
})
</script>
--
Gitblit v1.8.0