Merge remote-tracking branch 'origin/test'

src/components/diagBase/DiagBase.vue

@@ -123,10 +123,13 @@ export default {
         }
     },
     created() {
-        this.getDropList()
-        this.getDataList()
-        const userLoginDTO= JSON.parse(localStorage.getItem('userLoginDTO'))
-        this.modifier = userLoginDTO && userLoginDTO.linkman
+        this.$nextTick(()=>{
+          this.getDropList()
+          this.getDataList()
+          const userLoginDTO= JSON.parse(localStorage.getItem('userLoginDTO'))
+          this.modifier = userLoginDTO && userLoginDTO.linkman
+        }) 
+       
     },
   watch: {
     'filter': {

src/components/diagBase/QuestionWords.vue

@@ -172,7 +172,7 @@ export default {
           const data = {
             disName: this.filter.disName,
             question: this.filter.questionName,
-            type: this.filter.questionType
+            type: this.filter.type
           };
           api.exportDiagnosticBasis(data).then((res) => {
               utils.downloadExportedData(res.data,'问题词.xls')