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

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

@@ -66,14 +66,14 @@
         @click="lookexportHis"
         >导出记录</el-button
       >
-      <el-button
+      <!-- <el-button
         slot="table-head-left2"
         style="margin-left: 10px"
         icon="el-icon-tickets"
         size="mini"
         @click="setdialog"
         >表格设置</el-button
-      >
+      > -->
     </LayoutTable>
     <drawer-show ref="drawerform" @ok="getData" />
     <!-- 导出记录查看 -->

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

@@ -18,13 +18,13 @@
                 type="success"
                 @click="lookexportHis"
             >导出记录</el-button>
-            <el-button
+            <!-- <el-button
                 slot="table-head-left2"
                 style="margin-left: 10px"
                 icon="el-icon-tickets"
                 size="mini"
                 @click="setdialog"
-            >表格设置</el-button>
+            >表格设置</el-button> -->
         </LayoutTable>
         <dialog-show ref="dialogform" @ok="getData" />
         <!-- 表格设置 -->

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)
+      })
+
     },
   },
 };