修改设备备注

src/main/index.js

@@ -63,11 +63,11 @@ let jar_time = null;
 //设置访问路径
 //打包访问的路径
 
-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

@@ -176,6 +176,13 @@
             :formatter="rssiFor"
           >
           </el-table-column>
+          <el-table-column
+            prop="aliasName"
+            align="center"
+            label="名称"
+         
+          >
+          </el-table-column>
           <el-table-column
             prop="deviceType"
             align="center"
@@ -730,6 +737,7 @@ export default {
       for (let i = 0; i < scanDataTmpFin.length; i++) {
         let obj = {
           rssi: "",
+          aliasName:'',
           name: "",
           mac: "",
           connect: false,
@@ -738,6 +746,7 @@ export default {
           at: "",
         };
         obj.rssi = scanDataTmpFin[i].rssi;
+        obj.aliasName = scanDataTmpFin[i].aliasName;
         obj.name = scanDataTmpFin[i].name;
         obj.mac = scanDataTmpFin[i].mac;
         obj.connect = false;
@@ -1118,6 +1127,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
+                aliasName:dataLin.aliasName,
                 ai: dataLin.ai,
                 at: dataLin.at,
                 type: dataLin.t, //当type为1时为心电
@@ -1183,6 +1193,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
+                aliasName: dataLin.aliasName,
                 connect: true,
                 ai: dataLin.ai,
                 at: dataLin.at,

src/renderer/components/AnimationDouble.vue

@@ -212,6 +212,13 @@
             :formatter="rssiFormatter"
           >
           </el-table-column>
+          <el-table-column
+            prop="aliasName"
+            align="center"
+            label="名称"
+           
+          >
+          </el-table-column>
           <el-table-column
             prop="deviceType"
             align="center"
@@ -551,6 +558,7 @@ export default {
       userLink: {
         num: "",
         mac: "",
+        aliasName:'',
         linkStatus: false,
         ecgAllList: [], //心电数据部分
         ecgSectionList: [], //心电数据全部
@@ -560,6 +568,7 @@ export default {
       userTwoLink: {
         num: "",
         mac: "",
+        aliasName:'',
         linkStatus: false,
         ecgAllList: [], //心电数据部分
         ecgSectionList: [], //心电数据全部
@@ -1006,8 +1015,8 @@ export default {
       //当按钮状态是结束时
       if (this.buttonFlag == "结束") {
         this.send(one);
-        let left = `Player1,${this.userLink.num}, ${a},${this.userLink.mac}`;
-        let right = `Player2,${this.userTwoLink.num},${b},${this.userTwoLink.mac}`;
+        let left = `Player1,${this.userLink.num}, ${a},${this.userLink.aliasName}`;
+        let right = `Player2,${this.userTwoLink.num},${b},${this.userTwoLink.aliasName}`;
         this.sendTarget(left, right);
       }
     },
@@ -1031,6 +1040,7 @@ export default {
       for (let i = 0; i < scanDataTmpFin.length; i++) {
         let obj = {
           rssi: "",
+          aliasName:'',
           name: "",
           mac: "",
           connect: false,
@@ -1039,6 +1049,7 @@ export default {
           at: "",
         };
         obj.rssi = scanDataTmpFin[i].rssi;
+        obj.aliasName = scanDataTmpFin[i].aliasName;
         obj.name = scanDataTmpFin[i].name;
         obj.mac = scanDataTmpFin[i].mac;
         obj.connect = false;
@@ -1112,7 +1123,7 @@ export default {
         }
       }
       for (let k = 0; k < currentDeviceList.length; k++) {
-        if (that.userLink.mac !== "" && that.userLink.mac == currentDeviceList[k].mac) {
+        if (that.userLink.mac !== "" && (that.userLink.mac == currentDeviceList[k].mac)) {
           currentDeviceList[k].userNum = that.userLink.num;
         }
         if (
@@ -1767,6 +1778,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
+                aliasName: dataLin.aliasName,
                 ai: dataLin.ai,
                 at: dataLin.at,
                 type: dataLin.t, //当type为1时为心电
@@ -1776,7 +1788,7 @@ export default {
             } else if (redata.msgType == "eegData") {
               // let dataLin = JSON.parse(redata.content);
               ///先判断第一个用户是否有mac---有mac代表已连接
-              if (that.userLink.mac !== "" && that.userLink.mac == dataLin.id) {
+              if (that.userLink.mac !== "" && (that.userLink.mac == dataLin.id)) {
                 ipcRenderer.send("asynchronoushrv-naoData", {
                   value: dataLin.value,
                   mac: dataLin.id,
@@ -1798,7 +1810,7 @@ export default {
               //当该用户的mac与id相同时，取这个数据
               // console.log(dataLin.id === that.userLink.mac);
               //用户1
-              if (that.userLink.mac !== "" && dataLin.id === that.userLink.mac) {
+              if (that.userLink.mac !== "" && (dataLin.id === that.userLink.mac)) {
                 // let list = dataLin.value.split(",");
                 let list = JSON.parse(dataLin.value);
                 // console.log(list)
@@ -1848,6 +1860,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
+                aliasName: dataLin.aliasName,
                 connect: true,
                 ai: dataLin.ai,
                 at: dataLin.at,
@@ -1919,10 +1932,12 @@ export default {
               if (that.userLink.mac == mac) {
                 that.userLink.linkStatus = false;
                 that.userLink.mac = "";
+                that.userLink.aliasName='';
               }
               if (that.userTwoLink.mac == mac) {
                 that.userTwoLink.linkStatus = false;
                 that.userTwoLink.mac = "";
+                that.userTwoLink.aliasName = "";
               }
             } else if (redata.msgType == "connect") {
               console.log(dataLin);
@@ -1953,8 +1968,10 @@ export default {
                     // this.userDeviceFlag
                     if (that.userDeviceFlag == 1) {
                       that.userLink.mac = dataLin.m;
+                      that.userLink.aliasName = dataLin.aliasName;
                     } else if (that.userDeviceFlag == 2) {
                       that.userTwoLink.mac = dataLin.m;
+                      that.userTwoLink.aliasName = dataLin.aliasName;
                     }
                   }
                 }

src/renderer/components/ManageEquipment.vue

@@ -35,6 +35,8 @@
             </el-table-column> -->
             <el-table-column prop="ID" align="center" label="id"> </el-table-column>
             <el-table-column prop="Type" :formatter="typeFor" align="center" label="类型">
+            </el-table-column>
+              <el-table-column prop="aliasName"  align="center" label="名称">
             </el-table-column>
             <el-table-column prop="Mac" align="center" label="mac"> </el-table-column>
 
@@ -88,6 +90,12 @@
               :formatter="rssiFor"
             >
             </el-table-column>
+            <el-table-column
+              prop="aliasName"
+              align="center"
+              label="名称"
+            >
+            </el-table-column>
             <el-table-column
               prop="deviceType"
               align="center"
@@ -217,6 +225,14 @@
             placeholder="例如DC:0D:30:03:39:05"
           ></el-input>
         </div>
+        <div class="equipment_class">
+          <div style="margin-left: 40px; width: 120px">设备名称：&nbsp;&nbsp;</div>
+          <el-input
+            style="width: 100%; margin-right: 40px"
+            v-model="aliasName"
+            placeholder=""
+          ></el-input>
+        </div>
       </span>
       <span slot="footer" class="dialog-footer">
         <button class="cancle_add" @click="centerDialogVisible = false">取消</button>
@@ -224,6 +240,35 @@
       </span>
     </el-dialog>
 
+
+    <el-dialog :visible.sync="visibleFast" width="545px" center class="dig_equi">
+      <div slot="title" class="title_di" style="width: 545px">
+        <img width="545px" src="../assets/manage/bg_di.png" />
+        <div class="equipment_title">设置设备名称</div>
+        <img
+          class="equipment_bg"
+          width="85px"
+          height="85px"
+          src="../assets/manage/bg_title.png"
+        />
+      </div>
+      <span class="min_equi">
+       
+        <div class="equipment_class">
+          <div style="margin-left: 40px; width: 120px">设备名称：&nbsp;&nbsp;</div>
+          <el-input
+            style="width: 100%; margin-right: 40px"
+            v-model="aliasNameFast"
+            placeholder=""
+          ></el-input>
+        </div>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <button class="cancle_add" @click="visibleFast = false">取消</button>
+        <button class="com_add" @click="addFastFun()">确定</button>
+      </span>
+    </el-dialog>
+
     <!-- 修改mac -->
     <el-dialog :visible.sync="baseStationFlag" width="545px" center class="dig_equi">
       <div slot="title" class="title_di" style="width: 545px">
@@ -236,9 +281,16 @@
           src="../assets/manage/bg_title.png"
         />
       </div>
-      <p class="eweima">提示：蓝牙基站mac填写，可以选择蓝牙基站上附带的二维码图片，也可以手动书写</p>
+      <p class="eweima">
+        提示：蓝牙基站mac填写，可以选择蓝牙基站上附带的二维码图片，也可以手动书写
+      </p>
       <button class="sweep">
-        <input type="file" ref="fileId"class='fileIdClass' @change="upload($event)" />从本地选择二维码
+        <input
+          type="file"
+          ref="fileId"
+          class="fileIdClass"
+          @change="upload($event)"
+        />从本地选择二维码
       </button>
       <span class="min_equi">
         <div class="equipment_class">
@@ -323,8 +375,17 @@ export default {
           label: "心电",
         },
       ],
+      //手动添加
       mac: "",
+      aliasName: "",
       type: "1",
+      
+      //快速添加
+      macFast: "",
+      aliasNameFast: "",
+      typeFast: "1",
+      visibleFast:false,
+
       head_style: "#f5f7fa",
       value1: "",
       startDate: "",
@@ -482,12 +543,31 @@ export default {
         }
       });
     },
+
+    addFast(val){
+      this.macFast=val.mac;
+      this.typeFast=val.type;
+      this.aliasNameFast='';
+      this.visibleFast=true;
+      //然选择设备的弹出框弹出来
+      //弹出框弹出来
+      // macFast: "",
+      // aliasNameFast: "",
+      // typeFast: "1",
+    },
     //新增设备
-    addEquiLine(val) {
+    addFastFun() {
+      //判断设备名称是不是空
+      if(this.aliasNameFast==''){
+        this.$message.info('设备名称不能为空')
+        return;
+      }
+      this.visibleFast=false;
       let path = "v1/device/add";
       let data = {
-        type: val.type,
-        mac: val.mac,
+        type: this.typeFast,
+        mac: this.macFast,
+        aliasName: this.aliasNameFast,
       };
       this.$http.postTmp(path, data, (res) => {
         if (res.data.code == 200) {
@@ -670,6 +750,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
+                aliasName:dataLin.aliasName,
                 ai: dataLin.ai,
                 at: dataLin.at,
                 type: dataLin.t, //当type为1时为心电
@@ -684,6 +765,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
+                aliasName:dataLin.aliasName,
                 connect: true,
                 ai: dataLin.ai,
                 at: dataLin.at,
@@ -806,7 +888,16 @@ export default {
       let data = {
         type: this.type,
         mac: this.mac,
+        aliasName: this.aliasName,
       };
+      if(this.mac==''){
+       this.$message.info('设备mac不能为空')
+       return;
+      }
+      if(this.aliasName==''){
+       this.$message.info('设备名称不能为空')
+       return;
+      }
       this.$http.postTmp(path, data, (res) => {
         if (res.data.code == 200) {
           this.centerDialogVisible = false;
@@ -818,6 +909,8 @@ export default {
     },
     addEquipment() {
       this.centerDialogVisible = true;
+      this.mac='';
+      this.aliasName='';
     },
     dateForMa(row) {
       let date = new Date(row.createTime);
@@ -956,6 +1049,7 @@ export default {
       for (let i = 0; i < scanDataTmpFin.length; i++) {
         let obj = {
           rssi: "",
+          aliasName:'',
           name: "",
           mac: "",
           connect: false,
@@ -964,6 +1058,7 @@ export default {
           at: "",
         };
         obj.rssi = scanDataTmpFin[i].rssi;
+        obj.aliasName = scanDataTmpFin[i].aliasName;
         obj.name = scanDataTmpFin[i].name;
         obj.mac = scanDataTmpFin[i].mac;
         obj.connect = false;
@@ -1296,7 +1391,7 @@ export default {
   font-size: 24px;
   color: #ffffff;
 }
-.fileIdClass{
+.fileIdClass {
   cursor: pointer;
 }
 </style>
@@ -1322,9 +1417,9 @@ export default {
     opacity: 0;
   }
 }
-.eweima{
+.eweima {
   font-size: 12px;
-  color:#b2afaa;
-  margin-bottom:20px;
+  color: #b2afaa;
+  margin-bottom: 20px;
 }
 </style>

static/run/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "liveServer.settings.port": 5502
-}

static/run/index.html

@@ -101,7 +101,6 @@
         alert(message);
       });
     };
-
     function changeSize(width, height) {
       canvas.style.width = width + 'px';
       canvas.style.height = height + 'px';
@@ -109,27 +108,26 @@
     function Bloomsize(val) {
       this.gameInstance.SendMessage("Runvelocity", "Firstvelocity", val);
     }
-
     function startEnd(val) {
       this.gameInstance.SendMessage("Runvelocity", "IsStart", val);
     }
-    // setInterval(() => {
-    //   let b = Math.random(0, 1)
-    //   let c = Math.random(0, 1)
-    //   let a = b + ',' + c
-    //   let n = "Player1,aaa," + b + ",80:6F:B0:B7:72:AA"
-    //   let l = "Player2,bbb," + c + ",80:6F:B0:B7:72:AA"
+    // setInterval(()=>{
+    //   let b=Math.random(0,1)
+    //   let c=Math.random(0,1)
+    //   let a =b+','+c
+    //   let n ="Player1,aaa,"+b+",80:6F:B0:B7:72:AA"
+    //   let l ="Player2,bbb,"+c+",80:6F:B0:B7:72:AA"
     //   Bloo(a)
     //   ToUnityData(n)
     //   ToUnityData(l)
-    // }, 1000)
-    function ToUnityData(val) {
-      this.gameInstance.SendMessage("Runvelocity", "GetData", val);
-    }
+    // },1000)
     function towPersion(p1, p2) {
       ToUnityData(p1)
       ToUnityData(p2)
     }
+    function ToUnityData(val) {
+      this.gameInstance.SendMessage("Runvelocity", "GetData", val);
+    }
     document.body.appendChild(script);
   </script>
 </body>

static/tianping1/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "liveServer.settings.port": 5504
-}

static/tianping1/index.html

@@ -105,11 +105,9 @@
       canvas.style.width = width + 'px';
       canvas.style.height = height + 'px';
     }
-
     function Bloomsize(val) {
       this.gameInstance.SendMessage("Tianping", "Balance", val);
     }
-
     function startEnd(val) {
       this.gameInstance.SendMessage("Tianping", "IsStart", val);
     }
@@ -123,15 +121,13 @@
     //   ToUnityData(n)
     //   ToUnityData(l)
     // },1000)
-    function ToUnityData(val) {
-      this.gameInstance.SendMessage("Tianping", "GetData", val);
-    }
-
     function towPersion(p1, p2) {
       ToUnityData(p1)
       ToUnityData(p2)
     }
-
+    function ToUnityData(val) {
+      this.gameInstance.SendMessage("Tianping", "GetData", val);
+    }
     document.body.appendChild(script);
   </script>
 </body>