lsc преди 8 месеца
родител
ревизия
679c9d9865

+ 1 - 1
src/components/pages/classroomObservation/components/mdView.vue

@@ -31,7 +31,7 @@ const getFile = (url) => {
 		}
 		var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
 		let name = decodeURIComponent(
-			_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+			_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' ')
 		);
 		var params = {
 			Bucket: "ccrb",

+ 1 - 1
src/components/pages/classroomObservation/components/pieChart.vue

@@ -26,7 +26,7 @@ const getFile = (url) => {
 		}
 		var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
 		let name = decodeURIComponent(
-			_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+			_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' ')
 		);
 		var params = {
 			Bucket: "ccrb",

+ 2 - 2
src/components/pages/library/fileBox.vue

@@ -188,7 +188,7 @@ const getFile = (url) => {
             _url2 = url2;
         }
         var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
-        let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1])
+        let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' '))
         var params = {
             Bucket: "ccrb",
             Key: name
@@ -610,7 +610,7 @@ export default {
             let _this = this;
 
             var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
-            let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1])
+            let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' '))
             var params = {
                 Bucket: "ccrb",
                 Key: name

+ 1 - 1
src/components/pages/test/add/edit/check/file.vue

@@ -715,7 +715,7 @@ export default {
       _this.downLoading = _url2;
       var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
       let name = decodeURIComponent(
-        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' ')
       );
       var params = {
         Bucket: "ccrb",

+ 5 - 0
src/components/pages/test/add/edit/check/uploadFile.vue

@@ -54,6 +54,7 @@ export default {
 		// },
 		// 初始化上传入口
 		async initMultipartUpload(key, file) {
+			console.log(file)
 			const params = {
 				Bucket: this.bucketname,
 				Key: key,
@@ -208,6 +209,7 @@ export default {
 
 		//上传的接口
 		async awsupload({ file = this.file, keyName, folderName }) {
+			console.log('successsuccesssuccesssuccesssuccesssuccesssuccesssuccesssuccesssuccesssuccess')
 			if (!file) return this.$message.error("请上传文件");
 			this.init(); //初始化桶
 			// const key = (folderid || uuidv4()) + "/" + file.name; //需要上传的文件名
@@ -224,6 +226,9 @@ export default {
 							file.name.split(".")[file.name.split(".").length - 1]}`;
 				}
 			}
+			console.log(key);
+			// key = key.replace(/\s/g, "");
+			// key = encodeURIComponent(key);
 			this.filestate = {
 				percent: 0,
 				status: "start",

+ 6 - 1
src/components/pages/test/add/setInfo/index.vue

@@ -74,7 +74,12 @@
                 </div>
             </div>
         </div>
-        <div class="whiteBg" style="background:#fff;margin: 10px 0;min-height: 300px;">
+        <div class="e_btn" style="display: flex;justify-content: center;margin-top: 10px;" v-show="oid == 'd67940a5-510c-40ea-9c9a-2631ab03013a'">
+            <el-button type="primary" size="mini" @click="nextSteps()"
+            >下一步</el-button
+            >
+        </div>
+        <div class="whiteBg" style="background:#fff;margin: 10px 0;min-height: 300px;" v-show="oid != 'd67940a5-510c-40ea-9c9a-2631ab03013a'">
             <div class="whiteBg" style="border-radius: 0">
                 <div class="c_info_title">创建表单内容</div>
                 <div class="c_info_box">

+ 2 - 2
src/components/pages/test/check/index.vue

@@ -812,7 +812,7 @@ const getFile = (url) => {
             _url2 = url2;
         }
         var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
-        let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1])
+        let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' '))
         var params = {
             Bucket: "ccrb",
             Key: name
@@ -1440,7 +1440,7 @@ export default {
 
       _this.downLoading = _url2
       var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
-      let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1])
+      let name = decodeURIComponent(_url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' '))
       var params = {
         Bucket: "ccrb",
         Key: name

+ 2 - 2
src/components/pages/testStudent/view/component/file.vue

@@ -242,7 +242,7 @@ const getFile = url => {
     }
     var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
     let name = decodeURIComponent(
-      _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+      _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' ')
     );
     var params = {
       Bucket: "ccrb",
@@ -785,7 +785,7 @@ export default {
       _this.downLoading = _url2;
       var s3 = new window.AWS.S3({ params: { Bucket: "ccrb" } });
       let name = decodeURIComponent(
-        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1]
+        _url2.split("https://ccrb.s3.cn-northwest-1.amazonaws.com.cn/")[1].replace(/\+/g, ' ')
       );
       var params = {
         Bucket: "ccrb",