Browse Source

'版本号'

plg 11 months ago
parent
commit
9c5e44d4c2
4 changed files with 175 additions and 244 deletions
  1. 1 1
      .electron-vue/dev-runner.js
  2. 5 0
      .vscode/extensions.json
  3. 8 7
      src/main/index.js
  4. 161 236
      src/renderer/components/AnimationDes.vue

+ 1 - 1
.electron-vue/dev-runner.js

@@ -74,7 +74,7 @@ function startRenderer () {
       }
     )
 
-    server.listen(9080)
+    server.listen(9085)
   })
 }
 

+ 5 - 0
.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "ms-ceintl.vscode-language-pack-zh-hans"
+    ]
+}

+ 8 - 7
src/main/index.js

@@ -58,11 +58,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
@@ -70,9 +70,9 @@ let serveUrlJar = '\\resources\\exe'
 if (process.env.NODE_ENV !== 'development') {
   global.__static = require('path').join(__dirname, '/static').replace(/\\/g, '\\\\')
 }
-
-const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9080` : `file://${__dirname}/index.html`
-
+// process.env["ELECTRON_DISABLE_SECURITY_WARNINGS"] = "true";
+const winURL = process.env.NODE_ENV === 'development' ? `http://localhost:9085` : `file://${__dirname}/index.html`
+//const winURL = process.env.NODE_ENV === 'development' ? `https://www.baidu.com` : `file://${__dirname}/index.html`
 const loadingURL =
   process.env.NODE_ENV === "development" //加载loading.html页面地址
     ? require("path").join(__static, "loading.html")
@@ -89,6 +89,7 @@ function createLoadingWindow() {   //加载页面窗口
     transparent: false,
     maximizable: false,  //禁止双击放大
     frame: false,  // 去掉顶部操作栏
+    // allowRunningInsecureContent:true,
     webPreferences: {
       contextIsolation: false, // 设置此项为false后,才可在渲染进程中使用electron api
       nodeIntegration: true

+ 161 - 236
src/renderer/components/AnimationDes.vue

@@ -14,123 +14,52 @@
       <el-col :span="22">
         <div class="select_class_animation">
           <span class="desSty">选择设备</span>&nbsp;
-          <el-select
-            v-model="equipment"
-            placeholder="请选择"
-            class="selectSty"
-            size="medium"
-            @change="equipmentFun"
-          >
-            <el-option
-              class="select_option"
-              v-for="item in optionsEquipment"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="equipment" placeholder="请选择" class="selectSty" size="medium" @change="equipmentFun">
+            <el-option class="select_option" v-for="item in optionsEquipment" :key="item.value" :label="item.label"
+              :value="item.value">
             </el-option>
           </el-select>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <span class="desSty">游戏难度</span>&nbsp;
-          <el-select
-            v-model="gameDifficulty"
-            placeholder="请选择"
-            class="selectSty"
-            size="medium"
-            @change="gameDiffFun"
-          >
-            <el-option
-              v-for="item in difficultyOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="gameDifficulty" placeholder="请选择" class="selectSty" size="medium" @change="gameDiffFun">
+            <el-option v-for="item in difficultyOptions" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <span class="desSty">游戏时间</span>&nbsp;
-          <el-select
-            v-model="gameTime"
-            placeholder="请选择"
-            class="selectSty"
-            size="medium"
-            @change="gameTimeFun"
-          >
-            <el-option
-              v-for="item in timeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+          <el-select v-model="gameTime" placeholder="请选择" class="selectSty" size="medium" @change="gameTimeFun">
+            <el-option v-for="item in timeOptions" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <div class="equipment_status">
-            <span
-              class="desSty"
-              v-show="linkStatus"
-              :style="{ color: linkStatus ? '#0FB577' : '#000000' }"
-              >设备已连接:</span
-            >
+            <span class="desSty" v-show="linkStatus"
+              :style="{ color: linkStatus ? '#0FB577' : '#000000' }">设备已连接:</span>
             <span class="desSty" v-show="!linkStatus">设备未连接:</span>
-            <img
-              v-show="!linkStatus"
-              @click="openTableFun"
-              style="width: 14px; height: 20px; color: #ffffff"
-              src="../assets/newAnimation/lanya.png"
-            />
-            <img
-              v-show="linkStatus"
-              @click="openTableFun"
-              style="width: 14px; height: 20px; color: #ffffff"
-              src="../assets/newAnimation/lanyaActive.png"
-            />
+            <img v-show="!linkStatus" @click="openTableFun" style="width: 14px; height: 20px; color: #ffffff"
+              src="../assets/newAnimation/lanya.png" />
+            <img v-show="linkStatus" @click="openTableFun" style="width: 14px; height: 20px; color: #ffffff"
+              src="../assets/newAnimation/lanyaActive.png" />
           </div>
           &nbsp;&nbsp;&nbsp;&nbsp;
-          <span
-            class="desSty"
-            @click="viewEchartsFun"
-            :style="{ color: linkStatus ? '#0FB577' : '#000000' }"
-            >查看波形图</span
-          >
+          <span class="desSty" @click="viewEchartsFun"
+            :style="{ color: linkStatus ? '#0FB577' : '#000000' }">查看波形图</span>
           &nbsp;&nbsp;&nbsp;&nbsp;
-          <span
-            style="font-size: 12px"
-            v-show="equipment == '2' && pulseTimeNum < 180 && pulseTimeNum > 0"
-            >还剩{{ timeShow }}开始</span
-          >
-          <span
-            style="font-size: 12px"
-            v-show="buttonFlag == '结束' && gameTimeTimerFlag"
-            >{{ timeShow }}</span
-          >
+          <span style="font-size: 12px" v-show="equipment == '2' && pulseTimeNum < 180 && pulseTimeNum > 0">还剩{{
+      timeShow }}开始</span>
+          <span style="font-size: 12px" v-show="buttonFlag == '结束' && gameTimeTimerFlag">{{ timeShow }}</span>
           <div class="animation-middle-m">&nbsp;</div>
-          <el-button
-            @click="startTest"
-            size="small"
-            class="xl_animation_button"
-            style="float: right; font-size: 12px"
-            >{{ buttonFlag }}</el-button
-          >
+          <el-button @click="startTest" size="small" class="xl_animation_button"
+            style="float: right; font-size: 12px">{{ buttonFlag }}</el-button>
         </div>
-        <el-button @click="send"></el-button>
+        <!-- <el-button @click="send"></el-button> -->
         <el-row> </el-row>
         <el-row> </el-row>
         <el-row>
           <el-col :span="24">
-            <div
-              class="flood-plan-page"
-              ref="animationFlow"
-              style="display: block; height: 72vh; margin-top: 10px"
-            >
-              <iframe
-                scrolling="no"
-                :src="urlThreeP"
-                ref="unityIframe"
-                frameborder="0"
-                :width="widthIframe"
-                :height="heightIframe"
-              >
+            <div class="flood-plan-page" ref="animationFlow" style="display: block; height: 72vh; margin-top: 10px">
+              <iframe scrolling="no" :src="urlThreeP" ref="unityIframe" frameborder="0" :width="widthIframe"
+                :height="heightIframe">
               </iframe>
             </div>
           </el-col>
@@ -141,23 +70,14 @@
 
     <el-dialog title="提示" :visible.sync="tableVisible" width="60%" center>
       <span>
-        <el-table
-          :data="mergeData"
-          style="width: 100%; height: 400px"
-          :header-cell-style="{
-            background: '#66B497',
-            color: '#FFFFFF',
-            'letter-spacing': '4px',
-          }"
-        >
-          <el-table-column prop="rssi" align="center" label="信号强度">
+        <el-table :data="mergeData" style="width: 100%; height: 400px" :header-cell-style="{
+      background: '#66B497',
+      color: '#FFFFFF',
+      'letter-spacing': '4px',
+    }">
+          <el-table-column prop="rssi" align="center" label="信号强度" :formatter="rssiFor">
           </el-table-column>
-          <el-table-column
-            prop="deviceType"
-            align="center"
-            label="类型"
-            :formatter="typeFormatter"
-          >
+          <el-table-column prop="deviceType" align="center" label="类型" :formatter="typeFormatter">
           </el-table-column>
           <!-- <el-table-column
                 prop="Name"
@@ -173,33 +93,19 @@
 
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
-              <el-button
-                :disabled="buttonLinkFlag"
-                class="xl_d_button"
-                size="mini"
-                slot="reference"
-                @click="linkJudge(scope.$index, scope.row, scope.row.connect)"
-              >
-                <span v-if="scope.row.connect">断开连接</span
-                ><span v-if="!scope.row.connect">连接</span></el-button
-              >
+              <el-button :disabled="buttonLinkFlag" class="xl_d_button" size="mini" slot="reference"
+                @click="linkJudge(scope.$index, scope.row, scope.row.connect)">
+                <span v-if="scope.row.connect">断开连接</span><span v-if="!scope.row.connect">连接</span></el-button>
             </template>
           </el-table-column>
         </el-table>
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="tableVisible = false">取 消</el-button>
-        <el-button type="primary" @click="tableVisible = false"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="tableVisible = false">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="查看波形图"
-      :visible.sync="echartsVisible"
-      width="90%"
-      center
-    >
+    <el-dialog title="查看波形图" :visible.sync="echartsVisible" width="90%" center>
       <span>
         <div class="outPage" v-show="equipment == '1'">
           <div id="eegOne" class="naoOneClass"></div>
@@ -216,9 +122,7 @@
       </span>
       <span slot="footer" class="dialog-footer">
         <el-button @click="echartsVisible = false">取 消</el-button>
-        <el-button type="primary" @click="echartsVisible = false"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="echartsVisible = false">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -474,7 +378,6 @@ export default {
     //   console.log(that.$route.query.gameType);
     // }, 3000);
     that.singleFlag = that.$route.query.single;
-    console.log(that.singleFlag);
 
     ipcRenderer.on("accelerationData-message", this.acceptNao);
     this.initWebsocket();
@@ -492,24 +395,26 @@ export default {
   beforeDestroy() {
     //关闭扫描
     this.closeScan();
-  },
-  destroyed() {
+
     clearTimeout(this.mergeTimeFlag);
     clearTimeout(this.disabledTimeFlag);
     clearInterval(this.timeSendFlag);
     clearInterval(this.listTimeFlag);
-    console.log(ipcRenderer);
     this.websock.close(1000);
     ipcRenderer.removeListener("accelerationData-message", this.acceptNao);
     //清除特定的监听的ipcRenderer
     //ipcRenderer
     this.disconnectDevice();
   },
+  destroyed() { },
   methods: {
+    rssiFor(val) {
+      if (val == 0) {
+        return "";
+      }
+    },
     //合并数据
     mergeDataFun() {
-      console.log(this.scanData);
-      console.log(this.connectedData);
       let that = this;
 
       //先选出扫描列表
@@ -588,8 +493,6 @@ export default {
       //然后合并两个数组
 
       let listFin = list.concat(listBarring);
-      console.log("合并后的数据组");
-      console.log(listFin);
       //判断当前选择的是脑电还是心电
       let currentDeviceList = [];
       if (this.equipment == "1") {
@@ -615,7 +518,6 @@ export default {
         }
       }
       //将数组其他选项
-      // console.log(listFin);
 
       this.mergeData = currentDeviceList;
     },
@@ -645,8 +547,6 @@ export default {
             if (this.noiseData.length > ll) {
               this.noiseData.shift();
             }
-            // console.log(arg["_c"].get("Attention") / 100);
-            // console.log(Math.random() * 10);
             if (
               this.equipment == 1 &&
               this.linkStatus &&
@@ -657,14 +557,11 @@ export default {
 
             //先设为随机数
 
-            // this.send(Math.random()*10)
-            // console.log(arg["_c"].get("Attention")/100)
             this.attentionData.push(arg["_c"].get("Attention"));
             this.attentionDataAll.push(arg["_c"].get("Attention"));
             if (this.attentionData.length > ll) {
               this.attentionData.shift();
             }
-            console.log(this.attentionDataAll.length);
             this.meditationData.push(arg["_c"].get("Meditation"));
             this.meditationDataAll.push(arg["_c"].get("Meditation"));
             if (this.meditationData.length > ll) {
@@ -712,7 +609,6 @@ export default {
             }
             // this.numEleDom = this.focusNaoAll.length.toString();
             if (this.echartsVisible) {
-              // console.log(this.attentionDataAll.length);
               this.renderEegOne();
               this.renderEegTwo();
               this.renderEegThree();
@@ -773,7 +669,6 @@ export default {
     //进行解析脑电数据
 
     linkFun(index, val) {
-      console.log(val);
       let that = this;
       that.buttonLinkFlag = true;
       that.$http.postTmp(
@@ -786,6 +681,7 @@ export default {
         (res) => {
           that.disableStatus();
           if (res.data.code == 200) {
+            // that.linkStatus = false;
             // this.linkIndex = index;
             //如果是脑电的话直接调用打开数据接口
             //如果是心电需要先调用写入输入数据-发送指令接口
@@ -835,7 +731,7 @@ export default {
       let that = this;
       this.disabledTimeFlag = setTimeout(() => {
         this.buttonLinkFlag = false;
-      }, 1500);
+      }, 3000);
     },
     //断开连接的脑电
     disconnectEquipment(val) {
@@ -843,18 +739,7 @@ export default {
       that.buttonLinkFlag = true;
       that.$http.postTmp(`v2/device/dis/conn`, { mac: val.mac }, (res) => {
         that.disableStatus();
-        debugger;
-        if (res.code == 200) {
-          //关闭连接的时候看是不是当前绑定的mac与用户的mac是否相同
-          //如果相同则  连接标志变为false;
-          //如果不同则不变
-          if (that.userLink.mac == val.mac) {
-            that.linkStatus = false;
-            that.userLink.mac = "";
-          }
-          //打开数据接口
-          // that.tableData = res.data;
-          // that.totolSize = res.data.totalElements;
+        if (res.data.code == 200) {
         } else {
           this.$message.error(res.message);
         }
@@ -864,12 +749,10 @@ export default {
     connectList() {
       let that = this;
       that.$http.getTmp(`v2/device/connected/list`, {}, (res) => {
-        // console.log(res)
         //判断当前的列表是否存在该用户已点击的列表
       });
     },
     typeFormatter(val) {
-      // console.log(val.deviceType)
       if (val.type == "1") {
         return "心电";
       } else {
@@ -890,7 +773,7 @@ export default {
       } else {
         filter_name = 1;
       }
-      that.$http.getTmp(`/v2/device/scan`, {}, (res) => {});
+      that.$http.getTmp(`/v2/device/scan`, {}, (res) => { });
     },
 
     //关闭扫描
@@ -902,7 +785,7 @@ export default {
       } else {
         filter_name = 1;
       }
-      that.$http.getTmp(`/v2/device/scan`, {}, (res) => {});
+      that.$http.getTmp(`/v2/device/scan`, {}, (res) => { });
     },
     //进来后先连接websocket
     //连上后进行扫描
@@ -936,25 +819,31 @@ export default {
       let that = this;
       //数据接收
       const redata = JSON.parse(e.data);
-      console.log(redata);
+      // console.log(redata);
+      // if(redata.content == "设备连接成功"){
+      //   console.log(redata);
+      // }
+      // if(redata.content == "设备连接失败"){
+      //   console.log(redata);
+      // }
+
       if (
         redata.content != "开启扫描成功" &&
         redata.content != "设置过滤成功" &&
         redata.content != "Successful connection to socket service" &&
         redata.content != "关闭扫描成功" &&
         redata.content != "设置UUID成功" &&
-        redata.content != "设备连接成功"
+        // redata.content != "设备连接成功" &&
+        redata.content !== "成功"
+        //redata.content != "设备连接失败"
       ) {
         //首先判断是否redata.content是否是未定义
-        // console.log(redata.content)
         if (redata.hasOwnProperty("content")) {
           if (redata.content != "") {
             let dataLin = JSON.parse(redata.content);
 
             if (redata.msgType == "device") {
               // let dataLin = JSON.parse(redata.content);
-              console.log("-------------");
-              console.log(dataLin);
               let a = {
                 mac: dataLin.m,
                 name: dataLin.n,
@@ -968,8 +857,7 @@ export default {
             } else if (redata.msgType == "eegData") {
               // let dataLin = JSON.parse(redata.content);
               // console.log(dataLin);
-              console.log("11111111111111111111");
-              console.log(dataLin.value);
+
               ///先判断第一个用户是否有mac---有mac代表已连接
               if (that.userLink.mac !== "" && that.userLink.mac == dataLin.id) {
                 ipcRenderer.send("asynchronoushrv-naoData", {
@@ -1016,6 +904,7 @@ export default {
             } else if (redata.msgType == "connectedList") {
               //数组储存每次返回的已选列表
               //将每次的数据进行储存,然后经过去重及为已选列表的数据
+
               let obj = {
                 mac: dataLin.m,
                 name: dataLin.n,
@@ -1037,7 +926,7 @@ export default {
               for (let i = 0; i < list.length; i++) {
                 let flag = false;
                 for (let j = 0; j < listBarring.length; j++) {
-                  if (list[i].mac == list[j].mac) {
+                  if (list[i].mac == listBarring[j].mac) {
                     flag = true;
                   }
                 }
@@ -1045,9 +934,80 @@ export default {
                   listBarring.push(list[i]);
                 }
               }
+              that.isSelectedList = JSON.parse(JSON.stringify(listBarring));
               that.connectedData = JSON.parse(JSON.stringify(listBarring));
-              console.log(that.connectedData);
+
+
+              //   that.userLink.mac
+              //当已连接设备列表包含当前mac是则为连接状态
+
+              if (that.userLink.mac !== '') {
+                let listStatus = JSON.parse(JSON.stringify(that.isSelectedList));
+                for (let k = 0; k < listStatus.length; k++) {
+                  if (listStatus[k].mac == that.userLink.mac) {
+                    that.linkStatus = true;
+                  }
+                }
+              } else {
+                that.linkStatus = false;
+              }
+
+
+
+              // that.linkStatus = true;
               //listBarring  将值赋值给已选列表的值
+              //判断当前是脑电吗
+            } else if (redata.msgType == "disConnect") {
+              console.log("------------------------------------");
+              console.log(dataLin);
+              let mac = dataLin.m
+              let list = JSON.parse(JSON.stringify(that.connectedData));
+              let list1 = [];
+              for (let i = 0; i < list.length; i++) {
+                if (list[i].mac != mac) {
+                  list1.push(list[i]);
+                }
+              }
+              that.connectedData = JSON.parse(JSON.stringify(list1));
+
+              let listLin = JSON.parse(JSON.stringify(that.isSelectedList));
+              let listLin1 = [];
+              for (let i = 0; i < listLin.length; i++) {
+                if (listLin[i].mac != mac) {
+                  listLin1.push(list[i]);
+                }
+              }
+              that.isSelectedList = JSON.parse(JSON.stringify(listLin1));
+
+              console.log("断开连接后已选列表进行变化");
+              console.log(that.connectedData);
+              if (that.userLink.mac == mac) {
+                that.linkStatus = false;
+                that.userLink.mac = "";
+              }
+            } else if (redata.msgType == "connect") {
+              console.log(redata);
+              //设备正在等待
+              //设备连接成功
+              if (redata.state == "SUCCESS") {
+                //具体有个字段表示是成功还是失败
+
+                //这个设备连接失败时触发的条件
+                if (redata.cmd == 'DISCONNECT') {
+
+                }
+                //这个设备成功时触发的条件
+                if (redata.cmd == 'CONNECT') {
+
+                }
+
+              }
+              //设备连接失败
+              //设别可能被占用时触发的条件
+              if (redata.state == "REFUSE") {
+
+              }
+
             }
           }
         }
@@ -1086,7 +1046,6 @@ export default {
       // console.log(JSON.stringify(newArr));
       //listTmp即使最大扫描列表
       that.scanData = newArr;
-      console.log(that.scanData);
     },
     websocketclose(e) {
       if (e.code == 1005) {
@@ -1164,62 +1123,26 @@ export default {
       //如果未连接则提示连接设备
       //先判断脑电
       this.clearDataFun();
-      this.send(0);
+
       //   this.userLink.linkStatus = false;
       //   this.userTwoLink.linkStatus = false;
       this.resetData();
       this.disconnectDevice();
+      //只要切换类型就断开
+      this.userLink.mac = '';
+      this.linkStatus = false;
+      this.send(0);
       //结束测试
     },
     //断开所有设备的操作
     disconnectDevice() {
       let that = this;
-      that.$http.getTmp(`v1/device/connected`, {}, (res) => {
-        // console.log(res)
-        //判断当前的列表是否存在该用户已点击的列表
-        if (res.code == 200) {
-          if (res.data) {
-            if (res.data) {
-              let list = [];
-              for (let i = 0; i < res.data.length; i++) {
-                let obj = {
-                  rssi: "",
-                  name: "",
-                  mac: "",
-                  connect: false,
-                  deviceType: "",
-                };
-                obj.rssi = "";
-                obj.name = res.data[i].Name;
-                obj.mac = res.data[i].MAC;
-                obj.connect = true;
-                obj.deviceType = res.data[i].DeviceType;
-                obj.userNum = "";
-                list.push(obj);
-              }
-              that.connectedData = list;
-              // console.log(list);
-              if (list.length == 0) {
-                //表示未连接
-                that.userLink.linkStatus = false;
-              } else {
-                //标识已连接
-                for (let k = 0; k < list.length; k++) {
-                  //调用断开设备的方法
-                  that.disconnectEquipment(list[k]);
-                }
-              }
-            }
-          } else {
-            that.connectedData = [];
-          }
-          //打开数据接口
-          // that.tableData = res.data;
-          // that.totolSize = res.data.totalElements;
-        } else {
-          // this.$message.error("访问服务器失败!");
-        }
-      });
+      //获取到当前已连接的列表
+      let list = JSON.parse(JSON.stringify(this.connectedData));
+      console.log(list);
+      for (let i = 0; i < list.length; i++) {
+        that.disconnectEquipment(list[i]);
+      }
     },
     //需要先判断代码是否点击开始测试按钮了
     //如果点击开始测试按钮了//才能发送信号到游戏
@@ -1246,7 +1169,6 @@ export default {
       }, 1000);
     },
     getGameSence(val) {
-      console.log(val);
       let gameName = "";
       switch (val) {
         case "1":
@@ -1270,7 +1192,6 @@ export default {
         default:
           break;
       }
-      console.log(gameName);
       return gameName;
     },
     //获取游戏难度
@@ -1517,7 +1438,7 @@ export default {
       console.log(params);
       console.log("游戏和数据保存");
     },
-    setUrl() {},
+    setUrl() { },
     getSize() {
       let width = this.$refs.animationFlow.clientWidth;
       let height = this.$refs.animationFlow.clientHeight - 20;
@@ -1623,10 +1544,6 @@ export default {
         dataEcgFin.push(dataEcg[i] - min);
       }
 
-      // console.log(dataEcg)
-      // console.log(Math.max(...dataEcg));
-      // console.log(Math.min(...dataEcg));
-
       this.optionEcg = {
         animation: false,
         title: {
@@ -1655,9 +1572,6 @@ export default {
             axisLabel: {
               interval: 99,
               formatter: function (value, index) {
-                // console.log(value);
-                // console.log(index);
-
                 let a = parseInt(value);
                 // a = Math.round(a / 120);
 
@@ -2222,7 +2136,6 @@ export default {
               interval: 512,
               formatter: function (value, index) {
                 // 当当前value除以1000为整数是
-                // console.log(value);
                 // 将value转化为int类型
                 let a = parseInt(value);
                 a = Math.round(a / 512);
@@ -2270,16 +2183,19 @@ export default {
   flex-direction: row;
   align-items: center;
 }
+
 .main_right_height {
   height: 100vh !important;
   display: block !important;
   overflow-y: auto !important;
   background: #ffffff;
 }
+
 canvas {
   /* width: 100%;
   height: 100%; */
 }
+
 .main-unity {
   margin-top: 10px;
 }
@@ -2288,46 +2204,55 @@ canvas {
 .footer {
   text-align: center;
 }
+
 .fullscreen {
   margin-top: 25px !important;
 
   text-align: center !important;
   display: none !important;
 }
+
 .musicTitle {
   display: block;
   font-size: 18px;
   color: #57acbb;
   margin-bottom: 5px;
 }
+
 .flood-plan-page {
   /* margin-top:20px; */
 }
+
 .selectSty {
   width: 100px;
   font-size: 14px;
 }
+
 .desSty {
   font-size: 12px;
   font-family: Source Han Sans CN-Regular, Source Han Sans CN;
   font-weight: 500;
   /* color: #0f0f0f; */
 }
-.animation_fk {
-}
+
+.animation_fk {}
+
 .select_option {
   font-size: 10px;
 }
+
 .select_class_animation {
   display: flex;
   flex-direction: row;
   align-items: center;
 }
+
 .animation-middle-m {
   display: flex;
   flex-direction: row;
   flex: 1;
 }
+
 .naoOneClass {
   width: 100%;
   height: 30vh;