Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/cocoroboBlockly

src/components/blockly.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="ablockly">
+    <el-button type="primary" @click="go" class="btnPosition">下一步</el-button>
     <div id="blocklyDiv"></div>
     <xml id="toolbox" style="display: none">
       <category name="逻辑" colour="%{BKY_LOGIC_HUE}">
@@ -28,6 +29,13 @@
   width: 100%;
   height: 100%;
 }
+
+.btnPosition {
+  position: fixed;
+  right: 130px;
+  bottom: 35px;
+  z-index: 999999;
+}
 </style>
 
 
@@ -56,7 +64,7 @@ Vue.config.ignoredElements.push("mutation");
 export default {
   data() {
     return {
-      that: this
+      that: this,
     };
   },
 
@@ -80,7 +88,11 @@ export default {
     // 清空工作区
     clearBlockData() {
       this.workspace.clear();
-    }
+    },
+    //下一步
+    go() {
+      this.$router.push("./function?isCamera=" + false);
+    },
   },
 
   mounted() {
@@ -92,13 +104,13 @@ export default {
       //媒体资源
       media: "../assets/img/",
       //垃圾桶
-      trashcan: true
+      trashcan: true,
     });
     //工作区监听代码生成器
     this.workspace.addChangeListener(this.myUpdateFunction);
 
     Blockly.Blocks["iot_lcd_screeninit"] = {
-      init: function() {
+      init: function () {
         this.appendDummyInput().appendField(
           new Blockly.FieldImage(
             require("../assets/img/screen_init_header.png"),
@@ -113,16 +125,16 @@ export default {
         this.setColour("#5cb2d6");
         this.setTooltip("");
         this.setHelpUrl("");
-      }
+      },
     };
 
-    Blockly.JavaScript.iot_lcd_screeninit = function(block) {
+    Blockly.JavaScript.iot_lcd_screeninit = function (block) {
       var _code = "";
       return _code;
     };
 
     Blockly.Blocks["iot_lcd_faceinit"] = {
-      init: function() {
+      init: function () {
         this.appendDummyInput().appendField(
           new Blockly.FieldImage(
             require("../assets/img/face_recognition_header.png"),
@@ -137,13 +149,13 @@ export default {
         this.setColour("#ee783a");
         this.setTooltip("");
         this.setHelpUrl("");
-      }
+      },
     };
 
-    Blockly.JavaScript.iot_lcd_faceinit = function(block) {
+    Blockly.JavaScript.iot_lcd_faceinit = function (block) {
       var _code = "";
       return _code;
     };
-  }
+  },
 };
 </script>

src/components/function.vue

@@ -23,7 +23,7 @@
         <div class="cameraBtn">
           <el-button size="mini" type="primary" @click="callCamera" v-if="!isCamera">开启摄像头</el-button>
           <el-button size="mini" type="primary" @click="closeCamera" v-else>关闭摄像头</el-button>
-          <el-button size="mini" type="primary" @click="photograph">确认保存</el-button>
+          <el-button size="mini" type="primary" @click="photograph" v-if="isCamera">确认保存</el-button>
         </div>
         <!--确认-->
         <div>
@@ -36,20 +36,6 @@
 </template>
 <script>
 export default {
-  mounted() {
-    var _s3 = document.createElement("script");
-    _s3.src = "/static/materialize/jquery-2.1.3.min.js";
-    _s3.type = "text/javascript";
-    document.head.appendChild(_s3);
-    var _s2 = document.createElement("script");
-    _s2.src = "/static/camera.283d5d54.js";
-    _s2.type = "text/javascript";
-    document.head.appendChild(_s2);
-    var _s1 = document.createElement("script");
-    _s1.src = "/static/bundle.js";
-    _s1.type = "text/javascript";
-    document.head.appendChild(_s1);
-  },
   data() {
     return {
       that: this,
@@ -122,6 +108,23 @@ export default {
       this.$refs["video"].srcObject = null;
       this.isCamera = false;
     }
+  },
+  mounted() {
+    var _s3 = document.createElement("script");
+    _s3.src = "/static/materialize/jquery-2.1.3.min.js";
+    _s3.type = "text/javascript";
+    document.head.appendChild(_s3);
+    var _s2 = document.createElement("script");
+    _s2.src = "/static/camera.283d5d54.js";
+    _s2.type = "text/javascript";
+    document.head.appendChild(_s2);
+    var _s1 = document.createElement("script");
+    _s1.src = "/static/bundle.js";
+    _s1.type = "text/javascript";
+    document.head.appendChild(_s1);
+    if (this.$route.query.isCamera) {
+      this.$message.error("摄像头开启失败，请检查摄像头是否可用！");
+    }
   }
 };
 </script>