Skip to content

D
device-platform
Commit 50f1e3b1 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改设备新增

parent ab5377b9
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 172 deletions
device-manager-ui/admin/src/views/device/dialogshow.vue
View file @ 50f1e3b1
...@@ -52,6 +52,16 @@ ...@@ -52,6 +52,16 @@
placeholder="请输入备注" placeholder="请输入备注"
/> />
<Field
:span="20"
label="设备在线状态 "
prop="deviceOnlineStatus"
v-model="form.deviceOnlineStatus"
type="radio"
:enumData="dict.deviceOnlineStatus"
placeholder="请选择在线状态 "
/>
<Field <Field
:span="20" :span="20"
label="启用状态 " label="启用状态 "
......
device-manager-ui/admin/src/views/device/list.vue
View file @ 50f1e3b1
...@@ -64,9 +64,9 @@ export default { ...@@ -64,9 +64,9 @@ export default {
this.$refs.dialogform.edit(row); this.$refs.dialogform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
// toView(row) { toView(row) {
// this.$refs.dialogform.view(row); this.$refs.dialogform.view(row);
// }, },
}, },
data() { data() {
return { return {
......
device-manager-ui/admin/src/views/device/show.vue deleted 100644 → 0
View file @ ab5377b9
<template>
<layout-form>
<el-form :model="form" :loading="loading" :rules="rules" size='small' style="width:100%" label-width='120px' ref="form">
<el-row>
<Field label="设备名称" prop="deviceName" v-model="form.deviceName" placeholder="请输入设备名称"/>
<Field label="设备编码" prop="deviceCode" v-model="form.deviceCode" type="textarea" placeholder="请输入设备编码"/>
<Field label="设备类型" prop="deviceType" v-model="form.deviceType" type="select" :enumData="dict.deviceType" placeholder="请选择设备类型"/>
<Field label="设备的MAC地址" prop="deviceMac" v-model="form.deviceMac" placeholder="请输入设备的MAC地址"/>
<Field label="设备访问ip" prop="ip" v-model="form.ip" placeholder="请输入设备访问ip"/>
<Field label="中心设备编码" prop="centernum" v-model="form.centernum" placeholder="请输入中心设备编码"/>
<Field label="端口" prop="port" v-model="form.port" placeholder="请输入端口"/>
<Field label="站点编号" prop="siteNum" v-model="form.siteNum" placeholder="请输入站点编号"/>
<Field label="设备生产厂商ID" prop="deviceFirmId" v-model="form.deviceFirmId" placeholder="请输入设备生产厂商ID"/>
<Field label="设备生产厂商名称" prop="deviceFirmname" v-model="form.deviceFirmname" placeholder="请输入设备生产厂商名称"/>
<Field label="在线状态 " prop="deviceOnlineStatus" v-model="form.deviceOnlineStatus" type="select" :enumData="dict.deviceOnlineStatus" placeholder="请选择在线状态 "/>
<Field label="启用状态 " prop="status" v-model="form.status" type="select" :enumData="dict.status" placeholder="请选择启用状态 "/>
<Field label="备注" prop="deviceRemark" v-model="form.deviceRemark" type="textarea" placeholder="请输入备注"/>
<Field label="最近上线时间" prop="onlineTime" v-model="form.onlineTime" type="date" />
<Field label="最近离线时间" prop="offlineTime" v-model="form.offlineTime" type="date" />
</el-row>
<form-buttons @submit='submitForm' :noSaveBtn="pageInfo.type === 'view'"/>
</el-form>
</layout-form>
</template>
<script>
import form from "@/assets/mixins/form";
export default {
mixins: [form],
components: {
},
methods: {
},
data() {
return {
toString:[
"deviceType",
"deviceOnlineStatus",
"status",
],
rules: {
deviceName: [
{required: true,message: "请输入设备名称", trigger: "blur" },
{max: 20,message: "最多只能录入20个字符",trigger: "blur",},
],
deviceType: [
{required: true,message: "请输入设备类型", trigger: "blur" },
],
deviceOnlineStatus: [
{required: true,message: "请输入在线状态 ", trigger: "blur" },
],
status: [
{required: true,message: "请输入启用状态 ", trigger: "blur" },
],
createTime: [
{required: true,message: "请选择创建时间" },
],
}
};
}
};
</script>
\ No newline at end of file
device-manager-ui/admin/src/views/device/view.vue deleted 100644 → 0
View file @ ab5377b9
<template>
<layout-view>
<el-descriptions :title="title" :column="column" :size="size" :colon="false" border>
<template slot="title">
<i class="el-icon-tickets"></i>
基本详细信息
</template>
<template slot="extra">
<el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
</template>
<el-descriptions-item label="设备名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deviceName}}
</el-descriptions-item>
<el-descriptions-item label="设备编码" label-class-name="labelClass" content-class-name="contentClass">
{{form.deviceCode}}
</el-descriptions-item>
<el-descriptions-item label="设备类型" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("deviceType", form.deviceType) }}
</el-descriptions-item>
<el-descriptions-item label="设备的MAC地址" label-class-name="labelClass" content-class-name="contentClass">
{{form.deviceMac}}
</el-descriptions-item>
<el-descriptions-item label="设备访问ip" label-class-name="labelClass" content-class-name="contentClass">
{{form.ip}}
</el-descriptions-item>
<el-descriptions-item label="中心设备编码" label-class-name="labelClass" content-class-name="contentClass">
{{form.centernum}}
</el-descriptions-item>
<el-descriptions-item label="端口" label-class-name="labelClass" content-class-name="contentClass">
{{form.port}}
</el-descriptions-item>
<el-descriptions-item label="站点编号" label-class-name="labelClass" content-class-name="contentClass">
{{form.siteNum}}
</el-descriptions-item>
<el-descriptions-item label="设备生产厂商ID" label-class-name="labelClass" content-class-name="contentClass">
{{form.deviceFirmId}}
</el-descriptions-item>
<el-descriptions-item label="设备生产厂商名称" label-class-name="labelClass" content-class-name="contentClass">
{{form.deviceFirmname}}
</el-descriptions-item>
<el-descriptions-item label="在线状态 " label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("deviceOnlineStatus", form.deviceOnlineStatus) }}
</el-descriptions-item>
<el-descriptions-item label="启用状态 " label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatters("status", form.status) }}
</el-descriptions-item>
<el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
{{form.deviceRemark}}
</el-descriptions-item>
<el-descriptions-item label="最近上线时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.onlineTime)}}
</el-descriptions-item>
<el-descriptions-item label="最近离线时间" label-class-name="labelClass" content-class-name="contentClass">
{{ util_formatterDate(form.offlineTime)}}
</el-descriptions-item>
</el-descriptions>
</layout-view>
</template>
<script>
import view from "@/assets/mixins/view";
export default {
mixins: [view],
components: {
},
methods: {
},
data() {
return {
size:"small",
column:2,
toString:[
"deviceType",
"deviceOnlineStatus",
"status",
],
toArrays: [
],
toDate: [
]
}
}
}
</script>
<style lang="less">
.labelClass{
width: 200px;
}
.el-descriptions__body{
margin-left: 5px;
margin-right: 5px;
color: #606266;
background-color: #FFF;
}
.contentClass{
width: 600px;
}
</style>
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/common/code/DeviceOnlineStatusEnum.java
View file @ 50f1e3b1
...@@ -10,7 +10,8 @@ import java.util.Map; ...@@ -10,7 +10,8 @@ import java.util.Map;
*/ */
public enum DeviceOnlineStatusEnum { public enum DeviceOnlineStatusEnum {
离线(0, "离线"), 离线(0, "离线"),
在线(1, "在线"); 在线(1, "在线"),
手动状态(2, "手动状态");
private Integer value; private Integer value;
private String desc; private String desc;
......
device-manager/src/main/java/com/mortals/xhx/common/utils/SendTask.java
View file @ 50f1e3b1
...@@ -56,7 +56,7 @@ public class SendTask implements Runnable { ...@@ -56,7 +56,7 @@ public class SendTask implements Runnable {
} }
deviceService.update(deviceEntity); deviceService.update(deviceEntity);
} }
log.debug("http resp:{}", resp); log.info("http resp:{}", resp);
} catch (Exception e) { } catch (Exception e) {
log.error("发送异常：" + e); log.error("发送异常：" + e);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment