diff --git a/src/components/Discover/Conformance/ConformanceSidebar.vue b/src/components/Discover/Conformance/ConformanceSidebar.vue
index 8a86d85..46e41d1 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar.vue
@@ -40,6 +40,21 @@
     :isSubmitStartAndEnd="isSubmitStartAndEnd"
     :isSubmitListSeq="isSubmitListSeq"
     :isSubmitDurationData="isSubmitDurationData"
+    :isSubmitCfmPtEteStart="isSubmitCfmPtEteStart"
+    :isSubmitCfmPtEteEnd="isSubmitCfmPtEteEnd"
+    :isSubmitCfmPtEteSE="isSubmitCfmPtEteSE"
+    :isSubmitCfmPtPStart="isSubmitCfmPtPStart"
+    :isSubmitCfmPtPEnd="isSubmitCfmPtPEnd"
+    :isSubmitCfmPtPSE="isSubmitCfmPtPSE"
+    :isSubmitCfmWtEteStart="isSubmitCfmWtEteStart"
+    :isSubmitCfmWtEteEnd="isSubmitCfmWtEteEnd"
+    :isSubmitCfmWtEteSE="isSubmitCfmWtEteSE"
+    :isSubmitCfmWtPStart="isSubmitCfmWtPStart"
+    :isSubmitCfmWtPEnd="isSubmitCfmWtPEnd"
+    :isSubmitCfmWtPSE="isSubmitCfmWtPSE"
+    :isSubmitCfmCtEteStart="isSubmitCfmCtEteStart"
+    :isSubmitCfmCtEteEnd="isSubmitCfmCtEteEnd"
+    :isSubmitCfmCtEteSE="isSubmitCfmCtEteSE"
     ></ConformanceShowBar>
   </div>
 </section>
@@ -75,7 +90,7 @@ export default {
       selectConformanceTo: null,
       listSeq: [],
       selectDurationData: null,
-      selectDurationTime: null,
+      selectDurationTime: { min: 0, max: 0},
       selectTimeRangeMin: 0, // Time Range min
       selectTimeRangeMax: 0, // Time Range max
       selectCfmPtEteStart: null, // Processing time
@@ -103,6 +118,22 @@ export default {
       isSubmitStartAndEnd: null,
       isSubmitListSeq: [],
       isSubmitDurationData: null,
+      isSubmitDurationTime: null,
+      isSubmitCfmPtEteStart: null, // Processing time
+      isSubmitCfmPtEteEnd: null,
+      isSubmitCfmPtEteSE: null,
+      isSubmitCfmPtPStart: null,
+      isSubmitCfmPtPEnd: null,
+      isSubmitCfmPtPSE: null,
+      isSubmitCfmWtEteStart: null, // Waiting time
+      isSubmitCfmWtEteEnd: null,
+      isSubmitCfmWtEteSE: null,
+      isSubmitCfmWtPStart: null,
+      isSubmitCfmWtPEnd: null,
+      isSubmitCfmWtPSE: null,
+      isSubmitCfmCtEteStart: null, // Cycle time
+      isSubmitCfmCtEteEnd: null,
+      isSubmitCfmCtEteSE: null,
     }
   },
   components: {
@@ -202,6 +233,22 @@ export default {
       this.isSubmitStartAndEnd = null;
       this.isSubmitListSeq = [];
       this.isSubmitDurationData = null;
+      this.isSubmitDurationTime = null;
+      this.isSubmitCfmPtEteStart = null; // Processing time
+      this.isSubmitCfmPtEteEnd = null;
+      this.isSubmitCfmPtEteSE = null;
+      this.isSubmitCfmPtPStart = null;
+      this.isSubmitCfmPtPEnd = null;
+      this.isSubmitCfmPtPSE = null;
+      this.isSubmitCfmWtEteStart = null; // Waiting time
+      this.isSubmitCfmWtEteEnd = null;
+      this.isSubmitCfmWtEteSE = null;
+      this.isSubmitCfmWtPStart = null;
+      this.isSubmitCfmWtPEnd = null;
+      this.isSubmitCfmWtPSE = null;
+      this.isSubmitCfmCtEteStart = null; // Cycle time
+      this.isSubmitCfmCtEteEnd = null;
+      this.isSubmitCfmCtEteSE = null;
     },
     /**
      * @param {boolean} massage true | false 清空選單選項, 選擇的結果
@@ -209,14 +256,8 @@ export default {
      reset() {
       // Results page Cover Plate(遮罩為 ture)
       this.$emitter.emit('coverPlate', true);
-      // Have activity
-      this.isSubmitTask = null;
-      // Activity sequence
-      this.isSubmitStartAndEnd = null;
-      this.isSubmitListSeq = [];
-      // Activity duration
-      this.isSubmitDurationData = null;
-      // isSubmit
+      // is submit select Reset
+      this.isSubmitReset();
       this.isSubmit = false;
 
       // 其他子元件 reset
@@ -235,6 +276,8 @@ export default {
         min: this.selectTimeRangeMin,
         max: this.selectTimeRangeMax
       };
+      // this.selectDurationTime.min = this.selectTimeRangeMin;
+      // this.selectDurationTime.max = this.selectTimeRangeMax;
       this.$emitter.emit('timeRangeMaxMin', this.selectDurationTime);
 
       switch (this.selectedRuleType) {
@@ -248,7 +291,6 @@ export default {
             // 其他 isSubmitData 為 null
             this.isSubmitReset();
             this.isSubmitTask = this.selectConformanceTask;
-
           }
           break;
         case 'Activity sequence': // Rule Type 選 Activity sequence 的行為
@@ -314,6 +356,7 @@ export default {
             };
             this.isSubmitReset();
             this.isSubmitDurationData = this.selectDurationData;
+            this.isSubmitDurationTime = this.selectDurationTime;
           };
           break;
         case 'Processing time': // Rule Type 選 Processing time 的行為
@@ -329,31 +372,50 @@ export default {
                   break;
                 case 'Start':
                   if(!this.selectCfmPtEteStart) return this.$toast.error('Not selected.');
-                  else data = {
-                    task: this.selectCfmPtEteStart,
-                    min: this.selectDurationTime.min,
-                    max: this.selectDurationTime.max,
-                    type: 'processing-time-end-to-end-starts-with',
-                  };
+                  else {
+                    data = {
+                      task: this.selectCfmPtEteStart,
+                      min: this.selectDurationTime.min,
+                      max: this.selectDurationTime.max,
+                      type: 'processing-time-end-to-end-starts-with',
+                    };
+                    this.isSubmitReset();
+                    this.isSubmitCfmPtEteStart =  [
+                      {category: 'Start', task: this.selectCfmPtEteStart},
+                    ];
+                  }
                   break;
                 case 'End':
                   if(!this.selectCfmPtEteEnd) return this.$toast.error('Not selected.');
-                  else data = {
+                  else {
+                    data = {
                       task: this.selectCfmPtEteEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'processing-time-end-to-end-ends-with',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmPtEteEnd =  [
+                      {category: 'End', task: this.selectCfmPtEteEnd},
+                    ];
+                  }
                   break;
                 case 'Start & End':
                   if(!this.selectCfmPtEteSEStart || !this.selectCfmPtEteSEEnd) return this.$toast.error('Both Start and End must be selected.');
-                  else data = {
-                    start: this.selectCfmPtEteSEStart,
-                    end: this.selectCfmPtEteSEEnd,
-                    min: this.selectDurationTime.min,
-                    max: this.selectDurationTime.max,
-                    type: 'processing-time-end-to-end-start-end',
-                  };
+                  else {
+                    data = {
+                      start: this.selectCfmPtEteSEStart,
+                      end: this.selectCfmPtEteSEEnd,
+                      min: this.selectDurationTime.min,
+                      max: this.selectDurationTime.max,
+                      type: 'processing-time-end-to-end-start-end',
+                    };
+                    this.isSubmitReset();
+                    this.isSubmitCfmPtEteSE =  [
+                      {category: 'Start', task: this.selectCfmPtEteStart},
+                      {category: 'End', task: this.selectCfmPtEteSEEnd},
+                    ];
+                  }
                 break;
                 default:
                   break;
@@ -363,31 +425,50 @@ export default {
               switch (this.selectedActSeqFromTo) {
                 case 'From':
                   if(!this.selectCfmPtPStart) return this.$toast.error('Not selected.');
-                  else data = {
-                    task: this.selectCfmPtPStart,
-                    min: this.selectDurationTime.min,
-                    max: this.selectDurationTime.max,
-                    type: 'processing-time-partial-starts-with',
-                  };
+                  else {
+                    data = {
+                      task: this.selectCfmPtPStart,
+                      min: this.selectDurationTime.min,
+                      max: this.selectDurationTime.max,
+                      type: 'processing-time-partial-starts-with',
+                    };
+                    this.isSubmitReset();
+                    this.isSubmitCfmPtPStart =  [
+                      {category: 'From', task: this.selectCfmPtPStart},
+                    ];
+                  }
                   break;
                 case 'To':
                   if(!this.selectCfmPtPEnd) return this.$toast.error('Not selected.');
-                  else data = {
+                  else {
+                    data = {
                       task: this.selectCfmPtPEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'processing-time-partial-ends-with',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmPtPEnd =  [
+                      {category: 'To', task: this.selectCfmPtPEnd},
+                    ];
+                  }
                   break;
                 case 'From & To':
                   if(!this.selectCfmPtPSEStart || !this.selectCfmPtPSEEnd) return this.$toast.error('Both Start and End must be selected.');
-                  else data = {
+                  else {
+                    data = {
                       start: this.selectCfmPtPSEStart,
                       end: this.selectCfmPtPSEEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'processing-time-partial-start-end',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmPtPSE =  [
+                      {category: 'From', task: this.selectCfmPtPSEStart},
+                      {category: 'To', task: this.selectCfmPtPSEEnd},
+                    ];
+                  }
                 break;
                 default:
                   break;
@@ -410,31 +491,50 @@ export default {
                   break;
                 case 'Start':
                   if(!this.selectCfmWtEteStart) return this.$toast.error('Not selected.');
-                  else data = {
-                    task: this.selectCfmWtEteStart,
-                    min: this.selectDurationTime.min,
-                    max: this.selectDurationTime.max,
-                    type: 'waiting-time-end-to-end-starts-with',
-                  };
+                  else {
+                    data = {
+                      task: this.selectCfmWtEteStart,
+                      min: this.selectDurationTime.min,
+                      max: this.selectDurationTime.max,
+                      type: 'waiting-time-end-to-end-starts-with',
+                    };
+                    this.isSubmitReset();
+                    this.isSubmitCfmWtEteStart =  [
+                      {category: 'Start', task: this.selectCfmWtEteStart},
+                    ];
+                  }
                   break;
                 case 'End':
                   if(!this.selectCfmWtEteEnd) return this.$toast.error('Not selected.');
-                  else data = {
+                  else {
+                    data = {
                       task: this.selectCfmWtEteEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'waiting-time-end-to-end-ends-with',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmWtEteEnd =  [
+                      {category: 'End', task: this.selectCfmWtEteEnd},
+                    ];
+                  }
                   break;
                 case 'Start & End':
                   if(!this.selectCfmWtEteSEStart || !this.selectCfmWtEteSEEnd) return this.$toast.error('Both Start and End must be selected.');
-                  else data = {
+                  else {
+                    data = {
                       start: this.selectCfmWtEteSEStart,
                       end: this.selectCfmWtEteSEEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'waiting-time-end-to-end-start-end',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmWtEteSE =  [
+                      {category: 'Start', task: this.selectCfmWtEteSEStart},
+                      {category: 'End', task: this.selectCfmWtEteSEEnd},
+                    ];
+                  }
                   break;
                 default:
                   break;
@@ -444,31 +544,50 @@ export default {
               switch (this.selectedActSeqFromTo) {
                 case 'From':
                   if(!this.selectCfmWtPStart) return this.$toast.error('Not selected.');
-                  else data = {
-                    task: this.selectCfmWtPStart,
-                    min: this.selectDurationTime.min,
-                    max: this.selectDurationTime.max,
-                    type: 'waiting-time-partial-starts-with',
-                  };
+                  else {
+                    data = {
+                      task: this.selectCfmWtPStart,
+                      min: this.selectDurationTime.min,
+                      max: this.selectDurationTime.max,
+                      type: 'waiting-time-partial-starts-with',
+                    };
+                    this.isSubmitReset();
+                    this.isSubmitCfmWtPStart =  [
+                      {category: 'From', task: this.selectCfmWtPStart},
+                    ];
+                  }
                   break;
                 case 'To':
                   if(!this.selectCfmWtPEnd) return this.$toast.error('Not selected.');
-                  else data = {
+                  else {
+                    data = {
                       task: this.selectCfmWtPEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'waiting-time-partial-ends-with',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmWtPEnd =  [
+                      {category: 'To', task: this.selectCfmWtPEnd},
+                    ];
+                  }
                   break;
                 case 'From & To':
                   if(!this.selectCfmWtPSEStart || !this.selectCfmWtPSEEnd) return this.$toast.error('Both Start and End must be selected.');
-                  else data = {
+                  else {
+                    data = {
                       start: this.selectCfmWtPSEStart,
                       end: this.selectCfmWtPSEEnd,
                       min: this.selectDurationTime.min,
                       max: this.selectDurationTime.max,
                       type: 'waiting-time-partial-start-end',
                     };
+                    this.isSubmitReset();
+                    this.isSubmitCfmWtPSE =  [
+                      {category: 'From', task: this.selectCfmWtPSEStart},
+                      {category: 'To', task: this.selectCfmWtPSEEnd},
+                    ];
+                  }
                   break;
                 default:
                   break;
@@ -495,25 +614,42 @@ export default {
                 max: this.selectDurationTime.max,
                 type: 'cycle-time-end-to-end-starts-with',
               };
+              this.isSubmitReset();
+              this.isSubmitCfmCtEteStart =  [
+                {category: 'Start', task: this.selectCfmCtEteStart},
+              ];
               break;
             case 'End':
               if(!this.selectCfmCtEteEnd) return this.$toast.error('Not selected.');
-              else data = {
+              else {
+                data = {
                   task: this.selectCfmCtEteEnd,
                   min: this.selectDurationTime.min,
                   max: this.selectDurationTime.max,
                   type: 'cycle-time-end-to-end-ends-with',
                 };
+                this.isSubmitReset();
+                this.isSubmitCfmCtEteEnd =  [
+                  {category: 'End', task: this.selectCfmCtEteEnd},
+                ];
+              }
               break;
             case 'Start & End':
               if(!this.selectCfmCtEteSEStart || !this.selectCfmCtEteSEEnd) return this.$toast.error('Both Start and End must be selected.');
-              else data = {
+              else {
+                data = {
                   start: this.selectCfmCtEteSEStart,
                   end: this.selectCfmCtEteSEEnd,
                   min: this.selectDurationTime.min,
                   max: this.selectDurationTime.max,
                   type: 'cycle-time-end-to-end-start-end',
                 };
+                this.isSubmitReset();
+                this.isSubmitCfmCtEteSE =  [
+                  {category: 'Start', task: this.selectCfmCtEteSEStart},
+                  {category: 'End', task: this.selectCfmCtEteSEEnd},
+                ];
+              }
               break;
             default:
               break;
@@ -647,7 +783,7 @@ export default {
     this.$emitter.on('isRadioChange', (data) => {
       if(data) {
         this.selectTimeReset();
-        this.selectDurationTime = null;
+        this.selectDurationTime = { min: 0, max: 0};
       };
       switch (this.selectedRuleType) {
         case 'Processing time':
@@ -671,7 +807,7 @@ export default {
     });
     this.$emitter.on('isRadioProcessScopeChange', (data) => {
       if(data) {
-        this.selectDurationTime = null;
+        this.selectDurationTime = { min: 0, max: 0};
       };
     });
     this.$emitter.on('isRadioActSeqMoreChange', (data) => {
@@ -691,13 +827,13 @@ export default {
             break;
         };
         }else{
-          this.selectDurationTime = null;
+          this.selectDurationTime = { min: 0, max: 0};
         };
       };
     });
     this.$emitter.on('isRadioActSeqFromToChange', (data) => {
       if(data) {
-        this.selectDurationTime = null;
+        this.selectDurationTime = { min: 0, max: 0};
       };
     });
   },
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
index b7a3956..13d96a3 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceShowBar.vue
@@ -12,37 +12,37 @@
     <!-- Activity duration -->
     <ActRadio v-if="selectedRuleType === 'Activity duration'" :title="'Activities include'" :select="isSubmitDurationData?.[0]" :data="conformanceTask" />
     <!-- Processing time -->
-    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :title="'Start'" :select="'protimeStartRadio'" :data="cfmPtEteStartData" :category="'cfmPtEteStart'" />
-    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :title="'End'" :select="'protimeEndRadio'" :data="cfmPtEteEndData" :category="'cfmPtEteEnd'" />
+    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :title="'Start'" :select="isSubmitCfmPtEteStart?.[0].task" :data="cfmPtEteStartData" :category="'cfmPtEteStart'" />
+    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :title="'End'" :select="isSubmitCfmPtEteEnd?.[0].task" :data="cfmPtEteEndData" :category="'cfmPtEteEnd'" />
     <div v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start & End'" class="flex justify-between items-center w-full h-full">
-      <ActRadio :title="'Start'" :select="'protimeStartAndEndRadioStart'" :data="cfmPtEteSEStartData" :category="'cfmPtEteSEStart'" @selected-task="selectStart" class="w-1/2" />
-      <ActRadio :title="'End'" :select="'protimeStartAndEndRadioEnd'" :data="cfmPtEteSEEndData" :category="'cfmPtEteSEEnd'" @selected-task="selectEnd" class="w-1/2" />
+      <ActRadio :title="'Start'" :select="isSubmitCfmPtEteSE?.[0].task" :data="cfmPtEteSEStartData" :category="'cfmPtEteSEStart'" @selected-task="selectStart" class="w-1/2" />
+      <ActRadio :title="'End'" :select="isSubmitCfmPtEteSE?.[1].task" :data="cfmPtEteSEEndData" :category="'cfmPtEteSEEnd'" @selected-task="selectEnd" class="w-1/2" />
     </div>
-    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From'" :title="'From'" :select="'protimeFromRadio'" :data="cfmPtPStartData" :category="'cfmPtPStart'"/>
-    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'To'" :title="'To'" :select="'protimeToRadio'" :data="cfmPtPEndData" :category="'cfmPtPEnd'"/>
+    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From'" :title="'From'" :select="isSubmitCfmPtPStart?.[0].task" :data="cfmPtPStartData" :category="'cfmPtPStart'"/>
+    <ActRadio v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'To'" :title="'To'" :select="isSubmitCfmPtPEnd?.[0].task" :data="cfmPtPEndData" :category="'cfmPtPEnd'"/>
     <div v-if="selectedRuleType === 'Processing time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From & To'" class="flex justify-between items-center w-full h-full">
-      <ActRadio :title="'From'" :select="'protimeFromAndToRadioFrom'" :data="cfmPtPSEStartData" class="w-1/2" :category="'cfmPtPSEStart'" @selected-task="selectStart" />
-      <ActRadio :title="'To'" :select="'protimeFromAndToRadioTo'" :data="cfmPtPSEEndData" class="w-1/2" :category="'cfmPtPSEEnd'" @selected-task="selectEnd" />
+      <ActRadio :title="'From'" :select="isSubmitCfmPtPSE?.[0].task" :data="cfmPtPSEStartData" class="w-1/2" :category="'cfmPtPSEStart'" @selected-task="selectStart" />
+      <ActRadio :title="'To'" :select="isSubmitCfmPtPSE?.[1].task" :data="cfmPtPSEEndData" class="w-1/2" :category="'cfmPtPSEEnd'" @selected-task="selectEnd" />
     </div>
     <!-- Waiting time -->
-    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :title="'Start'" :select="'waittimeStartRadio'" :data="cfmWtEteStartData" :category="'cfmWtEteStart'"/>
-    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :title="'End'" :select="'waittimeEndRadio'" :data="cfmWtEteEndData" :category="'cfmWtEteEnd'"/>
+    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :title="'Start'" :select="isSubmitCfmWtEteStart?.[0].task" :data="cfmWtEteStartData" :category="'cfmWtEteStart'"/>
+    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :title="'End'" :select="isSubmitCfmWtEteEnd?.[0].task" :data="cfmWtEteEndData" :category="'cfmWtEteEnd'"/>
     <div v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start & End'" class="flex justify-between items-center w-full h-full">
-      <ActRadio :title="'Start'" :select="'waittimeStartAndEndRadioStart'" :data="cfmWtEteSEStartData" class="w-1/2" :category="'cfmWtEteSEStart'" @selected-task="selectStart" />
-      <ActRadio :title="'End'" :select="'waittimeStartAndEndRadioEnd'" :data="cfmWtEteSEEndData" class="w-1/2" :category="'cfmWtEteSEEnd'" @selected-task="selectEnd" />
+      <ActRadio :title="'Start'" :select="isSubmitCfmWtEteSE?.[0].task" :data="cfmWtEteSEStartData" class="w-1/2" :category="'cfmWtEteSEStart'" @selected-task="selectStart" />
+      <ActRadio :title="'End'" :select="isSubmitCfmWtEteSE?.[1].task" :data="cfmWtEteSEEndData" class="w-1/2" :category="'cfmWtEteSEEnd'" @selected-task="selectEnd" />
     </div>
-    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From'" :title="'From'" :select="'waittimeFromRadio'" :data="cfmWtPStartData" :category="'cfmWtPStart'"/>
-    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'To'" :title="'To'" :select="'waittimeToRadio'" :data="cfmWtPEndData" :category="'cfmWtPEnd'"/>
+    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From'" :title="'From'" :select="isSubmitCfmWtPStart?.[0].task" :data="cfmWtPStartData" :category="'cfmWtPStart'"/>
+    <ActRadio v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'To'" :title="'To'" :select="isSubmitCfmWtPEnd?.[0].task" :data="cfmWtPEndData" :category="'cfmWtPEnd'"/>
     <div v-if="selectedRuleType === 'Waiting time' && selectedProcessScope === 'Partial' && selectedActSeqFromTo === 'From & To'" class="flex justify-between items-center w-full h-full">
-      <ActRadio :title="'From'" :select="'waittimeFromAndToRadioFrom'" :data="cfmWtPSEStartData" class="w-1/2" :category="'cfmWtPSEStart'" @selected-task="selectStart" />
-      <ActRadio :title="'To'" :select="'waittimeFromAndToRadioTo'" :data="cfmWtPSEEndData" class="w-1/2" :category="'cfmWtPSEEnd'" @selected-task="selectEnd" />
+      <ActRadio :title="'From'" :select="isSubmitCfmWtPSE?.[0].task" :data="cfmWtPSEStartData" class="w-1/2" :category="'cfmWtPSEStart'" @selected-task="selectStart" />
+      <ActRadio :title="'To'" :select="isSubmitCfmWtPSE?.[1].task" :data="cfmWtPSEEndData" class="w-1/2" :category="'cfmWtPSEEnd'" @selected-task="selectEnd" />
     </div>
     <!-- Cycle time -->
-    <ActRadio v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :title="'Start'" :select="'cyctimeStartRadio'" :data="cfmCtEteStartData" :category="'cfmCtEteStart'"/>
-    <ActRadio v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :title="'End'" :select="'cyctimeEndRadio'" :data="cfmCtEteEndData" :category="'cfmCtEteEnd'"/>
+    <ActRadio v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start'" :title="'Start'" :select="isSubmitCfmCtEteStart?.[0].task" :data="cfmCtEteStartData" :category="'cfmCtEteStart'"/>
+    <ActRadio v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'End'" :title="'End'" :select="isSubmitCfmCtEteEnd?.[0].task" :data="cfmCtEteEndData" :category="'cfmCtEteEnd'"/>
     <div v-if="selectedRuleType === 'Cycle time' && selectedProcessScope === 'End to end' && selectedActSeqMore === 'Start & End'" class="flex justify-between items-center w-full h-full">
-      <ActRadio :title="'Start'" :select="'cyctimeStartAndEndRadioStart'" :data="cfmCtEteSEStartData" class="w-1/2" :category="'cfmCtEteSEStart'" @selected-task="selectStart" />
-      <ActRadio :title="'End'" :select="'cyctimeStartAndEndRadioEnd'" :data="cfmCtEteSEEndData" class="w-1/2" :category="'cfmCtEteSEEnd'" @selected-task="selectEnd" />
+      <ActRadio :title="'Start'" :select="isSubmitCfmCtEteSE?.[0].task" :data="cfmCtEteSEStartData" class="w-1/2" :category="'cfmCtEteSEStart'" @selected-task="selectStart" />
+      <ActRadio :title="'End'" :select="isSubmitCfmCtEteSE?.[1].task" :data="cfmCtEteSEEndData" class="w-1/2" :category="'cfmCtEteSEEnd'" @selected-task="selectEnd" />
     </div>
   </section>
 </template>
@@ -63,7 +63,7 @@ export default {
 
     return { isLoading, selectedRuleType, selectedActivitySequence, selectedMode, selectedProcessScope, selectedActSeqMore, selectedActSeqFromTo, conformanceTask, cfmSeqStart, cfmSeqEnd, cfmPtEteStart, cfmPtEteEnd, cfmPtEteSE, cfmPtPStart, cfmPtPEnd, cfmPtPSE, cfmWtEteStart, cfmWtEteEnd, cfmWtEteSE,  cfmWtPStart, cfmWtPEnd, cfmWtPSE, cfmCtEteStart, cfmCtEteEnd, cfmCtEteSE }
   },
-  props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq', 'isSubmitDurationData'],
+  props: ['isSubmit', 'isSubmitTask', 'isSubmitStartAndEnd', 'isSubmitListSeq', 'isSubmitDurationData', 'isSubmitCfmPtEteStart', 'isSubmitCfmPtEteEnd', 'isSubmitCfmPtEteSE', 'isSubmitCfmPtPStart', 'isSubmitCfmPtPEnd', 'isSubmitCfmPtPSE', 'isSubmitCfmWtEteStart', 'isSubmitCfmWtEteEnd', 'isSubmitCfmWtEteSE', 'isSubmitCfmWtPStart', 'isSubmitCfmWtPEnd', 'isSubmitCfmWtPSE', 'isSubmitCfmCtEteStart', 'isSubmitCfmCtEteEnd', 'isSubmitCfmCtEteSE'],
   components: {
     ActList,
     ActRadio,
diff --git a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue
index 444417e..7a8aac8 100644
--- a/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue
+++ b/src/components/Discover/Conformance/ConformanceSidebar/ConformanceTimeRange.vue
@@ -71,7 +71,6 @@ export default {
     minTotalSeconds(e) {
       this.timeRangeMin = e;
       this.$emit('min-total-seconds', e);
-      // console.log('min',e);
     },
     /**
      * get min total seconds
@@ -81,7 +80,6 @@ export default {
       this.timeRangeMax = e;
       this.updateMax = e;
       this.$emit('max-total-seconds', e);
-      // console.log('max',e);
     },
   },
 }