提交

whychdw

2021-05-15 bae9146cdc69c2f85383914caf263b2811a1cfb7

提交

 package-lock.json

Diff too large

 src/assets/css/science-blue.css

@@ -304,13 +304,14 @@

.el-science-blue .params-dialog .three-btn {
    box-shadow: none;
    background-color: #042271;
    background-color: #062e99;
}

.el-science-blue .params-dialog .three-btn:active {
    box-shadow: none;
    position: relative;
    top: 0px;
    background-color: #041d5f;
    color: #d5d5d5;
}

.el-science-blue .params-dialog .el-select .el-input.is-focus .el-input__inner {
@@ -362,6 +363,9 @@

.el-science-blue .bg-white .el-input__inner::-webkit-input-placeholder {
    color: #c0c4cc;
}
.el-science-blue .params-dialog .el-textarea .el-input__count {
    background: none;
}

/* table */
@@ -518,7 +522,7 @@
}

.el-science-blue .el-dialog__headerbtn {
    top: 8px;
    top: 12px;
}

.el-science-blue .el-dialog__headerbtn .el-dialog__close {
@@ -950,4 +954,8 @@
}
.dialog-center .el-dialog__header {
    text-align: left;
}

.dialog-content-wrapper {
    padding: 8px 16px 0 16px;
}

 src/pages/warn/incomingScreenWarnRule.vue

File was deleted

 src/pages/warn/js/api.js

@@ -27,6 +27,27 @@
    return axios({
        method: "POST",
        url: '/alarmRule',
        data: data,
        data,
    });
}
/**
 * 删除告警
 * @param params
 * @returns {AxiosPromise}
 */
export const delWarnRule = (id)=>{
    return axios({
        method: "DELETE",
        url: '/alarmRule',
        params: {
            id
        },
    });
}

export const searchWarnRange = (url)=>{
    return axios({
        method: "GET",
        url: url,
    });
}

 src/pages/warn/warnManager.vue

@@ -1,9 +1,6 @@
<template>
    <flex-layout>
        <page-panel class="page-list-banner" title="数据筛选" :border="true" slot="header">
            <template slot="btnGrp">
                <el-button type="primary" size="mini">高级筛选</el-button>
            </template>
            <div class="table-layout">
                <div class="table-row">
                    <!-- 查询条件 -->

 src/router/routes.js

@@ -57,12 +57,12 @@
            component: (resolve) => require(['@/pages/warn/warnManager.vue'], resolve),
        },
        {
            path: 'incomingScreenWarnRule',
            name: 'incomingScreenWarnRule',
            path: 'warnRule/:deviceFlag',
            name: 'warnRule',
            meta: {
                name: '进线屏告警规则',
                name: '告警规则',
            },
            component: (resolve) => require(['@/pages/warn/incomingScreenWarnRule.vue'], resolve),
            component: (resolve) => require(['@/pages/warn/warnRule.vue'], resolve),
        },
        {   // 环境监测
            path: 'environmentMonitor',