diff --git a/pages/admin/surveys/public/index.vue b/pages/admin/surveys/public/index.vue index 13faba2..544ae9d 100644 --- a/pages/admin/surveys/public/index.vue +++ b/pages/admin/surveys/public/index.vue @@ -71,7 +71,7 @@ export default { layout: 'admin', async asyncData({ $axios, error }) { try { - const surveys = await $axios.$get(`/api/admin/surveys?type=0`) + const surveys = await $axios.$get(`/api/admin/surveys?type=1`) return { surveys } diff --git a/pages/complaint/index.vue b/pages/complaint/index.vue index 6780ca5..7584316 100644 --- a/pages/complaint/index.vue +++ b/pages/complaint/index.vue @@ -170,7 +170,7 @@
- +
diff --git a/pages/survey/index.vue b/pages/survey/index.vue index dafa202..65a1c9a 100644 --- a/pages/survey/index.vue +++ b/pages/survey/index.vue @@ -150,7 +150,43 @@

{{ config.survey }}

+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
@@ -198,7 +234,21 @@ export default { data() { return { - survey: this.initForm(), + survey: { + purchasedProduct: 0, + guaranteeWorkFlow: 0, + employeeResponsibility: 0, + serviceQuality: 0, + serviceTime: 0, + repairQuality: 0, + coast: 0, + code: '', + fullName: '', + national: '', + phoneNumber: '', + email: '', + description: '' + }, validation: {}, hasValidationError: false, waiting: true @@ -227,24 +277,6 @@ export default { }, mounted() {}, methods: { - initForm() { - const survey = { - purchasedProduct: 0, - guaranteeWorkFlow: 0, - employeeResponsibility: 0, - serviceQuality: 0, - serviceTime: 0, - repairQuality: 0, - coast: 0, - code: '', - fullName: '', - national: '', - phoneNumber: '', - email: '', - description: '' - } - return survey - }, post() { if (this.disabledBtn) return this.$axios.$post('/api/public/survey', { ...this.survey }).then(res => { diff --git a/server/controllers/surveyController.js b/server/controllers/surveyController.js index 63aa51e..b45202a 100644 --- a/server/controllers/surveyController.js +++ b/server/controllers/surveyController.js @@ -104,12 +104,22 @@ module.exports.getAllForUser = [ module.exports.getAllForAdmin = [ (req, res) => { - Survey.find({type:req.query.type || 0}) - .populate('user', 'first_name last_name') - .exec((err, data) => { - if (err) return res500(res, err) - return res.json(data) - }) + + // eslint-disable-next-line eqeqeq + if(req.query.type == 1){ + Survey.find({type: 1 }) + .exec((err, data) => { + if (err) return res500(res, err) + return res.json(data) + }) + }else{ + Survey.find({type: 0 }) + .populate('user', 'first_name last_name') + .exec((err, data) => { + if (err) return res500(res, err) + return res.json(data) + }) + } } ]