|
|
@@ -11,12 +11,12 @@
|
|
|
<div class="panel-body">
|
|
|
<div class=" panel_control">
|
|
|
<div class="pline">
|
|
|
- <em>设备ID:</em>
|
|
|
+ <em>标签名:</em>
|
|
|
<el-input v-model="panel.tagname" placeholder=""></el-input>
|
|
|
</div>
|
|
|
<div class="pline">
|
|
|
<em>MAC地址:</em>
|
|
|
- <el-input v-model="panel.tagname" placeholder=""></el-input>
|
|
|
+ <el-input v-model="panel.mac" placeholder=""></el-input>
|
|
|
</div>
|
|
|
<div class="pline">
|
|
|
<em>所属区域:</em>
|
|
|
@@ -29,16 +29,6 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <!--<div class="pline">-->
|
|
|
- <!--<em>登记时间:</em>-->
|
|
|
- <!--<el-date-picker-->
|
|
|
- <!--v-model="panel.time1"-->
|
|
|
- <!--type="daterange"-->
|
|
|
- <!--range-separator="至"-->
|
|
|
- <!--start-placeholder="开始日期"-->
|
|
|
- <!--end-placeholder="结束日期">-->
|
|
|
- <!--</el-date-picker>-->
|
|
|
- <!--</div>-->
|
|
|
<div class="pline">
|
|
|
<el-button size="medium" type="primary" @click="query">查询</el-button>
|
|
|
</div>
|
|
|
@@ -51,7 +41,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-table
|
|
|
-
|
|
|
:data="tableData"
|
|
|
is-horizontal-resize
|
|
|
:default-sort="{prop: 'date', order: 'descending'}"
|
|
|
@@ -140,31 +129,6 @@
|
|
|
<span class="red" v-if="scope.row.Status == 4">已离线</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <!--<el-table-column-->
|
|
|
- <!--prop="WorkMode"-->
|
|
|
- <!--label="工作模式"-->
|
|
|
- <!--sortable-->
|
|
|
- <!-->-->
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
- <!--<span v-if="scope.row.Status == 1">普通</span>-->
|
|
|
- <!--<span class="red" v-if="scope.row.Status == 2">演示</span>-->
|
|
|
- <!--<span class="yellow" v-if="scope.row.Status == 3">测试</span>-->
|
|
|
- <!--</template>-->
|
|
|
- <!--</el-table-column>-->
|
|
|
- <!--<el-table-column-->
|
|
|
- <!--prop="address"-->
|
|
|
- <!--label="操作记录"-->
|
|
|
- <!--width="220"-->
|
|
|
- <!-->-->
|
|
|
- <!--<template slot-scope="scope">-->
|
|
|
- <!--<!–<el-button class="" type="text" @click="goPhoneRecord(scope.row)">手机信号记录</el-button>–>-->
|
|
|
- <!--<el-button class="" type="primary" size="small" @click="goWifiRecord(scope.row)">监测记录</el-button>-->
|
|
|
- <!--<!–<el-button v-if="scope.row.Status == 1" class="yellow" type="text" @click="pauseRow(scope.row)">禁用–>-->
|
|
|
- <!--<!–</el-button>–>-->
|
|
|
- <!--<!–<el-button v-if="scope.row.Status == 0" class="green" type="text" @click="runRow(scope.row)">启用–>-->
|
|
|
- <!--<!–</el-button>–>-->
|
|
|
- <!--</template>-->
|
|
|
- <!--</el-table-column>-->
|
|
|
</el-table>
|
|
|
<br>
|
|
|
<el-pagination
|
|
|
@@ -212,19 +176,6 @@
|
|
|
</label>
|
|
|
<el-input v-model="dialog.tagname"></el-input>
|
|
|
</el-col>
|
|
|
- <!--<el-col :span="12">-->
|
|
|
- <!--<label>-->
|
|
|
- <!--购买来源-->
|
|
|
- <!--</label>-->
|
|
|
- <!--<el-input v-model="dialog.purchasesrc"></el-input>-->
|
|
|
- <!--</el-col>-->
|
|
|
- <!---->
|
|
|
- <!--<el-col :span="12">-->
|
|
|
- <!--<label>-->
|
|
|
- <!--坐标说明-->
|
|
|
- <!--</label>-->
|
|
|
- <!--<el-input v-model="dialog.coords_memo "></el-input>-->
|
|
|
- <!--</el-col>-->
|
|
|
<el-col :span="12">
|
|
|
<label>
|
|
|
备注
|
|
|
@@ -303,6 +254,8 @@
|
|
|
],
|
|
|
// panel 配置项目
|
|
|
panel: {
|
|
|
+ mac: '',
|
|
|
+ tagname: '',
|
|
|
usercode: '',
|
|
|
username: '',
|
|
|
compname: '',
|
|
|
@@ -360,9 +313,6 @@
|
|
|
mac: this.panel.mac,//
|
|
|
regionId: that.panel.regionId,//
|
|
|
name: that.panel.tagname,//标签名
|
|
|
- comid: 1,//
|
|
|
- start: 1,//
|
|
|
- tableMax: 9999,//
|
|
|
};
|
|
|
let postdata = qs.stringify(param);
|
|
|
DetectorList(postdata).then(res => {
|
|
|
@@ -786,7 +736,7 @@
|
|
|
this.selectRegionLabel(that.dialog.regionId);
|
|
|
let param = {
|
|
|
token: localStorage.token,
|
|
|
- id : that.dialog.eqId,
|
|
|
+ id: that.dialog.eqId,
|
|
|
mac: that.dialog.mac,
|
|
|
comId: 1,
|
|
|
regionId: that.dialog.regionId,
|
|
|
@@ -920,7 +870,7 @@
|
|
|
});
|
|
|
},
|
|
|
filterTime(val, row, column) {
|
|
|
- return nonTfmtDate(column,10);
|
|
|
+ return nonTfmtDate(column, 10);
|
|
|
},
|
|
|
handle(row, column, event) {
|
|
|
this.$refs.multipleTable.toggleRowSelection(row);
|
|
|
@@ -1032,9 +982,11 @@
|
|
|
/deep/ .el-input.is-disabled .el-input__inner {
|
|
|
background-color: #015B9E;
|
|
|
}
|
|
|
+
|
|
|
.red {
|
|
|
color: red;
|
|
|
}
|
|
|
+
|
|
|
.yellow {
|
|
|
color: #fd0;
|
|
|
}
|