From fb1011cc487aef51229badc7ca52fb87a0ca7366 Mon Sep 17 00:00:00 2001
From: unknown <1371033826@qq.com>
Date: Tue, 26 Nov 2024 00:33:19 +0800
Subject: [PATCH] ejs-new

---
 ejs/data.ejs     |  1 -
 ejs/index.ejs    | 50 ++++++++++++++++++++++++++++++++++++++++++++++--
 ejs/manage.ejs   | 33 --------------------------------
 ejs/observe.ejs  |  2 --
 ejs/projects.ejs |  3 +--
 5 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/ejs/data.ejs b/ejs/data.ejs
index f80e163..c78fa87 100644
--- a/ejs/data.ejs
+++ b/ejs/data.ejs
@@ -25,7 +25,6 @@
     <script src="js/echarts.min.js"></script>
     <script src="js/jquery.easyui.min.js"></script>
     <script src="js/mqtt.min.js"></script>
-    <script src="js/gauge.min.js"></script>
     <link rel="stylesheet" href="css/dataTables.bootstrap4.min.css">
     <link rel="stylesheet" href="css/flatpkr.css">
     <script src="js/jquery.dataTables.min.js"></script>
diff --git a/ejs/index.ejs b/ejs/index.ejs
index 3509030..dc359ac 100644
--- a/ejs/index.ejs
+++ b/ejs/index.ejs
@@ -109,8 +109,53 @@
                                         <div class="text-center" style="margin-bottom:10px;padding-left: 5px;padding-right: 5px;" id="documentation_text">
                                             <a class="btn btn-light btn-icon-split" href="https://blog.csdn.net/fengydongdong/article/details/136017627?ops_request_misc=%257B%2522request%255Fid%2522%253A%2522170697370916800182197281%2522%252C%2522scm%2522%253A%252220140713.130102334.pc%255Fall.%2522%257D&request_id=170697370916800182197281&biz_id=0&utm_medium=distribute.pc_search_result.none-task-blog-2~all~first_rank_ecpm_v1~rank_v31_ecpm-1-136017627-null-null.142^v99^pc_search_result_base3&utm_term=MixIO%E8%AF%A6%E7%BB%86%E6%95%99%E7%A8%8BMixly%E5%9B%BE%E5%BD%A2%E5%8C%96%E7%BC%96%E7%A8%8B%E9%BD%90%E6%8A%A4%E6%9C%BA%E5%99%A8%E4%BA%BAArduino%E4%B8%8EMicropython%20%E7%89%A9%E8%81%94%E7%BD%91%E5%B9%B3%E5%8F%B0&spm=1018.2226.3001.4187"><span class="icon"><i class="fa fa-compass" style="margin-top:5px;width:1rem;height:1rem"></i></span><span class="text lang" style="margin-top:1px" key="GUIDE">入门指南</span></a>
                                         </div>
-                                        <div class="text-center" style="margin-bottom:10px;padding-left: 5px;padding-right: 5px;" id="android_text">
-                                            <a class="btn btn-light btn-icon-split" href="android"><span class="icon"><i class="fa fa-android" style="margin-top:5px;width:1rem;height:1rem"></i></span><span class="text lang" style="margin-top:1px" key="ANDROID">安卓微端</span></a>
+                                        <style>
+                                            #question_text{
+                position:relative;
+                animation:mymove 3s infinite;
+                -webkit-animation:mymove 3s infinite; /*Safari and Chrome*/
+                animation-direction:alternate;/*轮流反向播放动画。*/
+                animation-timing-function: ease-in-out; /*动画的速度曲线*/
+                /* Safari 和 Chrome */
+                -webkit-animation:mymove 5s infinite;
+                -webkit-animation-direction:alternate;/*轮流反向播放动画。*/
+                -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
+            }
+            @keyframes mymove
+            {
+                0%{
+                transform: scale(1);  /*开始为原始大小*/
+                }
+                25%{
+                    transform: scale(1.2); /*放大1.1倍*/
+                }
+                50%{
+                    transform: scale(1);
+                }
+                75%{
+                    transform: scale(1.2);
+                }
+
+            }
+            
+            @-webkit-keyframes mymove /*Safari and Chrome*/
+            {
+                0%{
+                transform: scale(1);  /*开始为原始大小*/
+                }
+                25%{
+                    transform: scale(1.2); /*放大1.1倍*/
+                }
+                50%{
+                    transform: scale(1);
+                }
+                75%{
+                    transform: scale(1.2);
+                }
+            }
+                                        </style>
+                                        <div class="text-center" style="margin-bottom:10px;padding-left: 5px;padding-right: 5px;" id="question_text">
+                                            <a class="btn btn-light btn-icon-split" target="_blank" title="进入页面后先登录并加入课程，再重新点击一次此链接" href="https://cmooc.bnu.edu.cn/cMOOC/theme?courseId=1847259373622644736&themeId=1849313704267784192"><span class="icon"><i class="fa fa-pencil" style="margin-top:5px;width:1rem;height:1rem"></i></span><span class="text" style="margin-top:1px">需求调研</span></a>
                                         </div>
                                     </div>
                                 </div>
@@ -127,6 +172,7 @@
     </div>
     </div>
     <footer id="footer" style="height:40px;font-size:0.8rem;text-align:center">
+            <a href="https://beian.miit.gov.cn/">京ICP备13037033号-1</a>&nbsp;
         <% if (mixly) { %>
             <a href="/mixly">Mixly Lite</a>&nbsp;
         <% } %>
diff --git a/ejs/manage.ejs b/ejs/manage.ejs
index 594b9b9..d508581 100644
--- a/ejs/manage.ejs
+++ b/ejs/manage.ejs
@@ -178,30 +178,6 @@
                                                 <input type="number" id="MIXIO_HTTPS_PORT">
                                             </td>
                                         </tr>
-                                        <tr>
-                                            <td>
-                                                <span>MQTT 端口：</span>
-                                            </td>
-                                            <td>
-                                                <input type="number" id="MIXIO_MQTT_PORT">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <span>WS 端口：</span>
-                                            </td>
-                                            <td>
-                                                <input type="number" id="MIXIO_WS_PORT">
-                                            </td>
-                                        </tr>
-                                        <tr>
-                                            <td>
-                                                <span>WSS 端口：</span>
-                                            </td>
-                                            <td>
-                                                <input type="number" id="MIXIO_WSS_PORT">
-                                            </td>
-                                        </tr>
                                         <tr>
                                             <td>
                                                 <span>SSL证书私钥：</span>
@@ -341,9 +317,6 @@
         }, 1000);
         var MIXIO_HTTP_PORT = "<%=configs["MIXIO_HTTP_PORT"]%>"
         var MIXIO_HTTPS_PORT = "<%=configs["MIXIO_HTTPS_PORT"]%>"
-        var MIXIO_MQTT_PORT = "<%=configs["MIXIO_MQTT_PORT"]%>"
-        var MIXIO_WS_PORT = "<%=configs["MIXIO_WS_PORT"]%>"
-        var MIXIO_WSS_PORT = "<%=configs["MIXIO_WSS_PORT"]%>"
         var HTTPS_PRIVATE_PEM = "<%=configs["HTTPS_PRIVATE_PEM"]%>"
         var HTTPS_CRT_FILE = "<%=configs["HTTPS_CRT_FILE"]%>"
         var MAX_PROJECT_NUM_PER_USER = "<%=configs["MAX_PROJECT_NUM_PER_USER"]%>"
@@ -371,9 +344,6 @@
         var loadConfig = function(){
             $("#MIXIO_HTTP_PORT").val(MIXIO_HTTP_PORT)
             $("#MIXIO_HTTPS_PORT").val(MIXIO_HTTPS_PORT)
-            $("#MIXIO_MQTT_PORT").val(MIXIO_MQTT_PORT)
-            $("#MIXIO_WS_PORT").val(MIXIO_WS_PORT)
-            $("#MIXIO_WSS_PORT").val(MIXIO_WSS_PORT)
             $("#HTTPS_PRIVATE_PEM").val(HTTPS_PRIVATE_PEM)
             $("#HTTPS_CRT_FILE").val(HTTPS_CRT_FILE)
             $("#ALLOW_REGISTER").prop("checked",ALLOW_REGISTER)
@@ -405,9 +375,6 @@
             configs = {}
             configs["MIXIO_HTTP_PORT"] = parseInt($("#MIXIO_HTTP_PORT").val())
             configs["MIXIO_HTTPS_PORT"] = parseInt($("#MIXIO_HTTPS_PORT").val())
-            configs["MIXIO_MQTT_PORT"] = parseInt($("#MIXIO_MQTT_PORT").val())
-            configs["MIXIO_WS_PORT"] = parseInt($("#MIXIO_WS_PORT").val())
-            configs["MIXIO_WSS_PORT"] = parseInt($("#MIXIO_WSS_PORT").val())
             configs["HTTPS_PRIVATE_PEM"] = $("#HTTPS_PRIVATE_PEM").val()
             configs["HTTPS_CRT_FILE"] = $("#HTTPS_CRT_FILE").val()
             configs["MAX_PROJECT_NUM_PER_USER"] = parseInt($("#MAX_PROJECT_NUM_PER_USER").val())
diff --git a/ejs/observe.ejs b/ejs/observe.ejs
index c5f77eb..d837eeb 100644
--- a/ejs/observe.ejs
+++ b/ejs/observe.ejs
@@ -30,8 +30,6 @@
     <script src="js/widgets.js"></script>
     <script>var OFFLINE_MODE = <%=configs['OFFLINE_MODE']%></script>
     <script>var BAIDU_MAP_AK = '<%=configs['BAIDU_MAP_AK']%>'</script>
-    <script>var MIXIO_WS_PORT = '<%=configs['MIXIO_WS_PORT']%>'</script>
-    <script>var MIXIO_WSS_PORT = '<%=configs['MIXIO_WSS_PORT']%>'</script>
     <script src="js/MixIO.js?v=4"></script>
     <script src="js/observe.js?v=10"></script>
 </head>
diff --git a/ejs/projects.ejs b/ejs/projects.ejs
index 7f45ad6..0b482a0 100644
--- a/ejs/projects.ejs
+++ b/ejs/projects.ejs
@@ -15,6 +15,7 @@
     <script src="js/faceapi.min.js"></script>
     <script src="js/lang.js?v=5"></script>
     <script src="js/farbtastic.js"></script>
+    <script src="js/jsqr.js"></script>
     <script src="js/bootstrap.bundle.min.js"></script>
     <script src="js/jquery.easing.min.js"></script>
     <script src="js/echarts.min.js"></script>
@@ -39,8 +40,6 @@
     <script>var OFFLINE_MODE = <%=configs['OFFLINE_MODE']%></script>
     <script>var MAX_PROJECT_NUM_PER_USER = <%=configs['MAX_PROJECT_NUM_PER_USER']%></script>
     <script>var BAIDU_MAP_AK = '<%=configs['BAIDU_MAP_AK']%>'</script>
-    <script>var MIXIO_WS_PORT = '<%=configs['MIXIO_WS_PORT']%>'</script>
-    <script>var MIXIO_WSS_PORT = '<%=configs['MIXIO_WSS_PORT']%>'</script>
     <script src="js/projects.js?v=273"></script>
     <script src="js/MixIO.js?v=30"></script>
     <style>