|
@@ -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">设备名称: </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">设备名称: </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>
|