Merge branch 'master' of http://101.43.129.26:10880/psychological_camera/RZGY

package.json

@@ -1,6 +1,6 @@
 {
   "name": "projectGy",
-  "version": "1.1.7",
+  "version": "1.1.8",
   "author": "北京决明科技有限公司",
   "description": "",
   "license": null,

src/main/index.js

@@ -55,11 +55,11 @@ let loadingWindow
 //设置访问路径
 //打包访问的路径
 
-// let serveUrl = "./resources/exe"
-// let serveUrlJar = '\\resources\\exe'
+let serveUrl = "./resources/exe"
+let serveUrlJar = '\\resources\\exe'
 //本地访问的路径
-let serveUrl = "./exe"
-let serveUrlJar = '\\exe'
+// let serveUrl = "./exe"
+// let serveUrlJar = '\\exe'
 /**
  * Set `__static` path to static files in production
  * https://simulatedgreg.gitbooks.io/electron-vue/content/en/using-static-assets.html

src/renderer/components/AnimationDes.vue

@@ -145,8 +145,8 @@ export default {
       widthIframe: 900,
       heightIframe: 600,
       // this.urlThreeP = "../../../static/BuildFlower/index.html";
-      urlThreeP: "../../../static/candle/index.html",
-      //urlThreeP: __static + "/candle/index.html",
+      // urlThreeP: "../../../static/candle/index.html",
+      urlThreeP: __static + "/candle/index.html",
       flag: 1,
       //游戏场景
       gameScene: 1,
@@ -281,30 +281,6 @@ export default {
       }
       flagAnimation = false;
     });
-    //设置定时器每秒定时器
-    // setInterval(() => {
-    //   //当按钮开始时需要发送信息到
-    //   //当按钮处于结束状态时
-    //   if (that.buttonFlag == "结束") {
-    //     //当前设备是选择的哪一个
-    //     //如果选择的是脑电时
-    //     //判断脑电是否连接
-    //     //如果脑电连接则发送send(0)
-    //     if (that.equipment == 1) {
-    //       if (that.eleFlag == "未连接") {
-    //         if (that.gameValue != 0) {
-    //           that.send(0);
-    //         }
-    //       }
-    //     } else {
-    //       if (that.pulseFlag == "未连接") {
-    //         if (that.gameValue != 0) {
-    //           that.send(0);
-    //         }
-    //       }
-    //     }
-    //   }
-    // }, 1000);
     setTimeout(() => {
       that.getSize();
     }, 5000);
@@ -343,7 +319,7 @@ export default {
           this.meditationData.push(arg["_c"].get("Meditation"));
           this.meditationDataAll.push(arg["_c"].get("Meditation"));
           if (this.meditationData.length > ll) {
-            this.attentionData.shift();
+            this.meditationData.shift();
           }
           this.thetaData.push(arg["_c"].get("Theta"));
           this.thetaDataAll.push(arg["_c"].get("Theta"));
@@ -676,38 +652,38 @@ export default {
       this.clearDataFun();
       switch (val) {
         case 1:
-          this.urlThreeP = "../../../static/candle/index.html";
-          //this.urlThreeP = __static + "/candle/index.html";
+          // this.urlThreeP = "../../../static/candle/index.html";
+          this.urlThreeP = __static + "/candle/index.html";
           this.delayTime();
           break;
         case 2:
-          this.urlThreeP = "../../../static/flower/index.html";
-          //this.urlThreeP = __static + "/flower/index.html";
+          // this.urlThreeP = "../../../static/flower/index.html";
+          this.urlThreeP = __static + "/flower/index.html";
           this.delayTime();
           break;
         case 3:
-          this.urlThreeP = "../../../static/car/index.html";
-          //this.urlThreeP = __static + "/car/index.html";
+          // this.urlThreeP = "../../../static/car/index.html";
+          this.urlThreeP = __static + "/car/index.html";
           this.delayTime();
           break;
         case 4:
-          this.urlThreeP = "../../../static/baobaotong/index.html";
-          //this.urlThreeP = __static + "/baobaotong/index.html";
+          // this.urlThreeP = "../../../static/baobaotong/index.html";
+          this.urlThreeP = __static + "/baobaotong/index.html";
           this.delayTime();
           break;
         case 5:
-          this.urlThreeP = "../../../static/bomb/index.html";
-          //this.urlThreeP = __static + "/bomb/index.html";
+          // this.urlThreeP = "../../../static/bomb/index.html";
+          this.urlThreeP = __static + "/bomb/index.html";
           this.delayTime();
           break;
         case 6:
-          this.urlThreeP = "../../../static/piaofuqiu/index.html";
-          //this.urlThreeP = __static + "/piaofuqiu/index.html";
+          // this.urlThreeP = "../../../static/piaofuqiu/index.html";
+          this.urlThreeP = __static + "/piaofuqiu/index.html";
           this.delayTime();
           break;
         default:
-          this.urlThreeP = "../../../static/candle/index.html";
-        //this.urlThreeP = __static + "/candle/index.html";
+          // this.urlThreeP = "../../../static/candle/index.html";
+        this.urlThreeP = __static + "/candle/index.html";
       }
       this.gameScene = val;
       this.flag = this.gameScene;

src/renderer/components/HealthKnowledge.vue

@@ -148,10 +148,10 @@ export default {
   //页面初始化函数
   created() {},
   mounted() {
-    // this.baseUrlTT =
-    //   sessionStorage.getItem("urlNews") + "\\resources\\exe\\healthKnowledge\\";
     this.baseUrlTT =
-      sessionStorage.getItem("urlNews") + "\\exe\\healthKnowledge\\";
+      sessionStorage.getItem("urlNews") + "\\resources\\exe\\healthKnowledge\\";
+    // this.baseUrlTT =
+    //   sessionStorage.getItem("urlNews") + "\\exe\\healthKnowledge\\";
 
     //读取文件列表的方法
     this.readFileList();

src/renderer/components/TopPage.vue

@@ -106,9 +106,9 @@
             本计算机程序受著作权法和国际公约的保护，未经授权擅自复制或传播本程序的部分或全部，
             可能受到严厉的民事及刑事制裁，并将在法律许可的范围内受到最大可能的起诉.
           </p>
-          <p><span>Version:</span> 1.1.7</p>
+          <p><span>Version:</span> 1.1.8</p>
           <p><span>Build:</span>#880f93eb23</p>
-           <p><span>Build on:</span>2023/8/24</p>
+           <p><span>Build on:</span>2023/10/27</p>
           <p><span>Windows:</span>{{ windowsVersion }}</p>
         </el-col>
       </el-row>

src/utils/public.css

@@ -140,7 +140,7 @@
 .xl_animation_button:focus {
     background: #1FD18E;
     opacity: 1;
-    border-radius: 18px;
+    border-radius: 8px;
     border: 1px solid #1FD18E;
     color: #ffffff;
     /* border-radius: 18px; */
@@ -154,7 +154,7 @@
 .xl_animation_button:hover {
     background: #1FD18E;
     opacity: 1;
-    border-radius: 18px;
+    border-radius: 8px;
     border: 1px solid #1FD18E;
     color: #ffffff;
     /* border-radius: 18px; */