diff --git a/src/components/configure/AlarmConfiguration.vue b/src/components/configure/AlarmConfiguration.vue
index d9e7290..df603b1 100644
--- a/src/components/configure/AlarmConfiguration.vue
+++ b/src/components/configure/AlarmConfiguration.vue
@@ -46,7 +46,7 @@
           <el-table-column prop="compareWayDesc" label="运算符"></el-table-column>
           <el-table-column prop="warnValue" label="线值"></el-table-column>
           <el-table-column prop="warnTypeDesc" label="警戒类型">
-            <template scope="scope">
+            <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>

diff --git a/src/components/configure/AlarmConfiguration.vue b/src/components/configure/AlarmConfiguration.vue
index d9e7290..df603b1 100644
--- a/src/components/configure/AlarmConfiguration.vue
+++ b/src/components/configure/AlarmConfiguration.vue
@@ -46,7 +46,7 @@
           <el-table-column prop="compareWayDesc" label="运算符"></el-table-column>
           <el-table-column prop="warnValue" label="线值"></el-table-column>
           <el-table-column prop="warnTypeDesc" label="警戒类型">
-            <template scope="scope">
+            <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>
diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue
index b9fbb9c..44523dd 100644
--- a/src/components/configure/AlarmLog.vue
+++ b/src/components/configure/AlarmLog.vue
@@ -1,21 +1,215 @@
 <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="ACValue" 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="ACSizeChange"
+        @current-change="ACCurrentChange"
+        :current-page="ACPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="ACSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="ACDatagridDataLength"
+        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: "", //所选择的项目的项目编号
+      ACValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      ACPage: 1, //分页默认显示页
+      ACDatagridDataLength: 0, //分页上显示的数据总条数
+      ACSize: 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() {},
+    ACSizeChange(val) {
+      // 改变每页的条数
+      this.ACSize = val;
+      this.loadGridData();
+    },
+    ACCurrentChange(val) {
+      //改变页数
+      this.ACPage = 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.ACDatagridDataLength = "";
+      this.$http
+        .post(this.nozzle.warnLogListWarnLog, {
+          current: this.ACPage,
+          size: this.ACSize,
+          data: {
+            platForm: this.ProjectNo, //平台编号(可填)
+            startTime: this.TimeBoxValue[0], //起始时间
+            endTime: this.TimeBoxValue[1], //截止时间
+            siteName: this.ACValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.ACDatagridDataLength = 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/AlarmConfiguration.vue b/src/components/configure/AlarmConfiguration.vue
index d9e7290..df603b1 100644
--- a/src/components/configure/AlarmConfiguration.vue
+++ b/src/components/configure/AlarmConfiguration.vue
@@ -46,7 +46,7 @@
           <el-table-column prop="compareWayDesc" label="运算符"></el-table-column>
           <el-table-column prop="warnValue" label="线值"></el-table-column>
           <el-table-column prop="warnTypeDesc" label="警戒类型">
-            <template scope="scope">
+            <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>
diff --git a/src/components/configure/AlarmLog.vue b/src/components/configure/AlarmLog.vue
index b9fbb9c..44523dd 100644
--- a/src/components/configure/AlarmLog.vue
+++ b/src/components/configure/AlarmLog.vue
@@ -1,21 +1,215 @@
 <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="ACValue" 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="ACSizeChange"
+        @current-change="ACCurrentChange"
+        :current-page="ACPage"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="ACSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="ACDatagridDataLength"
+        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: "", //所选择的项目的项目编号
+      ACValue: "", //顶部模糊搜索
+      TableData: [], //表格数据
+      ACPage: 1, //分页默认显示页
+      ACDatagridDataLength: 0, //分页上显示的数据总条数
+      ACSize: 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() {},
+    ACSizeChange(val) {
+      // 改变每页的条数
+      this.ACSize = val;
+      this.loadGridData();
+    },
+    ACCurrentChange(val) {
+      //改变页数
+      this.ACPage = 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.ACDatagridDataLength = "";
+      this.$http
+        .post(this.nozzle.warnLogListWarnLog, {
+          current: this.ACPage,
+          size: this.ACSize,
+          data: {
+            platForm: this.ProjectNo, //平台编号(可填)
+            startTime: this.TimeBoxValue[0], //起始时间
+            endTime: this.TimeBoxValue[1], //截止时间
+            siteName: this.ACValue //模糊搜索
+          }
+        })
+        .then(response => {
+          this.loading = false;
+          if (response.data.code === 200) {
+            this.TableData = response.data.data.records;
+            this.ACDatagridDataLength = 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/router/index.js b/src/router/index.js
index 0a01db5..6fb8b91 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,5 +1,13 @@
 import Vue from 'vue'
 import Router from 'vue-router'
+/**
+ * 重写路由的push方法
+ */
+const routerPush = Router.prototype.push
+Router.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error=> error)
+}
+40805
 import {
   getSession,
   message