update

src/components/classRoomHelper/index.vue

@@ -53,11 +53,8 @@
         <el-popover
           placement="left"
           width="200"
-          trigger="hover"
-          :disabled="
-            !splitScreenData.isOpen ||
-              splitScreenData.uid != splitScreenData.myUid
-          "
+          trigger="manual"
+					v-model="showPopover"
         >
           <div class="ch_nav_box_topFixed_popover">
             <div
@@ -565,6 +562,19 @@ export default {
       }
     };
   },
+	computed:{
+		showPopover:{
+			get(){
+				// return this.Annot
+				return (this.splitScreenData.isOpen && this.splitScreenData.uid === this.splitScreenData.myUid);
+			},
+			set(newValue){
+				console.log(newValue)
+
+				// this.AnnotationCanvasShow = newValue
+			}
+		}
+	},
   mounted() {
     let setting = this.courseDetail.setting;
     if (setting) {

src/components/components/choseWorksDetailDialog.vue

@@ -18,6 +18,7 @@
                 :key="item.value"
                 :class="{ s_b_m_t_l_active: showType === item.value }"
                 @click="changeShowType(item.value)"
+								v-if="item.showType.includes(toolType)"
                 >{{ item.label }}</span
               >
             </div>
@@ -26,7 +27,7 @@
             </div>
           </div>
           <div class="s_b_m_bottom">
-            <div class="s_b_m_b_item" v-if="showType === 0">
+            <div class="s_b_m_b_item" v-if="showType === 0 && [45].includes(toolType)">
               <div class="s_b_m_b_i_main">
                 <div class="s_b_m_b_i_m_title" v-if="testData">
                   <div>
@@ -135,7 +136,7 @@
                 </div>
               </div>
             </div>
-            <div class="s_b_m_b_item" v-if="showType === 1">
+            <div class="s_b_m_b_item" v-if="showType === 1 && [45].includes(toolType)">
 
 							<div class="s_b_m_b_i_eChartsArea">
 								<div class="s_b_m_b_i_e_title">
@@ -207,7 +208,7 @@
                 </div>
               </div>
             </div>
-            <div class="s_b_m_b_item s_b_m_b_worksSubmit" v-if="showType === 2">
+            <div class="s_b_m_b_item s_b_m_b_worksSubmit" v-if="showType === 2 && [45].includes(toolType)">
               <div class="s_b_b_i_noSubmit">
                 <div class="s_b_b_i_ws_top">
                   <div class="s_b_b_i_ws_t_left">
@@ -348,7 +349,7 @@ export default {
       default: () => []
     },
     courseType: {
-      type: String,
+      type: String || Number,
       default: ""
     },
     taskCount: {
@@ -367,14 +368,15 @@ export default {
       toolIndex: null,
       worksStudent: [],
       noWorksStudent: [],
+			toolType:null,
       foldList: {
         noSubmit: false,
         worksPreview: false
       },
       dialogTypeList: [
-        { label: "作业详细", value: 0, loading: false },
-        { label: "题目统计", value: 1, loading: false },
-        { label: "学生统计", value: 2, loading: false }
+        { label: "作业详细", value: 0,showType:[45], loading: false },
+        { label: "题目统计", value: 1,showType:[45], loading: false },
+        { label: "学生统计", value: 2,showType:[45], loading: false }
       ],
 			statisticsTypeList:[
 				{label:"准确率",value:0},
@@ -608,6 +610,7 @@ export default {
       this.show = true;
       this.data = data;
       this.toolIndex = data.toolIndex;
+			this.toolType = data.toolType;
       this.setData();
     },
     setData() {
@@ -640,6 +643,7 @@ export default {
       this.noWorksStudent = [];
       this.toolIndex = null;
       this.testData = null;
+			this.toolType = null;
       this.foldList = {
         noSubmit: false,
         worksPreview: false
@@ -675,13 +679,15 @@ export default {
         }})
 		},
 		splitScreenFn(data){
-			console.log("splitScreenFn",data)
 			if(data.type!==undefined){
 				this.showType = data.type;
 			}
 			if(data.showStatisticsType!==undefined){
 				this.showStatisticsType = data.showStatisticsType;
 			}
+			if(data.toolType!==undefined){
+				this.toolType = data.toolType;
+			}
 		}
   }
 };

src/components/components/statisticalAnalysis.vue

@@ -12,7 +12,7 @@
       <div class="s_box">
         <div class="s_b_top">
           <div class="s_b_t_left">
-            <img src="../../assets/icon/thirdToolList/ask.png" slt="图片"/>
+            <img src="../../assets/icon/thirdToolList/ask.png" slt="图片" />
             <div class="s_b_t_l_detail">
               <div>{{ askData.title }}</div>
               <span>{{ askData.describe }}</span>
@@ -56,16 +56,19 @@
             >
           </div>
           <div class="s_b_b_right">
-						<div class=s_b_b_r_btnArea>
-							<div class="s_b_b_r_primaryBtn" @click="refresh">刷新</div>
-						</div>
+            <div class="s_b_b_r_btnArea">
+              <div class="s_b_b_r_primaryBtn" @click="refresh">刷新</div>
+            </div>
             <div class="s_b_b_r_item" v-if="showType === 0">
               <div class="itemBox">
                 <div class="ib_title">数据统计图</div>
-                <div class="ib_echarts" style="width:60%;height: 600px;min-width: 600px;">
+                <div
+                  class="ib_echarts"
+                  style="width:60%;height: 600px;min-width: 600px;"
+                >
                   <eChartsView
-										id="problemSituationData"
-                    v-if="problemSituationData.eChartsOption && show "
+                    id="problemSituationData"
+                    v-if="problemSituationData.eChartsOption && show"
                     :data="problemSituationData.eChartsOption"
                   />
                 </div>
@@ -109,9 +112,12 @@
             <div class="s_b_b_r_item" v-if="showType === 1">
               <div class="itemBox">
                 <div class="ib_title">数据统计图</div>
-                <div class="ib_echarts" style="width:60%;height: 600px;min-width: 600px;">
+                <div
+                  class="ib_echarts"
+                  style="width:60%;height: 600px;min-width: 600px;"
+                >
                   <eChartsView2
-										id="studentSummaryData"
+                    id="studentSummaryData"
                     v-if="studentSummary.eChartsOption && show"
                     :data="studentSummary.eChartsOption"
                   />
@@ -158,7 +164,7 @@
                 <div class="ib_title">数据统计图</div>
                 <div class="ib_echarts" style="width:800px;height: 600px">
                   <eChartsView3
-										id="classSummaryData"
+                    id="classSummaryData"
                     v-if="classSummary.eChartsOption && show"
                     :data="classSummary.eChartsOption"
                   />
@@ -212,6 +218,16 @@ import eChartsView from "./eChartsView.vue";
 import eChartsView2 from "./eChartsView.vue";
 import eChartsView3 from "./eChartsView.vue";
 export default {
+  props: {
+    courseType: {
+      type: String || Number,
+      default: ""
+    },
+    taskCount: {
+      type: Number,
+      default: 0
+    }
+  },
   components: {
     eChartsView,
     eChartsView2,
@@ -225,7 +241,7 @@ export default {
       tType: null,
       worksData: null,
       worksStudent: null,
-			toolIndex:null,
+      toolIndex: null,
       askData: {
         title: "",
         describe: ""
@@ -234,11 +250,11 @@ export default {
   },
   methods: {
     open(data) {
-			console.log(data)
+      console.log(data);
       this.show = true;
       this.data = data;
       this.worksStudent = data.worksStudent;
-			this.toolIndex = data.toolIndex;
+      this.toolIndex = data.toolIndex;
       if (data.worksStudent.length > 0) {
         let works = data.worksStudent[0].works
           ? JSON.parse(data.worksStudent[0].works)
@@ -257,13 +273,14 @@ export default {
     close() {
       this.show = false;
       this.init();
+			this.$emit("changeSplitScreenBehavior",{code:99})
     },
     init() {
       this.data = null;
       this.showType = 0;
       this.tType = null;
       this.worksData = null;
-			this.toolIndex = null;
+      this.toolIndex = null;
       this.askData = {
         title: "",
         describe: ""
@@ -271,7 +288,16 @@ export default {
     },
     changeShowType(type) {
       this.showType = type;
-			this.$forceUpdate()
+      this.$emit("changeSplitScreenBehavior", {
+        code: 2,
+        form: {
+          toolIndex: this.toolIndex,
+          courseType: this.courseType,
+          taskCount: this.taskCount,
+          type: this.showType
+        }
+      });
+      this.$forceUpdate();
     },
     indexMethod(index) {
       if (index === 0) {
@@ -280,14 +306,14 @@ export default {
         return index;
       }
     },
-		refresh(){
-			this.$emit("refresh",this.toolIndex)
-		},
-		refreshData(data){
-			console.log(data)
-			this.data = data;
+    refresh() {
+      this.$emit("refresh", this.toolIndex);
+    },
+    refreshData(data) {
+      console.log(data);
+      this.data = data;
       this.worksStudent = data.worksStudent;
-			this.toolIndex = data.toolIndex;
+      this.toolIndex = data.toolIndex;
       if (data.worksStudent.length > 0) {
         let works = data.worksStudent[0].works
           ? JSON.parse(data.worksStudent[0].works)
@@ -302,7 +328,14 @@ export default {
       } else {
         this.worksData = [];
       }
-		},
+    },
+    splitScreenFn(data) {
+			console.log("👇👇")
+			console.log(data)
+      if (data.type !== undefined) {
+        this.showType = data.type;
+      }
+    }
   },
   computed: {
     // 题目情况
@@ -617,16 +650,13 @@ export default {
 
       result.tableData.unshift(totalData);
 
-
-			totalData.options.forEach((item,index)=>{
-				let obj = {
-					value:item,
-					name:`选项${index+1}`
-				}
-				result.eChartsOption.series[0].data.push(obj)
-			})
-			
-			
+      totalData.options.forEach((item, index) => {
+        let obj = {
+          value: item,
+          name: `选项${index + 1}`
+        };
+        result.eChartsOption.series[0].data.push(obj);
+      });
 
       return result;
     }
@@ -760,31 +790,30 @@ export default {
 .s_b_b_right {
   width: calc(100% - 300px);
   height: 100%;
-	position: relative;
+  position: relative;
 }
 
-.s_b_b_r_btnArea{
-	width: auto;
-	height: auto;
-	position: absolute;
-	right: 30px;
-	top: 30px;
+.s_b_b_r_btnArea {
+  width: auto;
+  height: auto;
+  position: absolute;
+  right: 30px;
+  top: 30px;
 }
 
-.s_b_b_r_primaryBtn{
-	width: auto;
-	height: auto;
-	background-color: #007AFF;
-	
-	color: #fff;
-	font-size: 16px;
-	padding: 10px 30px;
-	border-radius: 25px;
-	cursor: pointer;
-	box-shadow: 0px 2px 5px 0px #1D398314;
+.s_b_b_r_primaryBtn {
+  width: auto;
+  height: auto;
+  background-color: #007aff;
 
-box-shadow: 0.5px 0.5px 10px 2px #1D39830D;
+  color: #fff;
+  font-size: 16px;
+  padding: 10px 30px;
+  border-radius: 25px;
+  cursor: pointer;
+  box-shadow: 0px 2px 5px 0px #1d398314;
 
+  box-shadow: 0.5px 0.5px 10px 2px #1d39830d;
 }
 
 .s_b_b_r_item {

src/components/easy2/studyStudent.vue

@@ -13188,7 +13188,7 @@
                 'https://view.officeapps.live.com/op/view.aspx?src='
               ) != -1
           "
-          style="width: 95%; margin: 0 auto"
+          style="width: 100%;height:100%; margin: 0 auto"
         >
           <iframe
             style="width: 100%; height: 100%; border: none"
@@ -13212,6 +13212,7 @@
           v-if="fulltype == 1"
           style="
             box-shadow: 0 0 6px 1px #f2f2f2;
+						height:100%;
             width: 100%;
             background: #f1f1f1;
           "
@@ -15405,10 +15406,7 @@
       </div>
       <div>{{ TxtMd }}</div>
     </el-dialog>
-    <statisticalAnalysis
-      ref="statisticalAnalysisRef"
-      @refresh="statisticalAnalysisRefresh"
-    />
+    <statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh"  @changeSplitScreenBehavior="changeSplitScreenBehavior"  :courseType="courseType" :taskCount="taskCount"/>
     <choseWorksDetailDialog
       ref="choseWorksDetailDialogRef"
       :worksStudentData="this.worksStudent"
@@ -24475,12 +24473,14 @@ export default {
     },
     openChoseWorksDetailDialog(tooC, toolIndex, taskCount) {
       this.$refs.choseWorksDetailDialogRef.open({
+				toolType:45,
         tType: this.tType,
         toolIndex: toolIndex
       });
       this.changeSplitScreenBehavior({
         code: 1,
         form: {
+					toolType:45,
           toolIndex: toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
@@ -24493,6 +24493,16 @@ export default {
         worksStudent: this.worksStudent[toolIndex],
         tType: this.tType,
         toolIndex: toolIndex
+      });
+			this.changeSplitScreenBehavior({
+        code: 2,
+        form: {
+					toolType:4,
+					courseType: this.courseType,
+          taskCount: this.taskCount,
+          toolIndex: toolIndex,
+          type: 0
+        }
       });
     },
     statisticalAnalysisRefresh(toolIndex) {
@@ -24609,25 +24619,38 @@ export default {
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
+						if(this.$refs.statisticalAnalysisRef.show){
+							this.$refs.statisticalAnalysisRef.close();
+						}
           } else if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form[0], behavior.form[1]);
           } else if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
-						if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
+            if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
 							this.courseType = behavior.form.courseType;
             	this.taskCount = behavior.form.taskCount;
 						}
             this.$nextTick(() => {
-              if (this.$refs.choseWorksDetailDialogRef.show) {
+							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
               }
             });
-          }
+          }else if(behavior.code === 2){
+						if(this.$refs.statisticalAnalysisRef.show){
+							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
+						}else{
+							this.$refs.statisticalAnalysisRef.open({
+      				  worksStudent: this.worksStudent[behavior.form.toolIndex],
+      				  tType: this.tType,
+      				  toolIndex: behavior.form.toolIndex
+      				});
+						}
+					}
         } else {
         }
       }

src/components/easy3/studyStudent.vue

@@ -10008,7 +10008,7 @@
               'https://view.officeapps.live.com/op/view.aspx?src='
             ) != -1
           "
-          style="width: 95%; margin: 0 auto"
+          style="width: 100%;height:100%; margin: 0 auto"
         >
           <iframe
             style="width: 100%; height: 100%; border: none"
@@ -10032,6 +10032,7 @@
           v-if="fulltype == 1"
           style="
             box-shadow: 0 0 6px 1px #f2f2f2;
+						height:100%;
             width: 100%;
             background: #f1f1f1;
           "
@@ -11952,7 +11953,7 @@
     :scoreDetail="scoreDetail"
     @selectSWorks="selectSWorks" 
     @selectStudent="selectStudent"></checkEnglishVoice>
-		<statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh"/>
+		<statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh"  @changeSplitScreenBehavior="changeSplitScreenBehavior"  :courseType="courseType" :taskCount="taskCount"/>
 		<choseWorksDetailDialog
       ref="choseWorksDetailDialogRef"
       :worksStudentData="this.worksStudent"
@@ -20100,17 +20101,16 @@ export default {
 		setClassRoomHelperWidth(width){
       this.classRoomHelperWidth = width
     },
-		openStatisticalAnalysis(tooC,toolIndex,taskCount){
-			this.$refs.statisticalAnalysisRef.open({worksStudent:this.worksStudent[toolIndex],tType:this.tType,toolIndex:toolIndex})
-		},
-    openChoseWorksDetailDialog(tooC, toolIndex, taskCount) {
+		openChoseWorksDetailDialog(tooC, toolIndex, taskCount) {
       this.$refs.choseWorksDetailDialogRef.open({
+				toolType:45,
         tType: this.tType,
         toolIndex: toolIndex
       });
       this.changeSplitScreenBehavior({
         code: 1,
         form: {
+					toolType:45,
           toolIndex: toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
@@ -20123,6 +20123,16 @@ export default {
         worksStudent: this.worksStudent[toolIndex],
         tType: this.tType,
         toolIndex: toolIndex
+      });
+			this.changeSplitScreenBehavior({
+        code: 2,
+        form: {
+					toolType:4,
+					courseType: this.courseType,
+          taskCount: this.taskCount,
+          toolIndex: toolIndex,
+          type: 0
+        }
       });
     },
     statisticalAnalysisRefresh(toolIndex) {
@@ -20239,6 +20249,9 @@ export default {
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
+						if(this.$refs.statisticalAnalysisRef.show){
+							this.$refs.statisticalAnalysisRef.close();
+						}
           } else if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form[0], behavior.form[1]);
@@ -20250,14 +20263,24 @@ export default {
             	this.taskCount = behavior.form.taskCount;
 						}
             this.$nextTick(() => {
-              if (this.$refs.choseWorksDetailDialogRef.show) {
+							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
               }
             });
-          }
+          }else if(behavior.code === 2){
+						if(this.$refs.statisticalAnalysisRef.show){
+							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
+						}else{
+							this.$refs.statisticalAnalysisRef.open({
+      				  worksStudent: this.worksStudent[behavior.form.toolIndex],
+      				  tType: this.tType,
+      				  toolIndex: behavior.form.toolIndex
+      				});
+						}
+					}
         } else {
         }
       }

src/components/studyStudent.vue

@@ -9954,7 +9954,7 @@
               'https://view.officeapps.live.com/op/view.aspx?src='
             ) != -1
           "
-          style="width: 95%; margin: 0 auto"
+          style="width: 100%;height:100%; margin: 0 auto"
         >
           <iframe
             style="width: 100%; height: 100%; border: none"
@@ -9979,6 +9979,7 @@
           style="
             box-shadow: 0 0 6px 1px #f2f2f2;
             width: 100%;
+						height:100%;
             background: #f1f1f1;
           "
         >
@@ -11894,7 +11895,7 @@
     :scoreDetail="scoreDetail"
     @selectSWorks="selectSWorks" 
     @selectStudent="selectStudent"></checkEnglishVoice>
-		<statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh"/>
+		<statisticalAnalysis ref="statisticalAnalysisRef" @refresh="statisticalAnalysisRefresh"  @changeSplitScreenBehavior="changeSplitScreenBehavior"  :courseType="courseType" :taskCount="taskCount"/>
 		<choseWorksDetailDialog
       ref="choseWorksDetailDialogRef"
       :worksStudentData="this.worksStudent"
@@ -20090,17 +20091,16 @@ export default {
     setClassRoomHelperWidth(width){
       this.classRoomHelperWidth = width
     },
-		openStatisticalAnalysis(tooC,toolIndex,taskCount){
-			this.$refs.statisticalAnalysisRef.open({worksStudent:this.worksStudent[toolIndex],tType:this.tType,toolIndex:toolIndex})
-		},
-    openChoseWorksDetailDialog(tooC, toolIndex, taskCount) {
+		openChoseWorksDetailDialog(tooC, toolIndex, taskCount) {
       this.$refs.choseWorksDetailDialogRef.open({
+				toolType:45,
         tType: this.tType,
         toolIndex: toolIndex
       });
       this.changeSplitScreenBehavior({
         code: 1,
         form: {
+					toolType:45,
           toolIndex: toolIndex,
           courseType: this.courseType,
           taskCount: this.taskCount,
@@ -20113,6 +20113,16 @@ export default {
         worksStudent: this.worksStudent[toolIndex],
         tType: this.tType,
         toolIndex: toolIndex
+      });
+			this.changeSplitScreenBehavior({
+        code: 2,
+        form: {
+					toolType:4,
+					courseType: this.courseType,
+          taskCount: this.taskCount,
+          toolIndex: toolIndex,
+          type: 0
+        }
       });
     },
     statisticalAnalysisRefresh(toolIndex) {
@@ -20229,26 +20239,38 @@ export default {
 						if(this.$refs.choseWorksDetailDialogRef.show){
 							this.$refs.choseWorksDetailDialogRef.close();
 						}
+						if(this.$refs.statisticalAnalysisRef.show){
+							this.$refs.statisticalAnalysisRef.close();
+						}
           } else if (behavior.code === 0) {
             //开启内容列表弹窗
             this.checkFileFull1(behavior.form[0], behavior.form[1]);
           } else if (behavior.code === 1) {
             //关于选择题的作业详细的操作
             // toolIndex:toolIndex,courseType:this.courseType,taskCount:this.taskCount,type:0
-						if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
+            if(this.courseType!==behavior.form.courseType || this.taskCount!==behavior.form.taskCount){
 							this.courseType = behavior.form.courseType;
             	this.taskCount = behavior.form.taskCount;
 						}
-            
             this.$nextTick(() => {
-              if (this.$refs.choseWorksDetailDialogRef.show) {
+							if (this.$refs.choseWorksDetailDialogRef.show) {
                 //已经打开了
-								this.$refs.choseWorksDetailDialogRef.splitScreenFn({type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
+								this.$refs.choseWorksDetailDialogRef.splitScreenFn({toolType:behavior.form.toolType,type:behavior.form.type,showStatisticsType:behavior.form.showStatisticsType})
               } else {
-								this.$refs.choseWorksDetailDialogRef.open({toolIndex:behavior.form.toolIndex,tType: this.tType,})
+								this.$refs.choseWorksDetailDialogRef.open({toolType:behavior.form.toolType,toolIndex:behavior.form.toolIndex,tType: this.tType,})
               }
             });
-          }
+          }else if(behavior.code === 2){
+						if(this.$refs.statisticalAnalysisRef.show){
+							this.$refs.statisticalAnalysisRef.splitScreenFn({type:behavior.form.type})
+						}else{
+							this.$refs.statisticalAnalysisRef.open({
+      				  worksStudent: this.worksStudent[behavior.form.toolIndex],
+      				  tType: this.tType,
+      				  toolIndex: behavior.form.toolIndex
+      				});
+						}
+					}
         } else {
         }
       }