diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue index 44523dd..778f18e 100644 --- a/src/components/configure/AlarmLog.vue +++ b/src/components/configure/AlarmLog.vue @@ -9,7 +9,7 @@ :value="item.platformCode" > - + @@ -75,11 +75,11 @@ } ], //渲染项目下拉框的数据 ProjectNo: "", //所选择的项目的项目编号 - ACValue: "", //顶部模糊搜索 + ALValue: "", //顶部模糊搜索 TableData: [], //表格数据 - ACPage: 1, //分页默认显示页 - ACDatagridDataLength: 0, //分页上显示的数据总条数 - ACSize: 10, //分页上显示的每页的条数 + ALPage: 1, //分页默认显示页 + ALDatagridDataLength: 0, //分页上显示的数据总条数 + ALSize: 10, //分页上显示的每页的条数 TimeBoxValue: [ this.moment() .subtract("days", 3) @@ -122,14 +122,14 @@ }, methods: { selectV() {}, - ACSizeChange(val) { + ALSizeChange(val) { // 改变每页的条数 - this.ACSize = val; + this.ALSize = val; this.loadGridData(); }, - ACCurrentChange(val) { + ALCurrentChange(val) { //改变页数 - this.ACPage = val; + this.ALPage = val; this.loadGridData(); }, // 获取所有平台 @@ -157,23 +157,22 @@ loadGridData() { this.loading = true; this.TableData = []; - this.ACDatagridDataLength = ""; this.$http .post(this.nozzle.warnLogListWarnLog, { - current: this.ACPage, - size: this.ACSize, + current: this.ALPage, + size: this.ALSize, data: { platForm: this.ProjectNo, //平台编号(可填) startTime: this.TimeBoxValue[0], //起始时间 endTime: this.TimeBoxValue[1], //截止时间 - siteName: this.ACValue //模糊搜索 + siteName: this.ALValue //模糊搜索 } }) .then(response => { this.loading = false; if (response.data.code === 200) { this.TableData = response.data.data.records; - this.ACDatagridDataLength = response.data.data.total; + this.ALDatagridDataLength = response.data.data.total; } else { message(response); } diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue index 44523dd..778f18e 100644 --- a/src/components/configure/AlarmLog.vue +++ b/src/components/configure/AlarmLog.vue @@ -9,7 +9,7 @@ :value="item.platformCode" > - + @@ -75,11 +75,11 @@ } ], //渲染项目下拉框的数据 ProjectNo: "", //所选择的项目的项目编号 - ACValue: "", //顶部模糊搜索 + ALValue: "", //顶部模糊搜索 TableData: [], //表格数据 - ACPage: 1, //分页默认显示页 - ACDatagridDataLength: 0, //分页上显示的数据总条数 - ACSize: 10, //分页上显示的每页的条数 + ALPage: 1, //分页默认显示页 + ALDatagridDataLength: 0, //分页上显示的数据总条数 + ALSize: 10, //分页上显示的每页的条数 TimeBoxValue: [ this.moment() .subtract("days", 3) @@ -122,14 +122,14 @@ }, methods: { selectV() {}, - ACSizeChange(val) { + ALSizeChange(val) { // 改变每页的条数 - this.ACSize = val; + this.ALSize = val; this.loadGridData(); }, - ACCurrentChange(val) { + ALCurrentChange(val) { //改变页数 - this.ACPage = val; + this.ALPage = val; this.loadGridData(); }, // 获取所有平台 @@ -157,23 +157,22 @@ loadGridData() { this.loading = true; this.TableData = []; - this.ACDatagridDataLength = ""; this.$http .post(this.nozzle.warnLogListWarnLog, { - current: this.ACPage, - size: this.ACSize, + current: this.ALPage, + size: this.ALSize, data: { platForm: this.ProjectNo, //平台编号(可填) startTime: this.TimeBoxValue[0], //起始时间 endTime: this.TimeBoxValue[1], //截止时间 - siteName: this.ACValue //模糊搜索 + siteName: this.ALValue //模糊搜索 } }) .then(response => { this.loading = false; if (response.data.code === 200) { this.TableData = response.data.data.records; - this.ACDatagridDataLength = response.data.data.total; + this.ALDatagridDataLength = response.data.data.total; } else { message(response); } diff --git a/src/components/configure/PushRules.vue b/src/components/configure/PushRules.vue index 9073228..0da7e47 100644 --- a/src/components/configure/PushRules.vue +++ b/src/components/configure/PushRules.vue @@ -1,17 +1,362 @@ + \ No newline at end of file diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue index 44523dd..778f18e 100644 --- a/src/components/configure/AlarmLog.vue +++ b/src/components/configure/AlarmLog.vue @@ -9,7 +9,7 @@ :value="item.platformCode" > - + @@ -75,11 +75,11 @@ } ], //渲染项目下拉框的数据 ProjectNo: "", //所选择的项目的项目编号 - ACValue: "", //顶部模糊搜索 + ALValue: "", //顶部模糊搜索 TableData: [], //表格数据 - ACPage: 1, //分页默认显示页 - ACDatagridDataLength: 0, //分页上显示的数据总条数 - ACSize: 10, //分页上显示的每页的条数 + ALPage: 1, //分页默认显示页 + ALDatagridDataLength: 0, //分页上显示的数据总条数 + ALSize: 10, //分页上显示的每页的条数 TimeBoxValue: [ this.moment() .subtract("days", 3) @@ -122,14 +122,14 @@ }, methods: { selectV() {}, - ACSizeChange(val) { + ALSizeChange(val) { // 改变每页的条数 - this.ACSize = val; + this.ALSize = val; this.loadGridData(); }, - ACCurrentChange(val) { + ALCurrentChange(val) { //改变页数 - this.ACPage = val; + this.ALPage = val; this.loadGridData(); }, // 获取所有平台 @@ -157,23 +157,22 @@ loadGridData() { this.loading = true; this.TableData = []; - this.ACDatagridDataLength = ""; this.$http .post(this.nozzle.warnLogListWarnLog, { - current: this.ACPage, - size: this.ACSize, + current: this.ALPage, + size: this.ALSize, data: { platForm: this.ProjectNo, //平台编号(可填) startTime: this.TimeBoxValue[0], //起始时间 endTime: this.TimeBoxValue[1], //截止时间 - siteName: this.ACValue //模糊搜索 + siteName: this.ALValue //模糊搜索 } }) .then(response => { this.loading = false; if (response.data.code === 200) { this.TableData = response.data.data.records; - this.ACDatagridDataLength = response.data.data.total; + this.ALDatagridDataLength = response.data.data.total; } else { message(response); } diff --git a/src/components/configure/PushRules.vue b/src/components/configure/PushRules.vue index 9073228..0da7e47 100644 --- a/src/components/configure/PushRules.vue +++ b/src/components/configure/PushRules.vue @@ -1,17 +1,362 @@ + \ No newline at end of file diff --git a/src/util/project.js b/src/util/project.js index d110c7c..6d025e9 100644 --- a/src/util/project.js +++ b/src/util/project.js @@ -22,6 +22,7 @@ "warnConfigDeleteWarnConfig":"/warn/config/deleteWarnConfig",//删除警戒线 "warnLogListWarnLog":"/warn/log/listWarnLog",//查询报警日志 "warnRuleListPushRule":"/warn/rule/listPushRule",//查询报警推送规则 + "warnRuleListNonConfigPlatform":"/warn/rule/listNonConfigPlatform",//查询未配置规则得平台 "warnRuleInsertWarnPushRule":"/warn/rule/insertWarnPushRule",//新增推送规则 "warnRuleInsertUpdateWarnPushRule":"/warn/rule/updateWarnPushRule",//修改推送规则 "warnRuleInsertDeleteWarnPushRule":"/warn/rule/deleteWarnPushRule",//删除推送规则