2 Komitmen c78efad6e6 ... 1d02578f7f

Pembuat SHA1 Pesan Tanggal
  Karsa 1d02578f7f Merge branch 'eta1.8' into debug 2 bulan lalu
  Karsa bdc8f89dee style 2 bulan lalu

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
 # 接口地址http://8.136.199.33:8610/v1   http://8.136.199.33:7778/adminapi
 # 接口地址http://8.136.199.33:8610/v1   http://8.136.199.33:7778/adminapi
-VITE_APP_API_URL="http://8.136.199.33:7778/adminapi"
+VITE_APP_API_URL="http://8.136.199.33:8610/v1"
 # 路由根地址
 # 路由根地址
 VITE_APP_BASE_URL="/"
 VITE_APP_BASE_URL="/"
 # 打包输入文件名
 # 打包输入文件名

+ 2 - 3
src/views/report/PreviewDetail.vue

@@ -92,10 +92,9 @@ function handleCopyLink() {
 
 
 <template>
 <template>
     <div class="report-detail-page" v-if="reportInfo" :style="{backgroundColor:bgColor}">
     <div class="report-detail-page" v-if="reportInfo" :style="{backgroundColor:bgColor}">
-        <div class="top-stage-box" v-if="$route.query.id!=-1">
+        <!-- <div class="top-stage-box" v-if="$route.query.id!=-1">
             <span class="stage">第{{reportInfo.Stage}}期 / {{reportInfo.Frequency}}</span>
             <span class="stage">第{{reportInfo.Stage}}期 / {{reportInfo.Frequency}}</span>
-            <!-- <img v-if="reportInfo.State==1&&checkAuthBtn(reportManageBtn.reportManage_reportEdit)" class="edit-icon" src="@/assets/imgs/report/icon_edit2.png" alt="" @click="goEdit"> -->
-        </div>
+        </div> -->
 
 
         <!-- 版头 -->
         <!-- 版头 -->
         <div class="html-head-img-box" v-if="reportInfo && reportInfo.HeadImg">
         <div class="html-head-img-box" v-if="reportInfo && reportInfo.HeadImg">

+ 44 - 25
src/views/report/smartReport/EditReport.vue

@@ -860,7 +860,7 @@ const {
           <!-- 版头 -->
           <!-- 版头 -->
           <div class="html-head-img-box">
           <div class="html-head-img-box">
               <div class="opt-btn-box"  style="display: none;">
               <div class="opt-btn-box"  style="display: none;">
-									<van-icon name="delete-o" @click.stop="deleteLayoutPic(1)" color="#f00"/>
+									<van-icon name="delete-o" @click.stop="deleteLayoutPic(1)" color="#f00" size="22"/>
               </div>
               </div>
               <img :src="headImg" alt="" style="display:block;width:100%">
               <img :src="headImg" alt="" style="display:block;width:100%">
               <div class="head-layout-item" v-for="item in headImgStyle" :key="item.value"
               <div class="head-layout-item" v-for="item in headImgStyle" :key="item.value"
@@ -893,7 +893,7 @@ const {
               >
               >
                   <div class="resize-drag-box" @mousedown.stop="handleResizeP($event,index)"></div>
                   <div class="resize-drag-box" @mousedown.stop="handleResizeP($event,index)"></div>
                   <div class="opt-btn-box"  style="display: none;">
                   <div class="opt-btn-box"  style="display: none;">
-											<van-icon name="delete-o" @click.stop="handleDelItem(index,-1)" color="#f00"/>
+											<van-icon name="delete-o" @click.stop="handleDelItem(index,-1)" color="#f00" size="22"/>
 											<div class="drag-btn drag-btn_p"></div>
 											<div class="drag-btn drag-btn_p"></div>
                   </div>
                   </div>
                   <div 
                   <div 
@@ -952,7 +952,7 @@ const {
 											>
 											>
 													<div class="opt-btn-box2" style="display: none;">
 													<div class="opt-btn-box2" style="display: none;">
 															<div class="drag-btn drag-btn_c"></div>
 															<div class="drag-btn drag-btn_c"></div>
-															<van-icon name="delete-o" @click.stop="handleDelItem(index,child.index)" color="#f00"/>
+															<van-icon name="delete-o" @click.stop="handleDelItem(index,child.index)" color="#f00" size="22"/>
 													</div>
 													</div>
 													<!-- 拖动按钮 -->
 													<!-- 拖动按钮 -->
 													<div class="resize-drag-box_lb" @mousedown.stop="handleResizeC($event,index,child.index,'lb')"></div>
 													<div class="resize-drag-box_lb" @mousedown.stop="handleResizeC($event,index,child.index,'lb')"></div>
@@ -970,7 +970,7 @@ const {
           <!-- 版尾 -->
           <!-- 版尾 -->
           <div class="html-end-img-box">
           <div class="html-end-img-box">
               <div class="opt-btn-box"  style="display: none;">
               <div class="opt-btn-box"  style="display: none;">
-									<van-icon name="delete-o" @click.stop="deleteLayoutPic(2)" color="#f00"/>
+									<van-icon name="delete-o" @click.stop="deleteLayoutPic(2)" color="#f00" size="22"/>
               </div>
               </div>
               <img :src="endImg" alt="" style="display:block;width:100%">
               <img :src="endImg" alt="" style="display:block;width:100%">
               <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
               <div class="head-layout-item" v-for="item in endImgStyle" :key="item.value"
@@ -1163,9 +1163,6 @@ const {
 						}
 						}
 				}
 				}
 
 
-				.drag-btn {
-					display: block;
-				}
 				.drag-btn::after{
 				.drag-btn::after{
 						content: '';
 						content: '';
 						display: block;
 						display: block;
@@ -1177,9 +1174,17 @@ const {
 				}
 				}
 				.opt-btn-box{
 				.opt-btn-box{
 						position: absolute;
 						position: absolute;
-						right: -36px;
-						padding-right: 8px;
-						top: 0;
+						right: 0;
+						padding: 6px 10px 0;
+						top: -80px;
+						background: #fff;
+						border: 1px solid #ECF2FE;
+						box-shadow: 0 4px 8px rgba(0, 0, 0, 0.04);
+
+					.drag-btn {
+						display: inline-block;
+						margin-left: 10px;
+					}
 				}
 				}
 				.resize-drag-box{
 				.resize-drag-box{
 						position: absolute;
 						position: absolute;
@@ -1221,9 +1226,17 @@ const {
 				}
 				}
 				.opt-btn-box2{
 				.opt-btn-box2{
 						position: absolute;
 						position: absolute;
-						right: -15px;
+						padding: 6px 4px;
+						right: 0;
 						top: 0;
 						top: 0;
 						z-index: 10;
 						z-index: 10;
+						background: #fff;
+						border: 1px solid #ECF2FE;
+						box-shadow: 0 4px 8px rgba(0, 0, 0, 0.04);
+					.drag-btn {
+						display: block;
+						margin-bottom: 8px;
+					}
 				}
 				}
 				.resize-drag-box_lt,
 				.resize-drag-box_lt,
 				.resize-drag-box_lb,
 				.resize-drag-box_lb,
@@ -1263,7 +1276,7 @@ const {
 .report-content-box{
 .report-content-box{
     width: 100%;
     width: 100%;
     margin: 0 auto;
     margin: 0 auto;
-		padding: 20px 40px;
+		padding: 20px;
 		.html-head-img-box,.html-end-img-box{
 		.html-head-img-box,.html-end-img-box{
 				position: relative;
 				position: relative;
 				&:hover{
 				&:hover{
@@ -1273,9 +1286,12 @@ const {
 				}
 				}
 				.opt-btn-box{
 				.opt-btn-box{
 						position: absolute;
 						position: absolute;
-						right: -36px;
-						padding-right: 8px;
-						top: 0;
+						right: 0;
+						padding: 6px 10px 0;
+						top: -60px;
+						background: #fff;
+						border: 1px solid #ECF2FE;
+						box-shadow: 0 4px 8px rgba(0, 0, 0, 0.04);
 				}
 				}
 				.head-layout-item{
 				.head-layout-item{
 						position: absolute;
 						position: absolute;
@@ -1377,6 +1393,14 @@ const {
         height: calc(100dvh - 60px);
         height: calc(100dvh - 60px);
         min-height: calc(95vh - 60px);
         min-height: calc(95vh - 60px);
     }
     }
+		.report-content-box{
+			.html-head-img-box,.html-end-img-box{
+					.opt-btn-box{
+						top:-32px;
+						padding: 6px 10px 0;
+					}
+			}
+		} 
 
 
     .bot-action-box{
     .bot-action-box{
         margin: 0 auto;
         margin: 0 auto;
@@ -1409,23 +1433,18 @@ const {
       margin-top: 20px;
       margin-top: 20px;
 			max-width: 800px;
 			max-width: 800px;
 			.report-content-box {
 			.report-content-box {
-				padding: 20px 20px 20px 44px;
+				padding: 20px ;
 			}
 			}
 			.report-drag-item-wrap {
 			.report-drag-item-wrap {
 				margin-bottom: 80px;
 				margin-bottom: 80px;
 
 
 				.drag-btn::after{
 				.drag-btn::after{
-						width: 28px;
-						height: 28px;
+						width: 22px;
+						height: 22px;
 				}
 				}
 				.opt-btn-box{
 				.opt-btn-box{
-					right: -30px;
-				}
-			}
-
-			.report-drag-item-wrap_child_content{ 
-				.opt-btn-box2{
-					right: -10px;
+					top:-42px;
+					padding: 6px 10px 0;
 				}
 				}
 			}
 			}
     }
     }