src/views/report/EditReport.vue

@@ -239,13 +239,13 @@ function handlePreviewReport() {
         State:1
     }
     sessionStorage.setItem('reportPreData',JSON.stringify(params))
-    const routerEl=router.resolve({
+
+    router.push({
         path:'/report/preview',
         query:{
             id:-1
         }
     })
-    window.open(routerEl.href,'_blank')
     return
 }
 
@@ -274,13 +274,12 @@ async function handlePreviewChapter() {
     const saveRes = await autoSaveReportChapter('auto');
     if(!saveRes) return
     
-    const routerEl=router.resolve({
+    router.push({
         path:'/report/chapter/preview',
         query:{
             id:reportData.value.ReportChapterId
         }
     })
-    window.open(routerEl.href,'_blank')
 }
 
 // 自动保存章节报告

src/views/report/PreviewDetail.vue

@@ -186,8 +186,6 @@ function handleCopyLink() {
         justify-content: space-between;
         font-size: $font-grey;
         font-size: 36px;
-        padding-bottom: 40px;
-        border-bottom: 1px solid $border-color;
         margin-bottom: 40px;
     }
     .report-abstract{

src/views/report/chapter/List.vue

@@ -504,6 +504,7 @@ async function handleConfirmSetLayout() {
                 class="chapter-list"
                 :list="chapterList" 
                 item-key="ReportChapterId"
+                handle=".move-icon"
                 animation="300"
                 @end="handleMoveChapter"
                 tag="ul"
@@ -539,6 +540,8 @@ async function handleConfirmSetLayout() {
                             </div>
                             
                         </div>
+                        
+                        <img src="@/assets/imgs/report/icon_drag.png" alt="" class="move-icon">
                     </li>
                 </template>
             </draggable>
@@ -800,6 +803,7 @@ async function handleConfirmSetLayout() {
         border: 1px solid $border-color;
         border-radius: 8px;
         margin-bottom: 20px;
+        position: relative;
         .img-box{
             position: relative;
             width: 160px;
@@ -859,6 +863,14 @@ async function handleConfirmSetLayout() {
 
         }
 
+        .move-icon {
+            width: 40px;
+            height: 40px;
+            position: absolute;
+            top: 20px;
+            right: 20px;
+        }
+
         .item-top {
             margin-bottom: 20px;
             .type-name {

src/views/report/chapter/Preview.vue

@@ -59,8 +59,6 @@ getChapterDetail()
         justify-content: space-between;
         font-size: $font-grey;
         font-size: 36px;
-        padding-bottom: 40px;
-        border-bottom: 1px solid $border-color;
         margin-bottom: 40px;
     }
     .report-abstract{

src/views/report/components/ReportFilter.vue

@@ -166,27 +166,27 @@ function handleResetCalendar(){
           <van-cell
               value-class="cell-con"
               required
-              title="筛选时间类型"
-              :value="getName('timeType')"
+              title="推送消息状态"
+              :value="getName('msgIsSend')"
               is-link
-              @click="handleOpenPicker('timeType')"
+              @click="handleOpenPicker('msgIsSend')"
           />
       </van-cell-group>
       <van-cell-group>
           <van-cell
               value-class="cell-con"
               required
-              title="推送消息状态"
-              :value="getName('msgIsSend')"
+              title="筛选时间类型"
+              :value="getName('timeType')"
               is-link
-              @click="handleOpenPicker('msgIsSend')"
+              @click="handleOpenPicker('timeType')"
           />
       </van-cell-group>
       <van-cell-group>
           <van-cell
               value-class="cell-con"
               required
-              title="更新时间"
+              :title="getName('timeType')"
               :value="getDate()"
               is-link
               @click="handleOpenDatePicker"

src/views/report/smartReport/EditReport.vue

@@ -448,7 +448,7 @@ function handleOpenInsertCompPop(e,{element,index}) {
 	currentState.activePindex=''
 	currentState.activeCindex=''
 
-	insertState.activeId = element.id;
+	insertState.activeId = element.child?.length ? element.child.map(_ =>_.id).join('/') : element.id;
 	insertState.activePindex = index;
 
   showInsertCompType.value = e.compId;
@@ -553,8 +553,6 @@ function handleChartInsert({list,type,chartType}){
 //插入文本
 const temTextVal = ref('')
 function handleInsertText(content) {
-	console.log(content)
-	console.log(currentState)
 	if(currentState.activeId) { //编辑
 		currentState.activeContent=content
 		if(currentState.activeCindex>=0&&currentState.activeCindex!==''){
@@ -707,13 +705,12 @@ async function handlePreviewReport() {
 				const saveRes=await autoSaveReportContent("auto")
 				if(!saveRes) return
 		}
-	  const routerEl=router.resolve({
+	  router.push({
         path:'/report/preview',
         query:{
             id: reportInfo.value.Id
         }
     })
-    window.open(routerEl.href,'_blank')
     return
 }
 
@@ -780,13 +777,12 @@ async function handlePreviewChapter() {
     const saveRes = await autoSaveReportChapter('auto');
     if(!saveRes) return
     
-		const routerEl=router.resolve({
+		router.push({
         path:'/report/chapter/preview',
         query:{
             id:reportInfo.value.ReportChapterId
         }
     })
-    window.open(routerEl.href,'_blank')
 }
 
 // 自动保存章节报告

src/views/report/smartReport/components/ReportLayoutImg.vue

@@ -158,7 +158,9 @@ function handleConfirm() {
         }
     }
 }
-
+:deep(.van-dropdown-menu__bar) {
+  box-shadow: none;
+}
 @media screen and (min-width:$media-width){
   .top-box{
     height: 60px;