From 3f30ef926e80f0dd8100718d67dcb4c93c7fee81 Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Thu, 9 Jan 2025 12:24:08 +0800
Subject: [PATCH] 1

---
 src/components/OnlineFile/index.vue |  7 +++++--
 src/utils/formBuilder.js            |  9 ++++-----
 src/views/404.vue                   | 11 ++++-------
 src/views/flow/list.vue             | 16 ++++++++--------
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/components/OnlineFile/index.vue b/src/components/OnlineFile/index.vue
index e7a2306..59e9e81 100644
--- a/src/components/OnlineFile/index.vue
+++ b/src/components/OnlineFile/index.vue
@@ -16,8 +16,8 @@
     >
       <template>
         <iframe
+          ref="iframe"
           style="display: block;width: 100%;height: 100%;border: 0;"
-          :src="codeUri"
           frameborder="0"
         ></iframe>
       </template>
@@ -40,8 +40,11 @@ export default {
   },
   methods: {
     open(url) {
-      this.codeUri = `${window.location.origin}/admin/#/preview?url=${url}`;
+      // this.codeUri = `${window.location.origin}/admin/#/preview?url=${url}`;
       this.showModal = true;
+      this.$nextTick(() => {
+        this.$refs.iframe.contentWindow.location.replace(`${window.location.origin}/admin/#/preview?url=${url}`)
+      })
     }
   },
   computed: {},
diff --git a/src/utils/formBuilder.js b/src/utils/formBuilder.js
index e3a762e..cfebcbe 100644
--- a/src/utils/formBuilder.js
+++ b/src/utils/formBuilder.js
@@ -334,7 +334,8 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                   window.$_uploading = false
                   fileList.forEach((file) => {
                     if (file.response?.data && !file.response?.code) {
-                      file.response = file.response.data;
+                      file.response = file.response?.data;
+                      file.url = file.response?.url;
                     }
                   });
                   this.form[info.name] = fileList
@@ -814,7 +815,6 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                           },
                           on: {
                             click: _ => {
-                              console.log(file)
                               this.$bus.$emit('online-file', file.url)
                             }
                           }
@@ -1169,9 +1169,10 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                     fileList.forEach((file) => {
                       if (file.response?.data && !file.response?.code) {
                         file.response = file.response.data;
+                        file.url = file.response?.url;
                       }
                     });
-                    row ? row[info.name] = fileList : this.form[info.name] = fileList;
+                    target[info.name] = fileList;
                   },
                   onRemove: (file, fileList) => {
                     row ? row[info.name] = fileList : this.form[info.name] = fileList;
@@ -1210,7 +1211,6 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                             },
                             on: {
                               click: _ => {
-                                console.log(file)
                                 this.$bus.$emit('online-file', file.url)
                               }
                             }
@@ -1492,7 +1492,6 @@ export default function formBuilder(device, info, h, row, pWrite = false,pReadab
                   },
                   on: {
                     click:_ => {
-                      console.log(file)
                       this.$bus.$emit('online-file', file.url)
                     }
                   }
diff --git a/src/views/404.vue b/src/views/404.vue
index 1791f55..de8b5d4 100644
--- a/src/views/404.vue
+++ b/src/views/404.vue
@@ -8,13 +8,10 @@
         <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">OOPS!</div>
-        <div class="bullshit__info">All rights reserved
-          <a style="color:#20a0ff" href="https://wallstreetcn.com" target="_blank">wallstreetcn</a>
-        </div>
+        <div class="bullshit__oops">抱歉!</div>
         <div class="bullshit__headline">{{ message }}</div>
-        <div class="bullshit__info">Please check that the URL you entered is correct, or click the button below to return to the homepage.</div>
-        <a href="" class="bullshit__return-home">Back to home</a>
+        <div class="bullshit__info">请检查您输入的网址是否正确，或点击下面的按钮返回主页</div>
+        <a href="" class="bullshit__return-home">回到首页</a>
       </div>
     </div>
   </div>
@@ -26,7 +23,7 @@ export default {
   name: 'Page404',
   computed: {
     message() {
-      return 'The webmaster said that you can not enter this page...'
+      return '您无法进入这个页面...'
     }
   }
 }
diff --git a/src/views/flow/list.vue b/src/views/flow/list.vue
index 3fbf574..2fae94b 100644
--- a/src/views/flow/list.vue
+++ b/src/views/flow/list.vue
@@ -63,14 +63,14 @@
                 @click="getList"
                 >搜索</el-button
               >
-              <el-button
-                icon="el-icon-edit"
-                type="primary"
-                size="small"
-                plain
-                @click="multiDeal"
-              >批量审批</el-button
-              >
+<!--              <el-button-->
+<!--                icon="el-icon-edit"-->
+<!--                type="primary"-->
+<!--                size="small"-->
+<!--                plain-->
+<!--                @click="multiDeal"-->
+<!--              >批量审批</el-button-->
+<!--              >-->
             </div>
           </template>
         </vxe-toolbar>