From 9a2967ea71bdb1891cabb27ddced5a76f279f709 Mon Sep 17 00:00:00 2001
From: wangqing <smalljop@foxmail.com>
Date: Tue, 6 Apr 2021 14:12:06 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=20=20=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E8=A1=A8=E5=8D=95=E9=A1=B9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=20=20=20=E7=BB=9F=E8=AE=A1=E6=96=87=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A4=84=E7=90=86=20=20=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/editor.vue     | 36 +++++++++++------------------------
 src/views/form/setting.vue    |  2 +-
 src/views/form/statistics.vue |  6 +++---
 src/views/form/write.vue      | 14 +++++++-------
 4 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/src/views/form/editor.vue b/src/views/form/editor.vue
index a6a1273..a85d334 100644
--- a/src/views/form/editor.vue
+++ b/src/views/form/editor.vue
@@ -35,7 +35,7 @@
         </div>
         <div class="center-board">
             <el-scrollbar class="center-scrollbar">
-                <el-row class="center-board-row" :gutter="formConf.gutter">
+                <el-row class="center-board-row" v-if="formConf" :gutter="formConf.gutter">
                     <el-row type="flex" justify="center" align="middle">
                         <el-col :span="20" style="text-align: center">
                             <h4 class="form-name-text" contenteditable="true"
@@ -53,13 +53,13 @@
                             <div v-else v-html="formConf.description" class="form-name-text"
                                  @click="editDescription=true" style="min-height: 100px">
 
-                                </div>
-<!--                            <p class="form-name-text" contenteditable="true"-->
-<!--                               @blur="(event)=>{-->
-<!--                                   formConf.description=event.target.innerText;-->
-<!--                                   this.saveProjectInfo()}">-->
-<!--                                {{ formConf.description }}-->
-<!--                            </p>-->
+                            </div>
+                            <!--                            <p class="form-name-text" contenteditable="true"-->
+                            <!--                               @blur="(event)=>{-->
+                            <!--                                   formConf.description=event.target.innerText;-->
+                            <!--                                   this.saveProjectInfo()}">-->
+                            <!--                                {{ formConf.description }}-->
+                            <!--                            </p>-->
                         </el-col>
                     </el-row>
                     <el-divider></el-divider>
@@ -208,23 +208,9 @@ export default {
         this.formConf = JSON.parse(JSON.stringify(formConf))
         //项目key
         let projectKey = this.projectKey
-        //如果是编辑 从服务端读取数据
-        if (this.isEdit) {
-            this.queryProjectItems()
-        } else {
-            //表单内容 如果表单为空 使用默认表单
-            drawingListInDB = getDrawingList(projectKey)
-            if (Array.isArray(drawingListInDB) && drawingListInDB.length > 0) {
-                this.drawingList = drawingListInDB
-            } else {
-                this.drawingList = drawingDefalut
-            }
-        }
-        if (this.drawingList.length) {
-            this.activeFormItem(this.drawingList[0])
-        }
+        //从服务端获取
+        this.queryProjectItems()
         //获取表单配置
-        //获取服务端数据
         this.$api.get(`/user/project/${projectKey}`).then(res => {
             this.formConf.title = res.data.name
             this.formConf.description = res.data.describe
@@ -397,7 +383,7 @@ export default {
 }
 </script>
 
-<style lang='scss' >
+<style lang='scss'>
 @import '@/assets/styles/form/home';
 @import '@/assets/styles/form/index';
 </style>
diff --git a/src/views/form/setting.vue b/src/views/form/setting.vue
index de6e3e6..5621c23 100644
--- a/src/views/form/setting.vue
+++ b/src/views/form/setting.vue
@@ -811,7 +811,7 @@ export default {
     margin: 3px;
     color: rgba(16, 16, 16, 100);
     font-size: 14px;
-    text-align: center;
+    text-align: left;
 }
 
 .share-preview-msg-desc {
diff --git a/src/views/form/statistics.vue b/src/views/form/statistics.vue
index 58f93e6..074d266 100644
--- a/src/views/form/statistics.vue
+++ b/src/views/form/statistics.vue
@@ -72,11 +72,11 @@
                             <div v-for="item in projectItemList">
                                 <h4>{{ item.label }}</h4>
                                 <!--  如果是文件输入-->
-                                <div v-if="item.type==17 &&activeResultRow">
+                                <div v-if="item.type==17 &&activeResultRow&&activeResultRow['processData'][`field${item.formItemId}`]">
                                     <el-link
-                                        :href="file.url" target="_blank"  type="primary"
+                                        :href="file.url" target="_blank" type="primary"
                                         v-for="file in JSON.parse(activeResultRow['processData'][`field${item.formItemId}`]['files'])">
-                                        {{file.fileName}}
+                                        {{ file.fileName }}
                                     </el-link>
                                 </div>
                                 <el-tag v-else> {{
diff --git a/src/views/form/write.vue b/src/views/form/write.vue
index 7a0b2e4..85b25c1 100644
--- a/src/views/form/write.vue
+++ b/src/views/form/write.vue
@@ -16,19 +16,19 @@
                 v-if="projectConfig.projectKey"/>
         </div>
         <div v-if="writeStatus==2" class="title-icon-view">
-            <div>
-                <el-image
-                    v-if="userProjectSetting.submitPromptImg"
-                    :src="userProjectSetting.submitPromptImg"
-                    fit="cover"></el-image>
-            </div>
             <div class="icon-view">
-                <i class="el-icon-check success-icon"/>
+                <i clas="el-icon-check success-icon"/>
             </div>
             <p style="text-align: center">
                 <span v-if="userProjectSetting.submitPromptText">{{ userProjectSetting.submitPromptText }}</span>
                 <span v-else>{{ globalDefaultValue.projectSubmitPromptText }}</span>
             </p>
+            <div>
+                <el-image
+                    v-if="userProjectSetting.submitPromptImg"
+                    :src="userProjectSetting.submitPromptImg"
+                    fit="cover"></el-image>
+            </div>
         </div>
     </div>
 </template>