From 399e5825b6e01432e6340feb7bce7657e7548e17 Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Sun, 21 Mar 2021 00:57:30 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=20=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=A0=85=E6=A0=BC=E4=B8=8D=E7=94=9F=E6=95=88=20=20=20=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=94=B6=E9=9B=86=E7=BB=93=E6=9E=9C=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/convert.js          | 3 ++-
 src/views/form/statistics.vue | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/utils/convert.js b/src/utils/convert.js
index 2ba6dc3..17667c4 100644
--- a/src/utils/convert.js
+++ b/src/utils/convert.js
@@ -7,7 +7,6 @@ import {jsonClone} from '@/utils/index'
  * @param item
  */
 export function formItemConvertData(item, projectKey) {
-    console.log(item)
     let data = {
         'type': item.typeId,
         'formItemId': item.__config__.formId,
@@ -17,6 +16,7 @@ export function formItemConvertData(item, projectKey) {
         'placeholder': item.placeholder,
         'regList': item.__config__.regList,
         'showLabel': item.__config__.showLabel,
+        'span': item.__config__.span,
         'projectKey': projectKey
     }
     let expand = {}
@@ -56,6 +56,7 @@ export function dbDataConvertForItemJson(data) {
     }
     jsonItem.sort = data.sort
     jsonItem.typeId = data.type
+    jsonItem.__config__.span =  data.span
     jsonItem.__config__.formId = data.formItemId
     jsonItem.__config__.label = data.label
     jsonItem.__config__.required = data.required
diff --git a/src/views/form/statistics.vue b/src/views/form/statistics.vue
index 740f0c5..e5e67b4 100644
--- a/src/views/form/statistics.vue
+++ b/src/views/form/statistics.vue
@@ -222,6 +222,10 @@ export default {
             }
         },
         exportProjectResult() {
+            if(!this.total){
+                this.$message.error("无表单有效反馈结果，无法导出")
+                return
+            }
             this.$api.get('user/project/result/export', {
                 params: this.queryConditions,
                 responseType: 'blob'