diff --git a/src/iscs/mouseController.js b/src/iscs/mouseController.js
index 1a7c6bc13..90b205894 100644
--- a/src/iscs/mouseController.js
+++ b/src/iscs/mouseController.js
@@ -86,7 +86,8 @@ class MouseController extends Eventful {
     mousedown(e) {
         e.event.preventDefault();
         e.event.stopPropagation();
-        const em = new EventModel(e);
+		const em = new EventModel(e);
+		this.$zr.dom.focus();
         this.eventTarget = em.eventTarget;
         this._offsetX = e.offsetX;
         this._offsetY = e.offsetY;
diff --git a/src/jmap/mouseController.js b/src/jmap/mouseController.js
index f73ee90d0..a3262fbd7 100644
--- a/src/jmap/mouseController.js
+++ b/src/jmap/mouseController.js
@@ -84,7 +84,9 @@ class MouseController extends Eventful {
     mousedown(e) {
         // if (eventTool.notLeftMouse(e)) {
         //     return;
-        // }
+		// }
+
+		this.$zr.dom.focus();
         if (e.which == 1 || e.which == 3) {
             var x = e.offsetX;
             var y = e.offsetY;
diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js
index 07e93027a..4b7918e82 100644
--- a/src/jmapNew/mouseController.js
+++ b/src/jmapNew/mouseController.js
@@ -85,7 +85,8 @@ class MouseController extends Eventful {
     mousedown(e) {
         // if (eventTool.notLeftMouse(e)) {
         //     return;
-        // }
+		// }
+		this.$zr.dom.focus();
         if (e.which == 1 || e.which == 3) {
             var x = e.offsetX;
             var y = e.offsetY;
diff --git a/src/views/iscs/iscsDraw/iscsFireAlarm/index.vue b/src/views/iscs/iscsDraw/iscsFireAlarm/index.vue
index fc4fdc6d4..eebe71a46 100644
--- a/src/views/iscs/iscsDraw/iscsFireAlarm/index.vue
+++ b/src/views/iscs/iscsDraw/iscsFireAlarm/index.vue
@@ -41,6 +41,30 @@
               @createDataModel="createDataModel"
               @deleteDataModel="deleteDataModel"
             />
+          </el-tab-pane>
+		  <el-tab-pane label="圆形" name="IscsCircle">
+            <iscs-circle
+              ref="iscsCircle"
+              style="width: 100%;height: 100%;"
+              @createDataModel="createDataModel"
+              @deleteDataModel="deleteDataModel"
+            />
+          </el-tab-pane>
+     	  <el-tab-pane label="三角形" name="IscsTriangle">
+            <iscs-triangle
+              ref="iscsTriangle"
+              style="width: 100%;height: 100%;"
+              @createDataModel="createDataModel"
+              @deleteDataModel="deleteDataModel"
+            />
+          </el-tab-pane>
+		  <el-tab-pane label="表格" name="StateTable">
+            <state-table
+              ref="stateTable"
+              style="width: 100%;height: 100%;"
+              @createDataModel="createDataModel"
+              @deleteDataModel="deleteDataModel"
+            />
           </el-tab-pane>
         </el-tabs>
       </el-card>
@@ -53,6 +77,10 @@ import IscsLine from '../icscComponents/line';
 import IscsText from '../icscComponents/text';
 import IscsRect from '../icscComponents/rect';
 import IscsButton from '../icscComponents/button';
+import IscsCircle from '../icscComponents/circle';
+import IscsTriangle from '../icscComponents/triangle';
+import StateTable from '../icscComponents/stateTable';
+
 
 export default {
     name: 'IscsOperate',
@@ -60,7 +88,10 @@ export default {
         IscsRect,
         IscsLine,
         IscsText,
-        IscsButton
+		IscsButton,
+		IscsCircle,
+		IscsTriangle,
+		StateTable
     },
     mixins: [
     ],