修改打包别名

src/renderer/components/AnimationDouble.vue

@@ -1017,6 +1017,7 @@ export default {
         this.send(one);
         let left = `Player1,${this.userLink.num}, ${a},${this.userLink.aliasName}`;
         let right = `Player2,${this.userTwoLink.num},${b},${this.userTwoLink.aliasName}`;
+        console.log(left,right)
         this.sendTarget(left, right);
       }
     },
@@ -1991,8 +1992,10 @@ export default {
                 //还是需要判断是第一个用户还是第二个用户
                 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

@@ -36,7 +36,7 @@
             <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 prop="AliasName" align="center" label="名称">
             </el-table-column>
             <el-table-column prop="Mac" align="center" label="mac"> </el-table-column>
 
@@ -90,11 +90,7 @@
               :formatter="rssiFor"
             >
             </el-table-column>
-            <el-table-column
-              prop="aliasName"
-              align="center"
-              label="名称"
-            >
+            <el-table-column prop="aliasName" align="center" label="名称">
             </el-table-column>
             <el-table-column
               prop="deviceType"
@@ -104,30 +100,33 @@
             >
             </el-table-column>
             <el-table-column prop="mac" align="center" label="mac"> </el-table-column>
-            <el-table-column label="操作" align="center" width="200px">
-              <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-table-column label="操作" align="center" width="140px">
+              <template slot-scope="scope" style='width:120px'>
+                <div style='display:flex;flex-direction:column;justify-items: center;align-items:center'>
+                  <el-button
+                    :disabled="buttonLinkFlag"
+                    class="xl_d_button"
+                    style='width:70px'
+                    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
-                  style="margin-top: 10px"
-                  v-show="scope.row.addFlag"
-                  :disabled="buttonLinkFlag"
-                  class="xl_d_button"
-                  size="mini"
-                  slot="reference"
-                  @click="addEquiLine(scope.row)"
-                >
-                  <span>添加至设备列表</span>
-                </el-button>
+                  <el-button
+                    style="margin-top: 10px;width:100px;margin-right:2px"
+                    v-show="scope.row.addFlag"
+                    :disabled="buttonLinkFlag"
+                    class="xl_d_button"
+                    size="mini"
+                    slot="reference"
+                    @click="addFast(scope.row)"
+                  >
+                    <span>添加至列表</span>
+                  </el-button>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -240,7 +239,6 @@
       </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" />
@@ -253,7 +251,6 @@
         />
       </div>
       <span class="min_equi">
-       
         <div class="equipment_class">
           <div style="margin-left: 40px; width: 120px">设备名称：&nbsp;&nbsp;</div>
           <el-input
@@ -379,12 +376,12 @@ export default {
       mac: "",
       aliasName: "",
       type: "1",
-      
+
       //快速添加
       macFast: "",
       aliasNameFast: "",
       typeFast: "1",
-      visibleFast:false,
+      visibleFast: false,
 
       head_style: "#f5f7fa",
       value1: "",
@@ -544,11 +541,11 @@ export default {
       });
     },
 
-    addFast(val){
-      this.macFast=val.mac;
-      this.typeFast=val.type;
-      this.aliasNameFast='';
-      this.visibleFast=true;
+    addFast(val) {
+      this.macFast = val.mac;
+      this.typeFast = val.type;
+      this.aliasNameFast = "";
+      this.visibleFast = true;
       //然选择设备的弹出框弹出来
       //弹出框弹出来
       // macFast: "",
@@ -558,11 +555,11 @@ export default {
     //新增设备
     addFastFun() {
       //判断设备名称是不是空
-      if(this.aliasNameFast==''){
-        this.$message.info('设备名称不能为空')
+      if (this.aliasNameFast == "") {
+        this.$message.info("设备名称不能为空");
         return;
       }
-      this.visibleFast=false;
+      this.visibleFast = false;
       let path = "v1/device/add";
       let data = {
         type: this.typeFast,
@@ -720,7 +717,7 @@ export default {
       let that = this;
       //数据接收
       const redata = JSON.parse(e.data);
-      console.log(redata);
+      // console.log(redata);
       // if(redata.content == "设备连接成功"){
       //   console.log(redata);
       // }
@@ -745,12 +742,12 @@ export default {
 
             if (redata.msgType == "device") {
               // let dataLin = JSON.parse(redata.content);
-              console.log(redata);
+              
               let a = {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
-                aliasName:dataLin.aliasName,
+                aliasName: dataLin.aliasName,
                 ai: dataLin.ai,
                 at: dataLin.at,
                 type: dataLin.t, //当type为1时为心电
@@ -765,7 +762,7 @@ export default {
                 mac: dataLin.m,
                 name: dataLin.n,
                 rssi: dataLin.rssi,
-                aliasName:dataLin.aliasName,
+                aliasName: dataLin.aliasName,
                 connect: true,
                 ai: dataLin.ai,
                 at: dataLin.at,
@@ -890,13 +887,13 @@ export default {
         mac: this.mac,
         aliasName: this.aliasName,
       };
-      if(this.mac==''){
-       this.$message.info('设备mac不能为空')
-       return;
+      if (this.mac == "") {
+        this.$message.info("设备mac不能为空");
+        return;
       }
-      if(this.aliasName==''){
-       this.$message.info('设备名称不能为空')
-       return;
+      if (this.aliasName == "") {
+        this.$message.info("设备名称不能为空");
+        return;
       }
       this.$http.postTmp(path, data, (res) => {
         if (res.data.code == 200) {
@@ -909,8 +906,8 @@ export default {
     },
     addEquipment() {
       this.centerDialogVisible = true;
-      this.mac='';
-      this.aliasName='';
+      this.mac = "";
+      this.aliasName = "";
     },
     dateForMa(row) {
       let date = new Date(row.createTime);
@@ -1043,13 +1040,15 @@ export default {
       //先选出扫描列表
       //list为扫描列表
       let scanDataTmp = JSON.stringify(this.scanData);
+      console.log(JSON.stringify('----'))
+      console.log(JSON.stringify(this.scanData))
       let scanDataTmpFin = JSON.parse(scanDataTmp);
 
       let list = [];
       for (let i = 0; i < scanDataTmpFin.length; i++) {
         let obj = {
           rssi: "",
-          aliasName:'',
+          aliasName: "",
           name: "",
           mac: "",
           connect: false,
@@ -1112,6 +1111,7 @@ export default {
           if (list[i].mac == connectedDataTmpFin[j].mac) {
             list[i].connect = true;
             list[i].rssi = connectedDataTmpFin[j].rssi;
+            list[i].aliasName = connectedDataTmpFin[j].aliasName;
           }
         }
       }
@@ -1147,11 +1147,12 @@ export default {
           }
         }
       }
-      console.log(finalData);
+      // console.log(finalData);
       this.mergeData = finalData;
     },
     changeList(obj) {
-      // console.log(obj);
+      console.log('<<<<<<<<')
+      console.log(obj);
       let that = this;
       that.listTmp.push(obj);
       //让两个变量不是指向一个地址