diff --git a/package.json b/package.json index 412f095..bc06fab 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "tinymce": "^5.10.7", "view-design": "^4.7.0", "vue": "2.6.10", "vue-count-to": "^1.0.13", "vue-router": "3.0.6", - "vuex": "3.1.0", - "tinymce": "^5.10.7" + "vuex": "3.1.0" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.4", diff --git a/src/api/party/studyPoint.js b/src/api/party/studyPoint.js index 5e65b70..14490d3 100644 --- a/src/api/party/studyPoint.js +++ b/src/api/party/studyPoint.js @@ -1,10 +1,32 @@ import request from "@/utils/request"; - + +function customParamsSerializer(params) { + let result = ""; + for (let key in params) { + if (params.hasOwnProperty(key)) { + if (Array.isArray(params[key])) { + if (typeof params[key] === "object") { + params[key].forEach((item, index) => { + if (typeof item === "object") { + result += `${key}[${index}][key]=${item.key}&${key}[${index}][op]=${item.op}&${key}[${index}][value]=${item.value}&`; + } else { + result += `${key}[${index}]=${item}&`; + } + }); + } + } else { + result += `${key}=${params[key]}&`; + } + } + } + return result.slice(0, -1); +} export function index(params) { return request({ method: 'get', url: '/api/admin/study-point/index', - params + params:params, + paramsSerializer: customParamsSerializer, }) } diff --git a/src/api/party/studyQuestion.js b/src/api/party/studyQuestion.js index f5ca032..7d7d93e 100644 --- a/src/api/party/studyQuestion.js +++ b/src/api/party/studyQuestion.js @@ -4,7 +4,7 @@ export function index(params) { return request({ method: 'get', url: '/api/admin/study-question/index', - params + params:params, }) } diff --git a/src/views/PartyshistoryRecoder/components/addImg.vue b/src/views/PartyshistoryRecoder/components/addImg.vue new file mode 100644 index 0000000..dc987b0 --- /dev/null +++ b/src/views/PartyshistoryRecoder/components/addImg.vue @@ -0,0 +1,253 @@ + + + + + diff --git a/src/views/PartyshistoryRecoder/components/addPointer.vue b/src/views/PartyshistoryRecoder/components/addPointer.vue index 8e84e6d..174f64a 100644 --- a/src/views/PartyshistoryRecoder/components/addPointer.vue +++ b/src/views/PartyshistoryRecoder/components/addPointer.vue @@ -156,7 +156,7 @@
内容 :
- +
@@ -322,6 +322,8 @@ export default { } else { this.id = ""; this.type = ""; + this.image_id=[]; + this.video_id=[]; this.init(); this.$refs["dialog"].clearValidate(); delete this.form.id; diff --git a/src/views/PartyshistoryRecoder/components/addQuestions.vue b/src/views/PartyshistoryRecoder/components/addQuestions.vue index 11ca42a..631b869 100644 --- a/src/views/PartyshistoryRecoder/components/addQuestions.vue +++ b/src/views/PartyshistoryRecoder/components/addQuestions.vue @@ -1,226 +1,269 @@ - + + + - - diff --git a/src/views/PartyshistoryRecoder/components/addVr.vue b/src/views/PartyshistoryRecoder/components/addVr.vue index 633baa3..e4a8a2a 100644 --- a/src/views/PartyshistoryRecoder/components/addVr.vue +++ b/src/views/PartyshistoryRecoder/components/addVr.vue @@ -22,6 +22,23 @@ + + +