pref:修改工作人员页面

base-manager-ui/admin/src/assets/css/common.less

@@ -24,6 +24,10 @@
   margin-right: 10px;
   text-align: right;
 }
+.ant-tabs-nav-container {
+  border-bottom: 1px solid rgb(224, 224, 224) !important;
+}
+
 
 /* 溢出表格滚动条 */
 /* 表格 */
@@ -41,6 +45,9 @@
   }
 
 }
+.ant-table-placeholder{
+  width:calc(100% - 6px)
+}
 .ant-table-header {
   background: #fff;
 }

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs1.vue

@@ -2,11 +2,15 @@
   <div class="basicset-tab1">
     <div class="left">
       <div class="header">
-        <h3 class="titel">站点业务列表</h3>
+        <div class="titel">站点业务列表</div>
         <div class="control">
           <div>
-            <a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
-            <a-button class="add-btn" @click="showModal"> 新增业务 </a-button>
+            <a-space size="middle">
+              <a-button type="primary" @click="showModal"> 新增业务 </a-button>
+              <a-button type="danger" @click="handleDelAll">
+                批量移除
+              </a-button>
+            </a-space>
           </div>
           <div class="business-control">
             <a-input-search
@@ -60,15 +64,17 @@
             {{ text.businessName }}
           </template>
           <template slot="action" slot-scope="text">
-            <a href="javascript:;" class="edit" @click="handleEdit(text)"
-              >编辑</a
-            >
-            <a
-              href="javascript:;"
-              class="delete"
-              @click="handleDel(text.id, text)"
-              >删除</a
-            >
+            <a-space size="middle">
+              <a href="javascript:;" class="primary" @click="handleEdit(text)"
+                >编辑</a
+              >
+              <a
+                href="javascript:;"
+                class="delete"
+                @click="handleDel(text.id, text)"
+                >删除</a
+              >
+            </a-space>
           </template>
         </a-table>
       </div>
@@ -76,7 +82,7 @@
     <!-- 右 -->
     <div class="right">
       <div class="header">
-        <h3 class="titel">一体化业务列表</h3>
+        <div class="titel">一体化业务列表</div>
         <div class="control">
           <div>
             <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
@@ -132,13 +138,15 @@
             {{ text.name }}
           </template>
           <template slot="action" slot-scope="text">
-            <a class="jion" @click="handleIn(text.id)">加入</a>
-            <a
-              href="javascript:;"
-              class="delete"
-              @click="handleDelRight(+text.id)"
-              >删除</a
-            >
+            <a-space size="middle">
+              <a class="primary" @click="handleIn(text.id)">加入</a>
+              <a
+                href="javascript:;"
+                class="delete"
+                @click="handleDelRight(+text.id)"
+                >删除</a
+              >
+            </a-space>
           </template>
         </a-table>
       </div>
@@ -542,24 +550,12 @@ export default {
     .header {
       height: 100px;
       .titel {
+        font-size: 18px;
         margin-bottom: 15px;
       }
-      .ant-btn {
-        margin-right: 19px;
-      }
     }
   }
-  .edit {
-    color: #03d76f;
-    margin-right: 10px;
-  }
-  .delete {
-    color: #f94545;
-  }
-  .jion {
-    color: #67b6ff;
-    margin-right: 10px;
-  }
+
   // .ant-pagination {
   //   margin-top: 20px;
   // }
@@ -572,10 +568,7 @@ export default {
 // .table-content {
 //   height: 500px;
 // }
-.add-btn {
-  background-color: #04cb8f;
-  color: #fff;
-}
+
 // .table-name {
 //   width: 92%;
 //   text-align: center;

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs2.vue

@@ -2,7 +2,7 @@
   <div class="basicset-tab2">
     <div class="left">
       <div class="header">
-        <h3 class="titel">站点事项列表</h3>
+        <div class="titel">站点事项列表</div>
         <div class="header-bottom">
           <div class="left-btn">
             <a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
@@ -108,11 +108,15 @@
     <!-- 右 -->
     <div class="right">
       <div class="header">
-        <h3 class="titel">基础事项列表</h3>
+        <div class="titel">基础事项列表</div>
         <div class="control">
           <div>
-            <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
-            <a-button class="add-btn" @click="addMatter"> 新增事项 </a-button>
+            <a-space size="middle">
+              <a-button type="primary" @click="handleAddAll">
+                批量加入
+              </a-button>
+              <a-button type="primary" @click="addMatter"> 新增事项 </a-button>
+            </a-space>
           </div>
           <div>
             <a-space>
@@ -185,22 +189,24 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text">
-            <a href="javascript:;" class="jion" @click="handleIn(text.id)"
-              >加入</a
-            >
-            <a
-              href="javascript:;"
-              v-if="text.source == 1"
-              class="edit"
-              @click="handleEdit(text.id)"
-              >编辑</a
-            >
-            <a
-              href="javascript:;"
-              class="delete"
-              @click="handleDelRight(text.id)"
-              >删除</a
-            >
+            <a-space size="middle">
+              <a href="javascript:;" class="primary" @click="handleIn(text.id)"
+                >加入</a
+              >
+              <a
+                href="javascript:;"
+                v-if="text.source == 1"
+                class="primmary"
+                @click="handleEdit(text.id)"
+                >编辑</a
+              >
+              <a
+                href="javascript:;"
+                class="delete"
+                @click="handleDelRight(text.id)"
+                >删除</a
+              >
+            </a-space>
           </template>
         </a-table>
       </div>
@@ -286,7 +292,7 @@ const rightColumns = [
   },
   {
     title: "操作",
-    width: "130px",
+    width: "140px",
     scopedSlots: {
       customRender: "action",
     },
@@ -602,11 +608,9 @@ export default {
     .header {
       height: 100px;
       .titel {
+        font-size: 18px;
         margin-bottom: 15px;
       }
-      .ant-btn {
-        margin-right: 19px;
-      }
     }
     .matter-name {
       margin-bottom: 10px;
@@ -625,17 +629,6 @@ export default {
       }
     }
   }
-  .edit {
-    color: #03d76f;
-    margin-right: 10px;
-  }
-  .delete {
-    color: #f94545;
-  }
-  .jion {
-    color: #67b6ff;
-    margin-right: 10px;
-  }
 
   .control {
     display: flex;
@@ -647,10 +640,10 @@ export default {
     margin-left: 10px;
   }
 }
-.add-btn {
-  background-color: #04cb8f;
-  color: #fff;
-}
+// .add-btn {
+//   background-color: #04cb8f;
+//   color: #fff;
+// }
 // .table-content {
 //   height: 500px;
 // }

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs3.vue

@@ -2,7 +2,7 @@
   <div class="basicset-tab3">
     <div class="left">
       <div class="header">
-        <h3 class="titel">站点业务列表</h3>
+        <div class="titel">站点业务列表</div>
         <div class="header-bottom">
           <div class="left-btn">
             <a-button type="danger" @click="handleDelAll"> 批量解除 </a-button>
@@ -63,7 +63,7 @@
     <!-- 右 -->
     <div class="right">
       <div class="header">
-        <h3 class="titel">站点事项列表</h3>
+        <div class="titel">站点事项列表</div>
         <div class="control">
           <div>
             <a-button type="primary" @click="handleAddAll"> 批量关联 </a-button>
@@ -127,7 +127,9 @@
           </template>
           <!-- 操作 -->
           <template slot="action" slot-scope="text">
-            <a href="javascript:;" class="jion" @click="handleIn(text)">关联</a>
+            <a href="javascript:;" class="primary" @click="handleIn(text)"
+              >关联</a
+            >
           </template>
         </a-table>
       </div>
@@ -682,11 +684,9 @@ export default {
     .header {
       height: 100px;
       .titel {
+        font-size: 18px;
         margin-bottom: 15px;
       }
-      .ant-btn {
-        margin-right: 19px;
-      }
     }
   }
   .matter-name {
@@ -705,17 +705,7 @@ export default {
       }
     }
   }
-  .edit {
-    color: #03d76f;
-    margin-right: 10px;
-  }
-  .delete {
-    color: #f94545;
-  }
-  .jion {
-    color: #67b6ff;
-    margin-right: 10px;
-  }
+
   .ant-pagination {
     margin-top: 20px;
   }
@@ -729,10 +719,7 @@ export default {
     margin-left: 10px;
   }
 }
-.add-btn {
-  background-color: #04cb8f;
-  color: #fff;
-}
+
 // .table-content {
 //   height: 500px;
 // }

base-manager-ui/admin/src/pages/basicset/business/components/businessTabs4.vue

@@ -2,7 +2,7 @@ rrent" <template>
   <div class="basicset-tab4">
     <div class="left">
       <div class="header">
-        <h3 class="titel">站点事项列表</h3>
+        <div class="titel">站点事项列表</div>
         <div class="header-bottom flex aic jcb">
           <div class="left-btn"></div>
           <div>
@@ -57,6 +57,7 @@ rrent" <template>
             current: current,
             total: total,
             pageSize: size,
+            size: 'middle',
             showSizeChanger: true,
             showQuickJumper: true,
             pageSizeOptions: pageSizeOptions,
@@ -283,6 +284,10 @@ export default {
   padding: 0px 20px;
   .header {
     margin-bottom: 15px;
+    .titel {
+      font-size: 18px;
+      margin-bottom: 15px;
+    }
   }
   .workguide_btn {
     cursor: pointer;

base-manager-ui/admin/src/pages/basicset/dept/addWindowMatter.vue

@@ -71,12 +71,17 @@
             <y-switch v-model="text.isShow" :disabled="!text.isEdit"></y-switch>
           </template>
           <template slot="action" slot-scope="text">
-            <a href="javascript:;" class="edit" @click="handleEdit(text)">{{
-              text.isEdit ? "保存" : "编辑"
-            }}</a>
-            <a href="javascript:;" @click="handleDel(+text.id)" class="delete"
-              >删除</a
-            >
+            <a-space size="middle">
+              <a
+                href="javascript:;"
+                :class="text.isEdit ? 'edit' : 'primary'"
+                @click="handleEdit(text)"
+                >{{ text.isEdit ? "保存" : "编辑" }}</a
+              >
+              <a href="javascript:;" @click="handleDel(+text.id)" class="delete"
+                >删除</a
+              >
+            </a-space>
           </template>
         </a-table>
       </div>
@@ -133,9 +138,14 @@
           :pagination="{
             showTotal: (total) => `共 ${total} 条`,
             current: page,
+            pageSize: matterSize,
             total: matterTotal,
             size: 'small',
             onChange: changeMatter,
+            showSizeChanger: true,
+            showQuickJumper: true,
+            pageSizeOptions: pageSizeOptions,
+            onShowSizeChange: sizeChange,
           }"
           :columns="matterColumns"
           :data-source="siteMatterData"
@@ -252,6 +262,7 @@ export default {
       siteMatterData: [], // 站点事项列表
       matterTotal: 0,
       page: 1,
+      matterSize: 10,
       matterLoading: false,
       matterKeys: [],
       matterRows: [],
@@ -296,7 +307,7 @@ export default {
       this.matterLoading = true;
       let res = await getSiteMatterList({
         page: this.page,
-        size: 10,
+        size: this.matterSize,
         siteId: this.windowInfo.siteId,
         matterName: `%${this.matterNameSearch}%`,
         source: this.source,
@@ -305,6 +316,7 @@ export default {
       let { data, total } = res.data.data;
       this.siteMatterData = data;
       this.matterTotal = total;
+      console.log(data);
       this.matterLoading = false;
     },
     // 站点事项翻页
@@ -312,6 +324,13 @@ export default {
       this.page = cur;
       this.getSiteMatterData();
     },
+    // 站点事项改变每页显示数量
+    sizeChange(current, size) {
+      console.log(current, size);
+      this.page = current;
+      this.matterSize = size;
+      this.getSiteMatterData();
+    },
     // 站点事项搜索
     onSearchMatter() {
       this.page = 1;
@@ -497,13 +516,6 @@ export default {
   margin-top: 10px;
 }
 
-.edit {
-  color: #03d76f;
-  margin-right: 10px;
-}
-.delete {
-  color: #fa6d6e;
-}
 .ant-form-item {
   display: flex;
   align-items: center !important;

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -75,11 +75,9 @@
     <!-- 窗口管理 -->
     <div class="ff window-box">
       <div class="department_right_add">
-        <div>窗口管理</div>
+        <div class="department_manage">窗口管理</div>
         <div class="flex aic jcb">
-          <a-button type="primary" @click="addModal" class="department_btnadd"
-            >新增窗口</a-button
-          >
+          <a-button type="primary" @click="addModal">新增窗口</a-button>
           <a-input-search
             placeholder="请输入窗口编号搜索"
             v-model="windowSearch"
@@ -96,6 +94,7 @@
           <a-table
             :scroll="{ y: 580 }"
             :loading="loading"
+            bordered
             :columns="columns"
             :data-source="windowData"
             :pagination="{
@@ -565,7 +564,8 @@ export default {
     margin-right: 30px;
   }
   .department_manage {
-    margin-bottom: 10px;
+    font-size: 18px;
+    margin-bottom: 15px;
   }
   .department_add {
     background-color: #0595fd;
@@ -641,7 +641,7 @@ export default {
     margin-left: 10px;
   }
   .department_right_tab {
-    margin-top: 20px;
+    margin-top: 10px;
   }
   .department_right_table {
     font-size: 5px;

base-manager-ui/admin/src/pages/basicset/hall/hallmanage/HallManage.vue

@@ -53,7 +53,7 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text">
           <a-space size="middle">
-            <a href="javascript:;" class="edit" @click="handleEdit(text)"
+            <a href="javascript:;" class="primary" @click="handleEdit(text)"
               >编辑</a
             >
             <a href="javascript:;" class="delete" @click="handleDel(text.id)"

base-manager-ui/admin/src/pages/basicset/hall/hallwindow/HallWindow.vue

@@ -2,7 +2,7 @@
   <div class="hall-window">
     <div class="left">
       <div class="header">
-        <h3 class="titel">大厅窗口</h3>
+        <div class="titel">大厅窗口</div>
         <div class="control">
           <a-button type="danger" @click="handleDelAll"> 批量移除 </a-button>
           <div class="business-control">
@@ -78,7 +78,7 @@
     <!-- 右 -->
     <div class="right">
       <div class="header">
-        <h3 class="titel">站点窗口</h3>
+        <div class="titel">站点窗口</div>
         <div class="control">
           <div>
             <a-button type="primary" @click="handleAddAll"> 批量加入 </a-button>
@@ -455,6 +455,7 @@ export default {
     .header {
       height: 100px;
       .titel {
+        font-size: 18px;
         margin-bottom: 15px;
       }
     }

base-manager-ui/admin/src/pages/basicset/workman/personnel.vue

@@ -3,7 +3,7 @@
     <div class="website">
       <!-- 右边 -->
       <div class="right ff">
-        <div class="person_message">工作人员管理</div>
+        <!-- <div class="person_message">工作人员管理</div> -->
         <div class="person_chang">
           <div class="person_gruop">选择部门：</div>
           <div class="person_gruop1">
@@ -199,6 +199,7 @@
               onChange: handlePagination,
               onShowSizeChange: showSizeChange,
             }"
+            bordered
             :scroll="{ y: 530 }"
             :loading="loading"
             :columns="columns"
@@ -216,6 +217,7 @@
                 :src="api2 + text.photoPath"
                 class="pht"
               />
+
               <span v-else>--</span>
             </template>
             <!-- 电话 -->
@@ -248,11 +250,9 @@
             <!-- 操作 -->
             <span slot="action" slot-scope="text">
               <a-space>
-                <a class="edit" type="primary" @click="editModal(text)">编辑</a>
-                <a class="edit-pwd" type="primary" @click="changePwd(text)"
-                  >修改密码</a
-                >
-                <a class="delet" @click="handleDel(text.id)">删除</a>
+                <a class="primary" @click="editModal(text)">编辑</a>
+                <a class="primary" @click="changePwd(text)">修改密码</a>
+                <a class="delete" @click="handleDel(text.id)">删除</a>
               </a-space>
             </span>
           </a-table>
@@ -362,7 +362,7 @@ const columns = [
 
   {
     title: "操作",
-    width: "160px",
+    width: "170px",
     scopedSlots: {
       customRender: "action",
     },
@@ -618,12 +618,6 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.skins_btn_1 {
-  width: 100px;
-  height: 36px;
-  background-color: rgba(5, 149, 253, 1);
-  border-color: rgba(5, 149, 253, 1);
-}
 .website {
   .right {
     width: 100%;
@@ -632,7 +626,7 @@ export default {
     color: #333;
     padding-left: 20px;
     .person_message {
-      font-weight: 600;
+      font-size: 18px;
     }
   }
 
@@ -657,44 +651,12 @@ export default {
       margin-bottom: 6px;
     }
   }
-  .btn_add {
-    width: 80px;
-    height: 36px;
-    background-color: rgba(5, 149, 253, 1);
-    font-size: 13px;
-    text-align: center;
-    line-height: normal;
-    text-transform: none;
-    border: none;
-    margin-top: 15px;
-  }
-  .btn_to {
-    width: 80px;
-    height: 36px;
-    background-color: rgba(5, 149, 253, 1);
-    font-size: 13px;
-    text-align: center;
-    line-height: normal;
-    text-transform: none;
-    margin-left: 12px;
-    border: none;
-    margin-top: 20px;
-    margin-bottom: 20px;
-  }
   .pht {
     width: 56px;
     height: 74px;
     object-fit: cover;
   }
-  .edit {
-    color: #03d76f;
-  }
-  .edit-pwd {
-    color: #1890ff;
-  }
-  .delet {
-    color: red;
-  }
+
   div.person_gruop1 {
     display: inline;
     flex: 1;
@@ -714,14 +676,6 @@ export default {
     height: 36px;
     margin-right: 10px;
   }
-  .btn_search {
-    width: 72px;
-    height: 36px;
-    border: 0;
-    background: inherit;
-    // margin-b: 10px;
-    background-color: rgba(5, 149, 253, 1);
-  }
 
   .on {
     margin: 10px 0px;
@@ -778,8 +732,8 @@ export default {
     border-radius: 0px 4px 4px 0px;
   }
   .active {
-    background-color: #1890ff;
-    border-color: #1890ff;
+    background: linear-gradient(90deg, #5ab6ff, #2e9aff);
+    border-color: transparent;
     color: #fff;
     &:hover {
       color: #fff;