This commit is contained in:
parent
5c4b2a4abd
commit
5698a54698
|
|
@ -2034,25 +2034,25 @@ export default {
|
|||
text-align: left;
|
||||
}
|
||||
|
||||
/* 单日期 / 时间选择器 */
|
||||
::v-deep .el-date-editor .el-input__inner {
|
||||
text-align: left;
|
||||
}
|
||||
// /* 单日期 / 时间选择器 */
|
||||
// ::v-deep .el-date-editor .el-input__inner {
|
||||
// text-align: left;
|
||||
// }
|
||||
|
||||
/* 日期范围选择器整体左对齐 */
|
||||
::v-deep .el-date-editor--daterange {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
// /* 日期范围选择器整体左对齐 */
|
||||
// ::v-deep .el-date-editor--daterange {
|
||||
// justify-content: flex-start;
|
||||
// }
|
||||
|
||||
/* 日期范围左右输入框 placeholder 靠左 */
|
||||
::v-deep .el-date-editor--daterange .el-range-input {
|
||||
text-align: left;
|
||||
}
|
||||
// /* 日期范围左右输入框 placeholder 靠左 */
|
||||
// ::v-deep .el-date-editor--daterange .el-range-input {
|
||||
// text-align: left;
|
||||
// }
|
||||
|
||||
/* 分隔符间距微调(可选) */
|
||||
::v-deep .el-date-editor--daterange .el-range-separator {
|
||||
margin: 0 8px;
|
||||
}
|
||||
// /* 分隔符间距微调(可选) */
|
||||
// ::v-deep .el-date-editor--daterange .el-range-separator {
|
||||
// margin: 0 8px;
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,17 +5,17 @@
|
|||
<el-form label-width="130px" ref="searchFormRef" :model="searchParams" v-show="showSearch">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="iotName" label="定位设备名称:">
|
||||
<el-form-item prop="iotName" label="定位设备名称">
|
||||
<el-input clearable placeholder="请输入定位设备名称" v-model="searchParams.iotName" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="iotCode" label="定位设备编码:">
|
||||
<el-form-item prop="iotCode" label="定位设备编码">
|
||||
<el-input clearable placeholder="请输入定位设备编码" v-model="searchParams.iotCode" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="typeId" label="装备类目:">
|
||||
<el-form-item prop="typeId" label="装备类目">
|
||||
<el-select
|
||||
v-model="searchParams.typeId"
|
||||
placeholder="请选择定位设备状态"
|
||||
|
|
@ -37,22 +37,35 @@
|
|||
<div v-if="searchExpanded">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="typeName" label="装备名称:">
|
||||
<el-form-item prop="typeName" label="装备名称">
|
||||
<el-input clearable placeholder="请输入装备名称" v-model="searchParams.typeName" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="maCode" label="装备编码:">
|
||||
<el-form-item prop="maCode" label="装备编码">
|
||||
<el-input clearable placeholder="请输入装备编码" v-model="searchParams.maCode" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="proName" label="使用项目:">
|
||||
<el-input clearable placeholder="请输入使用项目" v-model="searchParams.proName" style="width: 100%" />
|
||||
<el-form-item prop="proCode" label="使用项目">
|
||||
<el-select
|
||||
v-model="searchParams.proCode"
|
||||
placeholder="请选择使用项目"
|
||||
clearable
|
||||
filterable
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in useProjectList"
|
||||
:key="index"
|
||||
:label="item.proName"
|
||||
:value="item.proCode"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="maStatus" label="装备状态:">
|
||||
<el-form-item prop="maStatus" label="装备状态">
|
||||
<el-select
|
||||
v-model="searchParams.maStatus"
|
||||
placeholder="请选择装备状态"
|
||||
|
|
@ -66,7 +79,7 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<!-- 设备状态 -->
|
||||
<el-form-item prop="iotStatus" label="设备状态:">
|
||||
<el-form-item prop="iotStatus" label="设备状态">
|
||||
<el-select
|
||||
v-model="searchParams.iotStatus"
|
||||
placeholder="请选择设备状态"
|
||||
|
|
@ -81,7 +94,7 @@
|
|||
</el-col>
|
||||
<!-- 绑定状态 -->
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="bindStatus" label="绑定状态:">
|
||||
<el-form-item prop="bindStatus" label="绑定状态">
|
||||
<el-select
|
||||
v-model="searchParams.bindStatus"
|
||||
placeholder="请选择绑定状态"
|
||||
|
|
@ -96,7 +109,7 @@
|
|||
</el-col>
|
||||
<!-- 绑定人 -->
|
||||
<el-col :span="8">
|
||||
<el-form-item prop="iotManager" label="设备负责人:">
|
||||
<el-form-item prop="iotManager" label="设备负责人">
|
||||
<el-input clearable placeholder="请输入设备负责人" v-model="searchParams.iotManager" style="width: 100%" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
|
@ -452,9 +465,9 @@ import { dialogConfig } from './config'
|
|||
import DialogModel from '@/components/DialogModel' // 弹框组件
|
||||
import TableModel from '@/components/TableModel'
|
||||
import { bindIot } from '../../api/iotDevice' // 表格组件
|
||||
|
||||
import { getUseProjectListAPI } from '@/api/EquipmentLedger/equ-out'
|
||||
import MapDialog from './MapDIalog'
|
||||
import { getOwnEquipmentList } from '@/api/system/equipmentNew'
|
||||
|
||||
|
||||
export default {
|
||||
name: 'IOTManagement',
|
||||
|
|
@ -484,6 +497,7 @@ export default {
|
|||
typeName: '',
|
||||
maCode: '',
|
||||
proName: '',
|
||||
proCode: '',
|
||||
maStatus: '',
|
||||
iotStatus: '',
|
||||
bindStatus: '',
|
||||
|
|
@ -615,14 +629,24 @@ export default {
|
|||
ownOpen: false, // 自有装备弹窗
|
||||
selectedOwnRows: [],
|
||||
selectedRowId: '',
|
||||
useProjectList: [],
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getDeviceList()
|
||||
//this.getDeviceTypeList()
|
||||
this.getCategoryList()
|
||||
this.getUseProjectList()
|
||||
},
|
||||
methods: {
|
||||
async getUseProjectList() {
|
||||
try {
|
||||
const res = await getUseProjectListAPI()
|
||||
this.useProjectList = res.data
|
||||
} catch (error) {
|
||||
console.log('🚀 ~ error:', error)
|
||||
}
|
||||
},
|
||||
async getCategoryList() {
|
||||
const res = await getCategoryList()
|
||||
if (res.code === 200) {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue