Merge remote-tracking branch 'lihao/master'

smsb-modules/smsb-source/src/main/java/com/inspur/source/service/impl/SmsbItemPushServiceImpl.java

@@ -152,8 +152,10 @@ public class SmsbItemPushServiceImpl implements ISmsbItemPushService {
             List<SmsbMinioDataVo> sourceList = getSourceListByProgram(itemPushVo,reviewVo);
             reviewVo.setResourceList(sourceList);
         }
+        // 根据pushId+deviceId 获取本次发布的时间段
+        Long oneDeviceId = deviceList.get(0).getId();
         List<SmsbItemPushPlaylistVo> pushPlaylistVos = smsbItemPushPlaylistMapper.selectVoList(new LambdaQueryWrapper<SmsbItemPushPlaylist>()
-            .eq(SmsbItemPushPlaylist::getPushId, pushId));
+            .eq(SmsbItemPushPlaylist::getPushId, pushId).eq(SmsbItemPushPlaylist::getDeviceId,oneDeviceId));
         String dateStart = pushPlaylistVos.get(0).getStartDate();
         String dateEnd = pushPlaylistVos.get(0).getEndDate();
         List<SmsbItemPushTimeRangeBo> timeRangeList = new ArrayList<>();

smsb-plus-ui/src/views/smsb/item/index.vue

@@ -113,9 +113,9 @@
                   v-model:limit="queryParams.pageSize" @pagination="getList"/>
     </el-card>
     <!-- 编辑历史弹窗 -->
-    <el-dialog title="编辑历史" v-model="editHistoryDialog.visible" width="800px" style="height: 720px" append-to-body>
+    <el-dialog title="编辑历史" v-model="editHistoryDialog.visible" width="900px" style="height: 720px" append-to-body>
       <div class="table-content">
-        <el-table v-loading="editHistoryDialog.loading" :data="itemEditHisList" style="height: 600px">
+        <el-table v-loading="editHistoryDialog.loading" border fit :data="itemEditHisList" style="height: 600px" >
           <el-table-column label="文件名称" align="left" prop="sourceName" :show-overflow-tooltip="true"/>
           <el-table-column label="编辑类型" align="center" prop="editType" width="100">
             <template #default="scope">
@@ -140,7 +140,7 @@
           <el-input v-model="itemName" placeholder="请输入轮播组名称" class="interface-input"></el-input>
 
           <el-table v-loading="dialogLoading" ref="fileTable" :data="minioDataList" reserve-selection row-key="id"
-            @selection-change="handleSelectionFile" @select="handleSelect" @select-all="handleSelectAll">
+            @selection-change="handleSelectionFile" @select="handleSelect" @select-all="handleSelectAll" border fit>
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="类型" align="center" prop="type" width="80">
               <template #default="scope">
@@ -842,6 +842,7 @@ onActivated(() => {
 
 .selected-container {
   flex: 1;
+  border: 1px solid #eee;
 }
 
 .interface-input {

smsb-plus-ui/src/views/smsb/itemPush/approval.vue

@@ -23,7 +23,27 @@
     <el-card shadow="always" class="custom-card">
       <div v-if="loading" class="loading-text">数据加载中...</div>
       <div v-else class="card-content">
-        <div class="info-item">
+        <el-descriptions title="发布详情" :column="7" border style="width: 100%">
+          <el-descriptions-item label="发布名称">
+            {{itemPushBase.name}}
+          </el-descriptions-item>
+          <el-descriptions-item label="发布类型">
+            <dict-tag :options="smsb_push_type" :value="itemPushBase.itemType" />
+          </el-descriptions-item>
+          <el-descriptions-item label="优先级">
+            <dict-tag :options="smsb_push_level" :value="itemPushBase.level" />
+          </el-descriptions-item>
+          <el-descriptions-item label="发布时间">
+            {{itemPushBase.createTime}}
+          </el-descriptions-item>
+          <el-descriptions-item label="发布人">
+            {{itemPushBase.createUser}}
+          </el-descriptions-item>
+          <el-descriptions-item label="发布状态">
+            <dict-tag :options="smsb_push_state" :value="itemPushBase.status" />
+          </el-descriptions-item>
+        </el-descriptions>
+<!--        <div class="info-item">
           <strong>名称：</strong>
           <el-text>{{ itemPushBase.name }}</el-text>
         </div>
@@ -58,7 +78,7 @@
               {{ dict.label }}
             </div>
           </el-text>
-        </div>
+        </div>-->
       </div>
     </el-card>
     <!-- deviceList timeList sourceList -->
@@ -76,15 +96,15 @@
         </div>
         <!-- 第三部分内容 -->
         <div class="section-content">
-          <el-table v-loading="loading" :data="sourceList">
-            <el-table-column label="原名" align="left" prop="originalName" width="150" :show-overflow-tooltip="true" />
+          <el-table v-loading="loading" border fit :data="sourceList">
+            <el-table-column label="文件" align="left" prop="originalName" :show-overflow-tooltip="true" />
             <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="center" prop="size" />
-            <el-table-column label="截图" align="center" prop="screenshot">
+            <el-table-column label="大小" align="center" prop="size" width="80"/>
+            <el-table-column label="截图" align="center" prop="screenshot" width="80">
               <template #default="scope">
                 <image-preview :src="scope.row.screenshot" style="width: 40px; height: 40px; cursor: pointer" />
               </template>

smsb-plus-ui/src/views/smsb/itemPush/index.vue

@@ -147,19 +147,19 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="1500px" style="height: 750px" append-to-body>
       <el-row :gutter="20" style="height: 100%; display: flex">
         <!--设备列表-->
-        <el-col :span="6" style="height: 100%; overflow: auto; border-right: 1px solid #eee; padding-right: 10px">
-          <el-row style="margin-bottom: 10px">
+        <el-col :span="6" style="height: 100%; overflow: auto; padding-right: 10px">
+          <el-row style="margin-bottom: 13px;margin-top: 5px">
             <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable style="width: 270px" />
             <el-button type="primary" @click="getDeviceList" style="margin-left: 10px">查询</el-button>
           </el-row>
-          <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectDevice" style="height: 520px">
+          <el-table v-loading="loading" border fit highlight-current-row :data="deviceList" @selection-change="handleSelectDevice" style="height: 520px">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column label="设备名称" align="left" prop="name" :show-overflow-tooltip="true" />
           </el-table>
         </el-col>
         <!--发布名称-->
-        <el-col :span="9" style="height: 100%; overflow: auto; padding-left: 10px">
-          <el-form ref="itemPushFormRef" :model="form" :rules="rules" label-width="60px">
+        <el-col :span="9" style="height: 570px; overflow: auto; border: 1px solid #eee; padding-left: 10px">
+          <el-form ref="itemPushFormRef" :model="form" :rules="rules" style="margin-top: 5px" label-width="60px">
             <el-form-item label="名称" prop="name">
               <el-input v-model="form.name" placeholder="请输入名称" />
             </el-form-item>
@@ -214,7 +214,7 @@
         <el-col :span="9" style="height: 100%; overflow: auto; padding-left: 10px">
           <!--轮播组 -->
           <div v-if="form.itemType === 1 || form.itemType === 3">
-            <el-table v-loading="loading" :data="itemList" style="height: 570px">
+            <el-table v-loading="loading" border fit highlight-current-row :data="itemList" style="height: 570px">
               <el-table-column label="ID" width="200" align="left" :show-overflow-tooltip="true">
                 <template #default="{ row }">
                   <el-radio v-model="selectedRowId" :label="row.id" @change="handleRadioChange(row)" />
@@ -227,7 +227,7 @@
           </div>
           <!-- 素材 -->
           <div v-if="form.itemType === 4 ">
-            <el-table v-loading="loading" :data="minioDataList" style="height: 570px" @selection-change="handleSelectionMinioChange">
+            <el-table v-loading="loading" border fit highlight-current-row :data="minioDataList" style="height: 570px" @selection-change="handleSelectionMinioChange">
               <el-table-column type="selection" width="40" align="center" />
               <el-table-column label="ID" prop="id" width="170" align="left" :show-overflow-tooltip="true" />
               <el-table-column label="文件" align="left" prop="originalName"  :show-overflow-tooltip="true" />
@@ -278,7 +278,7 @@
 
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-table v-loading="deviceLoading" :data="pushSourceList" style="height: 500px; margin-top: 10px">
+          <el-table v-loading="deviceLoading" border fit highlight-current-row :data="pushSourceList" style="height: 542px; margin-top: 10px">
             <el-table-column label="排序" align="center" prop="sort" width="60" :show-overflow-tooltip="true" />
             <el-table-column label="时长" align="center" prop="duration" width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="资源" align="left" prop="fileName" :show-overflow-tooltip="true"/>
@@ -300,7 +300,7 @@
           <!--设备列表-->
           <el-button type="primary" v-if="removeItemTag" icon="Bottom" :disabled="removeButtonTag"
                      @click="handleDoRemoveItem()" style="margin-top: 10px"> 下架 </el-button>
-          <el-table v-loading="deviceLoading" :data="pushDeviceList" style="height: 500px; margin-top: 10px"
+          <el-table v-loading="deviceLoading" border fit highlight-current-row :data="pushDeviceList" style="height: 500px; margin-top: 10px"
                     @selection-change="handleDeviceSelectionChange">
             <el-table-column type="selection" v-if="removeItemTag" width="55" align="center" />
             <el-table-column label="设备名称" align="left" prop="deviceName" :show-overflow-tooltip="true" />
@@ -316,7 +316,7 @@
               <template #default="scope">
                 <el-tooltip content="下架" placement="top">
                   <el-button link type="primary" icon="Bottom" @click="handleDoRemoveItem(scope.row)"
-                             v-hasPermi="['source:itemPush:edit']"></el-button>
+                             v-hasPermi="['source:itemPush:edit']">下架</el-button>
                 </el-tooltip>
               </template>
             </el-table-column>

smsb-plus-ui/src/views/smsb/itemReview/approvalRecordSmsb.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="container">
-    <el-dialog v-model="visible" draggable title="审批记录" :width="props.width" :height="props.height"
+    <el-dialog v-model="visible" draggable title="审批记录" style="height: 85%; width: 70%;"
       :close-on-click-modal="false">
-      <el-tabs v-model="tabActiveName" class="demo-tabs">
+      <el-tabs v-model="tabActiveName">
         <el-tab-pane label="流程图" name="bpmn">
           <BpmnView ref="bpmnViewRef"></BpmnView>
         </el-tab-pane>

smsb-plus-ui/src/views/smsb/itemReview/submitVerifySmsb.vue

@@ -1,7 +1,7 @@
 <template>
-  <el-dialog v-model="dialog.visible" :title="dialog.title" width="40%" draggable :before-close="cancel" center
+  <el-dialog v-model="dialog.visible" :title="dialog.title" width="55%" draggable :before-close="cancel" center
     :close-on-click-modal="false">
-    <el-form v-loading="loading" :model="form" label-width="120px">
+    <el-form v-loading="loading" :model="form" label-width="70px">
       <el-form-item v-if="task.businessStatus === 'waiting'" label="审批意见">
         <el-input v-model="form.message" type="textarea" :rows="5" maxlength="254" placeholder="请输入审批意见" />
       </el-form-item>
@@ -83,7 +83,7 @@ const task = ref<TaskVO>({
 });
 const dialog = reactive<DialogOption>({
   visible: false,
-  title: '提示'
+  title: '审批'
 });
 
 const form = ref<Record<string, any>>({

smsb-plus-ui/src/views/smsb/minioData/index.vue

@@ -200,7 +200,7 @@
     <el-dialog :title="trans.title" v-model="trans.visible" width="1000px" append-to-body :style="{ height: '700px' }">
       <el-card shadow="never">
         <div class="table-content" style="min-height: 525px">
-          <el-table v-loading="loading" :data="transRecordList">
+          <el-table v-loading="loading" border fit highlight-current-row :data="transRecordList">
             <el-table-column label="资源名称" align="left" prop="fileName" width="200" :show-overflow-tooltip="true" />
             <el-table-column label="转码类型" align="center" prop="transType">
               <template #default="scope">
@@ -236,7 +236,7 @@
       :style="{ height: '700px' }">
       <el-card shadow="never">
         <div class="table-content" style="min-height: 525px">
-          <el-table v-loading="loading" :data="itemRecordList">
+          <el-table v-loading="loading" :data="itemRecordList" border fit highlight-current-row style="width: 100%">
             <el-table-column label="名称" align="left" prop="itemName" />
             <el-table-column label="类型" align="center" prop="itemType" width="100">
               <template #default="scope">