修改

questionnair/src/app/ask/ask.component.ts

@@ -58,7 +58,7 @@ export class AskComponent implements OnInit {
             return
             return
           }
           }
         }
         }
-  
+
         if (this.curPage == 13) {
         if (this.curPage == 13) {
           if (optionId == 1) {
           if (optionId == 1) {
             this.curPage = this.curPage - 3
             this.curPage = this.curPage - 3
@@ -79,7 +79,7 @@ export class AskComponent implements OnInit {
           }
           }
         }
         }
       }
       }
-      
+
       this.curPage--;
       this.curPage--;
       this.setCurPageData()
       this.setCurPageData()
     } else {
     } else {
@@ -109,13 +109,13 @@ export class AskComponent implements OnInit {
       ) {
       ) {
         this.curPage++
         this.curPage++
         this.setCurPageData()
         this.setCurPageData()
-        
+
       }
       }
     } else {
     } else {
       this.curPage = 0
       this.curPage = 0
       return
       return
     }
     }
-    
+
     const answerParam = {
     const answerParam = {
       survey: {
       survey: {
         customerId: this.commonService.getQueryString('customerId'),
         customerId: this.commonService.getQueryString('customerId'),
@@ -139,7 +139,7 @@ export class AskComponent implements OnInit {
       if(optionId==1 || optionId==3){
       if(optionId==1 || optionId==3){
         if(e['questions'].length>0){
         if(e['questions'].length>0){
           this.nextBtn = true
           this.nextBtn = true
-        }  
+        }
       }
       }
     }
     }
     if(this.curPageData['questions'].length == e['questions'].length){
     if(this.curPageData['questions'].length == e['questions'].length){
@@ -148,7 +148,7 @@ export class AskComponent implements OnInit {
   }
   }
   setCurPageData() {
   setCurPageData() {
     const thePateData = this.allQues[this.curPage]
     const thePateData = this.allQues[this.curPage]
-    
+
     this.curPageData = thePateData
     this.curPageData = thePateData
     const page2Answer = this.allAnswers[1]
     const page2Answer = this.allAnswers[1]
     if (this.curPage == 2) {
     if (this.curPage == 2) {

questionnair/src/app/page11/page11.component.ts

@@ -26,7 +26,7 @@ export class Page11Component implements OnInit {
           let index = this.allOptions.indexOf(this.allOptions[i])
           let index = this.allOptions.indexOf(this.allOptions[i])
           if (index > -1) {
           if (index > -1) {
             this.allOptions.splice(index, 1)
             this.allOptions.splice(index, 1)
-          } 
+          }
       }
       }
     }
     }
     this.allOptions.push(options)
     this.allOptions.push(options)
@@ -73,7 +73,19 @@ export class Page11Component implements OnInit {
     }
     }
     questions[0]['options'].forEach(option => {
     questions[0]['options'].forEach(option => {
       if(option['selected']){
       if(option['selected']){
-        this.allOptions.push(option)
+        this.allOptions.push(option);
+        const ret = {
+          // ...this.curPageData,
+          pageId: this.curPageData['pageId'],
+          questions: [
+            {
+              ...this.curPageData['questions'][0],
+              questionId: this.curPageData['questions'][0].questionId,
+              options: this.filterItems()
+            }
+          ]
+        }
+        this.getAllAnswer.emit(ret)
       }
       }
     });
     });
   }
   }

questionnair/src/app/page12/page12.component.ts

@@ -23,7 +23,7 @@ export class Page12Component implements OnInit {
           let index = this.allOptions.indexOf(this.allOptions[i])
           let index = this.allOptions.indexOf(this.allOptions[i])
           if (index > -1) {
           if (index > -1) {
             this.allOptions.splice(index, 1)
             this.allOptions.splice(index, 1)
-          } 
+          }
       }
       }
     }
     }
     this.allOptions.push(options)
     this.allOptions.push(options)
@@ -70,7 +70,19 @@ export class Page12Component implements OnInit {
     }
     }
     questions[0]['options'].forEach(option => {
     questions[0]['options'].forEach(option => {
       if(option['selected']){
       if(option['selected']){
-        this.allOptions.push(option)
+        this.allOptions.push(option);
+        const ret = {
+          // ...this.curPageData,
+          pageId: this.curPageData['pageId'],
+          questions: [
+            {
+              ...this.curPageData['questions'][0],
+              questionId: this.curPageData['questions'][0].questionId,
+              options: this.filterItems()
+            }
+          ]
+        }
+        this.getAllAnswer.emit(ret)
       }
       }
     });
     });
   }
   }

questionnair/src/app/page13/page13.component.ts

@@ -22,7 +22,7 @@ export class Page13Component implements OnInit {
           let index = this.allOptions.indexOf(this.allOptions[i])
           let index = this.allOptions.indexOf(this.allOptions[i])
           if (index > -1) {
           if (index > -1) {
             this.allOptions.splice(index, 1)
             this.allOptions.splice(index, 1)
-          } 
+          }
       }
       }
     }
     }
     this.allOptions.push(options)
     this.allOptions.push(options)
@@ -67,7 +67,19 @@ export class Page13Component implements OnInit {
     }
     }
     questions[0]['options'].forEach(option => {
     questions[0]['options'].forEach(option => {
       if(option['selected']){
       if(option['selected']){
-        this.allOptions.push(option)
+        this.allOptions.push(option);
+        const ret = {
+          // ...this.curPageData,
+          pageId: this.curPageData['pageId'],
+          questions: [
+            {
+              ...this.curPageData['questions'][0],
+              questionId: this.curPageData['questions'][0].questionId,
+              options: this.filterItems()
+            }
+          ]
+        }
+        this.getAllAnswer.emit(ret)
       }
       }
     });
     });
   }
   }

questionnair/src/app/page14/page14.component.ts

@@ -37,7 +37,7 @@ export class Page14Component implements OnInit {
           let index = this.allOptions.indexOf(this.allOptions[i])
           let index = this.allOptions.indexOf(this.allOptions[i])
           if (index > -1) {
           if (index > -1) {
             this.allOptions.splice(index, 1)
             this.allOptions.splice(index, 1)
-          } 
+          }
       }
       }
     }
     }
     this.allOptions.push(options)
     this.allOptions.push(options)
@@ -108,7 +108,8 @@ export class Page14Component implements OnInit {
     }
     }
      options.forEach(option => {
      options.forEach(option => {
         if (option['selected']) {
         if (option['selected']) {
-          this.selectedObj = option
+          this.selectedObj = option;
+          this.getAnswer(this.selectedObj);
         }
         }
       })
       })
   }
   }

questionnair/src/app/page15/page15.component.ts

@@ -39,7 +39,7 @@ export class Page15Component implements OnInit {
           let index = this.allOptions.indexOf(this.allOptions[i])
           let index = this.allOptions.indexOf(this.allOptions[i])
           if (index > -1) {
           if (index > -1) {
             this.allOptions.splice(index, 1)
             this.allOptions.splice(index, 1)
-          } 
+          }
       }
       }
     }
     }
     this.allOptions.push(options)
     this.allOptions.push(options)
@@ -111,7 +111,8 @@ export class Page15Component implements OnInit {
     }
     }
      options.forEach(option => {
      options.forEach(option => {
         if (option['selected']) {
         if (option['selected']) {
-          this.selectedObj = option
+          this.selectedObj = option;
+          this.getAnswer(this.selectedObj);
         }
         }
       })
       })
   }
   }
@@ -137,5 +138,5 @@ export class Page15Component implements OnInit {
       }
       }
     });
     });
   }
   }
-  
+
 }
 }

questionnair/src/app/page16/page16.component.ts

@@ -107,10 +107,11 @@ export class Page16Component implements OnInit {
     }
     }
     options.forEach(option => {
     options.forEach(option => {
       if (option['selected']) {
       if (option['selected']) {
-        this.selectedProvinceObj = option
+        this.selectedProvinceObj = option;
+        this.getAnswer(this.selectedProvinceObj);
       }
       }
     })
     })
     console.log(this.selectedProvinceObj)
     console.log(this.selectedProvinceObj)
   }
   }
-  
+
 }
 }

questionnair/src/app/page2/page2.component.ts

@@ -50,7 +50,17 @@ export class Page2Component implements OnInit {
     }
     }
      options.forEach(option => {
      options.forEach(option => {
         if (option['selected']) {
         if (option['selected']) {
-          this.selectedObj = option
+          this.selectedObj = option;
+          const ret = {
+            pageId: this.curPageData['pageId'],
+            questions: [
+              {
+                questionId: this.curPageData['questions'][0].questionId,
+                options: [this.selectedObj]
+              }
+            ]
+          }
+          this.getAllAnswer.emit(ret);
         }
         }
       })
       })
   }
   }