Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/xjc-integratedmachine/common/ai/TouchColorCanvas.vue

package.json

@@ -26,6 +26,7 @@
     "fabric": "^6.7.0",
     "file-saver": "2.0.5",
     "fuse.js": "6.6.2",
+    "html2canvas": "^1.4.1",
     "js-beautify": "1.14.11",
     "js-cookie": "3.0.5",
     "jsencrypt": "3.3.2",

src/views/xjc-integratedmachine/common/ai/TestColorCanvas.vue

@@ -10,6 +10,7 @@
         </div>
     </div>
 </template>
+
 <script setup>
     import {onMounted} from 'vue'
     import * as echarts from "echarts";
@@ -248,6 +249,11 @@
         changes();
         drawBackground();
     });
+
+    function save() {
+
+    }
+
 </script>
 
 <style scoped>
@@ -255,4 +261,4 @@
         width: 500px;
         height: 400px;
     }
-</style>
+</style>

src/views/xjc-integratedmachine/wakeup/rainbow/index.vue

@@ -525,6 +525,8 @@
     //编辑和保存
     function save() {
         status.value = 'save'
+        //保存
+
     }
 
     function edit() {