From b0c3ba7f0325c5e2d2a8ec5f0f02a6dbb1ed0eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=B0=91=E5=BA=B7?=
 <zhangshaokang@zhangshaokangdeMacBook-Pro.local>
Date: Thu, 2 Nov 2023 14:39:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FirstJob/recordBill.vue | 12 +++++++-----
 src/components/screen/largeScreen.vue  |  5 +++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index ffc8b57..582360a 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -690,7 +690,7 @@ export default {
             that.dataObj.policy = response.data.policy
             that.dataObj.signature = response.data.signature
             that.dataObj.ossaccessKeyId = response.data.accessid
-            that.dataObj.key = response.data.dir + that.getUUID() + '_${filename}'
+            that.dataObj.key = response.data.dir + that.getUUID()
             that.dataObj.dir = response.data.dir
             that.dataObj.host = response.data.host
             console.log('响应的数据222。。。', that.dataObj)
@@ -712,7 +712,8 @@ export default {
       let _self = this
       this.loading = true
       var formData = new FormData()
-
+		let str = file.file.name.replace(/\s/g, "")
+		_self.dataObj.key = _self.dataObj.key + str
       //注意formData里append添加的键的大小写
       formData.append('key', _self.dataObj.key) //存储在oss的文件路径
       formData.append('OSSAccessKeyId', _self.dataObj.ossaccessKeyId) //accessKeyId
@@ -785,7 +786,7 @@ export default {
           file.onSuccess()
           _self.uploadFileFlag = true
           console.log(data)
-          var img = _self.dataObj.host + '/' + _self.dataObj.key.replace('${filename}', file.file.name)
+          var img = _self.dataObj.host + '/' + _self.dataObj.key
           _self.form.idCardImageUrl = img
           console.log(_self.form.idCardImageUrl)
         },
@@ -801,7 +802,8 @@ export default {
 
       let _self = this
       var formData = new FormData()
-
+	let str = file.file.name.replace(/\s/g, "")
+	_self.dataObj.key = _self.dataObj.key + str
       //注意formData里append添加的键的大小写
       formData.append('key', _self.dataObj.key) //存储在oss的文件路径
       formData.append('OSSAccessKeyId', _self.dataObj.ossaccessKeyId) //accessKeyId
@@ -829,7 +831,7 @@ export default {
         success: function (data) {
           file.onSuccess()
           console.log(data)
-          var img = _self.dataObj.host + '/' + _self.dataObj.key.replace('${filename}', file.file.name)
+          var img = _self.dataObj.host + '/' + _self.dataObj.key
           that.fileListT2.push(img)
         },
         fail: function (err) {
diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue
index 7f20b7c..0334779 100644
--- a/src/components/screen/largeScreen.vue
+++ b/src/components/screen/largeScreen.vue
@@ -186,7 +186,7 @@ export default {
             ruzhiStyle: '',
             array: [],
             isAuto: true,
-            autoSpeed: 1000000,
+            autoSpeed: 10000,
             pageSize: 10,
             // pageSize: 5,
 
@@ -859,7 +859,8 @@ div{
 	}
 	.ttd{
 		text-align: center;
-		font-size: 22px;
+		font-size: 22px;
+		line-height: 1.6;
 	}
 	.lNum{
 		font-size: 22px;