comit

src/api/index.js

@@ -12,7 +12,8 @@ import { showLoadingToast,showToast,closeToast } from "vant";
 //loading动画白名单
 const LOADINGWHITELIST=[
   '/public/wechat_warning',
-  '/report/saveReportContent'
+  '/report/saveReportContent',
+  '/report/editDayWeekChapter'
 ]
 // 请求数
 let LOADINGCOUNT = 0;

src/api/report.js

@@ -167,5 +167,40 @@ export default {
      */
     dayWeekReportAdd(params){
         return post('/report/addDayWeekReport',params)
+    },
+    /**
+     * 获取晨报/周报上一篇内容
+     * @param TypeId
+     * @param ReportType day晨报 week周报
+     */
+    chapterReportPreContent(params){
+        return get('/report/getLastDayWeekReportChapter',params)
+    },
+    /**
+     * 晨报/周报章节保存
+     * 
+     */
+    chapterDetailSave(params){
+        return post('/report/editDayWeekChapter',params)
+    },
+    /**
+     * 判断晨报周报当前章节是否为最后一篇发布的
+     * @param ReportChapterId
+     */
+    chapterReportIsLast(params){
+        return get('/report/isLastDayWeekReportChapter',params)
+    },
+    /**
+     * 发布晨报周报章节
+     */
+    chapterReportPublish(params){
+        return post('/report/publishDayWeekReportChapter',params)
+    },
+    /**
+     * 晨报数据指标列表
+     * @param ReportChapterId
+     */
+    chapterDayReportTicketList(params){
+        return get('/report/getDayReportTickerList',params)
     }
 }

src/assets/styles/common.scss

@@ -9,7 +9,6 @@
 html,body,#app{
     font-size: 30px;
     color: #333;
-    height: 100%;
 }
 
 @media screen and (min-width:650px){

src/layouts/Index.vue

@@ -107,7 +107,6 @@ function goBack(){
 
 <style lang="scss" scoped>
 .layout-wrap{
-    height: 100%;
     overflow:visible;
 }
 .pad-header-box{

src/views/report/AddReport.vue

@@ -157,6 +157,17 @@ async function handleReportOpt(type){
         State:1
     }
     console.log(params);
+    if(type==='yl'){
+        sessionStorage.setItem('reportPreData',JSON.stringify(params))
+        const routerEl=router.resolve({
+            path:'/report/preview',
+            query:{
+                id:-1
+            }
+        })
+        window.open(routerEl.href,'_blank')
+        return
+    }
     cachedViewsStore.removeCaches('ReportList')
     if(type==='cg'){
         // 存草稿
@@ -347,7 +358,7 @@ async function reportPublish(id){
     }
 }
 .add-report-page{
-    height: 100vh;
+    height: 100dvh;
     display: flex;
     flex-direction: column;
     overflow: hidden;

src/views/report/EditReport.vue

@@ -231,6 +231,17 @@ async function handleReportOpt(type){
         State:1
     }
     console.log(params);
+    if(type==='yl'){
+        sessionStorage.setItem('reportPreData',JSON.stringify(params))
+        const routerEl=router.resolve({
+            path:'/report/preview',
+            query:{
+                id:-1
+            }
+        })
+        window.open(routerEl.href,'_blank')
+        return
+    }
     cachedViewsStore.removeCaches('ReportList')
     if(type==='cg'){
         // 存草稿
@@ -417,7 +428,7 @@ async function reportPublish(id){
     }
 }
 .add-report-page{
-    height: 100%;
+    height: 100dvh;
     display: flex;
     flex-direction: column;
     overflow: hidden;

src/views/report/List.vue

@@ -160,6 +160,19 @@ function handleReportPublishCancle(item){
     })
 }
 
+// 推送消息
+function handldReportMsgSend(item){
+    apiReport.reportMessageSend({
+        ReportId:Number(item.Id)
+    }).then(res=>{
+        if(res.Ret===200){
+            showToast('推送成功')
+            showReportItemOpt.value=false
+            refreshList()
+        }
+    })
+}
+
 // 日期筛选
 const calendarMinDate=new Date(2010,0,1)
 const showCalendar=ref(false)
@@ -515,13 +528,14 @@ async function handleReportEdit(e){
         close-on-click-action
     >
         <div class="report-item-action-box" v-if="activeItem">
-            <div class="title">{{activeItem.Title}}</div>
+            <!-- <div class="title">{{activeItem.Title}}</div> -->
             <template v-if="activeItem.State==1">
-                <div class="item" style="color:#0052D9" @click="handleReportEdit(activeItem)">编辑</div>
-                <div class="item" style="color:#C54322" @click="handleReportDel(activeItem)">删除</div>
-                <div class="item" style="color:#0052D9" @click="handleReportPublish(activeItem)">发布</div>
+                <div class="item" @click="handleReportEdit(activeItem)">编辑</div>
+                <div class="item" @click="handleReportPublish(activeItem)">发布</div>
+                <div class="item" @click="handleReportDel(activeItem)">删除</div>
             </template>
             <template v-if="activeItem.State==2">
+                <div class="item" @click="handldReportMsgSend(activeItem)" v-if="activeItem.MsgIsSend==0">推送消息</div>
                 <div class="item" @click="handleReportPublishCancle(activeItem)">取消发布</div>
             </template>
         </div>

src/views/report/PreviewDetail.vue

@@ -18,7 +18,15 @@ async function getReportDetail(){
         document.title=res.Data.Title
     }
 }
-getReportDetail()
+if(route.query.id==-1){
+    //新增编辑报告时的预览
+    const data=JSON.parse(sessionStorage.getItem('reportPreData'))
+    reportInfo.value=data
+    document.title=data.Title
+}else{
+    getReportDetail()
+}
+
 
 //去编辑
 async function goEdit(){
@@ -59,7 +67,7 @@ async function goEdit(){
 
 <template>
     <div class="report-detail-page" v-if="reportInfo">
-        <div class="top-stage-box">
+        <div class="top-stage-box" v-if="$route.query.id!=-1">
             <span class="stage">第{{reportInfo.Stage}}期 / {{reportInfo.Frequency}}</span>
             <img v-if="reportInfo.State==1" class="edit-icon" src="@/assets/imgs/report/icon_edit2.png" alt="" @click="goEdit">
         </div>

src/views/report/ReportDayWeekAdd.vue

@@ -186,7 +186,7 @@ function close(){
 
 <style lang="scss" scoped>
 .dayweek-report-add{
-    height: 100%;
+    height: 100dvh;
     position: relative;
     background: #EDEDED;
     :deep(.cell-con){

src/views/report/chapter/Detail.vue

@@ -1,20 +1,24 @@
 <script setup name="reportChapterDetail">
 import {ref,onMounted,onUnmounted, reactive, nextTick} from 'vue'
 import apiReport from '@/api/report'
-import { useRoute } from 'vue-router'
-import EditChapterBaseInfo from './components/EditChapterBaseInfo.vue' 
+import apiChart from '@/api/chart'
+import { useRoute, useRouter } from 'vue-router'
+import EditChapterBaseInfo from './components/EditChapterBaseInfo.vue'
+import AudioBox from '../components/AudioBox.vue'
+import ReportInsertContent from '../components/reportInsert/Index.vue'
 import moment from 'moment'
 import {useInitFroalaEditor} from '@/hooks/useFroalaEditor'
 import {useUserInfo} from '@/hooks/common'
-import { showToast } from 'vant'
+import { showToast,showDialog } from 'vant'
 import {useUploadFileToOSS} from '@/hooks/useUploadFileToOSS'
 import MD5 from 'js-md5'
-import AudioBox from '../components/AudioBox.vue'
+
 
 const userInfo=useUserInfo()
 
 const {FroalaEditorIns,initFroalaEditor,frolaEditorContentChange}=useInitFroalaEditor()
 const route=useRoute()
+const router=useRouter()
 
 let autoSaveTimer=null
 
@@ -28,15 +32,49 @@ onUnmounted(()=>{
     clearInterval(autoSaveTimer)
 })
 // 自动保存
-function autoSaveReportContent(){
-
+function autoSaveReportContent(e){
+    if(!e&&!frolaEditorContentChange.value) return
+    let arr=[]
+    ticketList.value.forEach(item=>{
+        let obj={
+            ticker:'',
+            sort:1,
+            lable:''
+        }
+        if(item.Selected){
+            obj.ticker=item.BaseColumnTicker
+			obj.sort=arr.length+1
+			obj.lable=item.BaseColumnName
+			arr.push(obj)
+        }
+    })
+    apiReport.chapterDetailSave({
+        ReportChapterId: Number(route.query.id),
+		Title:chapterBaseInfo.title,
+		AddType:chapterBaseInfo.addType,
+		Author:chapterBaseInfo.author,
+		CreateTime:chapterBaseInfo.createTime,
+		TickerList:arr,
+		Content: $('.fr-element').html(),
+		VideoUrl:chapterBaseInfo.audioUrl,
+		VideoName:`${chapterBaseInfo.title}(${moment().format('MMDD')})`,
+		VideoPlaySeconds:Number(chapterBaseInfo.audioDuration).toFixed(2).toString(),
+		VideoSize:Number(chapterBaseInfo.audioSize).toFixed(2).toString()
+    }).then(res=>{
+        if(res.Ret===200){
+            if(e==='cg'){
+                showToast('保存成功')
+            }
+        }
+        frolaEditorContentChange.value=false
+    })
 }
 
 
 let info=ref(null)
 function getChapterDetail(){
     apiReport.getChapterDetail({
-        ReportChapterId:(Number(route.query.id))
+        ReportChapterId:Number(route.query.id)
     }).then(res=>{
         if(res.Ret===200){
             info.value=res.Data
@@ -52,6 +90,11 @@ function getChapterDetail(){
                 chapterBaseInfo.audioDuration=res.Data.VideoPlaySeconds
                 chapterBaseInfo.audioSize=res.Data.VideoSize
             }
+
+            // 晨报获取指标数据
+            if(res.Data.ReportType=='day'){
+                getDayTicketList()
+            }
             
             // 由于周报有个上传音频区域 所以得在此处初始化富文本区域 不然高度有问题
             nextTick(()=>{
@@ -65,7 +108,17 @@ function getChapterDetail(){
         }
     })
 }
-getChapterDetail()
+
+// 获取晨报指标数据
+let ticketList=ref([])
+async function getDayTicketList(){
+    const res=await apiReport.chapterDayReportTicketList({
+        ReportChapterId:info.value.ReportChapterId
+    })
+    if(res.Ret===200){
+        ticketList.value=res.Data||[]
+    }
+}
 
 // 报告基本内容
 const showChapterBaseInfo=ref(false)
@@ -73,23 +126,47 @@ const chapterBaseInfo=reactive({
     type:'',
     title:'',
     addType:'',
-    ticket:[],
     author:'',
     createTime:'',
     audioUrl:'',
     audioDuration:0,
     audioSize:0,
 })
-// 保存报告基本内容
-function handleChapterBaseInfoSave(e){
+// 更新报告基本内容
+async function handleChapterBaseInfoSave(e){
     console.log(e);
-    // 继承报告
-    if(e.addType==2){
+    chapterBaseInfo.type=e.type
+    chapterBaseInfo.title=e.title
+    chapterBaseInfo.author=e.author
+    chapterBaseInfo.createTime=e.createTime
+    ticketList.value=e.ticket
 
-    }else{
-        
+    // 如果修改报告的新增方式 则刷新数据
+    if(chapterBaseInfo.addType!=e.addType){
+        chapterBaseInfo.addType=e.addType
+        // 继承报告
+        if(e.addType==2){
+            const res=await apiReport.chapterReportPreContent({
+                TypeId:info.value.TypeId,
+                ReportType:info.value.ReportType
+            })
+            if(res.Ret===200){
+                chapterBaseInfo.type=res.Data.TypeName
+                chapterBaseInfo.title=res.Data.Title
+                chapterBaseInfo.author=res.Data.Author||userInfo.RealName
+                chapterBaseInfo.createTime=moment(res.Data.CreateTime).format('YYYY-MM-DD')
+                FroalaEditorIns.value.html.set(res.Data.Content);
+                // 晨报获取指标数据
+				if(res.data.ReportType=='day'){
+					getDayTicketList()
+				}
+            }
+        }else{
+            FroalaEditorIns.value.html.set('');
+        }
     }
     
+    
     showChapterBaseInfo.value=false
 }
 
@@ -156,6 +233,180 @@ function handleUpdateAudio(){
     showUploadAudio.value=false
 }
 
+// 报告插入数据弹窗
+const showReportInsertPop=ref(false)
+/**
+ * list:[UniqueCode] 图表code
+ * type:iframe/img 插入的为iframe或者图片
+ * chartType: chart-图表,sheet-表格
+ */
+function handleInsert({list,type,chartType}){
+    if(type==='iframe'){
+        let link;
+        if(chartType==='chart'){
+            link=import.meta.env.MODE==='production'?'https://chartlib.hzinsights.com/chartshow':'https://charttest.hzinsights.com/chartshow'
+            list.forEach(item => {
+                FroalaEditorIns.value.html.insert(`<p style='text-align:left; margin-top:10px;'>
+						<iframe src='${link}?code=${item}&fromPage=' width='100%' height='350' style='border-width:0px; min-height:350px;'></iframe>
+					</p>`,false)
+            });
+        }else if(chartType==='sheet'){
+            link=import.meta.env.MODE==='production'?'https://chartlib.hzinsights.com/sheetshow':'https://charttest.hzinsights.com/sheetshow'
+            list.forEach(item => {
+                FroalaEditorIns.value.html.insert(`<p style='text-align:left; margin-top:10px;'>
+						<iframe src='${link}?code=${item}' class='iframe${item}'  width='100%' style='border-width:0px;'></iframe>
+					</p>`,false)
+            });
+        }
+    }else if(type==='img'){
+        list.forEach(item=>{
+            FroalaEditorIns.value.html.insert(`<img style='width:100%' src='${item}' />`,false)
+        })
+    }
+
+    showReportInsertPop.value=false
+}
+
+// 更新sheet表格高度
+function reInitSheetIframe(e){
+    const { height,code } = e.data;
+    let iframeDom = document.getElementsByClassName(`iframe${code}`)
+    Array.prototype.forEach.call(iframeDom, function (ele) {
+        ele.height = `${height+45}px`;
+    });
+}
+onMounted(()=>{
+    window.addEventListener('message',reInitSheetIframe)
+})
+onUnmounted(()=>{
+    window.removeEventListener('message',reInitSheetIframe)
+})
+
+// 刷新所有图表
+async function handleRefreshAllChart(){
+    let code_arr = [];
+    $('iframe').each((k,i) => {
+        try {
+          let href = $(i).attr('src');
+          code_arr.push(href.slice(href.indexOf('code=') + 5));
+        } catch (err) {
+        }
+    });
+    if(!code_arr.length) return showToast('请插入图表');
+    const res=await apiChart.refreshChartMultiple({ChartInfoCode:code_arr})
+    if(res.Ret===200){
+        $('iframe').each((k,i) => {
+          $(i).attr('src',$(i).attr('src'))
+        });
+        showToast('刷新成功')
+    }
+}
+
+//周报校验是否上传了音频
+function handleWeekValidAudio(){
+    return new Promise((resolve,reject)=>{
+        showDialog({
+            title: '发布提示',
+            message: '您还未上传录音文件，确定发布报告吗？',
+            showCancelButton:true
+        }).then(()=>{
+            resolve(true)
+        }).catch(()=>{
+            resolve(false)
+        })
+    })
+}
+
+// 发布章节报告
+async function chapterReportPublish(PublishReport){
+    let arr=[]
+    ticketList.value.forEach(item=>{
+        let obj={
+            ticker:'',
+            sort:1,
+            lable:''
+        }
+        if(item.Selected){
+            obj.ticker=item.BaseColumnTicker
+			obj.sort=arr.length+1
+			obj.lable=item.BaseColumnName
+			arr.push(obj)
+        }
+    })
+    const res=await apiReport.chapterReportPublish({
+        ReportChapterId: Number(route.query.id),
+		Title:chapterBaseInfo.title,
+		AddType:chapterBaseInfo.addType,
+		Author:chapterBaseInfo.author,
+		CreateTime:chapterBaseInfo.createTime,
+		TickerList:arr,
+		Content: $('.fr-element').html(),
+        PublishReport:PublishReport,
+		VideoUrl:chapterBaseInfo.audioUrl,
+		VideoName:`${chapterBaseInfo.title}(${moment().format('MMDD')})`,
+		VideoPlaySeconds:Number(chapterBaseInfo.audioDuration).toFixed(2).toString(),
+		VideoSize:Number(chapterBaseInfo.audioSize).toFixed(2).toString()
+    })
+    if(res.Ret===200){
+        showToast('发布成功')
+        setTimeout(() => {
+            router.back()
+        }, 1000);
+    }
+}
+
+// 发布报告-fb;保存-cg;预览-yl
+async function handleReportOpt(type){
+    if(type==='yl'){
+
+        const params={
+            Title:chapterBaseInfo.title,
+            Author:chapterBaseInfo.author,
+            PublishTime:chapterBaseInfo.createTime,
+            Abstract:'',
+            Content:$('.fr-element').html()
+        }
+        if(!params.Title){
+            showToast('请填写标题')
+            return
+        }
+        sessionStorage.setItem('reportPreData',JSON.stringify(params))
+        const routerEl=router.resolve({
+            path:'/report/preview',
+            query:{
+                id:-1
+            }
+        })
+        window.open(routerEl.href,'_blank')
+        return
+    }
+    if(type==='cg'){
+        autoSaveReportContent('cg')
+    }
+    if(type==='fb'){
+        if(info.value.ReportType==='week'&&!chapterBaseInfo.audioUrl){
+            const validRes=await handleWeekValidAudio()
+            if(!validRes) return
+        }
+        const res=await apiReport.chapterReportIsLast({ReportChapterId:info.value.ReportChapterId})
+        if(res.Ret===200){
+            if(res.Data){
+                showDialog({
+                    title: '发布提示',
+                    message: '本期报告品种已全部更新，点击发布将同时发布周报，确认同时发布吗？',
+                    showCancelButton:true
+                }).then(()=>{
+                    chapterReportPublish(1)
+                }).catch(()=>{
+                    chapterReportPublish(0)
+                })
+            }else{
+                chapterReportPublish(0)
+            }
+        }
+    }
+}
+
 </script>
 
 <template>
@@ -201,6 +452,7 @@ function handleUpdateAudio(){
     >
         <EditChapterBaseInfo
             v-if="showChapterBaseInfo"
+            :ticketData="ticketList"
             :chapterInfo="info"
             :defaultData="chapterBaseInfo"
             @close="showChapterBaseInfo=false"
@@ -233,11 +485,20 @@ function handleUpdateAudio(){
             </div>
         </div>
     </van-popup>
+
+    <!-- 报告插入数据模块 -->
+    <van-popup
+        v-model:show="showReportInsertPop"
+        position="bottom"
+        round
+    >
+        <report-insert-content v-if="showReportInsertPop" @insert="handleInsert"/>
+    </van-popup>
 </template>
 
 <style lang="scss" scoped>
 .chapter-detail-edit-page{
-    height: 100%;
+    height: 100dvh;
     display: flex;
     flex-direction: column;
     overflow: hidden;
@@ -310,9 +571,10 @@ function handleUpdateAudio(){
         padding-bottom: 32px;
         border-bottom: 1px solid $border-color;
         margin-bottom: 32px;
+        word-wrap: break-word;
     }
     .bot-btns{
-        width: 100%;
+        // width: 100%;
         position: absolute;
         bottom: 0;
         padding: 20px 0;

src/views/report/chapter/components/EditChapterBaseInfo.vue

@@ -1,13 +1,31 @@
 <script setup>
 import { showToast } from "vant";
-import { reactive,ref } from "vue";
+import { computed, reactive,ref } from "vue";
+import apiReport from '@/api/report'
 
 const props=defineProps({
+    ticketData:{
+        default:[]
+    },
     chapterInfo:null,
     defaultData:null
 })
 const emits=defineEmits(['close','confirm'])
 
+// 获取晨报指标数据
+const showTicketPop=ref(false)
+let activeTicket=ref([])//选中的指标
+const activeTicketArr=computed(()=>{
+    return props.ticketData.filter(item=>activeTicket.value.includes(item.BaseColumnId))
+})
+if(props.chapterInfo.ReportType==='day'){
+    props.ticketData.forEach(item => {
+        if(item.Selected){
+            activeTicket.value.push(item.BaseColumnId)
+        }
+    });
+}
+
 const baseInfo=reactive({
     type:props.defaultData.type||'',
     title:props.defaultData.title||'',
@@ -73,6 +91,13 @@ function handleSave(){
         showToast('请填写标题')
         return
     }
+    // 处理晨报选中的指标
+    baseInfo.ticket=props.ticketData.map(item=>{
+        return {
+            ...item,
+            Selected:activeTicket.value.includes(item.BaseColumnId)?1:0
+        }
+    })
     emits('confirm',baseInfo)
 }
 
@@ -81,11 +106,48 @@ function handleSave(){
 <template>
     <div class="chapter-baseinfo-wrap">
         <van-cell-group>
-            <van-cell value-class="cell-con" required title="品种" :value="baseInfo.type"/>
-            <van-cell value-class="cell-con" required title="新增方式" is-link :value="getAddTypeName(baseInfo.addType)" @click="showAddTypePop=true"/>
-            <van-cell value-class="cell-con" title="显示指标" is-link value="" v-if="chapterInfo.ReportType==='day'"/>
-            <van-cell value-class="cell-con" title="创建人" is-link :value="baseInfo.author"/>
-            <van-cell value-class="cell-con" title="创建时间" is-link :value="baseInfo.createTime" @click="handleShowCreatetime"/>
+            <van-cell 
+                value-class="cell-con" 
+                required 
+                title="品种" 
+                :value="baseInfo.type"
+            />
+            <van-cell 
+                value-class="cell-con" 
+                required 
+                title="新增方式" 
+                is-link 
+                :value="getAddTypeName(baseInfo.addType)" 
+                @click="showAddTypePop=true"
+            />
+            <van-cell 
+                value-class="cell-con" 
+                title="显示指标" 
+                is-link 
+                value="" 
+                v-if="chapterInfo.ReportType==='day'" 
+                @click="showTicketPop=true"
+            >
+                <template #value>
+                    <div class="ticket-name-box">
+                        <span style="margin-right:5px">{{activeTicketArr[0]?.BaseColumnName}}</span>
+                        <van-tag type="primary" v-if="activeTicketArr.length>1">+{{activeTicketArr.length-1}}</van-tag>
+                    </div>
+                </template>
+            </van-cell>
+            <van-cell 
+                value-class="cell-con" 
+                title="创建人" 
+                is-link 
+                :value="baseInfo.author"
+            />
+            <van-cell 
+                value-class="cell-con" 
+                title="创建时间" 
+                is-link 
+                :value="baseInfo.createTime" 
+                @click="handleShowCreatetime"
+            />
         </van-cell-group>
         <van-cell-group style="margin-top:10px">
              <van-cell value-class="cell-con" required title="标题" is-link :label="baseInfo.title" @click="handleShowReportTitle"/>
@@ -130,6 +192,28 @@ function handleSave(){
             </div>
         </div>
     </van-popup>
+
+    <!-- 选择晨报的指标 -->
+    <van-popup
+        v-model:show="showTicketPop"
+        position="bottom"
+        :style="{ height: '100%' }"
+    >
+        <div class="day-report-ticket-list-wrap">
+            <ul class="list">
+                <van-checkbox-group v-model="activeTicket">
+                    <van-checkbox 
+                        :name="item.BaseColumnId" 
+                        v-for="item in ticketData" 
+                        :key="item.BaseColumnId"
+                    >{{item.BaseColumnName}}</van-checkbox>
+                </van-checkbox-group>
+            </ul>
+            <div class="btns">
+                <van-button type="primary" @click="showTicketPop=false">确定</van-button>
+            </div>
+        </div>
+    </van-popup>
 </template>
 
 <style lang="scss" scoped>
@@ -165,4 +249,30 @@ function handleSave(){
         text-align: center;
     }
 }
+
+.day-report-ticket-list-wrap{
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    .list{
+        overflow-y: auto;
+        flex: 1;
+        padding: var(--van-padding-sm) 0 var(--van-padding-sm) var(--van-padding-sm);
+        :deep(.van-checkbox__label){
+            flex: 1;
+            padding: 32px 0;
+            border-bottom: 1px solid $border-color;
+        }
+    }
+    .btns{
+        text-align: center;
+        padding: var(--van-padding-sm);
+        display: flex;
+        justify-content: space-around;
+        .van-button{
+            width: 100%;
+        }
+    }
+}
 </style>