|
@@ -180,15 +180,22 @@
|
|
:rules="rules"
|
|
:rules="rules"
|
|
label-width="108px"
|
|
label-width="108px"
|
|
>
|
|
>
|
|
- <el-form-item label="传感器:" prop="sensorId">
|
|
|
|
- <el-select v-model="form.sensorId" @change="sensorChange">
|
|
|
|
|
|
+ <el-form-item label="传感器:" prop="sensorArrayS">
|
|
|
|
+ <el-cascader
|
|
|
|
+ ref="cascader"
|
|
|
|
+ v-model="form.sensorArrayS"
|
|
|
|
+ :options="sensorNameList"
|
|
|
|
+ :props="props"
|
|
|
|
+ @change="sensorChange"
|
|
|
|
+ ></el-cascader>
|
|
|
|
+ <!-- <el-select v-model="form.sensorId" @change="sensorChange">
|
|
<el-option
|
|
<el-option
|
|
v-for="item in sensorNameList"
|
|
v-for="item in sensorNameList"
|
|
:label="item.sensorName"
|
|
:label="item.sensorName"
|
|
:value="item.id"
|
|
:value="item.id"
|
|
:key="item.id"
|
|
:key="item.id"
|
|
></el-option>
|
|
></el-option>
|
|
- </el-select>
|
|
|
|
|
|
+ </el-select> -->
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="传感器描述:" prop="sensorDescription">
|
|
<el-form-item label="传感器描述:" prop="sensorDescription">
|
|
<el-input
|
|
<el-input
|
|
@@ -237,15 +244,21 @@ export default {
|
|
sensorDescription: "",
|
|
sensorDescription: "",
|
|
sensorId: "",
|
|
sensorId: "",
|
|
sensorType: "",
|
|
sensorType: "",
|
|
|
|
+ sensorArrayS: []
|
|
},
|
|
},
|
|
rules: {
|
|
rules: {
|
|
- sensorId: [
|
|
|
|
|
|
+ sensorArrayS: [
|
|
{ required: true, message: "请选择", trigger: "change" },
|
|
{ required: true, message: "请选择", trigger: "change" },
|
|
],
|
|
],
|
|
sensorDescription: [
|
|
sensorDescription: [
|
|
{ required: true, message: "请输入", trigger: "blur" },
|
|
{ required: true, message: "请输入", trigger: "blur" },
|
|
],
|
|
],
|
|
},
|
|
},
|
|
|
|
+ props: {
|
|
|
|
+ multiple: false,
|
|
|
|
+ label: "name",
|
|
|
|
+ value: "code",
|
|
|
|
+ },
|
|
};
|
|
};
|
|
},
|
|
},
|
|
props: {
|
|
props: {
|
|
@@ -311,14 +324,14 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
let apis = [
|
|
let apis = [
|
|
- this.$api.modelLibrary.getMyCameraList,
|
|
|
|
- this.$api.modelLibrary.getMyOgtList,
|
|
|
|
- this.$api.modelLibrary.getMyLidarList,
|
|
|
|
- this.$api.modelLibrary.getMyGpsList,
|
|
|
|
|
|
+ this.$api.modelLibrary.getMyCameraListNew,
|
|
|
|
+ this.$api.modelLibrary.getMyOgtListNew,
|
|
|
|
+ this.$api.modelLibrary.getMyLidarListNew,
|
|
|
|
+ this.$api.modelLibrary.getMyGpsListNew,
|
|
];
|
|
];
|
|
this.currentType = type;
|
|
this.currentType = type;
|
|
this.dialogTitle = "添加" + this.configTitleList[index];
|
|
this.dialogTitle = "添加" + this.configTitleList[index];
|
|
- this.sensorNameList = [];
|
|
|
|
|
|
+ // this.sensorNameList = [];
|
|
|
|
|
|
this.$axios({
|
|
this.$axios({
|
|
method: "post",
|
|
method: "post",
|
|
@@ -338,10 +351,16 @@ export default {
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
- sensorChange(id) {
|
|
|
|
- let val = this.sensorNameList.find((i) => i.id == id);
|
|
|
|
- this.form.sensorName = val.sensorName;
|
|
|
|
- this.form.sensorDescription = val.description;
|
|
|
|
|
|
+ sensorChange(v) {
|
|
|
|
+ // let val = this.sensorNameList.find((i) => i.id == id);
|
|
|
|
+ // this.form.sensorName = val.sensorName;
|
|
|
|
+ // this.form.sensorDescription = val.description;
|
|
|
|
+
|
|
|
|
+ let item = this.$refs.cascader.getCheckedNodes(true)[0].data.vo;
|
|
|
|
+
|
|
|
|
+ this.form.sensorId = item.id;
|
|
|
|
+ this.form.sensorName = `${v[0]}/${item.sensorName}`;
|
|
|
|
+ this.form.sensorDescription = item.description;
|
|
},
|
|
},
|
|
delOne(type, index) {
|
|
delOne(type, index) {
|
|
this.$confirm("确认是否删除?", "提示", {
|
|
this.$confirm("确认是否删除?", "提示", {
|
|
@@ -495,6 +514,22 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/deep/ .el-form {
|
|
|
|
+ .el-input,
|
|
|
|
+ .el-cascader {
|
|
|
|
+ width: 100%;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .el-cascader {
|
|
|
|
+ height: 32px;
|
|
|
|
+ line-height: 32px;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ .el-cascader /deep/ .el-input {
|
|
|
|
+ width: 100%;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
+
|
|
/deep/ .el-dialog__footer {
|
|
/deep/ .el-dialog__footer {
|
|
padding: 10px 20px 20px;
|
|
padding: 10px 20px 20px;
|
|
text-align: right;
|
|
text-align: right;
|