Procházet zdrojové kódy

bugfix:
1、内容管理-文件资源-重置-无法重置时间
2、内容管理-文件资源-筛选-“名称”与“原名”建议统一名称
3、内容管理-文件资源-筛选-按照“目录”搜索报错乱码
4、内容管理-文件资源-文件上传成功后不会立即显示,需要重新刷新网页才会显示

lihao16 před 5 měsíci
rodič
revize
000b6cf22e

+ 4 - 1
smsb-modules/smsb-source/src/main/resources/mapper/SmsbMinioDataMapper.xml

@@ -37,13 +37,16 @@
         ) rel
         ON md.id = rel.source_id
         WHERE
-        AND md.del_falg = 0
+            md.del_flag = 0
         <if test="bo.type != null and bo.type != ''">
             AND md.type = #{bo.type}
         </if>
         <if test="bo.tag != null and bo.tag != ''">
             AND md.tag = #{bo.tag}
         </if>
+        <if test="bo.params.beginCreateTime != '' and bo.params.endCreateTime != ''">
+            AND md.create_time between #{bo.params.beginCreateTime} and #{bo.params.endCreateTime}
+        </if>
     </select>
     <select id="numLine" resultType="com.inspur.source.domain.vo.DashBoardPlayVo">
         SELECT

+ 48 - 35
smsb-plus-ui/src/views/smsb/minioData/index.vue

@@ -40,27 +40,27 @@
           </el-row>
         </el-card>
         <el-card shadow="hover" :style="{ marginTop: '10px', height: '60px' }">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="40px">
-            <el-form-item label="名称" prop="originalName">
-              <el-input v-model="queryParams.originalName" placeholder="请输入文件名" clearable style="width: 150px" />
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="0px">
+            <el-form-item label="" prop="originalName">
+              <el-input v-model="queryParams.originalName" placeholder="请输入文件名" clearable style="width: 120px" />
             </el-form-item>
-            <el-form-item label="类型" prop="type">
-              <el-select v-model="queryParams.type" style="width: 150px" placeholder="请选择类型" clearable>
+            <el-form-item label="" prop="type">
+              <el-select v-model="queryParams.type" style="width: 120px" placeholder="请选择类型" clearable>
                 <el-option v-for="dict in smsb_source_type" :key="dict.value" :label="dict.label" :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="分类" prop="tag">
-              <el-select v-model="queryParams.tag" style="width: 150px" placeholder="请选择分类" clearable>
+            <el-form-item label="" prop="tag">
+              <el-select v-model="queryParams.tag" style="width: 120px" placeholder="请选择分类" clearable>
                 <el-option v-for="dict in smsb_source_classify" :key="dict.value" :label="dict.label"
                   :value="dict.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="目录" prop="treeId">
+            <el-form-item label="" prop="treeId">
               <el-tree-select v-model="queryParams.treeId" :data="sourceTreeOptions"
                 :props="{ value: 'id', label: 'name', children: 'children' }" value-key="id" placeholder="请选择归属目录"
                 check-strictly @change="handleQuery" style="width: 200px" clearable />
             </el-form-item>
-            <el-form-item label="时间" style="width: 250px">
+            <el-form-item label="" style="width: 250px">
               <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>
@@ -88,19 +88,19 @@
     <el-card shadow="never">
       <div class="table-content">
         <el-table v-loading="loading" :data="minioDataList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="" align="left"  width="5" />
           <el-table-column label="资源" align="left" prop="keyName" width="200" :show-overflow-tooltip="true" />
-          <el-table-column label="类型" align="center" prop="type" width="120">
+          <el-table-column label="类型" align="center" prop="type" width="80">
             <template #default="scope">
               <dict-tag :options="smsb_source_type" :value="scope.row.type" />
             </template>
           </el-table-column>
-          <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true" />
-          <el-table-column label="大小" align="left" prop="size" />
-          <el-table-column label="分辨率" align="left" prop="resolution" />
-          <el-table-column label="码率(kbps)" align="left" prop="codeRate" />
-          <el-table-column label="时长" align="left" prop="durationStr" />
-          <el-table-column label="预览" align="center" prop="screenshot">
+          <el-table-column label="文件名" align="left" prop="originalName" :show-overflow-tooltip="true" />
+          <el-table-column label="大小" align="center" prop="size" width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="分辨率" align="center" prop="resolution" width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="码率(kbps)" align="center" prop="codeRate" width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="时长" align="center" prop="durationStr" width="100" :show-overflow-tooltip="true" />
+          <el-table-column label="预览" align="center" prop="screenshot" width="100">
             <template #default="scope">
               <div v-if="scope.row.type === 1">
                 <!-- 图片类型 -->
@@ -116,23 +116,23 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column label="转码" align="center" prop="transState">
+          <el-table-column label="转码" align="center" prop="transState" width="100" :show-overflow-tooltip="true">
             <template #default="scope">
               <dict-tag :options="smsb_trans_result" :value="scope.row.transState" />
             </template>
           </el-table-column>
-          <el-table-column label="分类" align="center" prop="tag">
+          <el-table-column label="分类" align="center" prop="tag"  width="100" >
             <template #default="scope">
               <dict-tag :options="smsb_source_classify" :value="scope.row.tag" />
             </template>
           </el-table-column>
-          <el-table-column label="创建人" align="left" prop="createUser" />
-          <el-table-column label="创建时间" align="left" prop="createTime" width="180">
+          <el-table-column label="创建人" align="left" prop="createUser" width="120" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建时间" align="left" prop="createTime" width="160" :show-overflow-tooltip="true">
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
             <template #default="scope">
               <!--            <el-tooltip content="修改" placement="top">
                           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['source:minioData:edit']"></el-button>
@@ -258,13 +258,16 @@
 
 <script setup name="MinioData" lang="ts">
 import SmsbFileUploader from '@/components/SmsbFileUpload/SmsbFileUploader.vue';
-import { listMinioData, getMinioData, delMinioData, addMinioData, updateMinioData, fileStatistics } from '@/api/smsb/source/minioData';
-import { MinioDataVO, MinioDataQuery, MinioDataForm } from '@/api/smsb/source/minioData_type';
-import { listSourceTree } from '@/api/smsb/source/sourceTree';
-import { listMinioTransRecord } from '@/api/smsb/source/transRecord';
-import { MinioTransRecordQuery, MinioTransRecordVO } from '@/api/smsb/source/transRecord_type';
-import { ItemQuery, ItemVO } from '@/api/smsb/source/item_type';
-import { itemListByFileId } from '@/api/smsb/source/item';
+import {delMinioData, fileStatistics, getMinioData, listMinioData} from '@/api/smsb/source/minioData';
+import {MinioDataForm, MinioDataQuery, MinioDataVO} from '@/api/smsb/source/minioData_type';
+import {listSourceTree} from '@/api/smsb/source/sourceTree';
+import {listMinioTransRecord} from '@/api/smsb/source/transRecord';
+import {MinioTransRecordQuery, MinioTransRecordVO} from '@/api/smsb/source/transRecord_type';
+import {ItemQuery, ItemVO} from '@/api/smsb/source/item_type';
+import {itemListByFileId} from '@/api/smsb/source/item';
+/** 提交按钮 */
+// 通过ref访问SmsbFileUploader实例
+import {ref as vueRef} from 'vue';
 
 type SourceTreeOption = {
   id: number;
@@ -272,8 +275,16 @@ type SourceTreeOption = {
   children?: SourceTreeOption[];
 };
 
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { smsb_source_classify, smsb_source_type, smsb_trans_type, smsb_trans_progress, smsb_trans_result, smsb_item_type, smsb_split_screen } =
+const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+const {
+  smsb_source_classify,
+  smsb_source_type,
+  smsb_trans_type,
+  smsb_trans_progress,
+  smsb_trans_result,
+  smsb_item_type,
+  smsb_split_screen
+} =
   toRefs<any>(
     proxy?.useDict(
       'smsb_source_classify',
@@ -429,6 +440,7 @@ const handleQuery = () => {
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  dateRangeCreateTime.value = ['', ''];
   queryFormRef.value?.resetFields();
   handleQuery();
 };
@@ -471,9 +483,6 @@ const handleUse = async (row?: MinioDataVO) => {
   getItemListByFileId();
 };
 
-/** 提交按钮 */
-// 通过ref访问SmsbFileUploader实例
-import { ref as vueRef } from 'vue';
 const fileUploaderRef = vueRef();
 
 const submitForm = () => {
@@ -529,7 +538,11 @@ const getFileStatistics = async () => {
   videoNum.value = res.data.videoNum;
   otherNum.value = res.data.otherNum;
 };
-
+watch(() => dialog.visible, (newValue) => {
+  if (!newValue) {
+    getList();
+  }
+});
 onMounted(() => {
   getList();
   getTreeselect();