Merge remote-tracking branch 'origin/master'

src/components/Pagination/index.vue

@@ -103,6 +103,10 @@ export default {
 <style lang="scss">
 .pagination-container{
   .el-pager li{
+    font-weight: initial!important;
+    &:hover {
+      color: #D31B20!important;
+    }
     &.active {
       color: #D31B20!important;
       border: 1px solid #D31B20!important;

src/layout/components/header.vue

@@ -219,8 +219,8 @@ export default {
           color: white;
           cursor: pointer;
           position: absolute;
-          right: -20px;
-          top: 25px;
+          right: -10px;
+          top: 17px;
           font-size: 12px;
         }
       }

src/styles/element-ui.scss

@@ -320,8 +320,9 @@ body .el-table th.gutter{
 .el-table tr td:last-child {
   border-right: 0 !important;
 }
-
-
+.el-table tr:hover>td{
+  background-color: #f3f3f3 !important
+}
 // 折叠面板 样式修改
 .el-collapse {
   .el-collapse-item__header {

src/views/productionInfo/badDefinition.vue

@@ -568,6 +568,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
+      const nowDate = this.dateFor(new Date().getTime())
       const queryParams = {
         rejectCode: this.queryParams.rejectCode,
         rejectDescription: this.queryParams.rejectDescription
@@ -583,7 +584,7 @@ export default {
           const downloadElement = document.createElement('a')
           const href = window.URL.createObjectURL(blob)// 创建下载的链接
           downloadElement.href = href
-          downloadElement.download = '不良定义信息' + '.xls' // 下载后文件名
+          downloadElement.download = '不良定义信息' + nowDate + '.xls' // 下载后文件名
           document.body.appendChild(downloadElement)
           downloadElement.click()// 点击下载
           document.body.removeChild(downloadElement)// 下载完成移除元素