|
|
@@ -5,7 +5,7 @@
|
|
|
<el-form-item label="关键字" prop="name">
|
|
|
<el-input
|
|
|
v-model="queryParams.searchValue"
|
|
|
- placeholder="识别器名称/设备编号/所属实验室"
|
|
|
+ placeholder="设备编号/所属实验室"
|
|
|
clearable
|
|
|
maxLength="30"
|
|
|
size="small"
|
|
|
@@ -74,12 +74,17 @@
|
|
|
<!-- 添加或修改传感器对话框 -->
|
|
|
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body class="recognizer-dialog-box add-hardware-dialog-box">
|
|
|
<el-form ref="form" :model="form" :rules="rules" >
|
|
|
- <el-form-item label="检测门编号" prop="hardwareNum">
|
|
|
- <el-input v-model="form.hardwareNum" placeholder="请输入检测门编号" />
|
|
|
+ <el-form-item label="识别器编号" prop="hardwareNum">
|
|
|
+ <el-input v-model="form.hardwareNum" placeholder="请输入识别器编号" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="IP地址" prop="ipAddress">
|
|
|
+ <el-form-item label="IP地址" >
|
|
|
<el-input v-model="form.ipAddress" placeholder="请输入IP地址" />
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="供应商">
|
|
|
+ <el-select v-model="form.manufacturerType" placeholder="请选择" style="width:320px;">
|
|
|
+ <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="信道数量" >
|
|
|
<el-select v-model="form.channels" placeholder="请选择信道数量">
|
|
|
<el-option label="1通道" value="1"></el-option>
|
|
|
@@ -127,33 +132,13 @@ import {
|
|
|
recognizerDelete,
|
|
|
recognizerList,
|
|
|
recognizerSwitch,
|
|
|
- supplierStop
|
|
|
+ supplierStop, RFIDTypeList
|
|
|
} from '@/api/gasManage3_0/gasManage'
|
|
|
|
|
|
export default {
|
|
|
name: "Sensor",
|
|
|
components: { Treeselect },
|
|
|
data() {
|
|
|
- let validatePort1 = (rule, value, callback) => {
|
|
|
- let reg =
|
|
|
-
|
|
|
- /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/;
|
|
|
-
|
|
|
- if (value == "") {
|
|
|
-
|
|
|
- callback(new Error("请输入IP地址"));
|
|
|
-
|
|
|
- } else if (value !== "" && reg.test(value) === false) {
|
|
|
-
|
|
|
- callback(new Error("请输入正确格式IP如(11.11.11.11)"));
|
|
|
-
|
|
|
- } else {
|
|
|
-
|
|
|
- callback();
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
return {
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
@@ -169,7 +154,7 @@ export default {
|
|
|
// 查询参数
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
- pageSize: 10,
|
|
|
+ pageSize:20,
|
|
|
searchValue:'',
|
|
|
type:'RFID_RECOGNIZER'
|
|
|
},
|
|
|
@@ -183,22 +168,20 @@ export default {
|
|
|
channels:4,//信道
|
|
|
sessionIndex:0,//设备推送频率
|
|
|
uniformPower:33,//设备推送频率
|
|
|
+ manufacturerType:'',//供应商
|
|
|
},
|
|
|
+ materialTypeList:[],
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
name:[
|
|
|
- {required: true, message: '检测门名称不能为空', trigger: 'blur'}
|
|
|
+ {required: true, message: '识别器名称不能为空', trigger: 'blur'}
|
|
|
],
|
|
|
hardwareNum:[
|
|
|
- {required: true, message: '检测门编号不能为空', trigger: 'blur'}
|
|
|
+ {required: true, message: '识别器编号不能为空', trigger: 'blur'}
|
|
|
],
|
|
|
subjectId:[
|
|
|
{required: true, message: '所属实验室不能为空', trigger: 'blur'}
|
|
|
- ],
|
|
|
- ipAddress:[
|
|
|
- {required: true,message: validatePort1.Error, validator: validatePort1, trigger: 'blur'}
|
|
|
- ],
|
|
|
-
|
|
|
+ ]
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
@@ -207,8 +190,18 @@ export default {
|
|
|
mounted(){
|
|
|
this.getList();
|
|
|
this.getSubjectAddDictList();
|
|
|
+ this.supplierTypeList();
|
|
|
},
|
|
|
methods: {
|
|
|
+ //供应商类型
|
|
|
+ supplierTypeList(){
|
|
|
+ let _this=this;
|
|
|
+ RFIDTypeList().then( response => {
|
|
|
+ let res=response.rows;
|
|
|
+ _this.materialTypeList=res;
|
|
|
+
|
|
|
+ });
|
|
|
+ },
|
|
|
//状态
|
|
|
switchChange(row){
|
|
|
console.log(row)
|
|
|
@@ -288,12 +281,12 @@ export default {
|
|
|
this.reset();
|
|
|
|
|
|
this.open = true;
|
|
|
- this.title = "新增检测门";
|
|
|
+ this.title = "新增识别器";
|
|
|
},
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.open = true;
|
|
|
- this.title = "修改检测门";
|
|
|
+ this.title = "修改识别器";
|
|
|
this.form.id=row.id
|
|
|
this.form.type='RFID_RECOGNIZER'
|
|
|
this.form.hardwareNum=row.hardwareNum
|
|
|
@@ -302,6 +295,7 @@ export default {
|
|
|
this.form.channels=row.channels+''
|
|
|
this.form.sessionIndex=row.sessionIndex+''
|
|
|
this.form.uniformPower=row.uniformPower
|
|
|
+ this.form.manufacturerType=row.manufacturerType
|
|
|
|
|
|
|
|
|
},
|
heyang