diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index d76d2cbb..351af8d6 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -124,7 +124,6 @@
 
 /*弹出modal 先有content后有body 故滚动条控制在body上*/
 .ant-modal-cust-warp .ant-modal-content {
-  height: 90% !important;
   overflow-y: hidden
 }
 
diff --git a/src/components/MindMap.vue b/src/components/MindMap.vue
index d0f2907d..99a13cd6 100644
--- a/src/components/MindMap.vue
+++ b/src/components/MindMap.vue
@@ -90,21 +90,32 @@ export default {
   data () {
     return {
       data: {},
-      graph: null
+      graph: null,
+      loadEnd: false
     }
   },
   watch: {
     mapData: {
       handler () {
         this.data = JSON.parse(JSON.stringify(this.mapData))
-        this.$nextTick(() => {
+        if (this.loadEnd) {
           this.initMindMap()
-        })
+        }
       },
       deep: true,
       immediate: true
+    },
+    loadEnd () {
+      if (this.loadEnd) {
+        this.initMindMap()
+      }
     }
   },
+  mounted () {
+    this.$nextTick(() => {
+      this.loadEnd = true
+    })
+  },
   methods: {
     initMindMap () {
       G6.registerNode('tree-node', {
@@ -194,6 +205,8 @@ export default {
       }, 'single-shape')
       this.graph = new G6.TreeGraph({
         container: this.domId,
+        width: document.getElementById(this.domId).clientWidth,
+        height: document.getElementById(this.domId).clientHeight,
         modes: {
           default: [{
             type: 'collapse-expand',
diff --git a/src/views/businessSupport/dataCenter/modules/AddModel.vue b/src/views/businessSupport/dataCenter/modules/AddModel.vue
index 371c4d6e..6dbdd1f6 100644
--- a/src/views/businessSupport/dataCenter/modules/AddModel.vue
+++ b/src/views/businessSupport/dataCenter/modules/AddModel.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <a-modal
+    <j-modal
       :title="title"
       :maskClosable="false"
       :width="600"
@@ -8,6 +8,7 @@
       :closable="true"
       @cancel="handleCancel"
       :visible="visible"
+      switchFullscreen
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
       <a-spin :tip="this.$t('businessSupp.dataCenter.fileUploaded')" :spinning="spinning">
         <a-form>
@@ -53,7 +54,7 @@
         <a-button style="margin-right: 8px" @click="handleCancel">{{$t('cancel')}}</a-button>
         <a-button @click="handleSubmit" type="primary">{{$t('submit')}}</a-button>
       </div>
-    </a-modal>
+    </j-modal>
     <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
   </div>
 </template>
diff --git a/src/views/businessSupport/dataCenter/modules/AddNodeModal.vue b/src/views/businessSupport/dataCenter/modules/AddNodeModal.vue
index 1a2309c5..a44aab8e 100644
--- a/src/views/businessSupport/dataCenter/modules/AddNodeModal.vue
+++ b/src/views/businessSupport/dataCenter/modules/AddNodeModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     class="add-menus"
     :title="title"
     :width="600"
     :visible="visible"
+    switchFullscreen
     :confirm-loading="confirmLoading"
     @cancel="handleCancelMenuRight"
     @ok="hideModalMenuRight"
@@ -106,7 +107,7 @@
         </a-col>
       </a-row>
     </a-form-model>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue
index 08a543e0..5a88a1e0 100644
--- a/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue
+++ b/src/views/businessSupport/standardizationActivity/StandardizationActivityPage.vue
@@ -206,7 +206,7 @@ export default {
 
 #mountNode {
   width: 100%;
-  height: 100%;
+  height: calc(100% - 56px);
 }
 
 </style>
diff --git a/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue b/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue
index 0d918477..e664ca4f 100644
--- a/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue
+++ b/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     :title="$t('docTool.comparison.fullTextComments')"
     :width="600"
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
+    switchFullscreen
     @cancel="visible = false">
 
     <template slot="footer">
@@ -22,7 +23,7 @@
                     :rows="4" />
       </a-form-model-item>
     </a-form-model>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentComparison/modules/ComparisonAddReplyComment.vue b/src/views/documentTool/documentComparison/modules/ComparisonAddReplyComment.vue
index fbc4419c..9fcbabf8 100644
--- a/src/views/documentTool/documentComparison/modules/ComparisonAddReplyComment.vue
+++ b/src/views/documentTool/documentComparison/modules/ComparisonAddReplyComment.vue
@@ -1,11 +1,12 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="500"
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
     @ok="handleOkComment"
+    switchFullscreen
     @cancel="handleCancelComment"
   >
     <a-form-model :model="formInline" :rules="rules" ref="ruleForm">
@@ -36,7 +37,7 @@
         </a-col>
       </a-row>
     </a-form-model>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue b/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
index d1b21fa6..21690d9a 100644
--- a/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
+++ b/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="600"
     :visible="visible"
     :confirm-loading="confirmLoading"
     :maskClosable="false"
+    switchFullscreen
     @cancel="visible = false"
   >
     <template slot="footer">
@@ -39,7 +40,7 @@
                     :rows="4" />
       </a-form-model-item>
     </a-form-model>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
index eb2b8dc0..12046797 100644
--- a/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue
@@ -1,13 +1,14 @@
 <template>
-  <a-modal
+  <j-modal
     :title="$t('docTool.split.clauseContent')"
     :visible="contentVisible"
     :confirm-loading="confirmLoading"
     :footer="false"
+    switchFullscreen
     @cancel="handleCancel"
   >
     <p v-html="contentValue"></p>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue b/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
index 900f59e1..f4da18f7 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailAddTable.vue
@@ -1,15 +1,16 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     class="split-table-title"
     :visible="visible"
+    switchFullscreen
     :confirm-loading="confirmLoading"
     @ok="handleOkTable"
     @cancel="handleCancelTable"
     :width="700"
   >
     <u-editor :content="ueContent" :config="config" ref="ueditor" @editor-onChange="uEditorChange"></u-editor>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue b/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
index 3dba61fb..141cc9a5 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailAddTypeCheck.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="$t('add')"
     class="split-title"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
   >
@@ -88,7 +89,7 @@
     </split-add-clause-upload-image>
     <!--  表格弹框  -->
     <split-detail-add-table ref="splitDetailAddTable" @addOk="tableAddOk"></split-detail-add-table>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailBatchSetting.vue b/src/views/documentTool/documentSplit/modules/SplitDetailBatchSetting.vue
index 4d53b47d..3fcdf11f 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailBatchSetting.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailBatchSetting.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     class="show-setting"
     :title="$t('docTool.split.batchSetting')"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     style="width: 1000px;height: auto"
@@ -15,7 +16,7 @@
       @submitFormData="submitFormData"
       :flag="'4'">
     </add-form>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue b/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
index 652f7735..c16e06cc 100644
--- a/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
+++ b/src/views/documentTool/documentSplit/modules/SplitDetailNodeAdd.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     class="add-menus"
     :title="title"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @cancel="handleCancel"
     @ok="handleOk"
   >
@@ -29,7 +30,7 @@
                         :parser="limitNumber" style="width: 100%" />
       </a-form-model-item>
     </a-form-model>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/standardRegulationLibrary/commonPage/modules/StandardResolutionSheetModal.vue b/src/views/standardRegulationLibrary/commonPage/modules/StandardResolutionSheetModal.vue
index a669609a..9d717fd5 100644
--- a/src/views/standardRegulationLibrary/commonPage/modules/StandardResolutionSheetModal.vue
+++ b/src/views/standardRegulationLibrary/commonPage/modules/StandardResolutionSheetModal.vue
@@ -5,6 +5,7 @@
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @cancel="handleCancel">
 
     <a-spin :spinning="confirmLoading">
diff --git a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
index 2086390d..6135cab9 100644
--- a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
+++ b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
@@ -5,6 +5,7 @@
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
 
diff --git a/src/views/standardRegulationLibrary/commonPage/modules/UpdateRecordModal.vue b/src/views/standardRegulationLibrary/commonPage/modules/UpdateRecordModal.vue
index 43b7f394..153988ba 100644
--- a/src/views/standardRegulationLibrary/commonPage/modules/UpdateRecordModal.vue
+++ b/src/views/standardRegulationLibrary/commonPage/modules/UpdateRecordModal.vue
@@ -5,6 +5,7 @@
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @cancel="handleCancel">
 
     <a-spin :spinning="confirmLoading">
diff --git a/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticSystemTreeModal.vue b/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticSystemTreeModal.vue
index 71205b83..70b1fa19 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticSystemTreeModal.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/modules/DomesticSystemTreeModal.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :maskClosable="false"
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
 
@@ -17,7 +18,7 @@
       </a-form-item>
     </a-form>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasSystemTreeModal.vue b/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasSystemTreeModal.vue
index 090c4e16..60ebd8cf 100644
--- a/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasSystemTreeModal.vue
+++ b/src/views/standardRegulationLibrary/overseasStandard/modules/OverseasSystemTreeModal.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :maskClosable="false"
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
 
@@ -17,7 +18,7 @@
       </a-form-item>
     </a-form>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue
index 6dff4a50..da617bc3 100644
--- a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue
+++ b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterModal.vue
@@ -5,6 +5,7 @@
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
 
diff --git a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue
index 4676a066..d313cdd9 100644
--- a/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue
+++ b/src/views/standardRegulationLibrary/profileCenter/modules/ProfileCenterTreeModal.vue
@@ -5,6 +5,7 @@
     :width="width"
     :visible="visible"
     :confirm-loading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
 
diff --git a/src/views/system/DictDeleteList.vue b/src/views/system/DictDeleteList.vue
index 66fb40b8..b25f0908 100644
--- a/src/views/system/DictDeleteList.vue
+++ b/src/views/system/DictDeleteList.vue
@@ -1,8 +1,9 @@
 <template>
-  <a-modal
+  <j-modal
     :width="modalWidth"
     :style="modalStyle"
     :visible="visible"
+    switchFullscreen
     :maskClosable="false"
     @cancel="handleCancel">
     <template slot="footer">
@@ -23,7 +24,7 @@
       </span>
     </a-table>
 
-  </a-modal>
+  </j-modal>
 
 </template>
 
diff --git a/src/views/system/UserList.vue b/src/views/system/UserList.vue
index f8b75966..9125672c 100644
--- a/src/views/system/UserList.vue
+++ b/src/views/system/UserList.vue
@@ -195,9 +195,9 @@
     <!-- 用户回收站 -->
     <user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/>
     <!-- 角色配置 -->
-<!--    <a-modal title="角色配置" :width='650'>-->
+<!--    <j-modal title="角色配置" :width='650'>-->
     <role-assignment ref="roleAssignmentModal" :selectedRowKeysArray='selectedRowKeys' @ok="modalFormOk" @rolevisible='rolevisibleMethods'></role-assignment>
-<!--    </a-modal>-->
+<!--    </j-modal>-->
 
   </a-card>
 </template>
diff --git a/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue b/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue
index 9dd85b74..551c59c9 100644
--- a/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue
+++ b/src/views/system/enterpriseLevelMapManage/modules/EnterpriseMapModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :maskClosable="true"
     :width="800"
     :closable="true"
+    switchFullscreen
     @cancel="handleCancel"
     @ok="handleOk"
     :visible="visible">
@@ -38,7 +39,7 @@
       </a-form>
     </a-spin>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue b/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue
index 615dbd19..4ae87573 100644
--- a/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue
+++ b/src/views/system/firendshipLinkManage/modules/FriendshipLinkModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :maskClosable="true"
     :width="500"
     :closable="true"
+    switchFullscreen
     @cancel="handleCancel"
     @ok="handleOk"
     :visible="visible">
@@ -42,7 +43,7 @@
       </a-form>
     </a-spin>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue b/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue
index eed10ce7..c5842ea0 100644
--- a/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue
+++ b/src/views/system/internalWorkGroup/modules/TreeNodeModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :maskClosable="true"
     :width="500"
     :closable="true"
+    switchFullscreen
     @cancel="handleCancel"
     @ok="handleOk"
     :visible="visible">
@@ -18,7 +19,7 @@
       </a-form>
     </a-spin>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue b/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue
index 3ec5d832..cf69893a 100644
--- a/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue
+++ b/src/views/system/internalWorkGroup/modules/WorkingGroupModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :maskClosable="true"
     :width="500"
     :closable="true"
+    switchFullscreen
     @cancel="handleCancel"
     @ok="handleOk"
     :visible="visible">
@@ -22,7 +23,7 @@
       </a-form>
     </a-spin>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/DataLogCompareModal.vue b/src/views/system/modules/DataLogCompareModal.vue
index 31504522..8a73f23e 100644
--- a/src/views/system/modules/DataLogCompareModal.vue
+++ b/src/views/system/modules/DataLogCompareModal.vue
@@ -1,8 +1,9 @@
 <template>
-  <a-modal
+  <j-modal
     :width="modalWidth"
     :visible="visible"
     :footer="null"
+    switchFullscreen
     @cancel="handleCancel"
     cancelText="关闭">
     <!--table区 -->
@@ -28,7 +29,7 @@
         </template>
       </a-table>
     </div>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/DataLogModal.vue b/src/views/system/modules/DataLogModal.vue
index c9d9b21c..bb394cf8 100644
--- a/src/views/system/modules/DataLogModal.vue
+++ b/src/views/system/modules/DataLogModal.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
-    <a-modal
+    <j-modal
       :width="modalWidth"
       :visible="visible"
       title="数据对比窗口"
       :confirmLoading="confirmLoading"
+      switchFullscreen
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="取消">
@@ -48,7 +49,7 @@
         </a-form>
       </a-spin>
       <data-log-compare-modal ref="modal" @ok="modalFormOk" ></data-log-compare-modal>
-    </a-modal>
+    </j-modal>
   </div>
 </template>
 
diff --git a/src/views/system/modules/DepartModal.vue b/src/views/system/modules/DepartModal.vue
index ac962ee5..1a6a5cc7 100644
--- a/src/views/system/modules/DepartModal.vue
+++ b/src/views/system/modules/DepartModal.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :ok=false
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     :okButtonProps="{ props: {disabled: disableSubmit} }"
     @ok="handleOk"
     @cancel="handleCancel"
@@ -87,7 +88,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/DepartWindow.vue b/src/views/system/modules/DepartWindow.vue
index 8a53c13e..2ac327c1 100644
--- a/src/views/system/modules/DepartWindow.vue
+++ b/src/views/system/modules/DepartWindow.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :width="modalWidth"
     :visible="visible"
     title="部门搜索"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleSubmit"
     @cancel="handleCancel"
     cancelText="关闭"
@@ -31,7 +32,7 @@
       </a-form-item>
       </a-form>
     </template>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/DictItemModal.vue b/src/views/system/modules/DictItemModal.vue
index 5d64c03f..05ef3d9d 100644
--- a/src/views/system/modules/DictItemModal.vue
+++ b/src/views/system/modules/DictItemModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     :cancelText="$t('close')"
@@ -60,7 +61,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/DictModal.vue b/src/views/system/modules/DictModal.vue
index f4f57367..6dd5765d 100644
--- a/src/views/system/modules/DictModal.vue
+++ b/src/views/system/modules/DictModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="600"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     :cancelText="$t('close')"
@@ -46,7 +47,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/PasswordModal.vue b/src/views/system/modules/PasswordModal.vue
index 158a6765..d7ca2a9a 100644
--- a/src/views/system/modules/PasswordModal.vue
+++ b/src/views/system/modules/PasswordModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="$t('resetPassword.resetPasswordModalTitle')"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleSubmit"
     @cancel="handleCancel"
     :cancelText="$t('close')"
@@ -26,7 +27,7 @@
 
       </a-form>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/PermissionDataRuleModal.vue b/src/views/system/modules/PermissionDataRuleModal.vue
index 499bb561..ea18a4d3 100644
--- a/src/views/system/modules/PermissionDataRuleModal.vue
+++ b/src/views/system/modules/PermissionDataRuleModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="1000"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
@@ -53,7 +54,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/QuartzJobModal.vue b/src/views/system/modules/QuartzJobModal.vue
index c956ba7e..70b593b7 100644
--- a/src/views/system/modules/QuartzJobModal.vue
+++ b/src/views/system/modules/QuartzJobModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     okText="保存并安排任务"
@@ -30,7 +31,7 @@
         </a-form-model-item>
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/RoleAssignment.vue b/src/views/system/modules/RoleAssignment.vue
index 92e6ff81..c14ff8cb 100644
--- a/src/views/system/modules/RoleAssignment.vue
+++ b/src/views/system/modules/RoleAssignment.vue
@@ -1,11 +1,12 @@
 <!--用户管理-角色配置弹框-->
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="650"
     :closable="true"
     :visible="visible"
     :footer='null'
+    switchFullscreen
     @cancel="handleCancel"
   >
     <div class='diolag-area'>
@@ -38,7 +39,7 @@
         <a-button @click='handleSubmit' type='primary' :loading='confirmLoading'>提交</a-button>
       </div>
     </div>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue
index aa830e78..b7754ef5 100644
--- a/src/views/system/modules/RoleModal.vue
+++ b/src/views/system/modules/RoleModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
@@ -7,27 +7,29 @@
     @ok="handleOk"
     @cancel="handleCancel"
     :cancelText="$t('close')"
+    switchFullscreen
     wrapClassName="ant-modal-cust-warp"
-    style="top:5%;height: 85%;overflow-y: hidden">
+    style="top:5%;overflow-y: hidden">
 
     <a-spin :spinning="confirmLoading">
-      <a-form-model ref="form"  v-bind="layout"  :model="model" :rules="validatorRules">
+      <a-form-model ref="form" v-bind="layout" :model="model" :rules="validatorRules">
         <a-form-model-item :label="$t('roleManage.roleCode')" required prop="roleCode">
-          <a-input v-model="model.roleCode" :disabled="roleDisabled"  :placeholder="$t('pleaseEnter') + $t('roleManage.roleCode')"/>
+          <a-input v-model="model.roleCode" :disabled="roleDisabled" :placeholder="$t('pleaseEnter') + $t('roleManage.roleCode')" />
         </a-form-model-item>
         <a-form-model-item :label="$t('roleManage.roleName')" required prop="roleName">
-          <a-input v-model="model.roleName" :placeholder="$t('pleaseEnter') + $t('roleManage.roleName')"/>
+          <a-input v-model="model.roleName" :placeholder="$t('pleaseEnter') + $t('roleManage.roleName')" />
         </a-form-model-item>
         <a-form-model-item :label="$t('roleManage.roleDescribe')" prop="description">
-          <a-textarea :rows="5" v-model="model.description" :placeholder="$t('pleaseEnter') + $t('roleManage.roleDescribe')"/>
+          <a-textarea :rows="5" v-model="model.description" :placeholder="$t('pleaseEnter') + $t('roleManage.roleDescribe')" />
         </a-form-model-item>
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
 import { addRole, editRole, duplicateCheck } from '@/api/api'
+
 export default {
   name: 'RoleModal',
   data () {
diff --git a/src/views/system/modules/SelectUserListModal.vue b/src/views/system/modules/SelectUserListModal.vue
index cbc151e5..f1763956 100644
--- a/src/views/system/modules/SelectUserListModal.vue
+++ b/src/views/system/modules/SelectUserListModal.vue
@@ -1,8 +1,9 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="1200"
     :visible="visible"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
@@ -77,7 +78,7 @@
     >
 <!--     update-end   author:kangxiaolin  date:20190921     for:系统发送通知 用户多选失败 #513 -->
     </a-table>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SelectUserModal.vue b/src/views/system/modules/SelectUserModal.vue
index 8b372cb9..f569c35c 100644
--- a/src/views/system/modules/SelectUserModal.vue
+++ b/src/views/system/modules/SelectUserModal.vue
@@ -1,10 +1,11 @@
 <template>
   <div>
-    <a-modal
+    <j-modal
       centered
       :title="title"
       :width="1000"
       :visible="visible"
+      switchFullscreen
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭">
@@ -47,7 +48,7 @@
       </div>
       <!-- table区域-end -->
 
-    </a-modal>
+    </j-modal>
   </div>
 </template>
 
diff --git a/src/views/system/modules/SysAnnouncementModal.vue b/src/views/system/modules/SysAnnouncementModal.vue
index 68824039..d849f080 100644
--- a/src/views/system/modules/SysAnnouncementModal.vue
+++ b/src/views/system/modules/SysAnnouncementModal.vue
@@ -1,7 +1,7 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
-
+    switchFullscreen
     :width="900"
     :visible="visible"
     :confirmLoading="confirmLoading"
@@ -137,7 +137,7 @@
       </a-form-model>
     </a-spin>
     <select-user-list-modal ref="UserListModal" @choseUser="choseUser"></select-user-list-modal>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysCategoryModal.vue b/src/views/system/modules/SysCategoryModal.vue
index be106a00..038b9528 100644
--- a/src/views/system/modules/SysCategoryModal.vue
+++ b/src/views/system/modules/SysCategoryModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="width"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     :destroyOnClose="true"
@@ -29,7 +30,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysCheckRuleModal.vue b/src/views/system/modules/SysCheckRuleModal.vue
index 32f09c20..c033f909 100644
--- a/src/views/system/modules/SysCheckRuleModal.vue
+++ b/src/views/system/modules/SysCheckRuleModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="1000"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
@@ -50,7 +51,7 @@
         </a-tab-pane>
       </a-tabs>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysCheckRuleTestModal.vue b/src/views/system/modules/SysCheckRuleTestModal.vue
index b9ff9823..244b8192 100644
--- a/src/views/system/modules/SysCheckRuleTestModal.vue
+++ b/src/views/system/modules/SysCheckRuleTestModal.vue
@@ -1,8 +1,9 @@
 <template>
-  <a-modal
+  <j-modal
     title="功能测试"
     :width="800"
     :visible="visible"
+    switchFullscreen
     @ok="visible=false"
     @cancel="visible=false"
   >
@@ -22,7 +23,7 @@
       </a-col>
     </a-row>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysDataSourceModal.vue b/src/views/system/modules/SysDataSourceModal.vue
index 046f7aaf..56c33cce 100644
--- a/src/views/system/modules/SysDataSourceModal.vue
+++ b/src/views/system/modules/SysDataSourceModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
@@ -68,7 +69,7 @@
         </a-form-item>
       </a-form>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysFillRuleModal.vue b/src/views/system/modules/SysFillRuleModal.vue
index 390b21a2..0b7bccd7 100644
--- a/src/views/system/modules/SysFillRuleModal.vue
+++ b/src/views/system/modules/SysFillRuleModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
     :maskClosable="false"
+    switchFullscreen
     :confirmLoading="confirmLoading"
     @ok="handleOk"
     @cancel="handleCancel"
@@ -27,7 +28,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysPositionModal.vue b/src/views/system/modules/SysPositionModal.vue
index 99854558..5893f914 100644
--- a/src/views/system/modules/SysPositionModal.vue
+++ b/src/views/system/modules/SysPositionModal.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
     :maskClosable="false"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
@@ -44,7 +45,7 @@
 
       </a-form-model>
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/SysUserAgentModal.vue b/src/views/system/modules/SysUserAgentModal.vue
index 05d6390e..a4d016a0 100644
--- a/src/views/system/modules/SysUserAgentModal.vue
+++ b/src/views/system/modules/SysUserAgentModal.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="800"
     :visible="visible"
     :confirmLoading="confirmLoading"
+    switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭">
@@ -62,7 +63,7 @@
       </a-form>
 
     </a-spin>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/UserRecycleBinModal.vue b/src/views/system/modules/UserRecycleBinModal.vue
index 3f8260be..80f7aad0 100644
--- a/src/views/system/modules/UserRecycleBinModal.vue
+++ b/src/views/system/modules/UserRecycleBinModal.vue
@@ -1,8 +1,9 @@
 <template>
-  <a-modal
+  <j-modal
     :width="1000"
     :title="title"
     :visible="innerVisible"
+    switchFullscreen
     @cancel="handleCancel"
     :cancelText="$t('close')"
     :okButtonProps="{style:{display:'none'}}"
@@ -49,7 +50,7 @@
       </span>
     </a-table>
 
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/system/modules/icon/Icons.vue b/src/views/system/modules/icon/Icons.vue
index a0315faa..064d5c4b 100644
--- a/src/views/system/modules/icon/Icons.vue
+++ b/src/views/system/modules/icon/Icons.vue
@@ -1,10 +1,11 @@
 <template>
-  <a-modal
+  <j-modal
     v-model="show"
     :width="900"
     :keyboard="false"
     :closable="false"
     :centered="true"
+    switchFullscreen
     @ok="ok"
     @cancel="cancel"
     :maskClosable="false"
@@ -62,7 +63,7 @@
         </ul>
       </a-tab-pane>
     </a-tabs>
-  </a-modal>
+  </j-modal>
 </template>
 <script>
 const directionIcons = ['step-backward', 'step-forward', 'fast-backward', 'fast-forward', 'shrink', 'arrows-alt', 'down', 'up', 'left', 'right', 'caret-up', 'caret-down', 'caret-left', 'caret-right', 'up-circle', 'down-circle', 'left-circle', 'right-circle', 'up-circle-o', 'down-circle-o', 'right-circle-o', 'left-circle-o', 'double-right', 'double-left', 'vertical-left', 'vertical-right', 'forward', 'backward', 'rollback', 'enter', 'retweet', 'swap', 'swap-left', 'swap-right', 'arrow-up', 'arrow-down', 'arrow-left', 'arrow-right', 'play-circle', 'play-circle-o', 'up-square', 'down-square', 'left-square', 'right-square', 'up-square-o', 'down-square-o', 'left-square-o', 'right-square-o', 'login', 'logout', 'menu-fold', 'menu-unfold', 'border-bottom', 'border-horizontal', 'border-inner', 'border-left', 'border-right', 'border-top', 'border-verticle', 'pic-center', 'pic-left', 'pic-right', 'radius-bottomleft', 'radius-bottomright', 'radius-upleft', 'radius-upright', 'fullscreen', 'fullscreen-exit']
diff --git a/src/views/user/LoginSelectTenant.vue b/src/views/user/LoginSelectTenant.vue
index 8fbae8b9..94dcf213 100644
--- a/src/views/user/LoginSelectTenant.vue
+++ b/src/views/user/LoginSelectTenant.vue
@@ -1,9 +1,10 @@
 <template>
-  <a-modal
+  <j-modal
     :title="title"
     :width="450"
     :visible="visible"
     :closable="false"
+    switchFullscreen
     :maskClosable="false">
 
     <template slot="footer">
@@ -12,14 +13,17 @@
 
     <a-form>
       <a-form-item v-if="isMultiTenant" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status1">
-        <a-tooltip placement="topLeft" >
+        <a-tooltip placement="topLeft">
           <template slot="title">
             <span>您有多个租户，请选择登录租户</span>
           </template>
           <a-avatar style="background-color:#87d068" icon="gold" />
         </a-tooltip>
 
-        <a-select @change="handleTenantChange" :class="{'valid-error':validate_status1==='error'}" placeholder="请选择登录租户" style="margin-left:10px;width: 80%">
+        <a-select @change="handleTenantChange"
+                  :class="{'valid-error':validate_status1==='error'}"
+                  placeholder="请选择登录租户"
+                  style="margin-left:10px;width: 80%">
           <a-icon slot="suffixIcon" type="gold" />
           <a-select-option v-for="d in tenantList" :key="d.id" :value="d.id">
             {{ d.name }}
@@ -28,14 +32,17 @@
       </a-form-item>
 
       <a-form-item v-if="isMultiDepart" :labelCol="{span:4}" :wrapperCol="{span:20}" style="margin-bottom:10px" :validate-status="validate_status2">
-        <a-tooltip placement="topLeft" >
+        <a-tooltip placement="topLeft">
           <template slot="title">
             <span>您有多个部门，请选择登录部门</span>
           </template>
           <a-avatar style="background-color:rgb(104, 208, 203);" icon="gold" />
         </a-tooltip>
 
-        <a-select @change="handleDepartChange" :class="{'valid-error':validate_status2==='error'}" placeholder="请选择登录部门" style="margin-left:10px;width: 80%">
+        <a-select @change="handleDepartChange"
+                  :class="{'valid-error':validate_status2==='error'}"
+                  placeholder="请选择登录部门"
+                  style="margin-left:10px;width: 80%">
           <a-icon slot="suffixIcon" type="gold" />
           <a-select-option v-for="d in departList" :key="d.id" :value="d.orgCode">
             {{ d.departName }}
@@ -44,7 +51,7 @@
       </a-form-item>
 
     </a-form>
-  </a-modal>
+  </j-modal>
 </template>
 
 <script>
diff --git a/src/views/user/third/ThirdLogin.vue b/src/views/user/third/ThirdLogin.vue
index 1c79c448..b10c2fdd 100644
--- a/src/views/user/third/ThirdLogin.vue
+++ b/src/views/user/third/ThirdLogin.vue
@@ -8,12 +8,12 @@
       <a @click="onThirdLogin('wechat_open')" title="微信"><a-icon class="item-icon" type="wechat"></a-icon></a>
     </div>
     <!-- 第三方登录绑定账号密码输入弹框 -->
-    <a-modal title="请输入密码" :visible="thirdPasswordShow" @ok="thirdLoginCheckPassword" @cancel="thirdLoginNoPassword">
+    <j-modal title="请输入密码" :visible="thirdPasswordShow" switchFullscreen @ok="thirdLoginCheckPassword" @cancel="thirdLoginNoPassword">
       <a-input-password placeholder="请输入密码" v-model="thirdLoginPassword" />
-    </a-modal>
+    </j-modal>
 
     <!-- 第三方登录提示是否绑定账号弹框 -->
-    <a-modal :footer="null" :closable="false" :visible="thirdConfirmShow" :class="'ant-modal-confirm'">
+    <j-modal :footer="null" :closable="false" :visible="thirdConfirmShow" :class="'ant-modal-confirm'" switchFullscreen>
       <div class="ant-modal-confirm-body-wrapper">
         <div class="ant-modal-confirm-body">
           <a-icon type="question-circle" style="color:#faad14"/>
@@ -27,10 +27,10 @@
           <a-button @click="thirdLoginUserBind" type="primary">确认绑定</a-button>
         </div>
       </div>
-    </a-modal>
+    </j-modal>
 
     <!-- 第三方登录绑定手机号 -->
-    <a-modal :visible="bindingPhoneModal" :class="'ant-modal-confirm'">
+    <j-modal :visible="bindingPhoneModal" :class="'ant-modal-confirm'" switchFullscreen>
       <template slot="footer">
         <a-button key="submit" type="primary" @click="thirdHandleOk">
           确定
@@ -72,7 +72,7 @@
           </a-col>
         </a-row>
       </div>
-    </a-modal>
+    </j-modal>
   </div>
 </template>