Tony/god-ytr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://117.73.11.115:3000/Tony/god-ytr

Browse Source
This commit is contained in:
wangyan21 2023-12-04 18:21:05 +08:00
commit bf91daafd8
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
god-ui/src/views/deviceInfo/deviceTrack/index.vue
View File

@ -179,7 +179,7 @@
<el-table-column label="维保任务" align="center" prop="maintenanceTask" width="300"/>-->
<el-table-column label="经度" align="center" prop="longitude"/>
<el-table-column label="纬度" align="center" prop="latitude"/>
<el-table-column label="工作时间" align="center" prop="workTime"/>
<el-table-column label="工作时间" align="center" prop="maintenanceTime"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="170">
<template slot-scope="scope">
<el-button
@ -216,22 +216,24 @@
/>
<!-- 添加或修改设备管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="70%" append-to-body>
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="设备编码" prop="deviceCode">
<el-input :disabled="disabled" v-model="form.deviceCode" maxlength="14" placeholder="请输入设备编码"/>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="设备名称" prop="deviceName">
<el-input :disabled="disabled" v-model="form.deviceName" placeholder="请输入设备名称"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="24">
<el-form-item label="设备类型" prop="deviceType">
<el-select :disabled="disabled" v-model="form.deviceType" placeholder="请选择设备类型" style="width: 100%">
<el-option
@ -243,30 +245,50 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="设备状态" prop="deviceStatus">
<el-select :disabled="disabled" v-model="form.deviceStatus" placeholder="请选择设备状态" style="width: 100%">
<el-option
v-for="dict in dict.type.gcjx_device_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="设备品牌" prop="deviceBrand">
<el-input :disabled="disabled" v-model="form.deviceBrand" placeholder="请输入设备品牌"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="24">
<el-form-item label="经度" prop="longitude">
<el-input v-model="form.longitude" placeholder="请输入经度"/>
<el-input :disabled="disabled" v-model="form.longitude" placeholder="请输入经度"/>
</el-form-item>
</el-col>
<el-col :span="8">
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="纬度" prop="latitude">
<el-input v-model="form.latitude" placeholder="请输入纬度"/>
<el-input :disabled="disabled" v-model="form.latitude" placeholder="请输入纬度"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作时间" prop="workTime">
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="工作时间" prop="maintenanceTime">
<el-date-picker
clearable
:disabled="disabled"
style="width: 100%"
v-model="form.workTime"
v-model="form.maintenanceTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择工作时间">
@ -315,7 +337,7 @@ export default {
deviceManageList: [],
// 弹出层标题
title: "",
defaultSort: { prop: "workTime", order: "descending" },
defaultSort: { prop: "maintenanceTime", order: "descending" },
// 是否显示弹出层
open: false,
// 查询参数