Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -344,6 +344,7 @@ export default {
       let newData = { page: 1 };
       Object.keys(data).forEach((item) => {
         let val = data[item];
+        console.log(item,this.search)
         this.search.forEach((obj) => {
           if (
             obj.name === item &&

attendance-performance-manager-ui/admin/src/views/attendance/record/list.vue

 <template>
   <div class="page">
-    <div style="margin:10px 0">
+    <div >
       <tab-pane
         :thirdList="thirdList"
         :activeName="activeName"

attendance-performance-manager-ui/admin/src/views/staff/perform/stat/components/BarCharts.vue

@@ -80,7 +80,7 @@ export default {
                     name: '目标线',
                     yAxis: this.markLine,
                     label: {
-                      formatter: '{b}：'+this.legendName+'不高于20.0%,',
+                      formatter: '{b}：' + this.legendName + '不高于20.0%,',
                       position: 'insideStartTop'
                     },
                     lineStyle: {
@@ -188,6 +188,10 @@ export default {
           ]
         })
       }
+      myChart.on('click',  (params)=>{
+        this.$emit("click",params)
+      })
+
     },
   },
 };