diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>

diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>
diff --git a/src/components/MessageManagement/MessageQuery.vue b/src/components/MessageManagement/MessageQuery.vue
index b33dc36..59e55bc 100644
--- a/src/components/MessageManagement/MessageQuery.vue
+++ b/src/components/MessageManagement/MessageQuery.vue
@@ -358,5 +358,6 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
\ No newline at end of file

diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>
diff --git a/src/components/MessageManagement/MessageQuery.vue b/src/components/MessageManagement/MessageQuery.vue
index b33dc36..59e55bc 100644
--- a/src/components/MessageManagement/MessageQuery.vue
+++ b/src/components/MessageManagement/MessageQuery.vue
@@ -358,5 +358,6 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/MessageManagement/MessageStatistics.vue b/src/components/MessageManagement/MessageStatistics.vue
index e2af79d..0dbdb1f 100644
--- a/src/components/MessageManagement/MessageStatistics.vue
+++ b/src/components/MessageManagement/MessageStatistics.vue
@@ -340,6 +340,7 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
 

diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>
diff --git a/src/components/MessageManagement/MessageQuery.vue b/src/components/MessageManagement/MessageQuery.vue
index b33dc36..59e55bc 100644
--- a/src/components/MessageManagement/MessageQuery.vue
+++ b/src/components/MessageManagement/MessageQuery.vue
@@ -358,5 +358,6 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/MessageManagement/MessageStatistics.vue b/src/components/MessageManagement/MessageStatistics.vue
index e2af79d..0dbdb1f 100644
--- a/src/components/MessageManagement/MessageStatistics.vue
+++ b/src/components/MessageManagement/MessageStatistics.vue
@@ -340,6 +340,7 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
 
diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue
index b9fbb9c..778f18e 100644
--- a/src/components/configure/AlarmLog.vue
+++ b/src/components/configure/AlarmLog.vue
@@ -1,21 +1,214 @@
 <template>
   <div id="AlarmLog">
-    <countTo :startVal="startVal" :endVal="endVal" :duration="9000" style="color:white"></countTo>
+    <div id="ALTop">
+      <el-select v-model="ProjectNo" filterable placeholder="请选择" @change="selectV()">
+        <el-option
+          v-for="item in ALSiteOptions"
+          :key="item.index"
+          :label="item.name"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-input placeholder="请输入站点名称" v-model="ALValue" clearable></el-input>
+      <el-date-picker
+        v-model="TimeBoxValue"
+        :picker-options="pickerOptions"
+        type="datetimerange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        id="IndexTime"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+    </div>
+    <div
+      id="ALCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="factorsName" label="因子名"></el-table-column>
+        <el-table-column prop="warnType" label="报警级别">
+          <template slot-scope="scope">
+            <span v-if="scope.row.warnType==2" style="color:red">{{ scope.row.warnTypeDesc }}</span>
+            <span v-else style="color: yellow">{{ scope.row.warnTypeDesc }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="warnValue" label="监测值"></el-table-column>
+        <el-table-column prop="ttTime" label="观测时间"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="ALSizeChange"
+        @current-change="ALCurrentChange"
+        :current-page="ALPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="ALSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="ALDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
-import countTo from "vue-count-to";
+import { message } from "./../../util/item";
 export default {
   name: "AlarmLog",
-  components: { countTo },
   data: function() {
-    return { startVal: 99, endVal: 0 };
+    return {
+      ALSiteOptions: [
+        {
+          //数据格式
+
+          name: "全部项目",
+          shortName: "全部项目",
+          latitude: "定位坐标",
+          longitude: "定位坐标",
+          zoomLevel: "8",
+          platformCode: ""
+        }
+      ], //渲染项目下拉框的数据
+      ProjectNo: "", //所选择的项目的项目编号
+      ALValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      ALPage: 1, //分页默认显示页
+      ALDatagridDataLength: 0, //分页上显示的数据总条数
+      ALSize: 10, //分页上显示的每页的条数
+      TimeBoxValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //起止日期
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近三天",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      }, //时间框的快捷选项
+      loading: false
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    selectV() {},
+    ALSizeChange(val) {
+      // 改变每页的条数
+      this.ALSize = val;
+      this.loadGridData();
+    },
+    ALCurrentChange(val) {
+      //改变页数
+      this.ALPage = val;
+      this.loadGridData();
+    },
+    // 获取所有平台
+    LoadAllProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformListPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            this.ALSiteOptions = this.ALSiteOptions.concat(
+              response.data.data.records
+            );
+            this.loadGridData();
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    //获取数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnLogListWarnLog, {
+          current: this.ALPage,
+          size: this.ALSize,
+          data: {
+            platForm: this.ProjectNo, //平台编号(可填)
+            startTime: this.TimeBoxValue[0], //起始时间
+            endTime: this.TimeBoxValue[1], //截止时间
+            siteName: this.ALValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.ALDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.LoadAllProject();
+  }
 };
 </script>
 
 <style scoped>
+#AlarmLog {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#ALTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#ALTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#ALCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
 </style>
\ No newline at end of file

diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>
diff --git a/src/components/MessageManagement/MessageQuery.vue b/src/components/MessageManagement/MessageQuery.vue
index b33dc36..59e55bc 100644
--- a/src/components/MessageManagement/MessageQuery.vue
+++ b/src/components/MessageManagement/MessageQuery.vue
@@ -358,5 +358,6 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/MessageManagement/MessageStatistics.vue b/src/components/MessageManagement/MessageStatistics.vue
index e2af79d..0dbdb1f 100644
--- a/src/components/MessageManagement/MessageStatistics.vue
+++ b/src/components/MessageManagement/MessageStatistics.vue
@@ -340,6 +340,7 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
 
diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue
index b9fbb9c..778f18e 100644
--- a/src/components/configure/AlarmLog.vue
+++ b/src/components/configure/AlarmLog.vue
@@ -1,21 +1,214 @@
 <template>
   <div id="AlarmLog">
-    <countTo :startVal="startVal" :endVal="endVal" :duration="9000" style="color:white"></countTo>
+    <div id="ALTop">
+      <el-select v-model="ProjectNo" filterable placeholder="请选择" @change="selectV()">
+        <el-option
+          v-for="item in ALSiteOptions"
+          :key="item.index"
+          :label="item.name"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-input placeholder="请输入站点名称" v-model="ALValue" clearable></el-input>
+      <el-date-picker
+        v-model="TimeBoxValue"
+        :picker-options="pickerOptions"
+        type="datetimerange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        id="IndexTime"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+    </div>
+    <div
+      id="ALCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="factorsName" label="因子名"></el-table-column>
+        <el-table-column prop="warnType" label="报警级别">
+          <template slot-scope="scope">
+            <span v-if="scope.row.warnType==2" style="color:red">{{ scope.row.warnTypeDesc }}</span>
+            <span v-else style="color: yellow">{{ scope.row.warnTypeDesc }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="warnValue" label="监测值"></el-table-column>
+        <el-table-column prop="ttTime" label="观测时间"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="ALSizeChange"
+        @current-change="ALCurrentChange"
+        :current-page="ALPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="ALSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="ALDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
-import countTo from "vue-count-to";
+import { message } from "./../../util/item";
 export default {
   name: "AlarmLog",
-  components: { countTo },
   data: function() {
-    return { startVal: 99, endVal: 0 };
+    return {
+      ALSiteOptions: [
+        {
+          //数据格式
+
+          name: "全部项目",
+          shortName: "全部项目",
+          latitude: "定位坐标",
+          longitude: "定位坐标",
+          zoomLevel: "8",
+          platformCode: ""
+        }
+      ], //渲染项目下拉框的数据
+      ProjectNo: "", //所选择的项目的项目编号
+      ALValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      ALPage: 1, //分页默认显示页
+      ALDatagridDataLength: 0, //分页上显示的数据总条数
+      ALSize: 10, //分页上显示的每页的条数
+      TimeBoxValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //起止日期
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近三天",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      }, //时间框的快捷选项
+      loading: false
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    selectV() {},
+    ALSizeChange(val) {
+      // 改变每页的条数
+      this.ALSize = val;
+      this.loadGridData();
+    },
+    ALCurrentChange(val) {
+      //改变页数
+      this.ALPage = val;
+      this.loadGridData();
+    },
+    // 获取所有平台
+    LoadAllProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformListPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            this.ALSiteOptions = this.ALSiteOptions.concat(
+              response.data.data.records
+            );
+            this.loadGridData();
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    //获取数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnLogListWarnLog, {
+          current: this.ALPage,
+          size: this.ALSize,
+          data: {
+            platForm: this.ProjectNo, //平台编号(可填)
+            startTime: this.TimeBoxValue[0], //起始时间
+            endTime: this.TimeBoxValue[1], //截止时间
+            siteName: this.ALValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.ALDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.LoadAllProject();
+  }
 };
 </script>
 
 <style scoped>
+#AlarmLog {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#ALTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#ALTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#ALCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
 </style>
\ No newline at end of file
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 @@
 <template>
-  <div id="PushRules"></div>
+  <div id="PushRules">
+    <div id="PRTop">
+      <el-input placeholder="请输入站点名称" v-model="PRValue" clearable></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="Add()">新增推送规则</el-button>
+    </div>
+    <div
+      id="PRCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="platForm" label="平台编号"></el-table-column>
+        <el-table-column prop="platFormName" label="平台名称"></el-table-column>
+        <el-table-column prop="pushFrequency" label="推送频率（秒）"></el-table-column>
+        <el-table-column prop="startTime" label="推送开始时间"></el-table-column>
+        <el-table-column prop="endTime" label="推送结束时间"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="Edit(scope.$index, scope.row)"
+              style="margin:0 10px"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="Del(scope.$index, scope.row)"
+              style="margin:0 10px"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="PRSizeChange"
+        @current-change="PRCurrentChange"
+        :current-page="PRPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="PRSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="PRDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog :title="DialogTitle" :visible.sync="dialogVisible" width="500px">
+      <div class="DialogList">
+        <span class="DialogListName">平&nbsp;台&nbsp;名&nbsp;称&nbsp;&nbsp;:</span>
+        <el-select
+          v-model="platForm"
+          filterable
+          placeholder="请选择平台"
+          :disabled="!isAdd"
+          @change="platFormChange"
+        >
+          <el-option
+            v-for="item in platFormData"
+            :key="item.index"
+            :label="item.name"
+            :value="item.platformCode"
+          ></el-option>
+        </el-select>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">推送频率(秒):</span>
+        <el-input placeholder="请输入站点名称" v-model="pushFrequency" clearable type="number"></el-input>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">开&nbsp;始&nbsp;推&nbsp;送&nbsp;&nbsp;:</span>
+        <el-time-picker v-model="startTime" value-format="HH:mm:ss"></el-time-picker>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">结&nbsp;束&nbsp;推&nbsp;送&nbsp;&nbsp;:</span>
+        <el-time-picker v-model="endTime" value-format="HH:mm:ss"></el-time-picker>
+      </div>
+      <div class="Dialog2List">
+        <a
+          href="javascript:void(0)"
+          class="DialogListButton"
+          @click="dialogVisible2=false"
+        >取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+        <a
+          href="javascript:void(0)"
+          class="DialogListButton2"
+          @click="Updata()"
+        >确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "PushRules",
   data: function() {
-    return {};
+    return {
+      loading: false, //加载中 状态
+      PRValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      PRPage: 1, //分页默认显示页
+      PRDatagridDataLength: 0, //分页上显示的数据总条数
+      PRSize: 10, //分页上显示的每页的条数
+      dialogVisible: false, //dialog状态
+      isAdd: true, //判断当前是新增还是修改，true为新增
+      DialogTitle: "", //弹窗得标题
+      platForm: "", //平台编号
+      platFormData: [], //平台编号渲染数据
+      platFormName: "", //平台名称
+      pushFrequency: 28800, //推送频率
+      startTime: "08:00:00", //时间
+      endTime: "08:00:00" //时间
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    PRSizeChange(val) {
+      // 改变每页的条数
+      this.PRSize = val;
+      this.loadGridData();
+    },
+    PRCurrentChange(val) {
+      console.log(val);
+      //改变页数
+      this.PRPage = val;
+      this.loadGridData();
+    },
+    // 加载表格数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnRuleListPushRule, {
+          current: this.PRPage,
+          size: this.PRSize,
+          data: {
+            platFormName: this.PRValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.PRDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    // 修改
+    Edit(index, rows) {
+      this.isAdd = false;
+      this.DialogTitle = rows.platFormName;
+      this.dialogVisible = true;
+      this.platFormData = [
+        {
+          platformCode: rows.platForm,
+          name: rows.platFormName
+        }
+      ];
+      this.platForm = rows.platForm;
+      this.pushFrequency = rows.pushFrequency;
+      this.startTime = rows.startTime;
+      this.endTime = rows.endTime;
+    },
+    // 新增
+    Add() {
+      this.isAdd = true;
+      // 获取未设置推送规则得平台，如果没有则阻止其操作
+      this.$http
+        .post(this.nozzle.warnRuleListNonConfigPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            if (response.data.data.length == 0) {
+              // 无法新增
+              this.$message({
+                type: "warning",
+                message: "暂无未配置推送规则的平台"
+              });
+            } else {
+              // 才能新增
+              this.DialogTitle = "新增推送规则";
+              this.dialogVisible = true;
+              // 设置默认值
+              this.platFormData = response.data.data;
+              this.platForm = response.data.data[0].platformCode;
+              this.platFormName = response.data.data[0].name;
+              this.pushFrequency = 28800;
+              this.startTime = "08:00:00";
+              this.endTime = "22:00:00";
+            }
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    // 选择项目
+    platFormChange(vId) {
+      let obj = {};
+      obj = this.platFormData.find(item => {
+        //这里的userList就是上面遍历的数据源
+        return item.platForm === vId; //筛选出匹配数据
+      });
+      this.platFormName = obj.name; //我这边的name就是对应label的
+    },
+    // 删除
+    Del(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.warnRuleInsertDeleteWarnPushRule, DelID)
+            .then(response => {
+              message(response);
+              this.dialogVisible = false;
+              this.loadGridData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 提交
+    Updata() {
+      var PostUrl = "",
+        params2;
+      if (this.isAdd) {
+        // 新增时：
+        PostUrl = this.nozzle.warnRuleInsertWarnPushRule;
+        params2 = {
+          data: {
+            platForm: this.platForm, //平台编号
+            platFormName: this.platFormName, //平台名称
+            pushFrequency: this.pushFrequency, //推送频率
+            startTime: this.startTime, //推送起始时间
+            endTime: this.endTime //推送结束时间
+          }
+        };
+      } else {
+        // 修改时：
+        PostUrl = this.nozzle.warnRuleInsertUpdateWarnPushRule;
+        params2 = {
+          data: {
+            platForm: this.platForm, //平台编号
+            pushFrequency: this.pushFrequency, //推送频率
+            startTime: this.startTime, //推送起始时间
+            endTime: this.endTime //推送结束时间
+          }
+        };
+      }
+      this.$http
+        .post(PostUrl, params2)
+        .then(response => {
+          message(response);
+          this.dialogVisible = false;
+          this.loadGridData();
+        })
+        .catch(response => {
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.loadGridData();
+  }
 };
 </script>
 
 <style scoped>
+#PushRules {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PRTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#PRTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#PRCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 弹窗 */
+.DialogList {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  box-sizing: border-box;
+  text-align: center;
+}
+.DialogList .el-input {
+  width: 217px;
+}
+.DialogListName {
+  display: inline-block;
+  width: 100px;
+  height: 60px;
+  line-height: 60px;
+  color: white;
+  text-align: center;
+}
+.DialogListButton {
+  height: 40px;
+  width: 100px;
+  display: inline-block;
+  line-height: 40px;
+  border-radius: 2px;
+  text-decoration: none;
+  color: rgb(0, 111, 255);
+  background: rgba(255, 255, 255, 0);
+  border: 1px solid rgb(0, 111, 255);
+  margin: 0 30px;
+}
+.DialogListButton2 {
+  height: 40px;
+  width: 100px;
+  display: inline-block;
+  line-height: 40px;
+  border-radius: 2px;
+  text-decoration: none;
+  color: white;
+  background: rgb(0, 111, 255);
+  border: 1px solid rgb(0, 111, 255);
+  margin: 0 30px;
+}
+</style>
+<style>
+.el-dialog__header {
+  text-align: left !important;
+}
 </style>
\ No newline at end of file

diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>
diff --git a/src/components/MessageManagement/MessageQuery.vue b/src/components/MessageManagement/MessageQuery.vue
index b33dc36..59e55bc 100644
--- a/src/components/MessageManagement/MessageQuery.vue
+++ b/src/components/MessageManagement/MessageQuery.vue
@@ -358,5 +358,6 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/MessageManagement/MessageStatistics.vue b/src/components/MessageManagement/MessageStatistics.vue
index e2af79d..0dbdb1f 100644
--- a/src/components/MessageManagement/MessageStatistics.vue
+++ b/src/components/MessageManagement/MessageStatistics.vue
@@ -340,6 +340,7 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
 
diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue
index b9fbb9c..778f18e 100644
--- a/src/components/configure/AlarmLog.vue
+++ b/src/components/configure/AlarmLog.vue
@@ -1,21 +1,214 @@
 <template>
   <div id="AlarmLog">
-    <countTo :startVal="startVal" :endVal="endVal" :duration="9000" style="color:white"></countTo>
+    <div id="ALTop">
+      <el-select v-model="ProjectNo" filterable placeholder="请选择" @change="selectV()">
+        <el-option
+          v-for="item in ALSiteOptions"
+          :key="item.index"
+          :label="item.name"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-input placeholder="请输入站点名称" v-model="ALValue" clearable></el-input>
+      <el-date-picker
+        v-model="TimeBoxValue"
+        :picker-options="pickerOptions"
+        type="datetimerange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        id="IndexTime"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+    </div>
+    <div
+      id="ALCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="factorsName" label="因子名"></el-table-column>
+        <el-table-column prop="warnType" label="报警级别">
+          <template slot-scope="scope">
+            <span v-if="scope.row.warnType==2" style="color:red">{{ scope.row.warnTypeDesc }}</span>
+            <span v-else style="color: yellow">{{ scope.row.warnTypeDesc }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="warnValue" label="监测值"></el-table-column>
+        <el-table-column prop="ttTime" label="观测时间"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="ALSizeChange"
+        @current-change="ALCurrentChange"
+        :current-page="ALPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="ALSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="ALDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
-import countTo from "vue-count-to";
+import { message } from "./../../util/item";
 export default {
   name: "AlarmLog",
-  components: { countTo },
   data: function() {
-    return { startVal: 99, endVal: 0 };
+    return {
+      ALSiteOptions: [
+        {
+          //数据格式
+
+          name: "全部项目",
+          shortName: "全部项目",
+          latitude: "定位坐标",
+          longitude: "定位坐标",
+          zoomLevel: "8",
+          platformCode: ""
+        }
+      ], //渲染项目下拉框的数据
+      ProjectNo: "", //所选择的项目的项目编号
+      ALValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      ALPage: 1, //分页默认显示页
+      ALDatagridDataLength: 0, //分页上显示的数据总条数
+      ALSize: 10, //分页上显示的每页的条数
+      TimeBoxValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //起止日期
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近三天",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      }, //时间框的快捷选项
+      loading: false
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    selectV() {},
+    ALSizeChange(val) {
+      // 改变每页的条数
+      this.ALSize = val;
+      this.loadGridData();
+    },
+    ALCurrentChange(val) {
+      //改变页数
+      this.ALPage = val;
+      this.loadGridData();
+    },
+    // 获取所有平台
+    LoadAllProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformListPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            this.ALSiteOptions = this.ALSiteOptions.concat(
+              response.data.data.records
+            );
+            this.loadGridData();
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    //获取数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnLogListWarnLog, {
+          current: this.ALPage,
+          size: this.ALSize,
+          data: {
+            platForm: this.ProjectNo, //平台编号(可填)
+            startTime: this.TimeBoxValue[0], //起始时间
+            endTime: this.TimeBoxValue[1], //截止时间
+            siteName: this.ALValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.ALDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.LoadAllProject();
+  }
 };
 </script>
 
 <style scoped>
+#AlarmLog {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#ALTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#ALTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#ALCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
 </style>
\ No newline at end of file
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 @@
 <template>
-  <div id="PushRules"></div>
+  <div id="PushRules">
+    <div id="PRTop">
+      <el-input placeholder="请输入站点名称" v-model="PRValue" clearable></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="Add()">新增推送规则</el-button>
+    </div>
+    <div
+      id="PRCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="platForm" label="平台编号"></el-table-column>
+        <el-table-column prop="platFormName" label="平台名称"></el-table-column>
+        <el-table-column prop="pushFrequency" label="推送频率（秒）"></el-table-column>
+        <el-table-column prop="startTime" label="推送开始时间"></el-table-column>
+        <el-table-column prop="endTime" label="推送结束时间"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="Edit(scope.$index, scope.row)"
+              style="margin:0 10px"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="Del(scope.$index, scope.row)"
+              style="margin:0 10px"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="PRSizeChange"
+        @current-change="PRCurrentChange"
+        :current-page="PRPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="PRSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="PRDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog :title="DialogTitle" :visible.sync="dialogVisible" width="500px">
+      <div class="DialogList">
+        <span class="DialogListName">平&nbsp;台&nbsp;名&nbsp;称&nbsp;&nbsp;:</span>
+        <el-select
+          v-model="platForm"
+          filterable
+          placeholder="请选择平台"
+          :disabled="!isAdd"
+          @change="platFormChange"
+        >
+          <el-option
+            v-for="item in platFormData"
+            :key="item.index"
+            :label="item.name"
+            :value="item.platformCode"
+          ></el-option>
+        </el-select>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">推送频率(秒):</span>
+        <el-input placeholder="请输入站点名称" v-model="pushFrequency" clearable type="number"></el-input>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">开&nbsp;始&nbsp;推&nbsp;送&nbsp;&nbsp;:</span>
+        <el-time-picker v-model="startTime" value-format="HH:mm:ss"></el-time-picker>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">结&nbsp;束&nbsp;推&nbsp;送&nbsp;&nbsp;:</span>
+        <el-time-picker v-model="endTime" value-format="HH:mm:ss"></el-time-picker>
+      </div>
+      <div class="Dialog2List">
+        <a
+          href="javascript:void(0)"
+          class="DialogListButton"
+          @click="dialogVisible2=false"
+        >取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+        <a
+          href="javascript:void(0)"
+          class="DialogListButton2"
+          @click="Updata()"
+        >确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "PushRules",
   data: function() {
-    return {};
+    return {
+      loading: false, //加载中 状态
+      PRValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      PRPage: 1, //分页默认显示页
+      PRDatagridDataLength: 0, //分页上显示的数据总条数
+      PRSize: 10, //分页上显示的每页的条数
+      dialogVisible: false, //dialog状态
+      isAdd: true, //判断当前是新增还是修改，true为新增
+      DialogTitle: "", //弹窗得标题
+      platForm: "", //平台编号
+      platFormData: [], //平台编号渲染数据
+      platFormName: "", //平台名称
+      pushFrequency: 28800, //推送频率
+      startTime: "08:00:00", //时间
+      endTime: "08:00:00" //时间
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    PRSizeChange(val) {
+      // 改变每页的条数
+      this.PRSize = val;
+      this.loadGridData();
+    },
+    PRCurrentChange(val) {
+      console.log(val);
+      //改变页数
+      this.PRPage = val;
+      this.loadGridData();
+    },
+    // 加载表格数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnRuleListPushRule, {
+          current: this.PRPage,
+          size: this.PRSize,
+          data: {
+            platFormName: this.PRValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.PRDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    // 修改
+    Edit(index, rows) {
+      this.isAdd = false;
+      this.DialogTitle = rows.platFormName;
+      this.dialogVisible = true;
+      this.platFormData = [
+        {
+          platformCode: rows.platForm,
+          name: rows.platFormName
+        }
+      ];
+      this.platForm = rows.platForm;
+      this.pushFrequency = rows.pushFrequency;
+      this.startTime = rows.startTime;
+      this.endTime = rows.endTime;
+    },
+    // 新增
+    Add() {
+      this.isAdd = true;
+      // 获取未设置推送规则得平台，如果没有则阻止其操作
+      this.$http
+        .post(this.nozzle.warnRuleListNonConfigPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            if (response.data.data.length == 0) {
+              // 无法新增
+              this.$message({
+                type: "warning",
+                message: "暂无未配置推送规则的平台"
+              });
+            } else {
+              // 才能新增
+              this.DialogTitle = "新增推送规则";
+              this.dialogVisible = true;
+              // 设置默认值
+              this.platFormData = response.data.data;
+              this.platForm = response.data.data[0].platformCode;
+              this.platFormName = response.data.data[0].name;
+              this.pushFrequency = 28800;
+              this.startTime = "08:00:00";
+              this.endTime = "22:00:00";
+            }
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    // 选择项目
+    platFormChange(vId) {
+      let obj = {};
+      obj = this.platFormData.find(item => {
+        //这里的userList就是上面遍历的数据源
+        return item.platForm === vId; //筛选出匹配数据
+      });
+      this.platFormName = obj.name; //我这边的name就是对应label的
+    },
+    // 删除
+    Del(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.warnRuleInsertDeleteWarnPushRule, DelID)
+            .then(response => {
+              message(response);
+              this.dialogVisible = false;
+              this.loadGridData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 提交
+    Updata() {
+      var PostUrl = "",
+        params2;
+      if (this.isAdd) {
+        // 新增时：
+        PostUrl = this.nozzle.warnRuleInsertWarnPushRule;
+        params2 = {
+          data: {
+            platForm: this.platForm, //平台编号
+            platFormName: this.platFormName, //平台名称
+            pushFrequency: this.pushFrequency, //推送频率
+            startTime: this.startTime, //推送起始时间
+            endTime: this.endTime //推送结束时间
+          }
+        };
+      } else {
+        // 修改时：
+        PostUrl = this.nozzle.warnRuleInsertUpdateWarnPushRule;
+        params2 = {
+          data: {
+            platForm: this.platForm, //平台编号
+            pushFrequency: this.pushFrequency, //推送频率
+            startTime: this.startTime, //推送起始时间
+            endTime: this.endTime //推送结束时间
+          }
+        };
+      }
+      this.$http
+        .post(PostUrl, params2)
+        .then(response => {
+          message(response);
+          this.dialogVisible = false;
+          this.loadGridData();
+        })
+        .catch(response => {
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.loadGridData();
+  }
 };
 </script>
 
 <style scoped>
+#PushRules {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PRTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#PRTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#PRCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 弹窗 */
+.DialogList {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  box-sizing: border-box;
+  text-align: center;
+}
+.DialogList .el-input {
+  width: 217px;
+}
+.DialogListName {
+  display: inline-block;
+  width: 100px;
+  height: 60px;
+  line-height: 60px;
+  color: white;
+  text-align: center;
+}
+.DialogListButton {
+  height: 40px;
+  width: 100px;
+  display: inline-block;
+  line-height: 40px;
+  border-radius: 2px;
+  text-decoration: none;
+  color: rgb(0, 111, 255);
+  background: rgba(255, 255, 255, 0);
+  border: 1px solid rgb(0, 111, 255);
+  margin: 0 30px;
+}
+.DialogListButton2 {
+  height: 40px;
+  width: 100px;
+  display: inline-block;
+  line-height: 40px;
+  border-radius: 2px;
+  text-decoration: none;
+  color: white;
+  background: rgb(0, 111, 255);
+  border: 1px solid rgb(0, 111, 255);
+  margin: 0 30px;
+}
+</style>
+<style>
+.el-dialog__header {
+  text-align: left !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/index.vue b/src/components/index.vue
index 85d93cf..e42a46b 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -42,7 +42,7 @@
       <el-container>
         <el-aside :style="'width:' + MenuWidth + 'px'">
           <el-menu
-            default-active="1"
+            default-active="2-1"
             class="el-menu-vertical-demo"
             @select="MenuClick"
             background-color="rgb(58, 58, 60)"
@@ -50,7 +50,7 @@
             active-text-color="rgb(255,213,0)"
             router="true"
           >
-            <el-menu-item index="1" route="/overview">
+            <el-menu-item index="1" route="/overview" v-show="false">
               <i class="el-icon-menu"></i>
               <span slot="title">概&nbsp;&nbsp;&nbsp;&nbsp;览</span>
             </el-menu-item>
@@ -274,9 +274,9 @@
   color: #fff;
   text-align: center;
 }
-.el-menu {
-  border-right: 0px solid #e6e6e6;
-}
+/* .el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+} */
 .el-menu-item {
   border-bottom: 2px solid #000;
   text-align: left;

diff --git a/src/App.vue b/src/App.vue
index c54eada..c360395 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -218,4 +218,10 @@
   background: rgba(27, 27, 28, 0) !important;
 }
 /* 新烽查询系统单独样式 B */
+
+/* 菜单 */
+.el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+}
+/* 菜单 */
 </style>
diff --git a/src/components/MessageManagement/MessageQuery.vue b/src/components/MessageManagement/MessageQuery.vue
index b33dc36..59e55bc 100644
--- a/src/components/MessageManagement/MessageQuery.vue
+++ b/src/components/MessageManagement/MessageQuery.vue
@@ -358,5 +358,6 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
\ No newline at end of file
diff --git a/src/components/MessageManagement/MessageStatistics.vue b/src/components/MessageManagement/MessageStatistics.vue
index e2af79d..0dbdb1f 100644
--- a/src/components/MessageManagement/MessageStatistics.vue
+++ b/src/components/MessageManagement/MessageStatistics.vue
@@ -340,6 +340,7 @@
   width: 100%;
   height: calc(100% - 70px);
   margin-top: 10px;
+  background: rgba(53,53,53,.5);
 }
 </style>
 
diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue
index b9fbb9c..778f18e 100644
--- a/src/components/configure/AlarmLog.vue
+++ b/src/components/configure/AlarmLog.vue
@@ -1,21 +1,214 @@
 <template>
   <div id="AlarmLog">
-    <countTo :startVal="startVal" :endVal="endVal" :duration="9000" style="color:white"></countTo>
+    <div id="ALTop">
+      <el-select v-model="ProjectNo" filterable placeholder="请选择" @change="selectV()">
+        <el-option
+          v-for="item in ALSiteOptions"
+          :key="item.index"
+          :label="item.name"
+          :value="item.platformCode"
+        ></el-option>
+      </el-select>
+      <el-input placeholder="请输入站点名称" v-model="ALValue" clearable></el-input>
+      <el-date-picker
+        v-model="TimeBoxValue"
+        :picker-options="pickerOptions"
+        type="datetimerange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        id="IndexTime"
+        value-format="yyyy-MM-dd HH:mm:ss"
+      ></el-date-picker>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+    </div>
+    <div
+      id="ALCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="siteNo" label="站点编号"></el-table-column>
+        <el-table-column prop="siteName" label="站点名称"></el-table-column>
+        <el-table-column prop="factorsName" label="因子名"></el-table-column>
+        <el-table-column prop="warnType" label="报警级别">
+          <template slot-scope="scope">
+            <span v-if="scope.row.warnType==2" style="color:red">{{ scope.row.warnTypeDesc }}</span>
+            <span v-else style="color: yellow">{{ scope.row.warnTypeDesc }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="warnValue" label="监测值"></el-table-column>
+        <el-table-column prop="ttTime" label="观测时间"></el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="ALSizeChange"
+        @current-change="ALCurrentChange"
+        :current-page="ALPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="ALSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="ALDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
   </div>
 </template>
 
 <script>
-import countTo from "vue-count-to";
+import { message } from "./../../util/item";
 export default {
   name: "AlarmLog",
-  components: { countTo },
   data: function() {
-    return { startVal: 99, endVal: 0 };
+    return {
+      ALSiteOptions: [
+        {
+          //数据格式
+
+          name: "全部项目",
+          shortName: "全部项目",
+          latitude: "定位坐标",
+          longitude: "定位坐标",
+          zoomLevel: "8",
+          platformCode: ""
+        }
+      ], //渲染项目下拉框的数据
+      ProjectNo: "", //所选择的项目的项目编号
+      ALValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      ALPage: 1, //分页默认显示页
+      ALDatagridDataLength: 0, //分页上显示的数据总条数
+      ALSize: 10, //分页上显示的每页的条数
+      TimeBoxValue: [
+        this.moment()
+          .subtract("days", 3)
+          .format("YYYY-MM-DD HH:mm:ss"),
+        this.moment().format("YYYY-MM-DD HH:mm:ss")
+      ], //起止日期
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近三天",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 3);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            }
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            }
+          }
+        ]
+      }, //时间框的快捷选项
+      loading: false
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    selectV() {},
+    ALSizeChange(val) {
+      // 改变每页的条数
+      this.ALSize = val;
+      this.loadGridData();
+    },
+    ALCurrentChange(val) {
+      //改变页数
+      this.ALPage = val;
+      this.loadGridData();
+    },
+    // 获取所有平台
+    LoadAllProject() {
+      this.$http
+        .post(this.nozzle.sysPlatformListPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            this.ALSiteOptions = this.ALSiteOptions.concat(
+              response.data.data.records
+            );
+            this.loadGridData();
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    //获取数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnLogListWarnLog, {
+          current: this.ALPage,
+          size: this.ALSize,
+          data: {
+            platForm: this.ProjectNo, //平台编号(可填)
+            startTime: this.TimeBoxValue[0], //起始时间
+            endTime: this.TimeBoxValue[1], //截止时间
+            siteName: this.ALValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.ALDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.LoadAllProject();
+  }
 };
 </script>
 
 <style scoped>
+#AlarmLog {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#ALTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#ALTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#ALCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
 </style>
\ No newline at end of file
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 @@
 <template>
-  <div id="PushRules"></div>
+  <div id="PushRules">
+    <div id="PRTop">
+      <el-input placeholder="请输入站点名称" v-model="PRValue" clearable></el-input>
+      <el-button type="primary" icon="el-icon-search" @click="loadGridData()">搜索</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="Add()">新增推送规则</el-button>
+    </div>
+    <div
+      id="PRCentent"
+      v-loading="loading"
+      element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading"
+      element-loading-background="rgba(0, 0, 0, 0.8)"
+    >
+      <el-table :data="TableData" style="width: 100%;height:calc(100% - 45px)" stripe>
+        <el-table-column prop="platForm" label="平台编号"></el-table-column>
+        <el-table-column prop="platFormName" label="平台名称"></el-table-column>
+        <el-table-column prop="pushFrequency" label="推送频率（秒）"></el-table-column>
+        <el-table-column prop="startTime" label="推送开始时间"></el-table-column>
+        <el-table-column prop="endTime" label="推送结束时间"></el-table-column>
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
+        <el-table-column label="操作">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click="Edit(scope.$index, scope.row)"
+              style="margin:0 10px"
+            >修改</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click="Del(scope.$index, scope.row)"
+              style="margin:0 10px"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        @size-change="PRSizeChange"
+        @current-change="PRCurrentChange"
+        :current-page="PRPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="PRSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="PRDatagridDataLength"
+        style="margin-top:10px;"
+      ></el-pagination>
+    </div>
+    <el-dialog :title="DialogTitle" :visible.sync="dialogVisible" width="500px">
+      <div class="DialogList">
+        <span class="DialogListName">平&nbsp;台&nbsp;名&nbsp;称&nbsp;&nbsp;:</span>
+        <el-select
+          v-model="platForm"
+          filterable
+          placeholder="请选择平台"
+          :disabled="!isAdd"
+          @change="platFormChange"
+        >
+          <el-option
+            v-for="item in platFormData"
+            :key="item.index"
+            :label="item.name"
+            :value="item.platformCode"
+          ></el-option>
+        </el-select>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">推送频率(秒):</span>
+        <el-input placeholder="请输入站点名称" v-model="pushFrequency" clearable type="number"></el-input>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">开&nbsp;始&nbsp;推&nbsp;送&nbsp;&nbsp;:</span>
+        <el-time-picker v-model="startTime" value-format="HH:mm:ss"></el-time-picker>
+      </div>
+      <div class="DialogList">
+        <span class="DialogListName">结&nbsp;束&nbsp;推&nbsp;送&nbsp;&nbsp;:</span>
+        <el-time-picker v-model="endTime" value-format="HH:mm:ss"></el-time-picker>
+      </div>
+      <div class="Dialog2List">
+        <a
+          href="javascript:void(0)"
+          class="DialogListButton"
+          @click="dialogVisible2=false"
+        >取&nbsp;&nbsp;&nbsp;&nbsp;消</a>
+        <a
+          href="javascript:void(0)"
+          class="DialogListButton2"
+          @click="Updata()"
+        >确&nbsp;&nbsp;&nbsp;&nbsp;定</a>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
+import { message } from "./../../util/item";
 export default {
   name: "PushRules",
   data: function() {
-    return {};
+    return {
+      loading: false, //加载中 状态
+      PRValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      PRPage: 1, //分页默认显示页
+      PRDatagridDataLength: 0, //分页上显示的数据总条数
+      PRSize: 10, //分页上显示的每页的条数
+      dialogVisible: false, //dialog状态
+      isAdd: true, //判断当前是新增还是修改，true为新增
+      DialogTitle: "", //弹窗得标题
+      platForm: "", //平台编号
+      platFormData: [], //平台编号渲染数据
+      platFormName: "", //平台名称
+      pushFrequency: 28800, //推送频率
+      startTime: "08:00:00", //时间
+      endTime: "08:00:00" //时间
+    };
   },
-  methods: {},
-  mounted: function() {}
+  methods: {
+    PRSizeChange(val) {
+      // 改变每页的条数
+      this.PRSize = val;
+      this.loadGridData();
+    },
+    PRCurrentChange(val) {
+      console.log(val);
+      //改变页数
+      this.PRPage = val;
+      this.loadGridData();
+    },
+    // 加载表格数据
+    loadGridData() {
+      this.loading = true;
+      this.TableData = [];
+      this.$http
+        .post(this.nozzle.warnRuleListPushRule, {
+          current: this.PRPage,
+          size: this.PRSize,
+          data: {
+            platFormName: this.PRValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.PRDatagridDataLength = response.data.data.total;
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          this.loading = false;
+          message(response);
+        });
+    },
+    // 修改
+    Edit(index, rows) {
+      this.isAdd = false;
+      this.DialogTitle = rows.platFormName;
+      this.dialogVisible = true;
+      this.platFormData = [
+        {
+          platformCode: rows.platForm,
+          name: rows.platFormName
+        }
+      ];
+      this.platForm = rows.platForm;
+      this.pushFrequency = rows.pushFrequency;
+      this.startTime = rows.startTime;
+      this.endTime = rows.endTime;
+    },
+    // 新增
+    Add() {
+      this.isAdd = true;
+      // 获取未设置推送规则得平台，如果没有则阻止其操作
+      this.$http
+        .post(this.nozzle.warnRuleListNonConfigPlatform, {
+          data: {}
+        })
+        .then(response => {
+          if (response.data.code === 200) {
+            if (response.data.data.length == 0) {
+              // 无法新增
+              this.$message({
+                type: "warning",
+                message: "暂无未配置推送规则的平台"
+              });
+            } else {
+              // 才能新增
+              this.DialogTitle = "新增推送规则";
+              this.dialogVisible = true;
+              // 设置默认值
+              this.platFormData = response.data.data;
+              this.platForm = response.data.data[0].platformCode;
+              this.platFormName = response.data.data[0].name;
+              this.pushFrequency = 28800;
+              this.startTime = "08:00:00";
+              this.endTime = "22:00:00";
+            }
+          } else {
+            message(response);
+          }
+        })
+        .catch(response => {
+          message(response);
+        });
+    },
+    // 选择项目
+    platFormChange(vId) {
+      let obj = {};
+      obj = this.platFormData.find(item => {
+        //这里的userList就是上面遍历的数据源
+        return item.platForm === vId; //筛选出匹配数据
+      });
+      this.platFormName = obj.name; //我这边的name就是对应label的
+    },
+    // 删除
+    Del(index, rows) {
+      this.$confirm("此操作将永久删除该信息, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          var DelID = [];
+          DelID.push(rows.id);
+          this.$http
+            .post(this.nozzle.warnRuleInsertDeleteWarnPushRule, DelID)
+            .then(response => {
+              message(response);
+              this.dialogVisible = false;
+              this.loadGridData();
+            })
+            .catch(response => {
+              message(response);
+            });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除"
+          });
+        });
+    },
+    // 提交
+    Updata() {
+      var PostUrl = "",
+        params2;
+      if (this.isAdd) {
+        // 新增时：
+        PostUrl = this.nozzle.warnRuleInsertWarnPushRule;
+        params2 = {
+          data: {
+            platForm: this.platForm, //平台编号
+            platFormName: this.platFormName, //平台名称
+            pushFrequency: this.pushFrequency, //推送频率
+            startTime: this.startTime, //推送起始时间
+            endTime: this.endTime //推送结束时间
+          }
+        };
+      } else {
+        // 修改时：
+        PostUrl = this.nozzle.warnRuleInsertUpdateWarnPushRule;
+        params2 = {
+          data: {
+            platForm: this.platForm, //平台编号
+            pushFrequency: this.pushFrequency, //推送频率
+            startTime: this.startTime, //推送起始时间
+            endTime: this.endTime //推送结束时间
+          }
+        };
+      }
+      this.$http
+        .post(PostUrl, params2)
+        .then(response => {
+          message(response);
+          this.dialogVisible = false;
+          this.loadGridData();
+        })
+        .catch(response => {
+          message(response);
+        });
+    }
+  },
+  mounted: function() {
+    this.loadGridData();
+  }
 };
 </script>
 
 <style scoped>
+#PushRules {
+  width: 100%;
+  height: 100%;
+}
+/* 顶部搜索 */
+#PRTop {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  text-align: left;
+}
+#PRTop .el-input {
+  width: 250px;
+  margin: 0 10px;
+} /* 表格 */
+#PRCentent {
+  width: 100%;
+  height: calc(100% - 70px);
+  margin-top: 10px;
+  background: rgba(53, 53, 53, 0.5);
+}
+/* 弹窗 */
+.DialogList {
+  width: 100%;
+  height: 60px;
+  line-height: 60px;
+  box-sizing: border-box;
+  text-align: center;
+}
+.DialogList .el-input {
+  width: 217px;
+}
+.DialogListName {
+  display: inline-block;
+  width: 100px;
+  height: 60px;
+  line-height: 60px;
+  color: white;
+  text-align: center;
+}
+.DialogListButton {
+  height: 40px;
+  width: 100px;
+  display: inline-block;
+  line-height: 40px;
+  border-radius: 2px;
+  text-decoration: none;
+  color: rgb(0, 111, 255);
+  background: rgba(255, 255, 255, 0);
+  border: 1px solid rgb(0, 111, 255);
+  margin: 0 30px;
+}
+.DialogListButton2 {
+  height: 40px;
+  width: 100px;
+  display: inline-block;
+  line-height: 40px;
+  border-radius: 2px;
+  text-decoration: none;
+  color: white;
+  background: rgb(0, 111, 255);
+  border: 1px solid rgb(0, 111, 255);
+  margin: 0 30px;
+}
+</style>
+<style>
+.el-dialog__header {
+  text-align: left !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/index.vue b/src/components/index.vue
index 85d93cf..e42a46b 100644
--- a/src/components/index.vue
+++ b/src/components/index.vue
@@ -42,7 +42,7 @@
       <el-container>
         <el-aside :style="'width:' + MenuWidth + 'px'">
           <el-menu
-            default-active="1"
+            default-active="2-1"
             class="el-menu-vertical-demo"
             @select="MenuClick"
             background-color="rgb(58, 58, 60)"
@@ -50,7 +50,7 @@
             active-text-color="rgb(255,213,0)"
             router="true"
           >
-            <el-menu-item index="1" route="/overview">
+            <el-menu-item index="1" route="/overview" v-show="false">
               <i class="el-icon-menu"></i>
               <span slot="title">概&nbsp;&nbsp;&nbsp;&nbsp;览</span>
             </el-menu-item>
@@ -274,9 +274,9 @@
   color: #fff;
   text-align: center;
 }
-.el-menu {
-  border-right: 0px solid #e6e6e6;
-}
+/* .el-menu {
+  border-right: 0px solid #e6e6e6 !important;
+} */
 .el-menu-item {
   border-bottom: 2px solid #000;
   text-align: left;
diff --git a/src/router/index.js b/src/router/index.js
index 0a01db5..db5e6ea 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -72,7 +72,7 @@
     component: Login
   }, {
     path: '/',
-    redirect: "/overview"
+    redirect: "/site/previewOfSiteStatus"
   }, {
     path: "*",
     redirect: "/"