duy 1 gadu atpakaļ
vecāks
revīzija
a461cffff3
3 mainītis faili ar 13 papildinājumiem un 11 dzēšanām
  1. 1 1
      package.json
  2. 8 6
      src/views/transfer/write-report.vue
  3. 4 4
      yarn.lock

+ 1 - 1
package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.4.2",
         "element-plus": "^2.4.1",
-        "hc-vue3-ui": "^2.5.3",
+        "hc-vue3-ui": "^2.5.4",
         "js-base64": "^3.7.5",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.3.0",

+ 8 - 6
src/views/transfer/write-report.vue

@@ -21,7 +21,7 @@
                 <el-button hc-btn @click="toBackClick">返回主页</el-button>
             </template>
 
-            <HcOnlineOffice :key="dataKey" :src="docxUrl" title="测试的文档.docx" :url="saveUrl" :project-id="projectId" :token="token" :user-info="userInfo" />
+            <HcOnlineOffice :key1="dataKey" :src="docxUrl" title="测试的文档.docx" :url="saveUrl" :project-id="projectId" :token="token" :user-info="userInfo" />
         </hc-new-card>
 
         <!-- 短信认证 -->
@@ -71,17 +71,18 @@ const token = ref( getToken())
 
 //渲染完成
 onMounted(() => {
-    // setTimeout(() => {
-    //     docxUrl.value = 'http://bladex-chongqing-info.oss-cn-hangzhou.aliyuncs.com/upload/20230317/e2bdc6581e397b810b46ac7cd71b111b.docx'
-    // }, 1000)
-    geDocxUrl()
+    setTimeout(() => {
+        geDocxUrl()
+    }, 1000)
+   
 
 })
 
 const state = ref(1)
 const docxUrl = ref('')
-const saveUrl = ref('http://192.168.0.128:8090/blade-archive/archivesauto/callbackSave?' + '&Blade-Auth=bearer' + token.value + '&' + 'projectId=' + projectId.value)
+const saveUrl = ref('http://192.168.0.128:8090/blade-archive/archivesauto/callbackSave?' + '?Blade-Auth=bearer ' + token.value + '&' + 'projectId=' + projectId.value)
 const dataKey = ref('')
+const datafile = ref({})
 //const docxUrl = ref('https://bladex-test-info.oss-cn-chengdu.aliyuncs.com//upload/20230317/e2bdc6581e397b810b46ac7cd71b111b.docx')
 
 //获取文档地址
@@ -93,6 +94,7 @@ const geDocxUrl = async ()=>{
         docxUrl.value = data['worldUrl']
         dataKey.value = data['id'] + '_' + Math.random() + ''
         console.log(dataKey.value, 'dataKey')
+        datafile.value = data
       
     } else {
         docxUrl.value = ''

+ 4 - 4
yarn.lock

@@ -1449,10 +1449,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^2.5.3:
-  version "2.5.3"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.5.3.tgz#5557fefbd2270d48c94b5305608fb1906ef62b1c"
-  integrity sha512-KX50pzrCdUidtefLUOGY6ndAucSVMMu4w8w8l6BiJGGG4G3zt/mNaAcQ1wzEfZg+FbQEF1AFshgkFzuasa1Tiw==
+hc-vue3-ui@^2.5.4:
+  version "2.5.4"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-2.5.4.tgz#77d30f5832156dd73894261783ef3ef9612d7ea5"
+  integrity sha512-sd1Mapcc81/eMuhdT8W0P6FOAtc5ShFu72F7Tt9qVMZ0hT8x1tnoaOjES5f2zPDFd88mDdBxWBF/b1TIMEP90g==
   dependencies:
     axios "^1.6.2"
     dayjs "^1.11.10"