diff --git a/assets/js/list.js b/assets/js/list.js index 0b5d188..94807d0 100644 --- a/assets/js/list.js +++ b/assets/js/list.js @@ -64,8 +64,8 @@ var $vue = new Vue({ return item[_.camelCase(attributeName)]; }, - largeImage: function(item, attributeName) { - var imageUrl = this.getAttributeValue(item, attributeName); + largeImage: function(imageUrl) { + //var imageUrl = this.getAttributeValue(item, attributeName); Swal.fire({ imageUrl: imageUrl, showConfirmButton: false, @@ -101,7 +101,7 @@ var $vue = new Vue({ this.pageType = 'loading'; $api.get(this.apiUrl + '/ss.form/' + this.siteId + '/' + this.formId, { - page: page + params: {page: page} }).then(function (res) { $this.fieldInfoList = res.data.fieldInfoList; $this.allAttributeNames = res.data.allAttributeNames; diff --git a/assets/js/submit.js b/assets/js/submit.js index 2c5c972..4e5909f 100644 --- a/assets/js/submit.js +++ b/assets/js/submit.js @@ -70,7 +70,12 @@ if (window.DatePicker) { if (!error) { var res = JSON.parse(file.serverId); var fieldInfo = _.find(this.fieldInfoList, function(o) { return o.id === res.fieldId; }); - fieldInfo.value = res.value; + if (fieldInfo.value){ + fieldInfo.value += ',' + res.value; + } + else{ + fieldInfo.value = res.value; + } } }, diff --git a/pages/logAdd.html b/pages/logAdd.html index 68e8608..5cf7a44 100644 --- a/pages/logAdd.html +++ b/pages/logAdd.html @@ -246,7 +246,7 @@
| + | {{ getAttributeText(attributeName) }} |
|---|---|
|
-
-
+
+ |
+
+
{{ getAttributeValue(item, attributeName) }}
diff --git a/templates/submit1/index.html b/templates/submit1/index.html
index 49670e6..e4f85fb 100644
--- a/templates/submit1/index.html
+++ b/templates/submit1/index.html
@@ -8,12 +8,17 @@
+
-
+
@@ -71,7 +76,8 @@
-
-
+
+
|