Merge branch 'dev' of https://e.coding.net/g-pheu9517/grt-iscs/ISCS_Ui_Admin_Base into dev

src/components/ImageUpload/index.vue

@@ -94,7 +94,7 @@ export default {
           this.fileList = list.map(item => {
             if (typeof item === "string") {
               if (item.indexOf(this.baseUrl) === -1) {
-                  // item = { name: this.baseUrl + item, url: this.baseUrl + item };
+                  // item = { name: this.baseUrl + item, url: this.baseUrl + item };k
                 item={name: item, url: item}
               } else {
                   item = { name: item, url: item };
@@ -133,7 +133,8 @@ export default {
         this.fileList = this.fileList.concat(this.uploadList);
         this.uploadList = [];
         this.number = 0;
-        this.$emit("onUploaded", this.listToString(this.fileList));
+        // this.$emit("onUploaded", this.listToString(this.fileList));
+        this.$emit("onUploaded", this.fileList)
         this.$modal.closeLoading();
       }
     },

src/views/mes/md/segregationpoint/index.vue

@@ -480,7 +480,7 @@ export default {
     },
     //图片上传成功
     handleImgUplaoded(imgUrl) {
-      this.form.pointIcon = imgUrl;
+      this.form.pointIcon = imgUrl[0].url;
     },
     //图片移除
     handleImgRemoved(imgUrl) {