Merge branch 'ETA1.2.9'

src/views/dataEntry_manage/databaseList.vue

@@ -234,7 +234,7 @@
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
 							<el-popover 
 								placement="left" 
-								trigger="click"
+								trigger="hover"
 								popper-class="edb-tool-popover"
 								width="320" style="display: inline-block;">
 								<div class="edb-tool-wrap">

src/views/predictEdb_manage/predictEdb.vue

@@ -188,7 +188,7 @@
 						<div class="edb-tool-icon edb-tool" style="align-items: center;">
 							<el-popover 
 								placement="left" 
-								trigger="click"
+								trigger="hover"
 								popper-class="edb-tool-popover"
 								width="320" style="display: inline-block;">
 								<div class="edb-tool-wrap">

src/views/report_manage/addreportNew.vue

@@ -312,7 +312,7 @@
 			</div>
 		</div>
 		<span
-			class="slide-icon"
+			class="slide-icon slide-btn-icon"
 			:class="{'slide-left':!isRightFormShow,'slide-right':isRightFormShow}"
 			@click="isRightFormShow = !isRightFormShow"
 		>
@@ -994,10 +994,6 @@ export default {
 		}
 	}
 	.slide-icon {
-		padding: 20px 0;
-		box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.3);
-		border-radius: 5px;
-		background-color: #fff;
 		cursor: pointer;
 		position: fixed;
 		top: 50%;

src/views/report_manage/editChapterReport.vue

@@ -2,6 +2,7 @@
   <div id="editreport">
     <div
       id="leftfroala"
+      :class="{'full':!isRightFormShow,'block':isRightFormShow}"
       v-loading="importChartNum > 0"
       element-loading-text="图表批量插入中..."
       element-loading-spinner="el-icon-loading"
@@ -15,7 +16,7 @@
         v-model="aeForm.content"
       ></froala>
     </div>
-    <div id="rightitems">
+    <div id="rightitems" v-show="isRightFormShow">
       <div
         style="text-align: right; padding: 0px 0 15px 0; box-sizing: border-box"
       >
@@ -289,6 +290,13 @@
 				</div>
       </div>
     </div>
+    <span
+            class="slide-icon slide-btn-icon"
+            :class="{'slide-left':!isRightFormShow,'slide-right':isRightFormShow}"
+            @click="isRightFormShow = !isRightFormShow"
+        >
+            <i :class="{'el-icon-d-arrow-left':!isRightFormShow,'el-icon-d-arrow-right':isRightFormShow}"></i>
+        </span>
   </div>
 </template>
 
@@ -334,6 +342,7 @@ export default {
   data() {
     let that=this
     return {
+      isRightFormShow:true,
       weekPanelTabs:[
         "基础信息",
         "图表插入",
@@ -893,7 +902,13 @@ export default {
   overflow: hidden;
   #leftfroala {
     flex: 1;
-    max-width: calc(100vw - 750px);
+    overflow: hidden;
+    &.full{
+        max-width: calc(100vw - 200px - 60px);
+    }
+    &.block{
+        max-width: calc(100vw - 200px - 60px - 500px);
+    }
   }
   #rightitems {
     width: 500px;
@@ -948,6 +963,21 @@ export default {
       font-size: 14px;
     }
   }
+  .slide-icon{
+    position:fixed;
+    top: 50%;
+    transform: translateY(-50%);
+    z-index: 99;
+    &:hover {
+        background-color: #e0e0e0;
+    }
+    &.slide-left {
+        right: 30px;
+    }
+    &.slide-right {
+        right: 515px;
+    }
+  }
 }
 </style>
 <style lang="scss">