heyang

src/api/system/publicConfig.js

@@ -16,7 +16,7 @@ export function updateLogoInfo(data) {
     data: data
   })
 }
-// 查询开发配置
+// 查询bottle
 export function getUrlConfig(query) {
   return request({
     url: '/system/urlConfig',

src/views/comprehensive/personnel/managePermissionTemplates/addPage.vue

@@ -1,183 +1,185 @@
 <!--新增/编辑权限页面-->
 <template>
   <div class="managePermissionTemplates-addPage scrollbar-box">
-    <p class="top-title-p">新增权限模板</p>
-    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="150px">
-      <div class="name-input-box">
-        <el-form-item label="权限模板名称" prop="name" style="margin-top:30px;">
-          <el-input v-model="form.name" clearable maxlength="12" placeholder="请输入权限模板名称"/>
-        </el-form-item>
-        <el-form-item label="请选择模板类型" prop="type" style="margin-top:30px;">
-          <el-radio-group v-model="form.type">
-            <el-radio :label="1" style="width:80px;margin-left:40px;">学生</el-radio>
-            <el-radio :label="2" style="width:100px;">教职工</el-radio>
-            <el-radio :label="0" style="width:80px;">其他</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </div>
-      <div class="top-title-one">
-        <p class="title-p">权限配置</p>
-        <p class="el-icon-question img-p" @mouseenter="showText" @mouseout="hideText"></p>
-        <div class="position-box" v-if="textType">
-          <p>1、权限快捷模板：列出所有已创建的快捷模板，可选择快捷导入模板；导入后可修改或清空。</p>
-          <p>2、模块菜单：选中父级，联动子级全部选中，可对子级单独勾选；子级选中，所属父级联动选中。</p>
-          <p>3、数据范围：数据查看范围选择，默认展示所有数据。</p>
-          <p>4、管理权限：功能操作权限，包含增删改查、启用、停用，以及导出等操作功能。</p>
-          <p>5、详细配置：对底层菜单的功能操作进行细分权限勾选，功能操作按所属菜单页面现有的功能操作进行展示，可单选、全选。</p>
+    <div class="public-form-box scrollbar-box">
+      <p class="top-title-p">新增权限模板</p>
+      <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="150px">
+        <div class="name-input-box">
+          <el-form-item label="权限模板名称" prop="name" style="margin-top:30px;">
+            <el-input v-model="form.name" clearable maxlength="12" placeholder="请输入权限模板名称"/>
+          </el-form-item>
+          <el-form-item label="请选择模板类型" prop="type" style="margin-top:30px;">
+            <el-radio-group v-model="form.type">
+              <el-radio :label="1" style="width:80px;margin-left:40px;">学生</el-radio>
+              <el-radio :label="2" style="width:100px;">教职工</el-radio>
+              <el-radio :label="0" style="width:80px;">其他</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </div>
-      </div>
-      <div class="for-button-list">
-        <p class="for-title-p">权限快捷模板：</p>
-        <div class="for-button-max-box">
-          <div class="for-button-min-box" v-for="(item,index) in templateList" :key="index"
-               :class="templateKey == item.id?'colorAA':'colorBB'" @click="templateClick(item.id)">
-            <i class="el-icon-success" v-if="templateKey == item.id"></i>
-            <span>{{item.name}}</span>
+        <div class="top-title-one">
+          <p class="title-p">权限配置</p>
+          <p class="el-icon-question img-p" @mouseenter="showText" @mouseout="hideText"></p>
+          <div class="position-box" v-if="textType">
+            <p>1、权限快捷模板：列出所有已创建的快捷模板，可选择快捷导入模板；导入后可修改或清空。</p>
+            <p>2、模块菜单：选中父级，联动子级全部选中，可对子级单独勾选；子级选中，所属父级联动选中。</p>
+            <p>3、数据范围：数据查看范围选择，默认展示所有数据。</p>
+            <p>4、管理权限：功能操作权限，包含增删改查、启用、停用，以及导出等操作功能。</p>
+            <p>5、详细配置：对底层菜单的功能操作进行细分权限勾选，功能操作按所属菜单页面现有的功能操作进行展示，可单选、全选。</p>
+          </div>
+        </div>
+        <div class="for-button-list">
+          <p class="for-title-p">权限快捷模板：</p>
+          <div class="for-button-max-box">
+            <div class="for-button-min-box" v-for="(item,index) in templateList" :key="index"
+                 :class="templateKey == item.id?'colorAA':'colorBB'" @click="templateClick(item.id)">
+              <i class="el-icon-success" v-if="templateKey == item.id"></i>
+              <span>{{item.name}}</span>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="template-name-box">
-        <p class="template-name-p">当前导入模板：{{templateName?templateName:'无'}}</p>
-        <p class="reset-button-one template-name-button" @click="templateDel">清除</p>
-      </div>
-      <div class="table-for-max-box">
-        <div class="table-title-box">
-          <p>模块菜单</p>
-          <p>权限</p>
+        <div class="template-name-box">
+          <p class="template-name-p">当前导入模板：{{templateName?templateName:'无'}}</p>
+          <p class="reset-button-one template-name-button" @click="templateDel">清除</p>
         </div>
-        <div class="table-for-big-box" v-for="(maxItem,maxIndex) in menuList" :key="maxIndex">
-          <div class="max-title-box" :class="!maxItem.children?'max-title-box-null':''">
-            <p><el-checkbox :disabled="maxItem.isRequired == 1" v-model="maxItem.checkType" @change="(type)=>itemCheckClick(1,type,maxItem)">{{maxItem.menuName}}</el-checkbox></p>
+        <div class="table-for-max-box">
+          <div class="table-title-box">
+            <p>模块菜单</p>
+            <p>权限</p>
           </div>
-          <div class="max-right-box">
-            <div class="big-box" v-for="(bigItem,bigIndex) in maxItem.children" :key="bigIndex">
-              <div class="big-title-box" :class="bigItem.menuType == 'C'?'big-title-box-null':''">
-                <p><el-checkbox :disabled="bigItem.isRequired == 1" v-model="bigItem.checkType" @change="(type)=>itemCheckClick(2,type,bigItem,maxItem)">{{bigItem.menuName}}</el-checkbox></p>
-              </div>
-              <div class="big-right-box" v-if="bigItem.menuType !='C'">
-                <div class="min-box" v-for="(minItem,minIndex) in bigItem.children" :key="minIndex">
-                  <div class="min-title-box">
-                    <p><el-checkbox :disabled="minItem.isRequired == 1" v-model="minItem.checkType" @change="(type)=>itemCheckClick(3,type,minItem,bigItem,maxItem)">{{minItem.menuName}}</el-checkbox></p>
-                  </div>
-                  <div class="min-right-box" v-if="minItem.checkType">
-                    <div class="scope-box">
-                      <p>
-                        <el-checkbox v-model="minItem.scopeCheckType" @change="(type)=>itemCheckClick(4,type,minItem)" style="margin-right:40px;">数据范围</el-checkbox>
-                        <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired == 1"
-                                   placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
-                          <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
-                        </el-select>
-                        <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired != 1"
-                                   placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
-                          <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
-                        </el-select>
-                      </p>
+          <div class="table-for-big-box" v-for="(maxItem,maxIndex) in menuList" :key="maxIndex">
+            <div class="max-title-box" :class="!maxItem.children?'max-title-box-null':''">
+              <p><el-checkbox :disabled="maxItem.isRequired == 1" v-model="maxItem.checkType" @change="(type)=>itemCheckClick(1,type,maxItem)">{{maxItem.menuName}}</el-checkbox></p>
+            </div>
+            <div class="max-right-box">
+              <div class="big-box" v-for="(bigItem,bigIndex) in maxItem.children" :key="bigIndex">
+                <div class="big-title-box" :class="bigItem.menuType == 'C'?'big-title-box-null':''">
+                  <p><el-checkbox :disabled="bigItem.isRequired == 1" v-model="bigItem.checkType" @change="(type)=>itemCheckClick(2,type,bigItem,maxItem)">{{bigItem.menuName}}</el-checkbox></p>
+                </div>
+                <div class="big-right-box" v-if="bigItem.menuType !='C'">
+                  <div class="min-box" v-for="(minItem,minIndex) in bigItem.children" :key="minIndex">
+                    <div class="min-title-box">
+                      <p><el-checkbox :disabled="minItem.isRequired == 1" v-model="minItem.checkType" @change="(type)=>itemCheckClick(3,type,minItem,bigItem,maxItem)">{{minItem.menuName}}</el-checkbox></p>
                     </div>
-                    <div class="permission-box" v-if="minItem.children">
-                      <p class="check-left-p"><el-checkbox v-model="minItem.permissionCheckType"  @change="(type)=>itemCheckClick(5,type,minItem)">管理权限</el-checkbox></p>
-                      <div class="check-button-box" @click="permissionDetails(minItem,maxIndex,bigIndex,minIndex)"
-                           :class="minItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
-                        <img v-if="!minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
-                        <img v-if="minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
-                        <p>详细配置</p>
+                    <div class="min-right-box" v-if="minItem.checkType">
+                      <div class="scope-box">
+                        <p>
+                          <el-checkbox v-model="minItem.scopeCheckType" @change="(type)=>itemCheckClick(4,type,minItem)" style="margin-right:40px;">数据范围</el-checkbox>
+                          <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired == 1"
+                                     placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
+                            <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
+                          </el-select>
+                          <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired != 1"
+                                     placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
+                            <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
+                          </el-select>
+                        </p>
+                      </div>
+                      <div class="permission-box" v-if="minItem.children">
+                        <p class="check-left-p"><el-checkbox v-model="minItem.permissionCheckType"  @change="(type)=>itemCheckClick(5,type,minItem)">管理权限</el-checkbox></p>
+                        <div class="check-button-box" @click="permissionDetails(minItem,maxIndex,bigIndex,minIndex)"
+                             :class="minItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
+                          <img v-if="!minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
+                          <img v-if="minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
+                          <p>详细配置</p>
+                        </div>
                       </div>
                     </div>
                   </div>
                 </div>
-              </div>
-              <div class="big-right-box-null" v-if="bigItem.menuType == 'C'&&bigItem.checkType">
-                <div class="scope-box">
-                  <p>
-                    <el-checkbox v-model="bigItem.scopeCheckType" style="margin-right:40px;" @change="(type)=>itemCheckClick(4,type,bigItem)">数据范围</el-checkbox>
-                    <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired == 1"
-                               placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
-                      <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
-                    </el-select>
-                    <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired != 1"
-                               placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
-                      <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
-                    </el-select>
-                  </p>
-                </div>
-                <div class="permission-box" v-if="bigItem.children">
-                  <p class="check-left-p"><el-checkbox v-model="bigItem.permissionCheckType" @change="(type)=>itemCheckClick(5,type,bigItem)">管理权限</el-checkbox></p>
-                  <div class="check-button-box" @click="permissionDetails(bigItem,maxIndex,bigIndex)"
-                       :class="bigItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
-                    <img v-if="!bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
-                    <img v-if="bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
-                    <p>详细配置</p>
+                <div class="big-right-box-null" v-if="bigItem.menuType == 'C'&&bigItem.checkType">
+                  <div class="scope-box">
+                    <p>
+                      <el-checkbox v-model="bigItem.scopeCheckType" style="margin-right:40px;" @change="(type)=>itemCheckClick(4,type,bigItem)">数据范围</el-checkbox>
+                      <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired == 1"
+                                 placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
+                        <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
+                      </el-select>
+                      <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired != 1"
+                                 placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
+                        <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
+                      </el-select>
+                    </p>
+                  </div>
+                  <div class="permission-box" v-if="bigItem.children">
+                    <p class="check-left-p"><el-checkbox v-model="bigItem.permissionCheckType" @change="(type)=>itemCheckClick(5,type,bigItem)">管理权限</el-checkbox></p>
+                    <div class="check-button-box" @click="permissionDetails(bigItem,maxIndex,bigIndex)"
+                         :class="bigItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
+                      <img v-if="!bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
+                      <img v-if="bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
+                      <p>详细配置</p>
+                    </div>
                   </div>
                 </div>
               </div>
+              <p class="big-box-null" v-if="!maxItem.children&&maxItem.menuName == '数据可视化'">数据可视化大屏查看权限</p>
             </div>
-            <p class="big-box-null" v-if="!maxItem.children&&maxItem.menuName == '数据可视化'">数据可视化大屏查看权限</p>
           </div>
         </div>
-      </div>
-      <el-form-item label="" prop="text">
-        <div class="textarea-box">
-          <p class="textarea-title-p">权限模板说明</p>
-          <el-input
-            type="textarea"
-            style="width:750px;"
-            maxlength="100"
-            resize="none"
-            show-word-limit
-            :autosize="{ minRows: 8, maxRows: 12}"
-            placeholder="请输入权限模板说明"
-            v-model="form.text">
-          </el-input>
+        <el-form-item label="" prop="text">
+          <div class="textarea-box">
+            <p class="textarea-title-p">权限模板说明</p>
+            <el-input
+              type="textarea"
+              style="width:750px;"
+              maxlength="100"
+              resize="none"
+              show-word-limit
+              :autosize="{ minRows: 8, maxRows: 12}"
+              placeholder="请输入权限模板说明"
+              v-model="form.text">
+            </el-input>
+          </div>
+        </el-form-item>
+      </el-form>
+      <!--权限操作弹窗-->
+      <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
+        <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
+        <div class="managePermissionTemplates-permission-dialog-form-box">
+          <div class="title-box">
+            <p class="left-title-p">功能菜单</p>
+            <div class="right-box">
+              <el-checkbox v-model="allCheckType" class="right-box-min" @change="(type)=>permissionCheckClick('1',type)">功能操作</el-checkbox>
+            </div>
+          </div>
+          <div class="check-box">
+            <div class="left-title-box">
+              <p class="left-title-p">{{permissionCheckData.menuName}}</p>
+            </div>
+            <div class="right-box">
+              <el-checkbox class="for-check-box" @change="(type)=>permissionCheckClick('2',type)"
+                           v-for="(item,index) in permissionCheckData.children" :key="index" v-model="item.checkType">
+                {{item.menuName}}
+              </el-checkbox>
+            </div>
+          </div>
+        </div>
+        <div slot="footer" class="managePermissionTemplates-permission-dialog-button-box">
+          <p class="reset-button-one" @click="permissionOpenOff">取消</p>
+          <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
         </div>
-      </el-form-item>
-    </el-form>
+      </el-dialog>
+      <el-dialog title="选择指定部门（可多选）" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
+        <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
+          <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
+            <el-cascader
+              style="width:300px;"
+              :options="treeselectList"
+              :props="{multiple: true,value: 'id', label: 'label'}"
+              v-model="deptForm.deptIds"
+              clearable>
+            </el-cascader>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="managePermissionTemplates-dept-dialog-button-box">
+          <p class="reset-button-one" @click="deptCancel">取消</p>
+          <p class="inquire-button-one" @click="deptSure">确定</p>
+        </div>
+      </el-dialog>
+    </div>
     <div class="bottom-button-box">
       <p class="reset-button-one" @click="outPageButton">取消</p>
       <p class="inquire-button-one" @click="upDataButton">{{propsData.id?'修改':'发布'}}</p>
     </div>
-    <!--权限操作弹窗-->
-    <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
-      <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
-      <div class="managePermissionTemplates-permission-dialog-form-box">
-        <div class="title-box">
-          <p class="left-title-p">功能菜单</p>
-          <div class="right-box">
-            <el-checkbox v-model="allCheckType" class="right-box-min" @change="(type)=>permissionCheckClick('1',type)">功能操作</el-checkbox>
-          </div>
-        </div>
-        <div class="check-box">
-          <div class="left-title-box">
-            <p class="left-title-p">{{permissionCheckData.menuName}}</p>
-          </div>
-          <div class="right-box">
-            <el-checkbox class="for-check-box" @change="(type)=>permissionCheckClick('2',type)"
-              v-for="(item,index) in permissionCheckData.children" :key="index" v-model="item.checkType">
-              {{item.menuName}}
-            </el-checkbox>
-          </div>
-        </div>
-      </div>
-      <div slot="footer" class="managePermissionTemplates-permission-dialog-button-box">
-        <p class="reset-button-one" @click="permissionOpenOff">取消</p>
-        <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
-      </div>
-    </el-dialog>
-    <el-dialog title="选择指定部门（可多选）" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
-      <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
-        <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
-          <el-cascader
-            style="width:300px;"
-            :options="treeselectList"
-            :props="{multiple: true,value: 'id', label: 'label'}"
-            v-model="deptForm.deptIds"
-            clearable>
-          </el-cascader>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="managePermissionTemplates-dept-dialog-button-box">
-        <p class="reset-button-one" @click="deptCancel">取消</p>
-        <p class="inquire-button-one" @click="deptSure">确定</p>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -666,9 +668,15 @@
     flex:1;
     display: flex;
     flex-direction: column;
+    overflow: hidden;
     *{
       margin:0;
     }
+    .public-form-box{
+      flex:1;
+      overflow-y: scroll;
+      overflow-x: hidden;
+    }
     .top-title-p{
       font-size:18px;
       color:#0045AF;

src/views/comprehensive/personnel/teacher/addPage.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="teacher-add-page">
-    <div class="top-title-box">
-      <p>{{titleName}}</p>
-      <p @click="outPageButton">返回</p>
-    </div>
-    <el-form :model="form" class="top-info-box" ref="form" :inline="true" :rules="rules" label-width="120px">
+    <div class="public-form-box scrollbar-box">
+      <div class="top-title-box">
+        <p>{{titleName}}</p>
+        <p @click="outPageButton">返回</p>
+      </div>
+      <el-form :model="form" class="top-info-box" ref="form" :inline="true" :rules="rules" label-width="120px">
         <div class="left-info-box">
           <img :src="form.avatar" v-if="form.avatar">
           <img src="@/assets/ZDimages/tx_cion.png" v-if="!form.avatar">
@@ -210,187 +211,189 @@
             <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.status==0?'启用':'停用'}}</p>
           </el-form-item>
         </div>
-    </el-form>
-    <div class="top-title-one" v-if="!editType && form.status == 0">
-      <p class="title-p">权限配置</p>
-      <p class="el-icon-question img-p" @mouseenter="showText" @mouseout="hideText"></p>
-      <div class="position-box" v-if="textType">
-        <p>1、权限快捷模板：列出所有已创建的快捷模板，可选择快捷导入模板；导入后可修改或清空。</p>
-        <p>2、模块菜单：选中父级，联动子级全部选中，可对子级单独勾选；子级选中，父级联动选中。</p>
-        <p>3、数据范围：数据查看范围选择，默认展示所有数据。</p>
-        <p>4、管理权限：功能操作权限，包含增删改查、启用、停用，以及导出等操作功能。</p>
-        <p>5、详细配置：对底层菜单的功能操作进行细分权限勾选，功能操作按所属菜单页面现有的功能操作进行展示，可单选、全选。</p>
+      </el-form>
+      <div class="top-title-one" v-if="!editType && form.status == 0">
+        <p class="title-p">权限配置</p>
+        <p class="el-icon-question img-p" @mouseenter="showText" @mouseout="hideText"></p>
+        <div class="position-box" v-if="textType">
+          <p>1、权限快捷模板：列出所有已创建的快捷模板，可选择快捷导入模板；导入后可修改或清空。</p>
+          <p>2、模块菜单：选中父级，联动子级全部选中，可对子级单独勾选；子级选中，父级联动选中。</p>
+          <p>3、数据范围：数据查看范围选择，默认展示所有数据。</p>
+          <p>4、管理权限：功能操作权限，包含增删改查、启用、停用，以及导出等操作功能。</p>
+          <p>5、详细配置：对底层菜单的功能操作进行细分权限勾选，功能操作按所属菜单页面现有的功能操作进行展示，可单选、全选。</p>
+        </div>
       </div>
-    </div>
-    <div class="for-button-list" v-if="!editType && form.status == 0">
-      <p class="for-title-p">权限快捷模板：</p>
-      <div class="for-button-max-box">
-        <div class="for-button-min-box" v-for="(item,index) in templateList" :key="index"
-             :class="templateKey == item.id?'colorAA':'colorBB'" @click="templateClick(item.id)">
-          <i class="el-icon-success" v-if="templateKey == item.id"></i>
-          <span>{{item.name}}</span>
+      <div class="for-button-list" v-if="!editType && form.status == 0">
+        <p class="for-title-p">权限快捷模板：</p>
+        <div class="for-button-max-box">
+          <div class="for-button-min-box" v-for="(item,index) in templateList" :key="index"
+               :class="templateKey == item.id?'colorAA':'colorBB'" @click="templateClick(item.id)">
+            <i class="el-icon-success" v-if="templateKey == item.id"></i>
+            <span>{{item.name}}</span>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="template-name-box" v-if="!editType && form.status == 0">
-      <p class="template-name-p">当前导入模板：{{templateName?templateName:'无'}}</p>
-      <p class="reset-button-one template-name-button" @click="templateDel">清除</p>
-      <p class="template-name-button-one" @click="importUser">导入其他账号权限</p>
-    </div>
-    <div class="table-for-max-box" v-if="!editType && form.status == 0">
-      <div class="table-title-box">
-        <p>模块菜单</p>
-        <p>权限</p>
+      <div class="template-name-box" v-if="!editType && form.status == 0">
+        <p class="template-name-p">当前导入模板：{{templateName?templateName:'无'}}</p>
+        <p class="reset-button-one template-name-button" @click="templateDel">清除</p>
+        <p class="template-name-button-one" @click="importUser">导入其他账号权限</p>
       </div>
-      <div class="table-for-big-box" v-for="(maxItem,maxIndex) in menuList" :key="maxIndex">
-        <div class="max-title-box" :class="!maxItem.children?'max-title-box-null':''">
-          <p><el-checkbox :disabled="maxItem.isRequired == 1" v-model="maxItem.checkType" @change="(type)=>itemCheckClick(1,type,maxItem)">{{maxItem.menuName}}</el-checkbox></p>
+      <div class="table-for-max-box" v-if="!editType && form.status == 0">
+        <div class="table-title-box">
+          <p>模块菜单</p>
+          <p>权限</p>
         </div>
-        <div class="max-right-box">
-          <div class="big-box" v-for="(bigItem,bigIndex) in maxItem.children" :key="bigIndex">
-            <div class="big-title-box" :class="bigItem.menuType == 'C'?'big-title-box-null':''">
-              <p><el-checkbox :disabled="bigItem.isRequired == 1" v-model="bigItem.checkType" @change="(type)=>itemCheckClick(2,type,bigItem,maxItem)">{{bigItem.menuName}}</el-checkbox></p>
-            </div>
-            <div class="big-right-box" v-if="bigItem.menuType !='C'">
-              <div class="min-box" v-for="(minItem,minIndex) in bigItem.children" :key="minIndex">
-                <div class="min-title-box">
-                  <p><el-checkbox :disabled="minItem.isRequired == 1" v-model="minItem.checkType" @change="(type)=>itemCheckClick(3,type,minItem,bigItem,maxItem)">{{minItem.menuName}}</el-checkbox></p>
-                </div>
-                <div class="min-right-box" v-if="minItem.checkType">
-                  <div class="scope-box">
-                    <p>
-                      <el-checkbox v-model="minItem.scopeCheckType" @change="(type)=>itemCheckClick(4,type,minItem)" style="margin-right:40px;">数据范围</el-checkbox>
-                      <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired == 1"
-                                 placeholder="请选择1" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
-                        <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
-                      </el-select>
-                      <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired != 1"
-                                 placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
-                        <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
-                      </el-select>
-                    </p>
+        <div class="table-for-big-box" v-for="(maxItem,maxIndex) in menuList" :key="maxIndex">
+          <div class="max-title-box" :class="!maxItem.children?'max-title-box-null':''">
+            <p><el-checkbox :disabled="maxItem.isRequired == 1" v-model="maxItem.checkType" @change="(type)=>itemCheckClick(1,type,maxItem)">{{maxItem.menuName}}</el-checkbox></p>
+          </div>
+          <div class="max-right-box">
+            <div class="big-box" v-for="(bigItem,bigIndex) in maxItem.children" :key="bigIndex">
+              <div class="big-title-box" :class="bigItem.menuType == 'C'?'big-title-box-null':''">
+                <p><el-checkbox :disabled="bigItem.isRequired == 1" v-model="bigItem.checkType" @change="(type)=>itemCheckClick(2,type,bigItem,maxItem)">{{bigItem.menuName}}</el-checkbox></p>
+              </div>
+              <div class="big-right-box" v-if="bigItem.menuType !='C'">
+                <div class="min-box" v-for="(minItem,minIndex) in bigItem.children" :key="minIndex">
+                  <div class="min-title-box">
+                    <p><el-checkbox :disabled="minItem.isRequired == 1" v-model="minItem.checkType" @change="(type)=>itemCheckClick(3,type,minItem,bigItem,maxItem)">{{minItem.menuName}}</el-checkbox></p>
                   </div>
-                  <div class="permission-box" v-if="minItem.children">
-                    <p class="check-left-p"><el-checkbox v-model="minItem.permissionCheckType"  @change="(type)=>itemCheckClick(5,type,minItem)">管理权限</el-checkbox></p>
-                    <div class="check-button-box" @click="permissionDetails(minItem,maxIndex,bigIndex,minIndex)"
-                         :class="minItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
-                      <img v-if="!minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
-                      <img v-if="minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
-                      <p>详细配置</p>
+                  <div class="min-right-box" v-if="minItem.checkType">
+                    <div class="scope-box">
+                      <p>
+                        <el-checkbox v-model="minItem.scopeCheckType" @change="(type)=>itemCheckClick(4,type,minItem)" style="margin-right:40px;">数据范围</el-checkbox>
+                        <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired == 1"
+                                   placeholder="请选择1" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
+                          <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
+                        </el-select>
+                        <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired != 1"
+                                   placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
+                          <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
+                        </el-select>
+                      </p>
+                    </div>
+                    <div class="permission-box" v-if="minItem.children">
+                      <p class="check-left-p"><el-checkbox v-model="minItem.permissionCheckType"  @change="(type)=>itemCheckClick(5,type,minItem)">管理权限</el-checkbox></p>
+                      <div class="check-button-box" @click="permissionDetails(minItem,maxIndex,bigIndex,minIndex)"
+                           :class="minItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
+                        <img v-if="!minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
+                        <img v-if="minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
+                        <p>详细配置</p>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="big-right-box-null" v-if="bigItem.menuType == 'C'&&bigItem.checkType">
-              <div class="scope-box">
-                <p>
-                  <el-checkbox v-model="bigItem.scopeCheckType" style="margin-right:40px;" @change="(type)=>itemCheckClick(4,type,bigItem)">数据范围</el-checkbox>
-                  <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired == 1"
-                             placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
-                    <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
-                  </el-select>
-                  <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired != 1"
-                             placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
-                    <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
-                  </el-select>
-                </p>
-              </div>
-              <div class="permission-box" v-if="bigItem.children">
-                <p class="check-left-p"><el-checkbox v-model="bigItem.permissionCheckType" @change="(type)=>itemCheckClick(5,type,bigItem)">管理权限</el-checkbox></p>
-                <div class="check-button-box" @click="permissionDetails(bigItem,maxIndex,bigIndex)"
-                     :class="bigItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
-                  <img v-if="!bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
-                  <img v-if="bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
-                  <p>详细配置</p>
+              <div class="big-right-box-null" v-if="bigItem.menuType == 'C'&&bigItem.checkType">
+                <div class="scope-box">
+                  <p>
+                    <el-checkbox v-model="bigItem.scopeCheckType" style="margin-right:40px;" @change="(type)=>itemCheckClick(4,type,bigItem)">数据范围</el-checkbox>
+                    <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired == 1"
+                               placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
+                      <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
+                    </el-select>
+                    <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired != 1"
+                               placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
+                      <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
+                    </el-select>
+                  </p>
+                </div>
+                <div class="permission-box" v-if="bigItem.children">
+                  <p class="check-left-p"><el-checkbox v-model="bigItem.permissionCheckType" @change="(type)=>itemCheckClick(5,type,bigItem)">管理权限</el-checkbox></p>
+                  <div class="check-button-box" @click="permissionDetails(bigItem,maxIndex,bigIndex)"
+                       :class="bigItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
+                    <img v-if="!bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
+                    <img v-if="bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
+                    <p>详细配置</p>
+                  </div>
                 </div>
               </div>
             </div>
+            <p class="big-box-null" v-if="!maxItem.children&&maxItem.menuName == '数据可视化'">数据可视化大屏查看权限</p>
           </div>
-          <p class="big-box-null" v-if="!maxItem.children&&maxItem.menuName == '数据可视化'">数据可视化大屏查看权限</p>
         </div>
       </div>
+
+      <user-list-one ref="userOpen"></user-list-one>
+      <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
+        <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
+        <div class="managePermissionTemplates-permission-dialog-form-box">
+          <div class="title-box">
+            <p class="left-title-p">功能菜单</p>
+            <div class="right-box">
+              <el-checkbox v-model="allCheckType" class="right-box-min" @change="(type)=>permissionCheckClick('1',type)">功能操作</el-checkbox>
+            </div>
+          </div>
+          <div class="check-box">
+            <div class="left-title-box">
+              <p class="left-title-p">{{permissionCheckData.menuName}}</p>
+            </div>
+            <div class="right-box">
+              <el-checkbox class="for-check-box" @change="(type)=>permissionCheckClick('2',type)"
+                           v-for="(item,index) in permissionCheckData.children" :key="index" v-model="item.checkType">
+                {{item.menuName}}
+              </el-checkbox>
+            </div>
+          </div>
+        </div>
+        <div slot="footer" class="managePermissionTemplates-permission-dialog-button-box">
+          <p class="reset-button-one" @click="permissionOpenOff">取消</p>
+          <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
+        </div>
+      </el-dialog>
+      <el-dialog title="选择指定部门（可多选）" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
+        <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
+          <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
+            <el-cascader
+              style="width:300px;"
+              :options="treeselectList"
+              :props="{multiple: true,value: 'id', label: 'label'}"
+              v-model="deptForm.deptIds"
+              clearable>
+            </el-cascader>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="managePermissionTemplates-dept-dialog-button-box">
+          <p class="reset-button-one" @click="deptCancel">取消</p>
+          <p class="inquire-button-one" @click="deptSure">确定</p>
+        </div>
+      </el-dialog>
+      <!--另存-->
+      <el-dialog title="另存为权限模板" :visible.sync="saveOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
+        <el-form :model="saveForm" ref="saveForm" :inline="true" :rules="rules" class="addCheckPage-min">
+          <el-form-item label="模板名称" prop="name" label-width="110px" >
+            <el-input v-model="saveForm.name" clearable maxlength="12" style="width:420px;" placeholder="请输入模板名称"/>
+          </el-form-item>
+          <el-form-item label="是否为学生模板" prop="type" style="width:420px;">
+            <el-radio-group v-model="saveForm.type">
+              <el-radio :label="1" style="width:80px;margin-left:20px;">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="权限模板说明" prop="newPassword" label-width="110px">
+            <el-input
+              type="textarea"
+              style="width:420px;"
+              maxlength="100"
+              resize="none"
+              show-word-limit
+              :autosize="{ minRows: 6, maxRows: 6}"
+              placeholder="请输入权限模板说明"
+              v-model="saveForm.text">
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <!--<p class="teacher-text-p">确定要重置该账号的密码吗？</p>-->
+        <!--<p class="teacher-text-p">确定操作后，该账号密码将重置为系统初始密码。</p>-->
+        <div slot="footer" class="teacher-revise-dialog-button-box">
+          <p class="reset-button-one" @click="saveOpenOff">取消</p>
+          <p class="inquire-button-one" @click="saveUpData">确定</p>
+        </div>
+      </el-dialog>
     </div>
     <div class="bottom-button-box" v-if="!editType">
       <p class="inquire-button-one" @click="upDataButton">提交</p>
       <p class="add-button-one-150" v-if="form.status == 0 && form.nature == 0" @click="saveDataButton">另存为权限模板</p>
     </div>
-    <user-list-one ref="userOpen"></user-list-one>
-    <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
-      <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
-      <div class="managePermissionTemplates-permission-dialog-form-box">
-        <div class="title-box">
-          <p class="left-title-p">功能菜单</p>
-          <div class="right-box">
-            <el-checkbox v-model="allCheckType" class="right-box-min" @change="(type)=>permissionCheckClick('1',type)">功能操作</el-checkbox>
-          </div>
-        </div>
-        <div class="check-box">
-          <div class="left-title-box">
-            <p class="left-title-p">{{permissionCheckData.menuName}}</p>
-          </div>
-          <div class="right-box">
-            <el-checkbox class="for-check-box" @change="(type)=>permissionCheckClick('2',type)"
-                         v-for="(item,index) in permissionCheckData.children" :key="index" v-model="item.checkType">
-              {{item.menuName}}
-            </el-checkbox>
-          </div>
-        </div>
-      </div>
-      <div slot="footer" class="managePermissionTemplates-permission-dialog-button-box">
-        <p class="reset-button-one" @click="permissionOpenOff">取消</p>
-        <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
-      </div>
-    </el-dialog>
-    <el-dialog title="选择指定部门（可多选）" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
-      <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
-        <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
-          <el-cascader
-            style="width:300px;"
-            :options="treeselectList"
-            :props="{multiple: true,value: 'id', label: 'label'}"
-            v-model="deptForm.deptIds"
-            clearable>
-          </el-cascader>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="managePermissionTemplates-dept-dialog-button-box">
-        <p class="reset-button-one" @click="deptCancel">取消</p>
-        <p class="inquire-button-one" @click="deptSure">确定</p>
-      </div>
-    </el-dialog>
-    <!--另存-->
-    <el-dialog title="另存为权限模板" :visible.sync="saveOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
-      <el-form :model="saveForm" ref="saveForm" :inline="true" :rules="rules" class="addCheckPage-min">
-        <el-form-item label="模板名称" prop="name" label-width="110px" >
-          <el-input v-model="saveForm.name" clearable maxlength="12" style="width:420px;" placeholder="请输入模板名称"/>
-        </el-form-item>
-        <el-form-item label="是否为学生模板" prop="type" style="width:420px;">
-          <el-radio-group v-model="saveForm.type">
-            <el-radio :label="1" style="width:80px;margin-left:20px;">是</el-radio>
-            <el-radio :label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="权限模板说明" prop="newPassword" label-width="110px">
-          <el-input
-            type="textarea"
-            style="width:420px;"
-            maxlength="100"
-            resize="none"
-            show-word-limit
-            :autosize="{ minRows: 6, maxRows: 6}"
-            placeholder="请输入权限模板说明"
-            v-model="saveForm.text">
-          </el-input>
-        </el-form-item>
-      </el-form>
-      <!--<p class="teacher-text-p">确定要重置该账号的密码吗？</p>-->
-      <!--<p class="teacher-text-p">确定操作后，该账号密码将重置为系统初始密码。</p>-->
-      <div slot="footer" class="teacher-revise-dialog-button-box">
-        <p class="reset-button-one" @click="saveOpenOff">取消</p>
-        <p class="inquire-button-one" @click="saveUpData">确定</p>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -1255,9 +1258,15 @@
     flex-direction: column;
     box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     padding:0 0 20px!important;
+    overflow: hidden;
     *{
       margin:0;
     }
+    .public-form-box{
+      flex:1;
+      overflow-y: scroll;
+      overflow-x: hidden;
+    }
     .top-title-box{
       border-bottom:1px solid #E0E0E0;
       display: flex;

src/views/comprehensive/personnel/teacher/addPageOne.vue

@@ -1,398 +1,402 @@
 <!--教职工管理新增/编辑(针对空军四医大项目 去除了检查者相关字段)-->
 <template>
   <div class="teacher-add-page">
-    <div class="top-title-box">
-      <p>{{titleName}}</p>
-      <p @click="outPageButton">返回</p>
-    </div>
-    <el-form :model="form" class="top-info-box" ref="form" :inline="true" :rules="rules" label-width="120px">
-      <div class="left-info-box">
-        <img :src="form.avatar" v-if="form.avatar">
-        <img src="@/assets/ZDimages/tx_cion.png" v-if="!form.avatar">
-        <el-upload
-          v-if="!editType"
-          class="certificate-avatar-uploader"
-          :action="uploadImgUrl"
-          :show-file-list="false"
-          accept="image/jpeg,image/gif,image/png"
-          :on-success="handleAvatarSuccess"
-          :headers="headers"
-          :before-upload="beforeAvatarUpload">
-          <p>上传证件照</p>
-        </el-upload>
+    <div class="public-form-box scrollbar-box">
+      <div class="top-title-box">
+        <p>{{titleName}}</p>
+        <p @click="outPageButton">返回</p>
       </div>
-      <div class="right-info-box">
-        <el-form-item label="姓名：" prop="nickName">
-          <el-input
-            :disabled="editType"
-            style="width:218px;"
-            maxlength="10"
-            v-model="form.nickName"
-            placeholder="请输入名称"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="性别：" prop="sex">
-          <el-radio-group v-model="form.sex" v-if="!editType">
-            <el-radio :label="0" style="margin-left:20px;width:70px;">男</el-radio>
-            <el-radio :label="1">女</el-radio>
-          </el-radio-group>
-          <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.sex==0?'男':'女'}}</p>
-        </el-form-item>
-        <el-form-item label="工号：" prop="userName">
-          <el-input
-            style="width:218px;"
-            :disabled="editType"
-            maxlength="50"
-            v-model="form.userName"
-            placeholder="请输入工号"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="所在部门：" prop="deptId">
-          <el-cascader
-            :disabled="editType"
-            :show-all-levels="false"
-            v-model="form.deptId"
-            :options="deptOptions"
-            :props="{ checkStrictly: true, value: 'id', label: 'label',emitPath:false  }"></el-cascader>
-        </el-form-item>
-        <el-form-item label="身份：" prop="position">
-          <el-select
-            :disabled="editType"
-            v-model="form.position"
-            filterable
-            remote
-            clearable
-            reserve-keyword
-            @change="positionSelectClick"
-            @clear="positionClearClick"
-            placeholder="请选择身份"
-            :remote-method="positionSelect">
-            <el-option
-              v-for="item in positionOptions"
-              :key="item.postId"
-              :label="item.postName"
-              :value="item.postId">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="手机号码：" prop="phonenumber">
-          <el-input
-            :disabled="editType"
-            style="width:218px;"
-            maxlength="25"
-            onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
-            v-model="form.phonenumber"
-            placeholder="请输入手机号码"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="职称：" prop="category">
-          <el-select
-            :disabled="editType"
-            v-model="form.category"
-            filterable
-            remote
-            clearable
-            reserve-keyword
-            @change="categorySelectClick"
-            @clear="categoryClearClick"
-            placeholder="请选择身份"
-            :remote-method="categorySelect">
-            <el-option
-              v-for="item in categoryOptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="邮箱：" prop="email">
-          <el-input
-            :disabled="editType"
-            style="width:218px;"
-            maxlength="40"
-            v-model="form.email"
-            placeholder="请输入邮箱"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="校园卡号：" prop="cardNum">
-          <el-input
-            :disabled="editType"
-            style="width:218px;"
-            onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
-            maxlength="50"
-            v-model="form.cardNum"
-            placeholder="请输入校园卡号"
-            clearable
-            size="small"
-          />
-        </el-form-item>
-        <el-form-item label="文化程度：" prop="education">
-          <el-select
-            :disabled="editType"
-            v-model="form.education"
-            filterable
-            remote
-            clearable
-            reserve-keyword
-            @change="educationSelectClick"
-            @clear="educationClearClick"
-            placeholder="请选择身份"
-            :remote-method="educationSelect">
-            <el-option
-              v-for="item in educationOptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="出生日期：" prop="dateBirth">
-          <el-date-picker
-            :disabled="editType"
-            v-model="form.dateBirth"
-            type="date"
-            placeholder="请选择出生日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="在职状态：" prop="nature">
-          <el-switch
+      <el-form :model="form" class="top-info-box" ref="form" :inline="true" :rules="rules" label-width="120px">
+        <div class="left-info-box">
+          <img :src="form.avatar" v-if="form.avatar">
+          <img src="@/assets/ZDimages/tx_cion.png" v-if="!form.avatar">
+          <el-upload
             v-if="!editType"
-            @click.native="natureCaptcha"
-            class="switch captcha-img"
-            active-value="0"
-            inactive-value="1"
-            active-color="#29B24D"
-            inactive-color="#999"
-            v-model="form.nature"
-            active-text="在职"
-            inactive-text="离职"
-            disabled
-          ></el-switch>
-          <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.nature==0?'在职':'离职'}}</p>
-        </el-form-item>
-        <!--<el-form-item label="安全检查人员：" prop="isCheck">-->
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="handleAvatarSuccess"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <p>上传证件照</p>
+          </el-upload>
+        </div>
+        <div class="right-info-box">
+          <el-form-item label="姓名：" prop="nickName">
+            <el-input
+              :disabled="editType"
+              style="width:218px;"
+              maxlength="10"
+              v-model="form.nickName"
+              placeholder="请输入名称"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="性别：" prop="sex">
+            <el-radio-group v-model="form.sex" v-if="!editType">
+              <el-radio :label="0" style="margin-left:20px;width:70px;">男</el-radio>
+              <el-radio :label="1">女</el-radio>
+            </el-radio-group>
+            <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.sex==0?'男':'女'}}</p>
+          </el-form-item>
+          <el-form-item label="工号：" prop="userName">
+            <el-input
+              style="width:218px;"
+              :disabled="editType"
+              maxlength="50"
+              v-model="form.userName"
+              placeholder="请输入工号"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="所在部门：" prop="deptId">
+            <el-cascader
+              :disabled="editType"
+              :show-all-levels="false"
+              v-model="form.deptId"
+              :options="deptOptions"
+              :props="{ checkStrictly: true, value: 'id', label: 'label',emitPath:false  }"></el-cascader>
+          </el-form-item>
+          <el-form-item label="身份：" prop="position">
+            <el-select
+              :disabled="editType"
+              v-model="form.position"
+              filterable
+              remote
+              clearable
+              reserve-keyword
+              @change="positionSelectClick"
+              @clear="positionClearClick"
+              placeholder="请选择身份"
+              :remote-method="positionSelect">
+              <el-option
+                v-for="item in positionOptions"
+                :key="item.postId"
+                :label="item.postName"
+                :value="item.postId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="手机号码：" prop="phonenumber">
+            <el-input
+              :disabled="editType"
+              style="width:218px;"
+              maxlength="25"
+              onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
+              v-model="form.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="职称：" prop="category">
+            <el-select
+              :disabled="editType"
+              v-model="form.category"
+              filterable
+              remote
+              clearable
+              reserve-keyword
+              @change="categorySelectClick"
+              @clear="categoryClearClick"
+              placeholder="请选择身份"
+              :remote-method="categorySelect">
+              <el-option
+                v-for="item in categoryOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="邮箱：" prop="email">
+            <el-input
+              :disabled="editType"
+              style="width:218px;"
+              maxlength="40"
+              v-model="form.email"
+              placeholder="请输入邮箱"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="校园卡号：" prop="cardNum">
+            <el-input
+              :disabled="editType"
+              style="width:218px;"
+              onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
+              maxlength="50"
+              v-model="form.cardNum"
+              placeholder="请输入校园卡号"
+              clearable
+              size="small"
+            />
+          </el-form-item>
+          <el-form-item label="文化程度：" prop="education">
+            <el-select
+              :disabled="editType"
+              v-model="form.education"
+              filterable
+              remote
+              clearable
+              reserve-keyword
+              @change="educationSelectClick"
+              @clear="educationClearClick"
+              placeholder="请选择身份"
+              :remote-method="educationSelect">
+              <el-option
+                v-for="item in educationOptions"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="item.dictValue">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出生日期：" prop="dateBirth">
+            <el-date-picker
+              :disabled="editType"
+              v-model="form.dateBirth"
+              type="date"
+              placeholder="请选择出生日期">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="在职状态：" prop="nature">
+            <el-switch
+              v-if="!editType"
+              @click.native="natureCaptcha"
+              class="switch captcha-img"
+              active-value="0"
+              inactive-value="1"
+              active-color="#29B24D"
+              inactive-color="#999"
+              v-model="form.nature"
+              active-text="在职"
+              inactive-text="离职"
+              disabled
+            ></el-switch>
+            <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.nature==0?'在职':'离职'}}</p>
+          </el-form-item>
+          <!--<el-form-item label="安全检查人员：" prop="isCheck">-->
           <!--<el-switch-->
-            <!--v-if="!editType"-->
-            <!--@click.native="isCheckCaptcha"-->
-            <!--class="switch captcha-img"-->
-            <!--:active-value="1"-->
-            <!--:inactive-value="0"-->
-            <!--active-color="#0183FA"-->
-            <!--inactive-color="#999"-->
-            <!--v-model="form.isCheck"-->
-            <!--active-text="是"-->
-            <!--inactive-text="否"-->
-            <!--disabled-->
+          <!--v-if="!editType"-->
+          <!--@click.native="isCheckCaptcha"-->
+          <!--class="switch captcha-img"-->
+          <!--:active-value="1"-->
+          <!--:inactive-value="0"-->
+          <!--active-color="#0183FA"-->
+          <!--inactive-color="#999"-->
+          <!--v-model="form.isCheck"-->
+          <!--active-text="是"-->
+          <!--inactive-text="否"-->
+          <!--disabled-->
           <!--&gt;</el-switch>-->
           <!--<p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.isCheck==0?'否':'是'}}</p>-->
-        <!--</el-form-item>-->
-        <el-form-item label="账号状态：" prop="status" v-if="form.nature == 0">
-          <el-switch
-            v-if="!editType"
-            @click.native="statusCaptcha"
-            class="switch captcha-img"
-            active-value="0"
-            inactive-value="1"
-            active-color="#0183FA"
-            inactive-color="#999"
-            v-model="form.status"
-            active-text="启用"
-            inactive-text="停用"
-            disabled
-          ></el-switch>
-          <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.status==0?'启用':'停用'}}</p>
-        </el-form-item>
-      </div>
-    </el-form>
-    <div class="top-title-one" v-if="!editType && form.status == 0">
-      <p class="title-p">权限配置</p>
-      <p class="el-icon-question img-p" @mouseenter="showText" @mouseout="hideText"></p>
-      <div class="position-box" v-if="textType">
-        <p>1、权限快捷模板：列出所有已创建的快捷模板，可选择快捷导入模板；导入后可修改或清空。</p>
-        <p>2、模块菜单：选中父级，联动子级全部选中，可对子级单独勾选；子级选中，父级联动选中。</p>
-        <p>3、数据范围：数据查看范围选择，默认展示所有数据。</p>
-        <p>4、管理权限：功能操作权限，包含增删改查、启用、停用，以及导出等操作功能。</p>
-        <p>5、详细配置：对底层菜单的功能操作进行细分权限勾选，功能操作按所属菜单页面现有的功能操作进行展示，可单选、全选。</p>
+          <!--</el-form-item>-->
+          <el-form-item label="账号状态：" prop="status" v-if="form.nature == 0">
+            <el-switch
+              v-if="!editType"
+              @click.native="statusCaptcha"
+              class="switch captcha-img"
+              active-value="0"
+              inactive-value="1"
+              active-color="#0183FA"
+              inactive-color="#999"
+              v-model="form.status"
+              active-text="启用"
+              inactive-text="停用"
+              disabled
+            ></el-switch>
+            <p v-if="editType" style="line-height:40px;color:#999;width:180px;padding-left:40px;">{{form.status==0?'启用':'停用'}}</p>
+          </el-form-item>
+        </div>
+      </el-form>
+      <div class="top-title-one" v-if="!editType && form.status == 0">
+        <p class="title-p">权限配置</p>
+        <p class="el-icon-question img-p" @mouseenter="showText" @mouseout="hideText"></p>
+        <div class="position-box" v-if="textType">
+          <p>1、权限快捷模板：列出所有已创建的快捷模板，可选择快捷导入模板；导入后可修改或清空。</p>
+          <p>2、模块菜单：选中父级，联动子级全部选中，可对子级单独勾选；子级选中，父级联动选中。</p>
+          <p>3、数据范围：数据查看范围选择，默认展示所有数据。</p>
+          <p>4、管理权限：功能操作权限，包含增删改查、启用、停用，以及导出等操作功能。</p>
+          <p>5、详细配置：对底层菜单的功能操作进行细分权限勾选，功能操作按所属菜单页面现有的功能操作进行展示，可单选、全选。</p>
+        </div>
       </div>
-    </div>
-    <div class="for-button-list" v-if="!editType && form.status == 0">
-      <p class="for-title-p">权限快捷模板：</p>
-      <div class="for-button-max-box">
-        <div class="for-button-min-box" v-for="(item,index) in templateList" :key="index"
-             :class="templateKey == item.id?'colorAA':'colorBB'" @click="templateClick(item.id)">
-          <i class="el-icon-success" v-if="templateKey == item.id"></i>
-          <span>{{item.name}}</span>
+      <div class="for-button-list" v-if="!editType && form.status == 0">
+        <p class="for-title-p">权限快捷模板：</p>
+        <div class="for-button-max-box">
+          <div class="for-button-min-box" v-for="(item,index) in templateList" :key="index"
+               :class="templateKey == item.id?'colorAA':'colorBB'" @click="templateClick(item.id)">
+            <i class="el-icon-success" v-if="templateKey == item.id"></i>
+            <span>{{item.name}}</span>
+          </div>
         </div>
       </div>
-    </div>
-    <div class="template-name-box" v-if="!editType && form.status == 0">
-      <p class="template-name-p">当前导入模板：{{templateName?templateName:'无'}}</p>
-      <p class="reset-button-one template-name-button" @click="templateDel">清除</p>
-      <p class="template-name-button-one" @click="importUser">导入其他账号权限</p>
-    </div>
-    <div class="table-for-max-box" v-if="!editType && form.status == 0">
-      <div class="table-title-box">
-        <p>模块菜单</p>
-        <p>权限</p>
+      <div class="template-name-box" v-if="!editType && form.status == 0">
+        <p class="template-name-p">当前导入模板：{{templateName?templateName:'无'}}</p>
+        <p class="reset-button-one template-name-button" @click="templateDel">清除</p>
+        <p class="template-name-button-one" @click="importUser">导入其他账号权限</p>
       </div>
-      <div class="table-for-big-box" v-for="(maxItem,maxIndex) in menuList" :key="maxIndex">
-        <div class="max-title-box" :class="!maxItem.children?'max-title-box-null':''">
-          <p><el-checkbox :disabled="maxItem.isRequired == 1" v-model="maxItem.checkType" @change="(type)=>itemCheckClick(1,type,maxItem)">{{maxItem.menuName}}</el-checkbox></p>
+      <div class="table-for-max-box" v-if="!editType && form.status == 0">
+        <div class="table-title-box">
+          <p>模块菜单</p>
+          <p>权限</p>
         </div>
-        <div class="max-right-box">
-          <div class="big-box" v-for="(bigItem,bigIndex) in maxItem.children" :key="bigIndex">
-            <div class="big-title-box" :class="bigItem.menuType == 'C'?'big-title-box-null':''">
-              <p><el-checkbox :disabled="bigItem.isRequired == 1" v-model="bigItem.checkType" @change="(type)=>itemCheckClick(2,type,bigItem,maxItem)">{{bigItem.menuName}}</el-checkbox></p>
-            </div>
-            <div class="big-right-box" v-if="bigItem.menuType !='C'">
-              <div class="min-box" v-for="(minItem,minIndex) in bigItem.children" :key="minIndex">
-                <div class="min-title-box">
-                  <p><el-checkbox :disabled="minItem.isRequired == 1" v-model="minItem.checkType" @change="(type)=>itemCheckClick(3,type,minItem,bigItem,maxItem)">{{minItem.menuName}}</el-checkbox></p>
-                </div>
-                <div class="min-right-box" v-if="minItem.checkType">
-                  <div class="scope-box">
-                    <p>
-                      <el-checkbox v-model="minItem.scopeCheckType" @change="(type)=>itemCheckClick(4,type,minItem)" style="margin-right:40px;">数据范围</el-checkbox>
-                      <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired == 1"
-                                 placeholder="请选择1" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
-                        <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
-                      </el-select>
-                      <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired != 1"
-                                 placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
-                        <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
-                      </el-select>
-                    </p>
+        <div class="table-for-big-box" v-for="(maxItem,maxIndex) in menuList" :key="maxIndex">
+          <div class="max-title-box" :class="!maxItem.children?'max-title-box-null':''">
+            <p><el-checkbox :disabled="maxItem.isRequired == 1" v-model="maxItem.checkType" @change="(type)=>itemCheckClick(1,type,maxItem)">{{maxItem.menuName}}</el-checkbox></p>
+          </div>
+          <div class="max-right-box">
+            <div class="big-box" v-for="(bigItem,bigIndex) in maxItem.children" :key="bigIndex">
+              <div class="big-title-box" :class="bigItem.menuType == 'C'?'big-title-box-null':''">
+                <p><el-checkbox :disabled="bigItem.isRequired == 1" v-model="bigItem.checkType" @change="(type)=>itemCheckClick(2,type,bigItem,maxItem)">{{bigItem.menuName}}</el-checkbox></p>
+              </div>
+              <div class="big-right-box" v-if="bigItem.menuType !='C'">
+                <div class="min-box" v-for="(minItem,minIndex) in bigItem.children" :key="minIndex">
+                  <div class="min-title-box">
+                    <p><el-checkbox :disabled="minItem.isRequired == 1" v-model="minItem.checkType" @change="(type)=>itemCheckClick(3,type,minItem,bigItem,maxItem)">{{minItem.menuName}}</el-checkbox></p>
                   </div>
-                  <div class="permission-box" v-if="minItem.children">
-                    <p class="check-left-p"><el-checkbox v-model="minItem.permissionCheckType"  @change="(type)=>itemCheckClick(5,type,minItem)">管理权限</el-checkbox></p>
-                    <div class="check-button-box" @click="permissionDetails(minItem,maxIndex,bigIndex,minIndex)"
-                         :class="minItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
-                      <img v-if="!minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
-                      <img v-if="minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
-                      <p>详细配置</p>
+                  <div class="min-right-box" v-if="minItem.checkType">
+                    <div class="scope-box">
+                      <p>
+                        <el-checkbox v-model="minItem.scopeCheckType" @change="(type)=>itemCheckClick(4,type,minItem)" style="margin-right:40px;">数据范围</el-checkbox>
+                        <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired == 1"
+                                   placeholder="请选择1" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
+                          <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
+                        </el-select>
+                        <el-select v-model="minItem.dataScope" :disabled="!minItem.scopeCheckType" v-if="minItem.isRequired != 1"
+                                   placeholder="请选择" @visible-change="(type)=>visibleChange(type,minItem,maxIndex,bigIndex,minIndex)">
+                          <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,minItem,maxIndex,bigIndex,minIndex)"></el-option>
+                        </el-select>
+                      </p>
+                    </div>
+                    <div class="permission-box" v-if="minItem.children">
+                      <p class="check-left-p"><el-checkbox v-model="minItem.permissionCheckType"  @change="(type)=>itemCheckClick(5,type,minItem)">管理权限</el-checkbox></p>
+                      <div class="check-button-box" @click="permissionDetails(minItem,maxIndex,bigIndex,minIndex)"
+                           :class="minItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
+                        <img v-if="!minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
+                        <img v-if="minItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
+                        <p>详细配置</p>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="big-right-box-null" v-if="bigItem.menuType == 'C'&&bigItem.checkType">
-              <div class="scope-box">
-                <p>
-                  <el-checkbox v-model="bigItem.scopeCheckType" style="margin-right:40px;" @change="(type)=>itemCheckClick(4,type,bigItem)">数据范围</el-checkbox>
-                  <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired == 1"
-                             placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
-                    <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
-                  </el-select>
-                  <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired != 1"
-                             placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
-                    <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
-                  </el-select>
-                </p>
-              </div>
-              <div class="permission-box" v-if="bigItem.children">
-                <p class="check-left-p"><el-checkbox v-model="bigItem.permissionCheckType" @change="(type)=>itemCheckClick(5,type,bigItem)">管理权限</el-checkbox></p>
-                <div class="check-button-box" @click="permissionDetails(bigItem,maxIndex,bigIndex)"
-                     :class="bigItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
-                  <img v-if="!bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
-                  <img v-if="bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
-                  <p>详细配置</p>
+              <div class="big-right-box-null" v-if="bigItem.menuType == 'C'&&bigItem.checkType">
+                <div class="scope-box">
+                  <p>
+                    <el-checkbox v-model="bigItem.scopeCheckType" style="margin-right:40px;" @change="(type)=>itemCheckClick(4,type,bigItem)">数据范围</el-checkbox>
+                    <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired == 1"
+                               placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
+                      <el-option v-for="dist in optionsDataListOne" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
+                    </el-select>
+                    <el-select v-model="bigItem.dataScope" :disabled="!bigItem.scopeCheckType" v-if="bigItem.isRequired != 1"
+                               placeholder="请选择" @visible-change="(type)=>visibleChange(type,bigItem,maxIndex,bigIndex)">
+                      <el-option v-for="dist in optionsDataList" :key="dist.type" :label="dist.value" :value="dist.type" @click.native="(type)=>optionChange(dist.type,bigItem,maxIndex,bigIndex)"></el-option>
+                    </el-select>
+                  </p>
+                </div>
+                <div class="permission-box" v-if="bigItem.children">
+                  <p class="check-left-p"><el-checkbox v-model="bigItem.permissionCheckType" @change="(type)=>itemCheckClick(5,type,bigItem)">管理权限</el-checkbox></p>
+                  <div class="check-button-box" @click="permissionDetails(bigItem,maxIndex,bigIndex)"
+                       :class="bigItem.permissionCheckType?'check-button-box-colorA':'check-button-box-colorB'">
+                    <img v-if="!bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_zc.png">
+                    <img v-if="bigItem.permissionCheckType" src="@/assets/ZDimages/personnelManagement/icon_xzqx_xz.png">
+                    <p>详细配置</p>
+                  </div>
                 </div>
               </div>
             </div>
+            <p class="big-box-null" v-if="!maxItem.children&&maxItem.menuName == '数据可视化'">数据可视化大屏查看权限</p>
           </div>
-          <p class="big-box-null" v-if="!maxItem.children&&maxItem.menuName == '数据可视化'">数据可视化大屏查看权限</p>
         </div>
       </div>
+
+      <user-list-one ref="userOpen"></user-list-one>
+      <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
+        <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
+        <div class="managePermissionTemplates-permission-dialog-form-box">
+          <div class="title-box">
+            <p class="left-title-p">功能菜单</p>
+            <div class="right-box">
+              <el-checkbox v-model="allCheckType" class="right-box-min" @change="(type)=>permissionCheckClick('1',type)">功能操作</el-checkbox>
+            </div>
+          </div>
+          <div class="check-box">
+            <div class="left-title-box">
+              <p class="left-title-p">{{permissionCheckData.menuName}}</p>
+            </div>
+            <div class="right-box">
+              <el-checkbox class="for-check-box" @change="(type)=>permissionCheckClick('2',type)"
+                           v-for="(item,index) in permissionCheckData.children" :key="index" v-model="item.checkType">
+                {{item.menuName}}
+              </el-checkbox>
+            </div>
+          </div>
+        </div>
+        <div slot="footer" class="managePermissionTemplates-permission-dialog-button-box">
+          <p class="reset-button-one" @click="permissionOpenOff">取消</p>
+          <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
+        </div>
+      </el-dialog>
+      <el-dialog title="选择指定部门（可多选）" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
+        <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
+          <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
+            <el-cascader
+              style="width:300px;"
+              :options="treeselectList"
+              :props="{multiple: true,value: 'id', label: 'label'}"
+              v-model="deptForm.deptIds"
+              clearable>
+            </el-cascader>
+          </el-form-item>
+        </el-form>
+        <div slot="footer" class="managePermissionTemplates-dept-dialog-button-box">
+          <p class="reset-button-one" @click="deptCancel">取消</p>
+          <p class="inquire-button-one" @click="deptSure">确定</p>
+        </div>
+      </el-dialog>
+      <!--另存-->
+      <el-dialog title="另存为权限模板" :visible.sync="saveOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
+        <el-form :model="saveForm" ref="saveForm" :inline="true" :rules="rules" class="addCheckPage-min">
+          <el-form-item label="模板名称" prop="name" label-width="110px" >
+            <el-input v-model="saveForm.name" clearable maxlength="12" style="width:420px;" placeholder="请输入模板名称"/>
+          </el-form-item>
+          <el-form-item label="是否为学生模板" prop="type" style="width:420px;">
+            <el-radio-group v-model="saveForm.type">
+              <el-radio :label="1" style="width:80px;margin-left:20px;">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="权限模板说明" prop="newPassword" label-width="110px">
+            <el-input
+              type="textarea"
+              style="width:420px;"
+              maxlength="100"
+              resize="none"
+              show-word-limit
+              :autosize="{ minRows: 6, maxRows: 6}"
+              placeholder="请输入权限模板说明"
+              v-model="saveForm.text">
+            </el-input>
+          </el-form-item>
+        </el-form>
+        <!--<p class="teacher-text-p">确定要重置该账号的密码吗？</p>-->
+        <!--<p class="teacher-text-p">确定操作后，该账号密码将重置为系统初始密码。</p>-->
+        <div slot="footer" class="teacher-revise-dialog-button-box">
+          <p class="reset-button-one" @click="saveOpenOff">取消</p>
+          <p class="inquire-button-one" @click="saveUpData">确定</p>
+        </div>
+      </el-dialog>
     </div>
     <div class="bottom-button-box" v-if="!editType">
       <p class="inquire-button-one" @click="upDataButton">提交</p>
       <p class="add-button-one-150" v-if="form.status == 0 && form.nature == 0" @click="saveDataButton">另存为权限模板</p>
     </div>
-    <user-list-one ref="userOpen"></user-list-one>
-    <el-dialog :title="permissionCheckData.menuName+'模块'" :visible.sync="permissionOpen" width="900px" append-to-body class="managePermissionTemplates-permission-dialog-box">
-      <p class="title-p">{{permissionCheckData.menuName}}权限详细配置</p>
-      <div class="managePermissionTemplates-permission-dialog-form-box">
-        <div class="title-box">
-          <p class="left-title-p">功能菜单</p>
-          <div class="right-box">
-            <el-checkbox v-model="allCheckType" class="right-box-min" @change="(type)=>permissionCheckClick('1',type)">功能操作</el-checkbox>
-          </div>
-        </div>
-        <div class="check-box">
-          <div class="left-title-box">
-            <p class="left-title-p">{{permissionCheckData.menuName}}</p>
-          </div>
-          <div class="right-box">
-            <el-checkbox class="for-check-box" @change="(type)=>permissionCheckClick('2',type)"
-                         v-for="(item,index) in permissionCheckData.children" :key="index" v-model="item.checkType">
-              {{item.menuName}}
-            </el-checkbox>
-          </div>
-        </div>
-      </div>
-      <div slot="footer" class="managePermissionTemplates-permission-dialog-button-box">
-        <p class="reset-button-one" @click="permissionOpenOff">取消</p>
-        <p class="inquire-button-one" @click="surePermissionOpen">确定</p>
-      </div>
-    </el-dialog>
-    <el-dialog title="选择指定部门（可多选）" @close="deptCancel" :visible.sync="deptOpen" v-if="deptOpen" width="500px" append-to-body class="managePermissionTemplates-dept-dialog-box">
-      <el-form :model="deptForm" ref="deptForm" :inline="true" :rules="rules" class="addCheckPage-min">
-        <el-form-item label="指定部门" prop="deptIds" label-width="90px" class="el-form-item-bottom">
-          <el-cascader
-            style="width:300px;"
-            :options="treeselectList"
-            :props="{multiple: true,value: 'id', label: 'label'}"
-            v-model="deptForm.deptIds"
-            clearable>
-          </el-cascader>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="managePermissionTemplates-dept-dialog-button-box">
-        <p class="reset-button-one" @click="deptCancel">取消</p>
-        <p class="inquire-button-one" @click="deptSure">确定</p>
-      </div>
-    </el-dialog>
-    <!--另存-->
-    <el-dialog title="另存为权限模板" :visible.sync="saveOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
-      <el-form :model="saveForm" ref="saveForm" :inline="true" :rules="rules" class="addCheckPage-min">
-        <el-form-item label="模板名称" prop="name" label-width="110px" >
-          <el-input v-model="saveForm.name" clearable maxlength="12" style="width:420px;" placeholder="请输入模板名称"/>
-        </el-form-item>
-        <el-form-item label="是否为学生模板" prop="type" style="width:420px;">
-          <el-radio-group v-model="saveForm.type">
-            <el-radio :label="1" style="width:80px;margin-left:20px;">是</el-radio>
-            <el-radio :label="0">否</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="权限模板说明" prop="newPassword" label-width="110px">
-          <el-input
-            type="textarea"
-            style="width:420px;"
-            maxlength="100"
-            resize="none"
-            show-word-limit
-            :autosize="{ minRows: 6, maxRows: 6}"
-            placeholder="请输入权限模板说明"
-            v-model="saveForm.text">
-          </el-input>
-        </el-form-item>
-      </el-form>
-      <!--<p class="teacher-text-p">确定要重置该账号的密码吗？</p>-->
-      <!--<p class="teacher-text-p">确定操作后，该账号密码将重置为系统初始密码。</p>-->
-      <div slot="footer" class="teacher-revise-dialog-button-box">
-        <p class="reset-button-one" @click="saveOpenOff">取消</p>
-        <p class="inquire-button-one" @click="saveUpData">确定</p>
-      </div>
-    </el-dialog>
   </div>
+
 </template>
 
 <script>
@@ -1256,9 +1260,15 @@
     flex-direction: column;
     box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     padding:0 0 20px!important;
+    overflow: hidden;
     *{
       margin:0;
     }
+    .public-form-box{
+      flex:1;
+      overflow-y: scroll;
+      overflow-x: hidden;
+    }
     .top-title-box{
       border-bottom:1px solid #E0E0E0;
       display: flex;

src/views/comprehensive/system/publicConfig/basicsConfig.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container public-config-page">
-    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+  <div class="public-config-page">
+    <el-form class="public-form-box scrollbar-box" :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
       <div class="form-max-box">
         <el-form-item label="学校名称：" prop="schoolName">
           <el-input
@@ -48,7 +48,9 @@
       </div>
     </el-form>
     <div class="sub_btn">
+      <p class="null-p"></p>
       <p class="inquire-button-one"  @click="submitForm">保存</p>
+      <p class="null-p"></p>
     </div>
     <!--查看图片-->
     <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
@@ -154,16 +156,23 @@
 
 <style scoped lang="scss">
   .public-config-page{
-    position: relative;
+    flex:1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    .public-form-box{
+      flex:1;
+      overflow-y: scroll;
+      overflow-x: hidden;
+    }
     /*底部按钮弹框*/
     .sub_btn{
-      position: fixed;
-      right: 20px;
-      bottom: 0;
+      display: flex;
       background: #fff;
       height: 112px;
-      width:84%;
-      text-align: center;
+      .null-p{
+        flex:1;
+      }
       .inquire-button-one{
         cursor:pointer;
         display: inline-block;

src/views/comprehensive/system/publicConfig/chemicalsConfig.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container public-config-page">
-    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+  <div class="public-config-page">
+    <el-form class="public-form-box scrollbar-box" :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
       <div class="form-max-box">
         <el-form-item label="使用身份配置" prop="userType">
           <el-checkbox-group v-model="form.userType">
@@ -20,7 +20,9 @@
       </div>
     </el-form>
     <div class="sub_btn">
+      <p class="null-p"></p>
       <p class="inquire-button-one"  @click="submitForm">保存</p>
+      <p class="null-p"></p>
     </div>
     <!--查看图片-->
     <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
@@ -154,15 +156,23 @@
 
 <style scoped lang="scss">
   .public-config-page{
+    flex:1;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    .public-form-box{
+      flex:1;
+      overflow-y: scroll;
+      overflow-x: hidden;
+    }
     /*底部按钮弹框*/
     .sub_btn{
-      position: fixed;
-      right: 20px;
-      bottom: 0;
+      display: flex;
       background: #fff;
       height: 112px;
-      width:84%;
-      text-align: center;
+      .null-p{
+        flex:1;
+      }
       .inquire-button-one{
         cursor:pointer;
         display: inline-block;

src/views/comprehensive/system/publicConfig/exploitConfig.vue

@@ -227,8 +227,6 @@
     display: flex;
     flex-direction: column;
     overflow: hidden;
-    /*position: relative;*/
-    /*padding-bottom: 200px !important;*/
     .public-form-box{
       flex:1;
       overflow-y: scroll;

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -1,7 +1,7 @@
 <!--一体机配置-->
 <template>
-  <div class="app-container public-config-page">
-    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+  <div class="public-config-page">
+    <el-form class="public-form-box scrollbar-box"  :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
       <div class="form-max-box">
         <el-form-item label="签到/离开示意图：" prop="signMap">
           <el-upload
@@ -58,7 +58,9 @@
       </div>
     </el-form>
     <div class="sub_btn">
+      <p class="null-p"></p>
       <p class="inquire-button-one"  @click="submitForm">保存</p>
+      <p class="null-p"></p>
     </div>
     <!--查看图片-->
     <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
@@ -168,15 +170,23 @@ export default {
 
 <style scoped lang="scss">
 .public-config-page{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  .public-form-box{
+    flex:1;
+    overflow-y: scroll;
+    overflow-x: hidden;
+  }
   /*底部按钮弹框*/
   .sub_btn{
-    position: fixed;
-    right: 20px;
-    bottom: 0;
+    display: flex;
     background: #fff;
     height: 112px;
-    width:84%;
-    text-align: center;
+    .null-p{
+      flex:1;
+    }
     .inquire-button-one{
       cursor:pointer;
       display: inline-block;

src/views/comprehensive/system/publicConfig/programConfig.vue

@@ -1,7 +1,7 @@
 <!--一体机配置-->
 <template>
-  <div class="app-container public-config-page">
-    <el-form :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
+  <div class="public-config-page">
+    <el-form class="public-form-box scrollbar-box"  :model="form" ref="form" :inline="true" :rules="rules" label-width="160px">
       <div class="form-max-box">
         <el-form-item label="登录页banner：" prop="loginBanner">
           <el-upload
@@ -40,7 +40,9 @@
       </div>
     </el-form>
     <div class="sub_btn">
+      <p class="null-p"></p>
       <p class="inquire-button-one"  @click="submitForm">保存</p>
+      <p class="null-p"></p>
     </div>
     <!--查看图片-->
     <el-dialog title="查看" :visible.sync="imgOpen" width="1200px" append-to-body>
@@ -140,15 +142,27 @@ export default {
 
 <style scoped lang="scss">
 .public-config-page{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  .public-form-box{
+    flex:1;
+    overflow-y: scroll;
+    overflow-x: hidden;
+  }
   /*底部按钮弹框*/
   .sub_btn{
-    position: fixed;
+    /*position: absolute;*/
+    display: flex;
     right: 20px;
     bottom: 0;
     background: #fff;
     height: 112px;
-    width:84%;
     text-align: center;
+    .null-p{
+      flex:1;
+    }
     .inquire-button-one{
       cursor:pointer;
       display: inline-block;