Merge branch 'master' into liua

* master:
  bug1033 名优绩效我审核的导出文件名修改

src/views/hysydgl/hyjyk/index.vue

@@ -160,7 +160,7 @@ export default {
   },
   mounted() {
     this.getHy();
-    this.gethyjyList();
+    this.getListData();
   },
 };
 </script>

src/views/jsld/myjsjxkh/wshd/index.vue

@@ -196,7 +196,7 @@ export default {
     exportAll() {
       let link =
           window.globalVariables.api +
-          "/jdbg/jsldgl_myjsjxkh_khhz/index?api=xls&page=1&limit=10000&jjmkl_jdshqk=2&token=" +
+          "/jdbg/jsldgl_myjsjxkh_khhz/index?api=xls&page=1&limit=10000&jjmkl_jdshqk=2&excel_file_name=局端办公-教师流动管理-名优教师绩效考核-我审核的&token=" +
           token + '&jjmk_id='+ this.multipleSelection.join(',');
       window.open(link, "_blank");
     },