odc.xiaohui
2023-12-04 018b6f9dbbaed096f3adb1c370956eb87581e85a
修改视频专网
4个文件已修改
222 ■■■■■ 已修改文件
src/components/FileUpload/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/index.vue 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/oss/index.vue 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vite.config.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/FileUpload/index.vue
@@ -46,7 +46,10 @@
const emit = defineEmits(['update:modelValue','closePopup']);
const number = ref(0);
const uploadList = ref<any[]>([]);
//互联网端
// const baseUrl = import.meta.env.VITE_APP_BASE_API;
// const uploadFileUrl = ref('http://10.248.255.130:18080' + "/resource/oss/upload"); // 上传文件服务器地址
// 内网端
const baseUrl = import.meta.env.VITE_APP_BASE_API;
const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 上传文件服务器地址
const headers = ref(globalHeaders());
src/views/index.vue
@@ -1,27 +1,27 @@
<template>
  <div class="p-2">
    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
      <div class="mb-[10px]" v-show="showSearch">
        <el-card shadow="hover">
          <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<!--    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">-->
<!--      <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="originalName">
              <el-input v-model="queryParams.originalName" 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>
              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
            </el-form-item>
          </el-form>
        </el-card>
      </div>
    </transition>
<!--            <el-form-item>-->
<!--              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>-->
<!--              <el-button icon="Refresh" @click="resetQuery">重置</el-button>-->
<!--            </el-form-item>-->
<!--          </el-form>-->
<!--        </el-card>-->
<!--      </div>-->
<!--    </transition>-->
    <el-card shadow="hover">
      <template #header>
        <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
        <el-row  style="text-align: center">
          <el-col>
            <el-button type="primary" plain icon="Upload" @click="handleFile" v-if="isContains(useUserStore().permissions, 'system:oss:upload')">上传文件</el-button>
          </el-col>
@@ -30,37 +30,37 @@
<!--              删除-->
<!--            </el-button>-->
<!--          </el-col>-->
          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
<!--          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>-->
        </el-row>
      </template>
      <el-table
        v-loading="loading"
        :data="ossList"
        @selection-change="handleSelectionChange"
        :header-cell-class-name="handleHeaderClass"
        @header-click="handleHeaderCLick"
        v-if="showTable"
      >
        <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="createTime" />
        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
          <template #default="scope">
            <el-tooltip content="查看提取码" placement="top">
              <el-button link type="primary" icon="Search" @click="handleCode(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:view')"></el-button>
            </el-tooltip>
            <el-tooltip content="下载" placement="top">
              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:download')"></el-button>
            </el-tooltip>
            <el-tooltip content="删除" placement="top">
              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:remove')"></el-button>
            </el-tooltip>
          </template>
        </el-table-column>
      </el-table>
<!--      <el-table-->
<!--        v-loading="loading"-->
<!--        :data="ossList"-->
<!--        @selection-change="handleSelectionChange"-->
<!--        :header-cell-class-name="handleHeaderClass"-->
<!--        @header-click="handleHeaderCLick"-->
<!--        v-if="showTable"-->
<!--      >-->
<!--        <el-table-column type="index"  />-->
<!--&lt;!&ndash;        <el-table-column type="selection" width="55" align="center" />&ndash;&gt;-->
<!--        <el-table-column label="原名" align="center" prop="originalName" />-->
<!--        <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">-->
<!--              <el-button link type="primary" icon="Search" @click="handleCode(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:view')"></el-button>-->
<!--            </el-tooltip>-->
<!--            <el-tooltip content="下载" placement="top">-->
<!--              <el-button link type="primary" icon="Download" @click="handleDownload(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:download')"></el-button>-->
<!--            </el-tooltip>-->
<!--            <el-tooltip content="删除" placement="top">-->
<!--              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-if="isContains(useUserStore().permissions, 'system:oss:remove')"></el-button>-->
<!--            </el-tooltip>-->
<!--          </template>-->
<!--        </el-table-column>-->
<!--      </el-table>-->
      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<!--      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />-->
    </el-card>
    <!-- 添加或修改OSS对象存储对话框 -->
    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
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('有token');
    await getList();
  }else {
    console.log('无token');
    router.push('/login')
  }
  // 调用 getList() 方法
  // await getList();
})
</script>
vite.config.ts
@@ -26,7 +26,7 @@
      open: true,
      proxy: {
        [env.VITE_APP_BASE_API]: {
          target: 'http://172.35.50.34:8080',
          target: '171.221.173.53:8801',
          // target: 'http://80.36.32.175:8080',
          // target: 'http://192.168.3.228:8080',
          changeOrigin: true,