Merge branch 'dev' of http://git.pro.g107.net/guojy/dd_pc into dev

# Conflicts:
#	src/home.vue

src/home.vue

@@ -250,30 +250,30 @@
         </el-row>
 
         <el-row class="left-all-style">
-          <el-row style="position: relative;">
+          <el-row>
             <el-col :span="24">
               <b class="title" style="margin-bottom:15px;display:block"
                 >积分构成</b
               >
             </el-col>
 
-            <el-col
-              :span="5"
-              style="position: absolute;top:40px;left:10px;z-index: 1;"
-            >
-              <el-cascader
-                v-model="dept_name1"
-                :options="dept_tree"
-                @change="dept1_null"
-				  	    :props="{ checkStrictly: true,value:'id',label:'name',children:'_child'}"
-                ref="dept1"
-                filterable
-                change-on-select
-                placeholder="请选择部门"
-                clearable
-              ></el-cascader>
-            </el-col>
-            <div v-loading="IntegralFormChartLoad">
+            <div v-loading="IntegralFormChartLoad" style="position: relative;">
+              <el-col
+                :span="5"
+                style="position: absolute;left:10px;z-index: 1;margin-top:10px;"
+              >
+                <el-cascader
+                  v-model="dept_name1"
+                  :options="dept_tree"
+                  @change="dept1_null"
+                  :props="{ checkStrictly: true,value:'id',label:'name',children:'_child'}"
+                  ref="dept1"
+                  filterable
+                  change-on-select
+                  placeholder="请选择部门"
+                  clearable
+                ></el-cascader>
+              </el-col>
               <div
                 class="nopoint_box"
                 style="height:377px;"
@@ -303,12 +303,12 @@
 
         
         <el-row class="left-all-style">
-          <el-row style="position: relative;">
+          <el-row>
             <el-col :span="24" style="display:flex">
               <b class="title" style="margin:0 20px 15px 0;display:block">本月积分情况</b>
               <el-checkbox v-model="exclusiveMonthChecked">不包含自动积分加分项</el-checkbox>
             </el-col>
-            <div v-loading="monthlyIntegralloading">
+            <div v-loading="monthlyIntegralloading" style="position: relative;">
               <el-col :span="5" style="position: absolute;left:10px;z-index: 1;">
                 <el-cascader
                   v-model="dept_name2"
@@ -348,12 +348,12 @@
 
         
         <el-row class="left-all-style" style="">
-          <el-row style="position: relative;">
+          <el-row>
             <el-col :span="24">
               <b class="title" style="margin-bottom:15px;display:block">管理者奖扣任务执行情况</b>
             </el-col>
-            <div v-loading="ManagerSAwardloading">
-              <el-col :span="5" style="position: absolute;left:10px;z-index: 1;">
+            <div v-loading="ManagerSAwardloading" style="position: relative;">
+              <el-col :span="5" style="position: absolute;left:10px;z-index: 10;">
                 <el-cascader
                   v-model="dept_name3"
                   :options="dept_tree"
@@ -776,9 +776,6 @@ export default {
             self.$message.error(res.data.data.msg);
           }
         })
-        .catch((e) => {
-          self.$message.error(e.data.data.msg);
-        })
         .finally(() => {
           this.tabPositionLoad = false;
           // self.item_loading = false;
@@ -1516,6 +1513,14 @@ export default {
     border-right: 1px #cecccc solid;
     margin: 34px 0;
   }
+  .hlheader-user-info .greetings div {
+    max-width: 95px;
+    display: inline-block;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    vertical-align: top;
+  }
   .hlheader-user-info {
     display: flex;
     .headimg {
@@ -1528,14 +1533,14 @@ export default {
       margin: 0 auto;
       font-size: 16px;
       font-weight: bold;
-      div {
-        max-width: 95px;
-        display: inline-block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        vertical-align: top;
-      }
+      // div {
+      //   max-width: 95px;
+      //   display: inline-block;
+      //   overflow: hidden;
+      //   white-space: nowrap;
+      //   text-overflow: ellipsis;
+      //   vertical-align: top;
+      // }
       span {
         font-size: 14px;
         color: #666;

src/views/ranking/department_statistics.vue

@@ -492,6 +492,7 @@ export default {
     },
   },
   mounted() {
+    console.log(this.formData)
     this.formData.month = this.$moment().format("YYYY-MM");
     this.executiveFunction();
     window.addEventListener('resize',this.selfAdaption);