merge fix

src/views/home/component/dash.vue

@@ -394,7 +394,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        const data = {id: res.id, is_report: 1}
+        const data = { id: res.id, is_report: 1 }
         this.$api.project.proUpdate(data).then(res => {
           if (res.code === 200) {
             this.onLoad()
@@ -441,7 +441,7 @@ export default {
           this.$message.error(res.msg)
           return
         }
-        const url = window.URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        const url = window.URL.createObjectURL(new Blob([res], { type: 'application/vnd.ms-excel' }))
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url
@@ -462,7 +462,7 @@ export default {
           return
         }
         console.log(res)
-        const url = window.URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        const url = window.URL.createObjectURL(new Blob([res], { type: 'application/vnd.ms-excel' }))
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url