Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -140,20 +140,18 @@ export default {
             inputForm.value.information.split("|").forEach((item) => {
               if (item.trim().length > 0) {
                 fileupList.value.push({
-                  file: {
-                    name: decodeURIComponent(
-                      item.substring(item.lastIndexOf("/") + 1)
-                    ),
-                  },
-                  url: item,
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
+                  url: $base + item.replace("程序附件//", "程序附件/"),
+                  id: item.replace("程序附件//", "程序附件/")
                 });
                 fileList.value.push({
-                  file: {
-                    name: decodeURIComponent(
-                      item.substring(item.lastIndexOf("/") + 1)
-                    ),
-                  },
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
                   url: $base + item.replace("程序附件//", "程序附件/"),
+                  id: item.replace("程序附件//", "程序附件/")
                 });
               }
             });

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -166,20 +166,18 @@ export default {
           placeActivity.value.safetyPlan.split("|").forEach((item) => {
             if (item.trim().length > 0) {
               fileupList.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                },
-                url: item,
+                name: decodeURIComponent(
+                  item.substring(item.lastIndexOf("/") + 1)
+                ),
+                url: $base + item.replace("程序附件//", "程序附件/"),
+                id: item.replace("程序附件//", "程序附件/")
               });
               fileList.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                },
+                name: decodeURIComponent(
+                  item.substring(item.lastIndexOf("/") + 1)
+                ),
                 url: $base + item.replace("程序附件//", "程序附件/"),
+                id: item.replace("程序附件//", "程序附件/")
               });
             }
           });