Merge remote-tracking branch 'origin/apps_dev' into apps_dev

com.awspaas.user.apps.yili.integration/template/page/Department.html

@@ -19,11 +19,12 @@
     <span style="margin-top: 6px;font-size: 11px;">智能文件搜索</span>
     <el-dialog
             :visible.sync="dialogVisible"
-            width="80%"
+            width="70%"
+            top="2%"
             custom-class="custom-dialog"
             append-to-body>
-      <span class="">
+      <span >
-        <el-button @click="openInFullScreen">全屏打开</el-button>
+        <i class="button-icon" @click="openInFullScreen"></i>
       </span>
       <iframe :src="newPageUrl" frameborder="0" style="width: 100%; height: 100%;"></iframe>
       <span slot="footer" class="dialog-footer">
@@ -758,8 +759,10 @@
   .custom-dialog .el-dialog__body {
     /* 设置高度为 70%，注意这里可能需要额外的 CSS 来处理滚动条和布局问题 */
     height: 70vh; /* 使用视口高度（viewport height）的 70% */
-    overflow: auto; /* 允许内容滚动 */
+    /*overflow: auto; /* 允许内容滚动 */
+    padding: 5px 10px;
   }
+
   .postInfo.icon1 i{display: block; width: 32px;height: 32px; float: left; background: url("../apps/com.awspaas.user.apps.yili.integration/static/icon1.png") no-repeat; background-size: 100%;border-radius: 100%; margin-right: 10px}
   .postInfo span{display:block;color: #639; font-size: 20px;margin-left: 6px}
   .postInfo.icon2 i{display: block; width: 32px;height: 32px; float: left; background: url("../apps/com.awspaas.user.apps.yili.integration/static/icon2.png") no-repeat; background-size: 100%;border-radius: 100%; margin-right: 10px}

com.awspaas.user.apps.yili.integration/web/com.awspaas.user.apps.yili.integration/css/department1.css

@@ -8,6 +8,18 @@
     background-size: contain;
 }
 
+.button-icon {
+    background: url(../img/fangda.png) no-repeat;
+    font-size: 16px;
+    position: absolute;
+    top: 20px;
+    right: 50px;
+    cursor: pointer;
+    border: none;
+    height: 16px;
+    width: 16px;
+}
+
 .tips{
     display: inline-block;
     height: 15px;