|
@@ -50,7 +50,7 @@
|
|
|
<el-table-column label="实验室" align="left" prop="subjectName" />
|
|
|
<el-table-column label="路由" align="left" prop="routeNum" />
|
|
|
<el-table-column label="状态" align="left" prop="senseState">
|
|
|
- <template slot-scope="scope">{{scope.row.senseState.name}}</template>
|
|
|
+ <template slot-scope="scope">{{scope.row.senseState==null?'-':scope.row.senseState.name}}</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
|
|
|
<template slot-scope="scope">
|
|
@@ -215,7 +215,8 @@ export default {
|
|
|
],
|
|
|
gatewayId:[
|
|
|
{required: true, message: '网关不能为空', trigger: 'blur'},
|
|
|
- { required: true, message: "网关不能为空", validator: this.spaceJudgment, trigger: "blur" }
|
|
|
+ { required: true, message: "网关不能为空", validator: this.spaceJudgment, trigger: "blur" },
|
|
|
+ { pattern:/^(192\.168(\.(\d|([1-9]\d)|(1\d{2})|(2[0-4]\d)|(25[0-5]))){2})$/, message: "请输入正确的网关", trigger: "blur" }
|
|
|
],
|
|
|
senseData:[
|
|
|
{required: true, message: '检测数据不能为空', trigger: 'blur'},
|