批量异常推送

src/views/emport/emport/index.vue

@@ -45,12 +45,12 @@
         <el-divider class="divider1"></el-divider>
         <el-form inline size="small">
             <el-form-item>
+                <el-button icon="el-icon-set-up" plain size="small" @click="openOrgDictDialog">设置机构字典</el-button>
                 <el-button icon="el-icon-pie-chart" plain
                            size="small"
                            style="margin-left:6px;" @click="analyzeExport"
                 >分析并导出
                 </el-button>
-                <el-button icon="el-icon-set-up" plain size="small" @click="openOrgDictDialog">设置机构字典</el-button>
                 <el-button size="small" icon="el-icon-refresh" plain :loading="clearTempLoading" @click="clearTemp">
                     清空数据
                 </el-button>
@@ -1307,15 +1307,15 @@ export default {
         // 数据分析并导出
         analyzeExport() {
             let template = this.templateList.find(item => item.orgName === this.queryForm.orgName)
-            if (!template || !this.queryForm.file || this.queryForm.file.status !== 'success') {
+            /*if (!template || !this.queryForm.file || this.queryForm.file.status !== 'success') {
                 this.$message.warning('请先导入数据文件')
                 return
-            }
+            }*/
             this.analyzeData.content = `正在分析 ${template.orgName} 数据...`
             this.analyzeData.loading = true
             DataImport.analyzeExport(template.id)
                 .then(res => {
-                    saveAs(res, '分析结果.xlsx')
+                    saveAs(res, '分析结果.zip')
                 }).finally(_ => this.analyzeData.loading = false)
         },
         // 清空数据
@@ -1354,9 +1354,10 @@ export default {
             this.queryTemplateRule()
             this.templateRuleDialog.show = true
             DataTemplate.getAllTemplateField(row.id).then(res => {
+                console.log('模板规则查询',res)
                 this.templateRuleDialog.fieldList = res.data.map(item => {
                     return {
-                        value: item.id,
+                        value: item.field,
                         label: StringUtil.mergeRule(item.code, item.title)
                     }
                 })