Skip to content

D
device-new-platform
Commit 2ce36050 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

fix:修改列表返回按钮

parent 1d0cd293
Show whitespace changes
Inline Side-by-side
Showing with 234 additions and 181 deletions
device-manager-ui/admin/src/views/device/alarm/info/dialogshow.vue
View file @ 2ce36050
...@@ -3,33 +3,79 @@ ...@@ -3,33 +3,79 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field label="告警时间" prop="alarmTime" v-model="form.alarmTime" type="date" /> <Field
<Field label="告警设备" prop="alarmDevice" v-model="form.alarmDevice" placeholder="请输入告警设备"/> label="告警时间"
<Field label="告警类型," prop="alarmType" v-model="form.alarmType" type="select" :enumData="dict.alarmType" placeholder="请选择告警类型,"/> prop="alarmTime"
<Field label="告警级别" prop="alarmLevel" v-model="form.alarmLevel" type="select" :enumData="dict.alarmLevel" placeholder="请选择告警级别"/> v-model="form.alarmTime"
<Field label="接收人员[设备管理的责任人]" prop="alarmReceivePersonnel" v-model="form.alarmReceivePersonnel" placeholder="请输入接收人员[设备管理的责任人]"/> type="date"
<Field label="接收人员电话" prop="receivePersonnelTelephone" v-model="form.receivePersonnelTelephone" placeholder="请输入接收人员电话"/> />
<Field label="告警状态,来自工单系统" prop="alarmStatus" v-model="form.alarmStatus" type="select" :enumData="dict.alarmStatus" placeholder="请选择告警状态,来自工单系统"/> <Field
<Field label="告警详细内容"><editor v-model="form.alarmContent" :min-height="256"/></Field> label="告警设备"
prop="alarmDevice"
v-model="form.alarmDevice"
placeholder="请输入告警设备"
/>
<Field
label="告警类型,"
prop="alarmType"
v-model="form.alarmType"
type="select"
:enumData="dict.alarmType"
placeholder="请选择告警类型,"
/>
<Field
label="告警级别"
prop="alarmLevel"
v-model="form.alarmLevel"
type="select"
:enumData="dict.alarmLevel"
placeholder="请选择告警级别"
/>
<Field
label="接收人员[设备管理的责任人]"
prop="alarmReceivePersonnel"
v-model="form.alarmReceivePersonnel"
placeholder="请输入接收人员[设备管理的责任人]"
/>
<Field
label="接收人员电话"
prop="receivePersonnelTelephone"
v-model="form.receivePersonnelTelephone"
placeholder="请输入接收人员电话"
/>
<Field
label="告警状态,来自工单系统"
prop="alarmStatus"
v-model="form.alarmStatus"
type="select"
:enumData="dict.alarmStatus"
placeholder="请选择告警状态,来自工单系统"
/>
<Field label="告警详细内容"
><editor v-model="form.alarmContent" :min-height="256"
/></Field>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" v-if="pageInfo.type !== 'view'" @click="submitForm">确 定</el-button> <el-button
type="primary"
v-if="pageInfo.type !== 'view'"
@click="submitForm"
>确 定</el-button
>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import form from "@/assets/mixins/formdialog"; import form from "@/assets/mixins/formdialog";
import dialogShow from "./dialogshow"; import dialogShow from "./dialogshow";
import Editor from '@/components/Editor'; import Editor from "@/components/Editor";
export default { export default {
mixins: [form], mixins: [form],
components: { components: {
dialogShow , dialogShow,
Editor, Editor,
}, },
data() { data() {
...@@ -40,67 +86,63 @@ ...@@ -40,67 +86,63 @@
title: "设备告警日志", title: "设备告警日志",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
toString:[ toString: ["alarmType", "alarmLevel", "alarmStatus"],
"alarmType",
"alarmLevel",
"alarmStatus",
],
// 表单校验 // 表单校验
rules: { rules: {
alarmTime: [ alarmTime: [{ required: true, message: "请选择告警时间" }],
{required: true,message: "请选择告警时间" },
],
alarmType: [ alarmType: [
{required: true,message: "请输入告警类型,", trigger: "blur" }, { required: true, message: "请输入告警类型,", trigger: "blur" },
], ],
alarmLevel: [ alarmLevel: [
{required: true,message: "请输入告警级别", trigger: "blur" }, { required: true, message: "请输入告警级别", trigger: "blur" },
], ],
alarmReceivePersonnel: [ alarmReceivePersonnel: [
{required: true,message: "请输入接收人员[设备管理的责任人]", trigger: "blur" }, {
{max: 32,message: "最多只能录入32个字符",trigger: "blur",}, required: true,
message: "请输入接收人员[设备管理的责任人]",
trigger: "blur",
},
{ max: 32, message: "最多只能录入32个字符", trigger: "blur" },
], ],
receivePersonnelTelephone: [ receivePersonnelTelephone: [
{required: true,message: "请输入接收人员电话", trigger: "blur" }, { required: true, message: "请输入接收人员电话", trigger: "blur" },
{max: 11,message: "最多只能录入11个字符",trigger: "blur",}, { max: 11, message: "最多只能录入11个字符", trigger: "blur" },
], ],
alarmContent: [ alarmContent: [
{required: true,message: "请输入告警详细内容", trigger: "blur" }, { required: true, message: "请输入告警详细内容", trigger: "blur" },
{max: 512,message: "最多只能录入512个字符",trigger: "blur",}, { max: 512, message: "最多只能录入512个字符", trigger: "blur" },
], ],
createTime: [ createTime: [{ required: true, message: "请选择创建时间" }],
{required: true,message: "请选择创建时间" }, },
],
}
}; };
}, },
methods: { methods: {
/** 编辑 */ /** 编辑 */
edit(row) { edit(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.editUrl;; this.urls.currUrl = this.pageInfo.editUrl;
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type = "edit";
this.title = "修改设备告警日志"; this.title = "修改设备告警日志";
}, },
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl = this.pageInfo.addUrl; this.urls.currUrl = this.pageInfo.addUrl;
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type = "add";
this.title = "新增设备告警日志"; this.title = "新增设备告警日志";
}, },
/** 查看*/ /** 查看*/
view(row) { view(row) {
this.reset() this.reset();
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.viewUrl;; this.urls.currUrl = this.pageInfo.viewUrl;
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type = "view";
this.title = "设备告警日志详细"; this.title = "设备告警日志详细";
}, },
/**取消按钮 */ /**取消按钮 */
...@@ -120,14 +162,14 @@ ...@@ -120,14 +162,14 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
alarmTime : null, alarmTime: null,
alarmDevice : null, alarmDevice: null,
alarmType : null, alarmType: null,
alarmLevel : null, alarmLevel: null,
alarmReceivePersonnel : "", alarmReceivePersonnel: "",
receivePersonnelTelephone : "", receivePersonnelTelephone: "",
alarmStatus : 0, alarmStatus: 0,
alarmContent : "", alarmContent: "",
}; };
this.resetForm("form"); this.resetForm("form");
}, },
...@@ -137,5 +179,5 @@ ...@@ -137,5 +179,5 @@
} }
}, },
}, },
}; };
</script> </script>
device-manager-ui/admin/src/views/device/list.vue
View file @ 2ce36050
align: "center",<template> <template>
<div class="page"> <div class="page">
<span style="font-size: 13px" <div class="page-header">
<div>
<span style="font-size: 14px"
><b>设备列表</b> (<el-link ><b>设备列表</b> (<el-link
style="margin-left: 10px" style="margin-left: 10px"
type="primary" type="primary"
...@@ -16,14 +18,11 @@ ...@@ -16,14 +18,11 @@
:underline="false" :underline="false"
>地图模式</el-link >地图模式</el-link
> >
<el-button </div>
style="float: right; margin-right: 10px" <el-button style="margin-right: 10px" @click="$router.back()" size="small"
type="text" >返回上一级</el-button
icon="el-icon-back"
@click="$router.go(-1)"
size="small"
>返回</el-button
> >
</div>
<el-divider></el-divider> <el-divider></el-divider>
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
<el-button <el-button
...@@ -43,7 +42,11 @@ ...@@ -43,7 +42,11 @@
:disabled="isExport" :disabled="isExport"
>导出</el-button >导出</el-button
> >
<el-tag slot="table-head-row2-left" size="mini" class="cursord" @click="changeStat(null)" <el-tag
slot="table-head-row2-left"
size="mini"
class="cursord"
@click="changeStat(null)"
>设备总数：{{ tableData.totalCount }}台</el-tag >设备总数：{{ tableData.totalCount }}台</el-tag
> >
...@@ -73,7 +76,7 @@ ...@@ -73,7 +76,7 @@
style="margin: 5px" style="margin: 5px"
type="danger" type="danger"
class="cursord" class="cursord"
@click="changeStat(null,0)" @click="changeStat(null, 0)"
>停用：{{ tableData.stopCount }}台</el-tag >停用：{{ tableData.stopCount }}台</el-tag
> >
...@@ -292,22 +295,20 @@ export default { ...@@ -292,22 +295,20 @@ export default {
this.$refs.drawerViewform.view(row); this.$refs.drawerViewform.view(row);
}, },
changeStat(val, enabled) {
this.query = Object.assign(this.query, { deviceStatus: val });
changeStat(val,enabled){ if (!enabled) {
this.query = Object.assign(this.query, {
this.query=Object.assign(this.query,{deviceStatus:val}); deviceStatusList: [1, 2],
enabled: enabled,
if(!enabled){ });
this.query=Object.assign(this.query,{deviceStatusList:[1,2],enabled:enabled});
} }
this.getData(); this.getData();
// delete this.query.deviceStatus // delete this.query.deviceStatus
// delete this.query.deviceStatusList // delete this.query.deviceStatusList
}, },
downMsg(row) { downMsg(row) {
...@@ -560,14 +561,20 @@ export default { ...@@ -560,14 +561,20 @@ export default {
}, },
}; };
</script> </script>
<style scoped> <style lang="less" scoped>
.page-header {
height: 40px;
display: flex;
justify-content: space-between;
align-items: center;
}
.el-divider--horizontal { .el-divider--horizontal {
margin: 2px 0; margin: 2px 0;
background: 0 0; background: 0 0;
border-top: 1px solid #e8eaec; border-top: 1px solid #e8eaec;
} }
.cursord{ .cursord {
cursor:pointer cursor: pointer;
} }
</style> </style>
\ No newline at end of file
device-manager-ui/admin/src/views/sitestat/list.vue
View file @ 2ce36050
...@@ -187,35 +187,35 @@ export default { ...@@ -187,35 +187,35 @@ export default {
label: "设备总数", label: "设备总数",
align: "center", align: "center",
prop: "deviceTotal", prop: "deviceTotal",
formatter: this.formatter, // formatter: this.formatter,
}, },
{ {
label: "在线数量", label: "在线数量",
align: "center", align: "center",
prop: "onlineCount", prop: "onlineCount",
formatter: this.formatter, // formatter: this.formatter,
}, },
{ {
label: "离线数量", label: "离线数量",
align: "center", align: "center",
prop: "offlineCount", prop: "offlineCount",
formatter: this.formatter, // formatter: this.formatter,
}, },
{ {
label: "停用数量", label: "停用数量",
align: "center", align: "center",
prop: "stopCount", prop: "stopCount",
formatter: this.formatter, // formatter: this.formatter,
}, },
{ {
label: "待激活数量", label: "待激活数量",
align: "center", align: "center",
prop: "unActiveCount", prop: "unActiveCount",
formatter: this.formatter, // formatter: this.formatter,
}, },
{ {
label: "操作", label: "操作",
......
yarn.lock 0 → 100644
View file @ 2ce36050
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1
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