zc

src/views/integratedManagement/personnelManage/onDutyConfiguration/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container onDutyConfiguration">
     <div class="onDutyConfigurationPage" v-show="pageType === 1">
-      <div class="left-page-max-big-box">
+      <div class="left-page-max-big-box scrollbar-box">
         <el-tree
           style="margin-right:10px;"
           :data="deptOptions"
@@ -200,8 +200,8 @@
         treeList:[],
         deptOptions:[],
         defaultProps: {
-          children: "children",
-          label: "label"
+          children: "child",
+          label: "deptName"
         },
         checkTreeId:null,
         //年月状态切换 1.月度  2.年度
@@ -863,23 +863,20 @@
 
 <style scoped lang="scss">
 .onDutyConfiguration{
+  flex:1;
   display: flex;
   flex-direction: column;
+  overflow: hidden;
   font-weight:500;
-  *{
-    margin:0;
-    padding:0;
-  }
   .onDutyConfigurationPage{
     flex:1;
     display: flex;
     overflow: hidden;
     .left-page-max-big-box{
       width:250px;
-      overflow: hidden;
       display: flex;
       flex-direction: column;
-      padding:36px 0 36px 10px;
+      padding:36px 0 36px 20px;
       .tree-box {
         flex: 1;
         .terr-max-box:nth-child(1){

src/views/integratedManagement/personnelManage/patrolRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container patrolRecord">
     <div class="patrolRecordPage" v-show="pageType === 1">
-      <div class="left-page-max-big-box">
+      <div class="left-page-max-big-box scrollbar-box">
         <el-tree
           style="margin-right:10px;"
           :data="deptOptions"
@@ -93,8 +93,8 @@
         treeList:[],
         deptOptions:[],
         defaultProps: {
-          children: "children",
-          label: "label"
+          children: "child",
+          label: "deptName"
         },
         checkTreeId:null,
         //年月状态切换 1.月度  2.年度
@@ -241,7 +241,7 @@
       /** 查询部门下拉树结构 */
       getTreeselect() {
         let self = this;
-        treeselect({}).then(response => {
+        systemDeptOrganizeStructureByDept({}).then(response => {
           this.deptOptions = response.data;
           this.$nextTick(function(){
             if(response.data[0]){
@@ -437,23 +437,20 @@
 
 <style scoped lang="scss">
 .patrolRecord{
+  flex:1;
   display: flex;
   flex-direction: column;
+  overflow: hidden;
   font-weight:500;
-  *{
-    margin:0;
-    padding:0;
-  }
   .patrolRecordPage{
     flex:1;
     display: flex;
     overflow: hidden;
     .left-page-max-big-box{
       width:250px;
-      overflow: hidden;
       display: flex;
       flex-direction: column;
-      padding:36px 0 36px 10px;
+      padding:36px 0 36px 20px;
       .tree-box {
         flex: 1;
         .terr-max-box:nth-child(1){