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