diff --git a/.env.production b/.env.production index 1149ceb..4082428 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,10 @@ ENV = 'production' # base api -VUE_APP_BASE_API = https://wx.sstbc.com -VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file + +VUE_APP_BASE_API=https://suzhoukeji-test.ali251.langye.net +VUE_APP_UPLOAD_API=https://suzhoukeji-test.ali251.langye.net/api/admin/upload-file + +#VUE_APP_BASE_API = https://wx.sstbc.com +#VUE_APP_UPLOAD_API = https://wx.sstbc.com/api/admin/upload-file + diff --git a/src/api/survey/evaluations.js b/src/api/survey/evaluations.js new file mode 100644 index 0000000..03d5506 --- /dev/null +++ b/src/api/survey/evaluations.js @@ -0,0 +1,60 @@ +import request from "@/utils/request"; +function customParamsSerializer(params) { + let result = ''; + for (let key in params) { + if (params.hasOwnProperty(key)) { + if (Array.isArray(params[key])) { + params[key].forEach((item,index) => { + if(item.key){ + 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,isLoading = false) { + return request({ + method: "get", + url: "/api/admin/course-content-evaluations/index", + params, + paramsSerializer: customParamsSerializer, + isLoading + }) +} + +export function show(params, isLoading = true) { + return request({ + method: "get", + url: "/api/admin/course-content-evaluations/show", + params, + isLoading + }) +} + + +export function save(data) { + return request({ + method: "post", + url: "/api/admin/course-content-evaluations/save", + data + }) +} + +export function destroy(params) { + return request({ + method: "get", + url: "/api/admin/course-content-evaluations/destroy", + params + }) +} + + + diff --git a/src/api/survey/index.js b/src/api/survey/index.js new file mode 100644 index 0000000..63c0c54 --- /dev/null +++ b/src/api/survey/index.js @@ -0,0 +1,60 @@ +import request from "@/utils/request"; +function customParamsSerializer(params) { + let result = ''; + for (let key in params) { + if (params.hasOwnProperty(key)) { + if (Array.isArray(params[key])) { + params[key].forEach((item,index) => { + if(item.key){ + 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,isLoading = false) { + return request({ + method: "get", + url: "/api/admin/course-content-evaluation-ask/index", + params, + paramsSerializer: customParamsSerializer, + isLoading + }) +} + +export function show(params, isLoading = true) { + return request({ + method: "get", + url: "/api/admin/course-content-evaluation-ask/show", + params, + isLoading + }) +} + + +export function save(data) { + return request({ + method: "post", + url: "/api/admin/course-content-evaluation-ask/save", + data + }) +} + +export function destroy(params) { + return request({ + method: "get", + url: "/api/admin/course-content-evaluation-ask/destroy", + params + }) +} + + + diff --git a/src/views/courseQr/index.vue b/src/views/courseQr/index.vue new file mode 100644 index 0000000..6c12fb8 --- /dev/null +++ b/src/views/courseQr/index.vue @@ -0,0 +1,209 @@ + + + + + diff --git a/src/views/survey/components/SurveyCreateDialog.vue b/src/views/survey/components/SurveyCreateDialog.vue index ec24817..4dd6e7a 100644 --- a/src/views/survey/components/SurveyCreateDialog.vue +++ b/src/views/survey/components/SurveyCreateDialog.vue @@ -64,21 +64,23 @@ export default { name: 'SurveyCreateDialog', components: { draggable }, props: { - visible: Boolean, surveyData: Object }, data() { return { + visible:false, + course_content_id:'', localSurvey: { title: '', description: '', questions: [] }, questionTypes: [ - { label: '单选题', value: 'single' }, - { label: '多选题', value: 'multi' }, + { label: '单选题', value: 'radio' }, + { label: '多选题', value: 'checkbox' }, { label: '文本题', value: 'text' }, - { label: '评分题', value: 'rate' } + { label: '评分题', value: 'number' }, + { label: '评分题', value: 'number' } ] } }, diff --git a/src/views/survey/components/SurveyCreateWizard.vue b/src/views/survey/components/SurveyCreateWizard.vue new file mode 100644 index 0000000..ce1c2c2 --- /dev/null +++ b/src/views/survey/components/SurveyCreateWizard.vue @@ -0,0 +1,461 @@ + + + + + diff --git a/src/views/survey/components/SurveyFillDialog.vue b/src/views/survey/components/SurveyFillDialog.vue index 715d37e..ef09c47 100644 --- a/src/views/survey/components/SurveyFillDialog.vue +++ b/src/views/survey/components/SurveyFillDialog.vue @@ -1,231 +1,308 @@ -