修改 org-tree动态高度

src/assets/styles/element-ui.scss

@@ -85,14 +85,14 @@
 
 .tree-container{
   .el-tree-node>.el-tree-node__children{
-    overflow: visible!important; /* 添加横向滚动条*/
+    -overflow: visible!important; /* 添加横向滚动条*/
   }
 }
 
-.tree-container{
-  height: 744px;
-  overflow: auto;
-}
+//.tree-container{
+//  height: 744px;
+//  overflow: auto;
+//}
 
 .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content{
   background-color:#d1e0f1  !important;

src/assets/styles/index.scss

@@ -1,7 +1,7 @@
+@import "./element-ui.scss";
 @import "./variables.scss";
 @import "./mixin.scss";
 @import "./transition.scss";
-@import "./element-ui.scss";
 @import "./sidebar.scss";
 @import "./btn.scss";
 

src/assets/styles/ruoyi.scss

@@ -299,5 +299,11 @@
   }
 }
 .el-tree-node__content{
-	height: 32px !important;
+    font-size: 13px;
+    height: 32px!important;
   }
+ .el-submenu__title{
+   font-size: 13px!important;
+   height: 48px!important;
+   line-height: 48px!important;
+ }

src/components/orgTree/index.vue

@@ -112,7 +112,20 @@ export default {
   computed:{
     ...mapGetters(["orgTree"]),
   },
+  mounted() {
+    this.getHeight();
+  },
   methods: {
+    getHeight(){
+      let orgTree = document.querySelector('.org-tree');
+      const resizeObserver = new ResizeObserver(entries => {
+        for (let entry of entries) {
+          orgTree.style.height = entry.contentRect.height + 'px';
+          console.log(entry,'entry')
+        }
+      });
+      resizeObserver.observe(document.querySelector('.main-right-box'));
+    },
     /** 下穿状态改变*/
     changeCheckBox(state) {
       this.$emit("checkChange", state);
@@ -174,6 +187,8 @@ export default {
   background-color: #fff;
   padding: 10px;
   box-shadow: 0 2px 8px #ccc;
+  -min-height: calc(100vh - 107px);
+  overflow: auto;
 }
 .el-tree-ex {
   // overflow: auto;

src/layout/components/TagsView/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="tags-view-container" class="tags-view-container">
-    
+
     <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
     -->
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">

src/views/system/dept/index.vue

@@ -1,226 +1,228 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10">
-    <!--机构数据-->
-     <el-col :span="4" :xs="24">
-      <org-tree
-        v-model="queryParams.orgId"
-        @defaultKey="defaultKeys"
-        @checkChange="checkChange"
-        @click="handleNodeClick"
-      ></org-tree>
-     </el-col>
-      <!--用户数据-->
-     <el-col :span="20" :xs="24">
-      <!--    搜索条件    -->
-        <div class="main-search-box">
-           <el-form
-             :model="queryParams"
-             ref="queryForm"
-             size="small"
-             :inline="true"
-             v-show="showSearch"
-           >
-             <el-form-item label="机构名称" prop="name" >
-               <el-input
-                 v-model="queryParams.name"
-                 placeholder="请输入机构名称"
-                 clearable
-                 @keyup.enter.native="handleQuery"
-                 maxlength="50" @input="inputRestriction"
-               />
-             </el-form-item>
-             <el-form-item label="机构编码" prop="code">
-               <el-input
-                 v-model="queryParams.code"
-                 placeholder="请输入机构编码"
-                 clearable
-                 @keyup.enter.native="handleQuery"
-               />
-             </el-form-item>
-             <el-form-item label="状态" prop="isLock">
-               <el-select
-                 v-model="queryParams.isLock"
-                 placeholder="请选择状态"
-                 clearable
-               >
-                 <el-option
-                   v-for="dict in dict.type.sys_normal_disable"
-                   :key="dict.value"
-                   :label="dict.label"
-                   :value="dict.value"
+       <!--机构数据-->
+       <el-col :span="4" :xs="24">
+        <org-tree
+          v-model="queryParams.orgId"
+          @defaultKey="defaultKeys"
+          @checkChange="checkChange"
+          @click="handleNodeClick"
+        ></org-tree>
+       </el-col>
+        <!--用户数据-->
+       <el-col :span="20" :xs="24">
+         <div class="main-right-box">
+           <!--    搜索条件    -->
+           <div class="main-search-box">
+             <el-form
+               :model="queryParams"
+               ref="queryForm"
+               size="small"
+               :inline="true"
+               v-show="showSearch"
+             >
+               <el-form-item label="机构名称" prop="name" >
+                 <el-input
+                   v-model="queryParams.name"
+                   placeholder="请输入机构名称"
+                   clearable
+                   @keyup.enter.native="handleQuery"
+                   maxlength="50" @input="inputRestriction"
                  />
-               </el-select>
-             </el-form-item>
-             <el-form-item label="机构类型" prop="type">
-               <el-select
-                 v-model="queryParams.type"
-                 placeholder="请选择机构类型"
-                 clearable
-               >
-                 <el-option
-                   v-for="dict in dict.type.sys_org_type"
-                   :key="dict.value"
-                   :label="dict.label"
-                   :value="dict.value"
+               </el-form-item>
+               <el-form-item label="机构编码" prop="code">
+                 <el-input
+                   v-model="queryParams.code"
+                   placeholder="请输入机构编码"
+                   clearable
+                   @keyup.enter.native="handleQuery"
                  />
-               </el-select>
-             </el-form-item>
-             <el-form-item>
-               <el-button
-                 type="primary"
-                 icon="el-icon-search"
-                 size="mini"
-                 @click="handleQuery"
-               >搜索</el-button
-               >
-               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-               >重置</el-button
-               >
-             </el-form-item>
-           </el-form>
-           <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:dept:add']"
-              >新增机构</el-button
-              >
-            </el-col>
-            <right-toolbar
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
-          </el-row>
-        </div>
-          <el-table
-          border
-          height="650"
-          size="small"
-          v-loading="loading"
-          :data="deptList">
-          <el-table-column label="序号" align="center" width="80">
-            <template v-slot:default="scope">
-              <span v-text="getPageIndex(scope.$index)"> </span>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="false"
-            prop="name"
-            label="机构名称"
-          ></el-table-column>
-          <el-table-column
-            prop="shortName"
-            label="机构简称"
-          ></el-table-column>
-          <el-table-column align="center" prop="type" label="机构类型">
-            <template v-slot="scope">
-              <dict-tag
-                :options="dict.type.sys_org_type"
-                :value="scope.row.type"
-              />
-            </template>
-          </el-table-column>
-           <el-table-column  prop="code" align="center" label="机构编码"></el-table-column>
+               </el-form-item>
+               <el-form-item label="状态" prop="isLock">
+                 <el-select
+                   v-model="queryParams.isLock"
+                   placeholder="请选择状态"
+                   clearable
+                 >
+                   <el-option
+                     v-for="dict in dict.type.sys_normal_disable"
+                     :key="dict.value"
+                     :label="dict.label"
+                     :value="dict.value"
+                   />
+                 </el-select>
+               </el-form-item>
+               <el-form-item label="机构类型" prop="type">
+                 <el-select
+                   v-model="queryParams.type"
+                   placeholder="请选择机构类型"
+                   clearable
+                 >
+                   <el-option
+                     v-for="dict in dict.type.sys_org_type"
+                     :key="dict.value"
+                     :label="dict.label"
+                     :value="dict.value"
+                   />
+                 </el-select>
+               </el-form-item>
+               <el-form-item>
+                 <el-button
+                   type="primary"
+                   icon="el-icon-search"
+                   size="mini"
+                   @click="handleQuery"
+                 >搜索</el-button
+                 >
+                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                 >重置</el-button
+                 >
+               </el-form-item>
+             </el-form>
+             <el-row :gutter="10">
+               <el-col :span="1.5">
+                 <el-button
+                   type="primary"
+                   icon="el-icon-plus"
+                   size="mini"
+                   @click="handleAdd"
+                   v-hasPermi="['system:dept:add']"
+                 >新增机构</el-button
+                 >
+               </el-col>
+               <right-toolbar
+                 :showSearch.sync="showSearch"
+                 @queryTable="getList"
+               ></right-toolbar>
+             </el-row>
+           </div>
+           <el-table
+             border
+             height="650"
+             size="small"
+             v-loading="loading"
+             :data="deptList">
+             <el-table-column label="序号" align="center" width="80">
+               <template v-slot:default="scope">
+                 <span v-text="getPageIndex(scope.$index)"> </span>
+               </template>
+             </el-table-column>
+             <el-table-column v-if="false"
+                              prop="name"
+                              label="机构名称"
+             ></el-table-column>
+             <el-table-column
+               prop="shortName"
+               label="机构简称"
+             ></el-table-column>
+             <el-table-column align="center" prop="type" label="机构类型">
+               <template v-slot="scope">
+                 <dict-tag
+                   :options="dict.type.sys_org_type"
+                   :value="scope.row.type"
+                 />
+               </template>
+             </el-table-column>
+             <el-table-column  prop="code" align="center" label="机构编码"></el-table-column>
 
-            <el-table-column prop="isLock" align="center" label="机构状态">
-              <template v-slot="scope">
-                <dict-tag
-                  :options="dict.type.sys_normal_disable"
-                  :value="scope.row.isLock"
-                />
-              </template>
-            </el-table-column>
+             <el-table-column prop="isLock" align="center" label="机构状态">
+               <template v-slot="scope">
+                 <dict-tag
+                   :options="dict.type.sys_normal_disable"
+                   :value="scope.row.isLock"
+                 />
+               </template>
+             </el-table-column>
 
-            <el-table-column
-              align="center"
-              prop="sort"
-              label="排序"
-            ></el-table-column>
-            <el-table-column v-if="false"
-              align="center"
-              prop="weatherCityCode"
-              label="城市天气区域"
-            >
-              <template slot-scope="r">
-                <span>{{ getCode(r.row.weatherCityCode) }}</span>
-              </template>
-            </el-table-column>
-            <!-- <el-table-column prop="address" label="地址"></el-table-column> -->
-            <!-- <el-table-column label="负责人" align="center">
-            <template v-slot:default="scope">
-              <span v-text="scope.row.manager"></span>-
-              <span v-text="scope.row.managerPhone"> </span>
-            </template>
-          </el-table-column> -->
-            <el-table-column  v-if="false"
-              align="center"
-              prop="manager"
-              label="负责人"
-            ></el-table-column>
-            <el-table-column v-if="false"
-              align="center"
-              prop="managerPhone"
-              label="负责人电话"
-            ></el-table-column>
-            <el-table-column
-              label="操作"
-              align="left"
-              width="220"
-              class-name="small-padding fixed-width"
-            >
-              <template slot-scope="scope">
-                <!-- <router-link
-                  :to="'/system/dept-extend/extend/' + scope.row.id"
-                  class="link-type"
-                > -->
-                <el-button
-                  v-if="
+             <el-table-column
+               align="center"
+               prop="sort"
+               label="排序"
+             ></el-table-column>
+             <el-table-column v-if="false"
+                              align="center"
+                              prop="weatherCityCode"
+                              label="城市天气区域"
+             >
+               <template slot-scope="r">
+                 <span>{{ getCode(r.row.weatherCityCode) }}</span>
+               </template>
+             </el-table-column>
+             <!-- <el-table-column prop="address" label="地址"></el-table-column> -->
+             <!-- <el-table-column label="负责人" align="center">
+             <template v-slot:default="scope">
+               <span v-text="scope.row.manager"></span>-
+               <span v-text="scope.row.managerPhone"> </span>
+             </template>
+           </el-table-column> -->
+             <el-table-column  v-if="false"
+                               align="center"
+                               prop="manager"
+                               label="负责人"
+             ></el-table-column>
+             <el-table-column v-if="false"
+                              align="center"
+                              prop="managerPhone"
+                              label="负责人电话"
+             ></el-table-column>
+             <el-table-column
+               label="操作"
+               align="left"
+               width="220"
+               class-name="small-padding fixed-width"
+             >
+               <template slot-scope="scope">
+                 <!-- <router-link
+                   :to="'/system/dept-extend/extend/' + scope.row.id"
+                   class="link-type"
+                 > -->
+                 <el-button
+                   v-if="
                     scope.row.type == 4 ||
                     scope.row.type == 10 ||
                     scope.row.type == 5
                   "
-                  size="mini"
-                  type="text"
-                  icon="el-icon-plus"
-                  v-hasPermi="['system:dept:extend']"
-                  @click="handleReplenish(scope.row.id)"
-                  >补充信息</el-button
-                >
-                <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
-                <!-- </router-link> -->
-                <el-divider direction="vertical"></el-divider>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit-outline"
-                  @click="handleUpdate(scope.row)"
-                  v-hasPermi="['system:dept:edit']"
-                  >编辑</el-button
-                ><el-divider direction="vertical"></el-divider>
-                <el-button
-                  v-if="!scope.row.source"
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                  v-hasPermi="['system:dept:remove']"
-                  >删除</el-button
-                >
-              </template>
-            </el-table-column>
-          </el-table>
-          <pagination
-            v-show="total > 0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-          />
-        </el-col>
-     </el-row>
+                   size="mini"
+                   type="text"
+                   icon="el-icon-plus"
+                   v-hasPermi="['system:dept:extend']"
+                   @click="handleReplenish(scope.row.id)"
+                 >补充信息</el-button
+                 >
+                 <span v-else style="display: inline-block;width: 70px;height: 20px;"></span>
+                 <!-- </router-link> -->
+                 <el-divider direction="vertical"></el-divider>
+                 <el-button
+                   size="mini"
+                   type="text"
+                   icon="el-icon-edit-outline"
+                   @click="handleUpdate(scope.row)"
+                   v-hasPermi="['system:dept:edit']"
+                 >编辑</el-button
+                 ><el-divider direction="vertical"></el-divider>
+                 <el-button
+                   v-if="!scope.row.source"
+                   size="mini"
+                   type="text"
+                   icon="el-icon-delete"
+                   @click="handleDelete(scope.row)"
+                   v-hasPermi="['system:dept:remove']"
+                 >删除</el-button
+                 >
+               </template>
+             </el-table-column>
+           </el-table>
+           <pagination
+             v-show="total > 0"
+             :total="total"
+             :page.sync="queryParams.pageNum"
+             :limit.sync="queryParams.pageSize"
+             @pagination="getList"
+           />
+         </div>
+       </el-col>
+    </el-row>
 
     <!-- 添加或修改机构对话框 -->
     <DialogCom

src/views/system/device/index.vue

@@ -12,171 +12,172 @@
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-        <div class="main-search-box">
-            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                     label-width="68px">
-              <el-form-item label="设备名称" prop="deviceName">
-                <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
-                          @keyup.enter.native="handleQuery" />
-              </el-form-item>
-              <el-form-item label="设备类别" prop="assetType">
+        <div class="main-right-box">
+          <div class="main-search-box">
+              <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                       label-width="68px">
+                <el-form-item label="设备名称" prop="deviceName">
+                  <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
+                            @keyup.enter.native="handleQuery" />
+                </el-form-item>
+                <el-form-item label="设备类别" prop="assetType">
 
-                <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
-                           @change="searchChangeSelectDevice">
-                  <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
-                             :value="`${dict.value}`"></el-option>
-                </el-select>
-              </el-form-item>
+                  <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
+                             @change="searchChangeSelectDevice">
+                    <el-option v-for="dict in dict.type.sys_asset_type" :key="dict.value" :label="dict.label"
+                               :value="`${dict.value}`"></el-option>
+                  </el-select>
+                </el-form-item>
 
-              <el-form-item label="设备分类" prop="deviceType">
+                <el-form-item label="设备分类" prop="deviceType">
 
-                <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
-                  <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
-                             :value="item.dictValue"></el-option>
-                </el-select>
-              </el-form-item>
+                  <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
+                    <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
+                               :value="item.dictValue"></el-option>
+                  </el-select>
+                </el-form-item>
 
-              <el-form-item>
-                <el-button
-                  type="primary"
-                  icon="el-icon-search"
-                  size="mini"
-                  @click="handleQuery"
-                >搜索</el-button
-                >
-                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >重置</el-button
-                >
-              </el-form-item>
-            </el-form>
-            <el-row :gutter="10">
-              <el-col :span="1.5">
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="handleAdd"
-                  v-hasPermi="['system:device:add']"
-                >新增设备</el-button
-                >
-              </el-col>
+                <el-form-item>
+                  <el-button
+                    type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                  >搜索</el-button
+                  >
+                  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                  >重置</el-button
+                  >
+                </el-form-item>
+              </el-form>
+              <el-row :gutter="10">
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-plus"
+                    size="mini"
+                    @click="handleAdd"
+                    v-hasPermi="['system:device:add']"
+                  >新增设备</el-button
+                  >
+                </el-col>
+
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-upload"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['system:device:importData']"
+                  >导入设备</el-button
+                  >
+                </el-col>
 
-              <el-col :span="1.5">
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-download"
+                    size="mini"
+                    @click="handleOut"
+                    v-hasPermi="['system:user:export']"
+                  >导出模版</el-button
+                  >
+                </el-col>
+                <right-toolbar
+                  :showSearch.sync="showSearch"
+                  @queryTable="getList"
+                ></right-toolbar>
+              </el-row>
+            </div>
+          <el-table
+            border
+            height="650"
+            size="small"
+            v-loading="loading"
+            :data="deviceList"
+            @selection-change="handleSelectionChange"
+
+          >
+          <!-- :header-cell-style="{backgroundColor:'#CCE8F7'}" -->
+            <!--<el-table-column type="selection" width="55" align="center" />-->
+            <el-table-column label="序号" align="center" min-width="50">
+              <template v-slot:default="scope">
+                <span v-text="getPageIndex(scope.$index)"> </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="所属机构" align="left" prop="orgName" />
+
+            <el-table-column
+              label="设备类别"
+              align="center"
+              key="assetType"
+              prop="assetType"
+            >
+              <template slot-scope="scope">
+                <dict-tag
+                  :options="dict.type.sys_asset_type"
+                  :value="scope.row.assetType"
+                />
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              label="设备分类"
+              align="center"
+              key="deviceType"
+              prop="deviceType"
+            >
+              <template slot-scope="scope">
+                <dict-tag
+                  :options="dict.type.sys_device_type"
+                  :value="scope.row.deviceType"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="设备名称" align="center" prop="deviceName"  />
+            <!-- <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
+            <el-table-column
+              label="有效期至"
+              align="center"
+              prop="checkTime"
+              width="160"
+            >
+            </el-table-column> -->
+            <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
+            <el-table-column
+              label="操作"
+              align="center"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope">
                 <el-button
-                  type="primary"
-                  icon="el-icon-upload"
                   size="mini"
-                  @click="handleImport"
-                  v-hasPermi="['system:device:importData']"
-                >导入设备</el-button
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:device:edit']"
+                  >编辑</el-button
                 >
-              </el-col>
-
-              <el-col :span="1.5">
+                <el-divider direction="vertical"></el-divider>
                 <el-button
-                  type="primary"
-                  icon="el-icon-download"
                   size="mini"
-                  @click="handleOut"
-                  v-hasPermi="['system:user:export']"
-                >导出模版</el-button
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:device:remove']"
+                  >删除</el-button
                 >
-              </el-col>
-              <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-              ></right-toolbar>
-            </el-row>
-          </div>
-        <el-table
-          border
-          height="650"
-          size="small"
-          v-loading="loading"
-          :data="deviceList"
-          @selection-change="handleSelectionChange"
-
-        >
-        <!-- :header-cell-style="{backgroundColor:'#CCE8F7'}" -->
-          <!--<el-table-column type="selection" width="55" align="center" />-->
-          <el-table-column label="序号" align="center" min-width="50">
-            <template v-slot:default="scope">
-              <span v-text="getPageIndex(scope.$index)"> </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="所属机构" align="left" prop="orgName" />
-
-          <el-table-column
-            label="设备类别"
-            align="center"
-            key="assetType"
-            prop="assetType"
-          >
-            <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_asset_type"
-                :value="scope.row.assetType"
-              />
-            </template>
-          </el-table-column>
-
-          <el-table-column
-            label="设备分类"
-            align="center"
-            key="deviceType"
-            prop="deviceType"
-          >
-            <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_device_type"
-                :value="scope.row.deviceType"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column label="设备名称" align="center" prop="deviceName"  />
-          <!-- <el-table-column label="设备品牌" align="center" prop="deviceBrand" />
-          <el-table-column
-            label="有效期至"
-            align="center"
-            prop="checkTime"
-            width="160"
-          >
-          </el-table-column> -->
-          <!--    <el-table-column label="保修期限" align="center" prop="maintenanceTerm" /> -->
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:device:edit']"
-                >编辑</el-button
-              >
-              <el-divider direction="vertical"></el-divider>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:device:remove']"
-                >删除</el-button
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>
 

src/views/system/user/index.vue

@@ -13,362 +13,363 @@
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">
-        <!--    搜索条件    -->
-        <div class="main-search-box">
-          <el-form
-            :model="queryParams"
-            ref="queryForm"
-            size="small"
-            :inline="true"
-            v-show="showSearch"
-          >
-            <el-form-item label="账号" prop="username">
-              <el-input
-                :maxlength="20"
-                v-model="queryParams.username"
-                placeholder="请输入关键字"
-                clearable
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="姓名" prop="name">
-              <el-input
-                :maxlength="50"
-                v-model="queryParams.name"
-                placeholder="请输入关键字"
-                clearable
-                style="width: 200px"
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-
-            <el-form-item label="用户角色" prop="roleIds">
-              <!-- @visible-change="selectAllRoles" -->
-              <el-select
-                style="width: 200px"
-                v-model="queryParams.roleId"
-                placeholder="请选择用户角色"
-                clearable
-              >
-                <el-option
-                  v-for="item in role_options"
-                  :key="item.id"
-                  :label="item.roleName"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="账号状态" prop="isLock">
-              <el-select
-                v-model="queryParams.isLock"
-                placeholder="请选择账号状态"
-                clearable
-                style="width: 200px"
-              >
-                <el-option
-                  v-for="dict in dict.type.sys_user_is_lock"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
+        <div class="main-right-box">
+          <!--    搜索条件    -->
+          <div class="main-search-box">
+            <el-form
+              :model="queryParams"
+              ref="queryForm"
+              size="small"
+              :inline="true"
+              v-show="showSearch"
+            >
+              <el-form-item label="账号" prop="username">
+                <el-input
+                  :maxlength="20"
+                  v-model="queryParams.username"
+                  placeholder="请输入关键字"
+                  clearable
+                  style="width: 200px"
+                  @keyup.enter.native="handleQuery"
                 />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="安保部门从业人员" prop="isLock">
-              <el-switch
-                v-model="queryParams.onlyManager"
-                active-text=""
-                @change="handleQuery"
-              >
-              </el-switch>
-            </el-form-item>
-            <!-- <el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-              >搜索</el-button
-              >
-              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button
-              >
-            </el-form-item> -->
-            <!-- <el-form-item label="创建时间">
-              <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
-                range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-            </el-form-item> -->
-          </el-form>
-          <!--    按纽    -->
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-            <el-button
-                type="primary"
-                icon="el-icon-search"
-                size="mini"
-                @click="handleQuery"
-              >搜索</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
-              >重置</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['system:user:add']"
-              >新增人员</el-button
-              >
-            </el-col>
-            <!-- <el-col :span="1.5">
-              <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
-                v-hasPermi="['system:user:edit']">修改</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-                v-hasPermi="['system:user:remove']">删除</el-button>
-            </el-col> -->
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-upload2"
-                size="mini"
-                @click="handleImport"
-                v-hasPermi="['system:user:import']"
-              >导入人员</el-button
-              >
-            </el-col>
+              </el-form-item>
+              <el-form-item label="姓名" prop="name">
+                <el-input
+                  :maxlength="50"
+                  v-model="queryParams.name"
+                  placeholder="请输入关键字"
+                  clearable
+                  style="width: 200px"
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
 
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExport"
-                v-hasPermi="['system:user:export']"
-              >导出人员</el-button
-              >
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-download"
-                size="mini"
-                @click="handleExportManager"
-                v-hasPermi="['system:user:exportManager']"
-              >导出管理人员</el-button
-              >
-            </el-col>
-            <right-toolbar
-              :showSearch.sync="showSearch"
-              @queryTable="getList"
-            ></right-toolbar>
-          </el-row>
-        </div>
-        <el-table
-          border
-          height="650"
-          size="small"
-          v-loading="loading"
-          :data="userList"
-          @selection-change="handleSelectionChange"
-        >
-          <el-table-column
-            fixed
-            label="序号"
-            type="index"
-            align="center"
-            width="50"
-          ></el-table-column>
-          <el-table-column
-            label="账号"
-            align="center"
-            key="username"
-            prop="username"
-            width="100"
-            v-if="columns[0].visible"
-          />
-          <el-table-column
-            label="姓名"
-            align="center"
-            key="name"
-            prop="name"
-            width="100"
-            v-if="columns[1].visible"
-            :show-overflow-tooltip="true"
-          />
+              <el-form-item label="用户角色" prop="roleIds">
+                <!-- @visible-change="selectAllRoles" -->
+                <el-select
+                  style="width: 200px"
+                  v-model="queryParams.roleId"
+                  placeholder="请选择用户角色"
+                  clearable
+                >
+                  <el-option
+                    v-for="item in role_options"
+                    :key="item.id"
+                    :label="item.roleName"
+                    :value="item.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="账号状态" prop="isLock">
+                <el-select
+                  v-model="queryParams.isLock"
+                  placeholder="请选择账号状态"
+                  clearable
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_user_is_lock"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="安保部门从业人员" prop="isLock">
+                <el-switch
+                  v-model="queryParams.onlyManager"
+                  active-text=""
+                  @change="handleQuery"
+                >
+                </el-switch>
+              </el-form-item>
+              <!-- <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                >搜索</el-button
+                >
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+                >
+              </el-form-item> -->
+              <!-- <el-form-item label="创建时间">
+                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
+                  range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+              </el-form-item> -->
+            </el-form>
+            <!--    按纽    -->
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-search"
+                  size="mini"
+                  @click="handleQuery"
+                >搜索</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="mini"
+                  @click="handleAdd"
+                  v-hasPermi="['system:user:add']"
+                >新增人员</el-button
+                >
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-button type="success" plain icon="el-icon-edit-outline" size="mini" :disabled="single" @click="handleUpdate"
+                  v-hasPermi="['system:user:edit']">修改</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+                  v-hasPermi="['system:user:remove']">删除</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-upload2"
+                  size="mini"
+                  @click="handleImport"
+                  v-hasPermi="['system:user:import']"
+                >导入人员</el-button
+                >
+              </el-col>
 
-          <el-table-column
-            label="所属机构"
-            align="left"
-            header-align="center"
-            key="orgName"
-            prop="orgName"
-            width="180"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            label="用户角色"
-            align="left"
-            header-align="center"
-            prop="roles"
-            width="300"
-            v-if="columns[2].visible"
-            :show-overflow-tooltip="true"
-          >
-            <template slot-scope="scope">
-              <!-- <template v-for="item in scope.row.roles">
-                  {{ item.roleName }}
-                  <br />
-                </template> -->
-              <div class="cell" v-html="formatter(scope.row.roleNames)"></div>
-            </template>
-          </el-table-column>
-          <!-- <el-table-column
-            label="手机号码"
-            align="left"
-            prop="phone"
-            width="200"
-            v-if="columns[3].visible"
-            :show-overflow-tooltip="true"
-          /> -->
-          <el-table-column
-            label="状态"
-            align="center"
-            key="isLock"
-            prop="isLock"
-            v-if="columns[4].visible"
-            width="60"
-          >
-            <template slot-scope="scope">
-              <dict-tag
-                :options="dict.type.sys_user_is_lock"
-                :value="scope.row.isLock"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="安保部门从业人员"
-            align="center"
-            key="isManager"
-            prop="isManager"
-            v-if="columns[5].visible"
-            width="160"
-          >
-            <template slot-scope="scope">
-              {{ scope.row.isManage === "Y" ? "是" : "否" }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="登录IP"
-            align="center"
-            key="lastIp"
-            prop="lastIp"
-            v-if="columns[6].visible"
-            width="140"
-          />
-          <el-table-column
-            label="登录时间"
-            align="center"
-            key="lastTime"
-            prop="lastTime"
-            v-if="columns[7].visible"
-            width="140"
-          />
-          <el-table-column
-            label="操作"
-            align="left"
-            header-align="center"
-            width="300"
-            fixed="right"
-            class-name="small-padding fixed-width"
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['system:user:export']"
+                >导出人员</el-button
+                >
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExportManager"
+                  v-hasPermi="['system:user:exportManager']"
+                >导出管理人员</el-button
+                >
+              </el-col>
+              <right-toolbar
+                :showSearch.sync="showSearch"
+                @queryTable="getList"
+              ></right-toolbar>
+            </el-row>
+          </div>
+          <el-table
+            border
+            height="650"
+            size="small"
+            v-loading="loading"
+            :data="userList"
+            @selection-change="handleSelectionChange"
           >
-            <template slot-scope="scope">
+            <el-table-column
+              fixed
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            ></el-table-column>
+            <el-table-column
+              label="账号"
+              align="center"
+              key="username"
+              prop="username"
+              width="100"
+              v-if="columns[0].visible"
+            />
+            <el-table-column
+              label="姓名"
+              align="center"
+              key="name"
+              prop="name"
+              width="100"
+              v-if="columns[1].visible"
+              :show-overflow-tooltip="true"
+            />
 
-              <el-button
-                size="mini"
-                type="text"
-                v-if="scope.row.isManage=='Y'"
-                icon="el-icon-plus"
-                @click="handleExtend(scope.row)"
-                v-hasPermi="['system:user:extend']"
+            <el-table-column
+              label="所属机构"
+              align="left"
+              header-align="center"
+              key="orgName"
+              prop="orgName"
+              width="180"
+              v-if="columns[3].visible"
+              :show-overflow-tooltip="true"
+            />
+            <el-table-column
+              label="用户角色"
+              align="left"
+              header-align="center"
+              prop="roles"
+              width="300"
+              v-if="columns[2].visible"
+              :show-overflow-tooltip="true"
+            >
+              <template slot-scope="scope">
+                <!-- <template v-for="item in scope.row.roles">
+                    {{ item.roleName }}
+                    <br />
+                  </template> -->
+                <div class="cell" v-html="formatter(scope.row.roleNames)"></div>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column
+              label="手机号码"
+              align="left"
+              prop="phone"
+              width="200"
+              v-if="columns[3].visible"
+              :show-overflow-tooltip="true"
+            /> -->
+            <el-table-column
+              label="状态"
+              align="center"
+              key="isLock"
+              prop="isLock"
+              v-if="columns[4].visible"
+              width="60"
+            >
+              <template slot-scope="scope">
+                <dict-tag
+                  :options="dict.type.sys_user_is_lock"
+                  :value="scope.row.isLock"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="安保部门从业人员"
+              align="center"
+              key="isManager"
+              prop="isManager"
+              v-if="columns[5].visible"
+              width="160"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.isManage === "Y" ? "是" : "否" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              label="登录IP"
+              align="center"
+              key="lastIp"
+              prop="lastIp"
+              v-if="columns[6].visible"
+              width="140"
+            />
+            <el-table-column
+              label="登录时间"
+              align="center"
+              key="lastTime"
+              prop="lastTime"
+              v-if="columns[7].visible"
+              width="140"
+            />
+            <el-table-column
+              label="操作"
+              align="left"
+              header-align="center"
+              width="300"
+              fixed="right"
+              class-name="small-padding fixed-width"
+            >
+              <template slot-scope="scope">
+
+                <el-button
+                  size="mini"
+                  type="text"
+                  v-if="scope.row.isManage=='Y'"
+                  icon="el-icon-plus"
+                  @click="handleExtend(scope.row)"
+                  v-hasPermi="['system:user:extend']"
                 >补充信息</el-button
-              >
-              <!-- <span v-else style="display: inline-block;width: 70px;height: 20px;"></span> -->
-              <!-- <el-divider direction="vertical"></el-divider> -->
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
+                >
+                <!-- <span v-else style="display: inline-block;width: 70px;height: 20px;"></span> -->
+                <!-- <el-divider direction="vertical"></el-divider> -->
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="handleUpdate(scope.row)"
+                  v-hasPermi="['system:user:edit']"
                 >编辑</el-button
-              >
+                >
 
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                v-if="scope.row.source==0"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-delete"
+                  v-if="scope.row.source==0"
+                  @click="handleDelete(scope.row)"
+                  v-hasPermi="['system:user:remove']"
                 >删除</el-button
-              >
+                >
 
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-key"
-                v-if="scope.row.source==0"
-                @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']"
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-key"
+                  v-if="scope.row.source==0"
+                  @click="handleResetPwd(scope.row)"
+                  v-hasPermi="['system:user:resetPwd']"
                 >重置密码</el-button
-              >
-              <!-- <el-divider direction="vertical"></el-divider> -->
-              <!-- <el-dropdown
-                size="mini"
-                @command="(command) => handleCommand(command, scope.row)"
-                v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <el-button size="mini" type="text" icon="el-icon-menu">更多</el-button>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item
-                    command="handleResetPwd"
-                    icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']"
-                    >重置密码</el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    command="handleAuthRole"
-                    v-if="false"
-                    icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']"
-                    >分配角色</el-dropdown-item
-                  >
-                  <el-dropdown-item
-                    command="handleDelete"
-                    icon="el-icon-delete"
-                    v-hasPermi="['system:user:remove']"
-                  >删除</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown> -->
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
+                >
+                <!-- <el-divider direction="vertical"></el-divider> -->
+                <!-- <el-dropdown
+                  size="mini"
+                  @command="(command) => handleCommand(command, scope.row)"
+                  v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                  <el-button size="mini" type="text" icon="el-icon-menu">更多</el-button>
+                  <el-dropdown-menu slot="dropdown">
+                    <el-dropdown-item
+                      command="handleResetPwd"
+                      icon="el-icon-key"
+                      v-hasPermi="['system:user:resetPwd']"
+                      >重置密码</el-dropdown-item
+                    >
+                    <el-dropdown-item
+                      command="handleAuthRole"
+                      v-if="false"
+                      icon="el-icon-circle-check"
+                      v-hasPermi="['system:user:edit']"
+                      >分配角色</el-dropdown-item
+                    >
+                    <el-dropdown-item
+                      command="handleDelete"
+                      icon="el-icon-delete"
+                      v-hasPermi="['system:user:remove']"
+                    >删除</el-dropdown-item>
+                  </el-dropdown-menu>
+                </el-dropdown> -->
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total > 0"
+            :total="total"
+            :page.sync="queryParams.pageNum"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </el-col>
     </el-row>