Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/App.vue

@@ -22,8 +22,8 @@ export default {
 };
 </script>
 <style scoped>
-#app{
-  font-size: 14px;
+#app {
+  font-size: 16px;
 }
 #app .theme-picker {
   display: none;

src/assets/styles/index.scss

@@ -8,28 +8,27 @@
 //@font-face {
 //  font-family: SYExtraLight;
 //  font-style: normal;
-//  font-weight: 300;
 //  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-VF.ttf");
 //}
 
-//@font-face {
-//  font-family: SYExtraLight;
-//  font-style: normal;
-//  font-weight: 300;
-//  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-ExtraLight.otf");
-//}
-//
-//@font-face {
-//  font-family: SYLight;
-//  font-style: normal;
-//  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Light.otf");
-//}
-//
-//@font-face {
-//  font-family: SYNormal;
-//  font-style: normal;
-//  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
-//}
+@font-face {
+  font-family: SYBold;
+  font-style: normal;
+  font-weight: 300;
+  src: local("ExtraLight"), url("@/assets/fonts/SourceHanSansCN-Bold.otf");
+}
+
+@font-face {
+  font-family: SYHeavy;
+  font-style: normal;
+  src: local("SYLight"), url("@/assets/fonts/SourceHanSansCN-Heavy.otf");
+}
+
+@font-face {
+  font-family: SYNormal;
+  font-style: normal;
+  src: local("SYNormal"), url("@/assets/fonts/SourceHanSansCN-Normal.otf");
+}
 
 body {
   height: 100%;
@@ -37,7 +36,7 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   color: #000;
-  //font-family: SYExtraLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
   /*框架自带字体*/
   //font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
   //  Microsoft YaHei, Arial, sans-serif;
@@ -45,9 +44,11 @@ body {
 
 .el-button{
   //font-weight: 400;
-  //font-family: SYLight,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+  font-family: SYBold,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+.el-button--text{
+  font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
 }
-
 .el-table__header-wrapper{
   //font-weight: normal;
   //font-family: SYNormal,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;

src/assets/styles/ruoyi.scss

@@ -289,21 +289,42 @@
    font-size: 12px;
  }
  .el-button--mini{
-   font-size: 13px!important;
+   font-size: 16px!important;
+ }
+ .el-table--small{
+    font-size: 16px!important;
  }
 .el-table thead{
   >tr{
     >th{
+      font-family: SYHeavy,Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+      font-size: 16px!important;
       background-color: #d1e0f1 !important;
     }
   }
 }
 .el-tree-node__content{
-    font-size: 13px;
-    height: 32px!important;
-  }
- .el-submenu__title,.el-menu-item{
-   font-size: 13px!important;
+   font-size: 16px;
+  height: 36px!important;
+  line-height: 36px!important;
+}
+.el-submenu__title,.el-menu-item{
+   font-size: 16px!important;
    height: 42px!important;
    line-height: 42px!important;
+}
+
+ .el-form-item__label{
+    font-size: 16px!important;
+ }
+
+ .tags-view-item{
+   line-height: 23px!important;
+   font-size: 16px!important;
  }
+ .el-pagination button, .el-pagination span:not([class*=suffix]){
+   font-size: 16px!important;
+ }
+.el-checkbox__label{
+  font-size: 16px!important;
+}

src/views/core/drill/drillDictionary/index.vue

@@ -7,6 +7,8 @@
                   @click="clickTreeNode" wholeTree></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="id">
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
@@ -61,8 +63,8 @@
           </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table border height="555px" v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
+          </div>
+        <el-table border height="650px" v-loading="loading" :data="drillDictionaryList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="60"/>
           <el-table-column label="机构名称" align="left" header-align="center" width="250" prop="orgName" />
 
@@ -112,6 +114,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改预案演练库对话框 -->

src/views/core/drill/plan/index.vue

@@ -8,7 +8,8 @@
       </el-col>
       <!--搜索栏-->
       <el-col :span="20" :xs="24">
-        <div class="main-search-box">
+        <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="planName">
             <el-input v-model="queryParams.planName" placeholder="请输入关键字" clearable
@@ -32,14 +33,14 @@
                          :value="dict.value"/>
             </el-select>
           </el-form-item>
-         
+
           <!--          <el-form-item label="演练角色" prop="planRoleId">
                       <el-select v-model="queryParams.planRoleId" placeholder="请选择演练角色" clearable>
                         <el-option v-for="item in planRoleList" :key="item.roleId" :label="item.roleName"
                                    :value="item.roleId"></el-option>
                       </el-select>
                     </el-form-item>-->
-          
+
 
           <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -62,7 +63,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
         </div>
-        <el-table height="640px" border :data="planList" @selection-change="handleSelectionChange"
+        <el-table height="650px" border :data="planList" @selection-change="handleSelectionChange"
                   row-key="id"
                   :tree-props="{ children: 'children' }">
           <el-table-column label="序号" align="center" width="60" prop="no"/>
@@ -84,7 +85,7 @@
             <template slot-scope="scope">
               <dict-tag :options="dict.type.drill_plan_status" :value="scope.row.planStatus"/>
             </template>
-          </el-table-column>          
+          </el-table-column>
           <!-- <el-table-column label="备注" align="center" prop="remark"/> -->
           <!-- <el-table-column label="修改人" align="center" width="100" prop="updateBy"/> -->
           <el-table-column label="操作" align="left" header-align="center"  fixed="right" class-name="small-padding fixed-width">
@@ -108,6 +109,7 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
@@ -129,7 +131,7 @@
                            :value="parseInt(dict.value)"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>          
+          </el-col>
           <el-col :span="12">
             <el-form-item label="任务次数" prop="execTimes">
               <template>
@@ -157,7 +159,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12" v-show="form.planCycle != 0">
+          <el-col :span="12" v-show="form.planCycle != 0&&form.planStatus!=2">
             <el-form-item label="立即生效" prop="buildTaskNow">
               <!--              <el-checkbox v-model="form.buildTaskNow">
                               默认从下个周期...
@@ -182,7 +184,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
+
         </el-row>
         <!-- <el-row>
            <el-col :span="12">

src/views/core/drill/task/index.vue

@@ -6,6 +6,8 @@
                   @click="clickTreeNode" businessTree></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="title">
             <el-input v-model="queryParams.title" placeholder="请输入关键字" clearable/>
@@ -30,13 +32,21 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="任务时间" prop="rangen">
+          <!-- <el-form-item label="任务时间" prop="rangen">
             <el-date-picker
               v-model="queryParams.range"
               type="daterange"
               value-format="yyyy-MM-dd"
               placeholder="请选择开始日期">
             </el-date-picker>
+          </el-form-item> -->
+          <el-form-item class="searchTitle" prop="rangen" label="任务时间">
+            <DataRangePicker
+              v-model="queryParams.range"
+              key="daterange"
+              type="daterange"
+              :clearable="timeClearable"
+            />
           </el-form-item>
           <!-- <el-form-item>
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -61,8 +71,8 @@
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
-        <el-table border height="555px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
+          </div>
+        <el-table border height="650px" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="60"/>
           <el-table-column label="任务名称" width="250" align="left" header-align="center" prop="title"/>
           <el-table-column label="演练机构" width="200" align="left" header-align="center" prop="orgName"/>
@@ -154,6 +164,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
@@ -165,6 +176,7 @@
 
 <script>
 import {listEduTask, addEduTask, updateEduTask} from "@/api/core/drill/drillTask";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import DialogPerform from "./dialog.perform";
@@ -181,7 +193,8 @@ export default {
     DialogNewTask,
     DialogEvaluate,
     OrgTree,
-    dayjs
+    dayjs,
+    DataRangePicker
   },
   data() {
     return {

src/views/core/edu/plan/index.vue

@@ -8,6 +8,8 @@
       </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="planName">
@@ -54,7 +56,7 @@
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <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"
@@ -84,10 +86,10 @@
                    </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
+          </div>
         <el-table
           border
-          height="550"
+          height="650"
           size="small" :data="planList" @selection-change="handleSelectionChange" row-key="id">
           <!-- :tree-props="{ children: 'children' }" -->
           <el-table-column label="序号" align="center" prop="no" width="60"/>
@@ -148,6 +150,7 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
                     :limit.sync="queryParams.pageSize"
                     @pagination="getList"/>
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改教育培训计划对话框 -->
@@ -207,7 +210,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="12" v-show="form.planCycle != 0">
+          <el-col :span="12" v-show="form.planCycle != 0&&form.planStatus!=2">
             <el-form-item label="立即生效" prop="buildTaskNow">
               <el-checkbox v-model="form.buildTaskNow">
                 默认从下个周期生成任务，

src/views/core/edu/task/index.vue

@@ -6,6 +6,8 @@
                   @click="clickTreeNode" businessTree></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="title">
@@ -27,13 +29,21 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="任务时间" prop="rangen">
+          <!-- <el-form-item label="任务时间" prop="rangen">
             <el-date-picker
               v-model="queryParams.range"
               type="daterange"
               value-format="yyyy-MM-dd"
               placeholder="请选择任务时间段">
             </el-date-picker>
+          </el-form-item> -->
+          <el-form-item class="searchTitle" label="任务时间">
+            <DataRangePicker
+              v-model="queryParams.range"
+              key="daterange"
+              type="daterange"
+              :clearable="timeClearable"
+            />
           </el-form-item>
           <!--      <el-form-item label="培训类型" prop="type">
                   <el-select v-model="queryParams.type" placeholder="请选择培训类型" clearable>
@@ -58,7 +68,7 @@
             <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <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="handleAddTask">临时登记</el-button>
@@ -89,10 +99,10 @@
                    </el-col>-->
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-
+          </div>
         <el-table
           border
-          height="600"
+          height="650"
           size="small" v-loading="loading" :data="eduTaskList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" align="center" width="70" prop="no"/>
           <el-table-column label="培训主题" width="315" align="left" header-align="center" prop="title"/>
@@ -180,6 +190,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
 
@@ -191,6 +202,7 @@
 
 <script>
 import {listEduTask, addEduTask, updateEduTask} from "@/api/core/edu/eduTask";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import DialogPerform from "./dialog.perform";
@@ -204,7 +216,7 @@ export default {
     DialogInfo,
     DialogPerform,
     OrgTree,
-    DialogNewTask
+    DialogNewTask,DataRangePicker
   },
   data() {
     return {

src/views/core/materials/index.vue

@@ -8,7 +8,8 @@
       </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="title">
@@ -46,7 +47,7 @@
           <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
           </el-col>
           <el-col :span="1.5">
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button
@@ -61,10 +62,11 @@
 
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
+          </div>
         <!-- 表格数据 -->
         <el-table
           border
-          height="600"
+          height="650"
           size="small"
           v-loading="loading" :data="materialsList" @selection-change="handleSelectionChange">
           <el-table-column label="序号" type="index" align="center" width="68"/>
@@ -151,6 +153,7 @@
           :limit.sync="queryParams.pageSize"
           @pagination="getList"
         />
+        </div>
       </el-col>
     </el-row>
     <!-- 添加或修改学习资料对话框 -->

src/views/system/dept/index.vue

@@ -9,133 +9,140 @@
           @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-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-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
-              align="center"
-              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-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-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-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-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: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 align="center"
+               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">
@@ -168,26 +175,24 @@
                <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
+             <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="280"
+               class-name="small-padding fixed-width"
+             >
+               <template slot-scope="scope">
+                 <!-- <router-link
                    :to="'/system/dept-extend/extend/' + scope.row.id"
                    class="link-type"
                  > -->
@@ -197,48 +202,44 @@
                     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"
-          />
-        </div>
-      </el-col>
+                   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: 85px;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
+             :total="total"
+             :page.sync="queryParams.pageNum"
+             :limit.sync="queryParams.pageSize"
+             @pagination="getList"
+           />
+         </div>
+       </el-col>
     </el-row>
 
     <!-- 添加或修改机构对话框 -->

src/views/system/device/index.vue

@@ -171,7 +171,6 @@
             </el-table-column>
           </el-table>
           <pagination
-            v-show="total > 0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"

src/views/system/user/index.vue

@@ -194,6 +194,7 @@
               prop="username"
               width="120"
               v-if="columns[0].visible"
+              :show-overflow-tooltip="true"
             />
             <el-table-column
               label="姓名"
@@ -255,7 +256,7 @@
                 />
               </template>
             </el-table-column>
-            
+
             <el-table-column
               label="登录IP"
               align="center"
@@ -363,7 +364,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <pagination            
+          <pagination
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
@@ -653,7 +654,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 20,
         username: null,
         phone: null,
         status: null,