diff --git a/.gitignore b/.gitignore
index ba7a2d8..eab9941 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,4 +96,6 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
+package-lock.json
+node_modules/
 monitor-ui/
diff --git a/package.json b/package.json
index 3eb3e10..05884a5 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
     "axios": "^0.24.0",
     "bpmn-js": "^9.2.2",
     "core-js": "^2.6.12",
+    "echarts": "^5.4.2",
     "ejs": "^2.7.4",
     "element-ui": "2.15.13",
     "js-cookie": "2.2.0",
@@ -33,8 +34,8 @@
     "vue-router": "3.0.6",
     "vuex": "3.1.0",
     "vuex-persistedstate": "^4.0.0",
-    "xcrud": "^0.4.19",
-    "web-control": "^1.0.2"
+    "web-control": "^1.0.2",
+    "xcrud": "^0.4.19"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.4",
diff --git a/public/image/yujing.png b/public/image/yujing.png
new file mode 100644
index 0000000..dea6d73
Binary files /dev/null and b/public/image/yujing.png differ
diff --git a/src/views/index.vue b/src/views/index.vue
index 74059ff..48a0e16 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="webindex">
+  <div class="webindex">
     <div class="tops">
       <!-- 第1个 -->
       <div class="topbox">
@@ -10,8 +10,8 @@
           </div>
           <div class="rights">
             <div class="note">正常：<span class="bluezi">26</span></div>
-            <div class="note">离线：<span  class="huizi">12</span></div>
-            <div class="note">报警：<span  class="redzi">11</span></div>
+            <div class="note">离线：<span class="huizi">12</span></div>
+            <div class="note">报警：<span class="redzi">11</span></div>
           </div>
         </div>
       </div>
@@ -24,8 +24,8 @@
           </div>
           <div class="rights">
             <div class="note">正常：<span class="bluezi">36</span></div>
-            <div class="note">离线：<span  class="huizi">16</span></div>
-            <div class="note"><span  class="redzi"></span></div>
+            <div class="note">离线：<span class="huizi">16</span></div>
+            <div class="note"><span class="redzi"></span></div>
           </div>
         </div>
       </div>
@@ -38,8 +38,8 @@
           </div>
           <div class="rights">
             <div class="note">正常：<span class="bluezi">38</span></div>
-            <div class="note">离线：<span  class="huizi">15</span></div>
-            <div class="note">报警：<span  class="redzi">12</span></div>
+            <div class="note">离线：<span class="huizi">15</span></div>
+            <div class="note">报警：<span class="redzi">12</span></div>
           </div>
         </div>
       </div>
@@ -52,8 +52,8 @@
           </div>
           <div class="rights">
             <div class="note">正常：<span class="bluezi">26</span></div>
-            <div class="note">离线：<span  class="huizi">12</span></div>
-            <div class="note">报警：<span  class="redzi">11</span></div>
+            <div class="note">离线：<span class="huizi">12</span></div>
+            <div class="note">报警：<span class="redzi">11</span></div>
           </div>
         </div>
       </div>
@@ -66,8 +66,8 @@
           </div>
           <div class="rights">
             <div class="note">正常：<span class="bluezi">39</span></div>
-            <div class="note">离线：<span  class="huizi">15</span></div>
-            <div class="note">报警：<span  class="redzi">12</span></div>
+            <div class="note">离线：<span class="huizi">15</span></div>
+            <div class="note">报警：<span class="redzi">12</span></div>
           </div>
         </div>
       </div>
@@ -86,7 +86,7 @@
       <div class="tbar">
         <div class="title"><span class="iconfont icon-jiating greenzi"></span>视频监控</div>
         <div class="bar">
-          <pie-chartrenyuan :chart-data="shipinjiankong_Chart" ></pie-chartrenyuan>
+          <pie-chartrenyuan :chart-data="shipinjiankong_Chart"></pie-chartrenyuan>
         </div>
       </div>
       <!-- 第1个图表 -->
@@ -96,7 +96,7 @@
           <pie-chartrenyuan :chart-data="ruqinbaojing_Chart"></pie-chartrenyuan>
         </div>
       </div>
-        <!-- 第1个图表 -->
+      <!-- 第1个图表 -->
       <div class="tbar">
         <div class="title"><span class="iconfont icon-jiating greenzi"></span>电子围栏</div>
         <div class="bar">
@@ -113,7 +113,7 @@
     </div>
     <!-- 第3行 -->
     <div class="con">
-       <!-- 第1 -->
+      <!-- 第1 -->
       <div class="news">
         <div class="title">
           <div class="newstits">提醒任务</div>
@@ -127,8 +127,8 @@
           </div>
         </div>
       </div>
-       <!-- 第1 -->
-       <div class="news">
+      <!-- 第1 -->
+      <div class="news">
         <div class="title">
           <div class="newstits">待办</div>
           <div class="more" @click="toMore()">更多></div>
@@ -170,295 +170,364 @@
         </div>
       </div>
     </div>
-</div>
+  </div>
 </template>
 
 <script>
-	import {login1} from '@/api/system/user/login.js'
+  import { login1 } from '@/api/system/user/login.js'
   import * as echarts from "echarts";
   import PieChartrenyuan from '@/views/echarts/components/PieChartrenyuan'
   // 1.1入侵报警饼图
   const ruqinbaojing_Chart = {
-  // seriesName: '入侵报警',
-  unit: '次',
-  color: ['#fe7f02', '#049f51', '#fdc004'],
-  Data: {
-    seriesData: [
-    { value: 39, name: '正常' },
-      { value: 16, name: '离线' },
-      { value: 12, name: '报警' }
-    ]
-  },
-  label: {
-    normal: {
-      position: 'inner',
-      show: false
-    }
-  },
+    // seriesName: '入侵报警',
+    unit: '次',
+    color: ['#fe7f02', '#049f51', '#fdc004'],
+    Data: {
+      seriesData: [
+        { value: 39, name: '正常' },
+        { value: 16, name: '离线' },
+        { value: 12, name: '报警' }
+      ]
+    },
+    label: {
+      normal: {
+        position: 'inner',
+        show: false
+      }
+    },
 
-  // radius: ['50%', '55%']
-}
+    // radius: ['50%', '55%']
+  }
   // 1.2视频监控饼图
   const shipinjiankong_Chart = {
-  // seriesName: '视频监控',
-  unit: '次',
-  color: ['#fe7f02', '#049f51', '#fdc004'],
-  Data: {
-    seriesData: [
-    { value: 39, name: '正常' },
-      { value: 16, name: '离线' },
-      // { value: 12, name: '报警' }
-    ]
-  },
-  label: {
-    normal: {
-      position: 'inner',
-      show: false
-    }
-  },
+    // seriesName: '视频监控',
+    unit: '次',
+    color: ['#fe7f02', '#049f51', '#fdc004'],
+    Data: {
+      seriesData: [
+        { value: 39, name: '正常' },
+        { value: 16, name: '离线' },
+        // { value: 12, name: '报警' }
+      ]
+    },
+    label: {
+      normal: {
+        position: 'inner',
+        show: false
+      }
+    },
 
-  // radius: ['50%', '55%']
-}
+    // radius: ['50%', '55%']
+  }
   export default {
     name: 'index',
     components: {
-    PieChartrenyuan
-  },
+      PieChartrenyuan
+    },
+    created() {
+      var _self = this
+      setInterval(function () {
+        _self.getMessage();
+      }, 20000)
+    },
     data() {
       return {
         ruqinbaojing_Chart: ruqinbaojing_Chart, // 1.1
-        shipinjiankong_Chart:shipinjiankong_Chart,
-      	token:'',
+        shipinjiankong_Chart: shipinjiankong_Chart,
+        token: '',
         Datalista: [
-         { title: '您有新任务了', createTime: '2023-05-23' },
-         { title: '您有新任务了', createTime: '2023-05-23' },
-         { title: '您有新任务了', createTime: '2023-05-23' },
-         { title: '您有新任务了', createTime: '2023-05-23' },
-         { title: '您有新任务了', createTime: '2023-05-23' },
-      ],
-      Datalist: [
-         { title: '您有新消息了', createTime: '2023-05-23' },
-         { title: '您有新消息了', createTime: '2023-05-23' },
-         { title: '您有新消息了', createTime: '2023-05-23' },
-         { title: '您有新消息了', createTime: '2023-05-23' },
-         { title: '您有新消息了', createTime: '2023-05-23' },
-      ],
+          { title: '您有新任务了', createTime: '2023-05-23' },
+          { title: '您有新任务了', createTime: '2023-05-23' },
+          { title: '您有新任务了', createTime: '2023-05-23' },
+          { title: '您有新任务了', createTime: '2023-05-23' },
+          { title: '您有新任务了', createTime: '2023-05-23' },
+        ],
+        Datalist: [
+          { title: '您有新消息了', createTime: '2023-05-23' },
+          { title: '您有新消息了', createTime: '2023-05-23' },
+          { title: '您有新消息了', createTime: '2023-05-23' },
+          { title: '您有新消息了', createTime: '2023-05-23' },
+          { title: '您有新消息了', createTime: '2023-05-23' },
+        ],
       }
     },
-    methods:{
-//  	getToken(){
-//  		let params = {
-//  			password: "329653",
-//					roleSid: "",
-//					token: "",
-//					userName: "15097329653",
-//					verifyCode: ""
-//  		}
-//  		login1(params).then(res => {
-//  			this.token = res.data.token
-//  			window.sessionStorage.setItem('token', res.data.token)
-//        })
-//  	}
+    methods: {
+      getMessage() {
+        this.$notify({
+          title: '报警消息',
+          dangerouslyUseHTMLString: true,
+          // // message: "<img src='" + warningIcon + "'>" + data.messageContent,
+          message: "<img style='width:50px' src='/image/yujing.png'>" + "新的报警待处理",
+          position: 'bottom-right',
+          onClick: () => {
+            alert("这是一条新订单")
+            // this.playText('你有一条报警信息未读')
+            // this.getServicePageLists()
+          },
+          duration: 3000,
+        })
+      },
+      //  	getToken(){
+      //  		let params = {
+      //  			password: "329653",
+      //					roleSid: "",
+      //					token: "",
+      //					userName: "15097329653",
+      //					verifyCode: ""
+      //  		}
+      //  		login1(params).then(res => {
+      //  			this.token = res.data.token
+      //  			window.sessionStorage.setItem('token', res.data.token)
+      //        })
+      //  	}
     }
   }
 </script>
 
 <style lang="scss" scoped>
   .webindex {
-    width: 100%; padding: 20px;
+    width: 100%;
+    padding: 20px;
     height: 100%;
-    background: radial-gradient(#fff,#f5f7f4, #fff);
+    background: radial-gradient(#fff, #f5f7f4, #fff);
   }
+
   .tops {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: flex-start;align-items: flex-start;
-  padding: 0px;
-  margin: 0px;
-}
-.tops .topbox {
-  width: 25%;
-  margin: 0 20px 0 0;
-  background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
-  padding: 10px;
-}
-.tops .topbox:last-of-type {
-  margin: 0;
-}
-.tops .topbox .toptitle {
-  font-size: 20px;
-  padding: 10px 20px;
-  font-weight: bold;  color: #333;font-size: 16px;
-  border-bottom: 1px solid #ececee;
-}
-.tops .topbox .mids {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: flex-start;align-items: center;
-  margin: 0;
-  padding: 20px ;
-}
-.tops .topbox .mids .lefts{width: 100px;}
-.tops .topbox .mids .lefts .iconbox {
-		border-radius: 10px;
-		line-height: 80px;
-		width: 80px;
-		height: 80px;
-		color: #fff;
-		font-size: 36px;text-align: center;
-	}
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: flex-start;
+    padding: 0px;
+    margin: 0px;
+  }
+
+  .tops .topbox {
+    width: 25%;
+    margin: 0 20px 0 0;
+    background-color: #fff;
+    box-shadow: 0px 0px 10px #E9E9E9;
+    border-radius: 5px;
+    padding: 10px;
+  }
+
+  .tops .topbox:last-of-type {
+    margin: 0;
+  }
+
+  .tops .topbox .toptitle {
+    font-size: 20px;
+    padding: 10px 20px;
+    font-weight: bold;
+    color: #333;
+    font-size: 16px;
+    border-bottom: 1px solid #ececee;
+  }
+
+  .tops .topbox .mids {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+    margin: 0;
+    padding: 20px;
+  }
+
+  .tops .topbox .mids .lefts {
+    width: 100px;
+  }
+
+  .tops .topbox .mids .lefts .iconbox {
+    border-radius: 10px;
+    line-height: 80px;
+    width: 80px;
+    height: 80px;
+    color: #fff;
+    font-size: 36px;
+    text-align: center;
+  }
+
   .iconbox_red {
-		background-color: #df2f07;
-	}
+    background-color: #df2f07;
+  }
 
-	.iconbox_yellow {
-		background-color: #ff7521;
-	}
+  .iconbox_yellow {
+    background-color: #ff7521;
+  }
 
 
   .iconbox_green {
-		background-color: #07C160;
-	}
-	.iconbox_blue {
-		background-color: #3f9bfa;
-	}
-	.iconbox_zi {
-		background-color: #6421ff;
-	}
-
-	.iconbox_fen {
-		background-color: #9b2efb;
-	}
-.tops .topbox .mids .rights {flex: 1;
-  padding: 2px 0 2px 10px;
-}
-.tops .topbox .mids .rights .note {
-  color: #333;
-  font-size: 14px;
-  padding: 0 0 3px 0;
-}
-.tops .topbox .mids .rights .note span {
-  font-size: 20px;
-  padding: 0 5px;
-}
-
-/* 饼图部分 */
-.tbars {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: flex-start;align-items: flex-start;
-  margin: 0;
-  padding: 20px 0 0 0;
-}
-.tbar {
-  width: 25%;
-  margin: 0 20px 0 0;
-  background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
-  padding: 10px;
-}
-.tbar:last-of-type {
-  margin: 0;
-}
-.tbar0 {
-  border-bottom: 0px solid #032ab8;
-}
-.tbar .title {
-  font-size: 20px;
-  padding: 10px 20px;
-  font-weight: bold;  color: #333;font-size: 16px;
-  border-bottom: 1px solid #ececee;
-}
-.tbar .title span {
-  padding: 0 10px 0 0;
-}
-.tbar .bar {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: flex-start;align-items: center;
-  margin: 0;
-  padding: 0px;
-  height: 190px;
-
-}
-.con {
-  padding: 20px 0;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: space-around;
-}
-.news {
-  width: 25%;
-  margin: 0 20px 0 0;
-  background-color: #fff;
-  box-shadow:0px 0px 10px #E9E9E9;border-radius: 5px;
-  padding: 10px;
-}
-.news:last-of-type {
-  margin: 0;
-}
-.news .title {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  padding: 10px 10px 10px 20px;
-  border-bottom: 1px solid #ececee;
-}
-
-.news .title .newstits {
-  font-weight: bold;  color: #333;font-size: 16px;
-}
-
-.news .title .more {text-align: right;
-  cursor: pointer;color: #6c6a6a;font-size: 14px;
-}
-
-.news .content {
-  padding: 10px 0;
-  height: 210px;
-  overflow: hidden;
-}
-
-.news .content .newsli {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  margin: 0px 0px;
-  padding: 5px 10px;
-  border-bottom: 1px solid #ececee;
-}
-.news .content .newsli .dot {
-  padding: 0px 8px 0 0;
-  font-size: 18px;
-  height: 25px;
-  line-height: 25px;color: #047cf7;
-}
-.news .content .newsli .tit {
-  padding: 0px 0;
-  font-size: 14px;
-  flex: 3;
-  height: 25px;
-  overflow: hidden;
-  line-height: 25px;
-  cursor: pointer;
-}
-
-// .news .content .newsli .tel{padding: 10px 0;color: #84d1f5;flex: 1;text-align: center;}
-.news .content .newsli .time {
-  padding: 0px 0;
-  color: #666666;
-  text-align: right;font-size: 14px;
-  width: 100px;
-  height: 25px;
-  line-height: 25px;
-}
-</style>
+    background-color: #07C160;
+  }
+
+  .iconbox_blue {
+    background-color: #3f9bfa;
+  }
+
+  .iconbox_zi {
+    background-color: #6421ff;
+  }
+
+  .iconbox_fen {
+    background-color: #9b2efb;
+  }
+
+  .tops .topbox .mids .rights {
+    flex: 1;
+    padding: 2px 0 2px 10px;
+  }
+
+  .tops .topbox .mids .rights .note {
+    color: #333;
+    font-size: 14px;
+    padding: 0 0 3px 0;
+  }
+
+  .tops .topbox .mids .rights .note span {
+    font-size: 20px;
+    padding: 0 5px;
+  }
+
+  /* 饼图部分 */
+  .tbars {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: flex-start;
+    margin: 0;
+    padding: 20px 0 0 0;
+  }
+
+  .tbar {
+    width: 25%;
+    margin: 0 20px 0 0;
+    background-color: #fff;
+    box-shadow: 0px 0px 10px #E9E9E9;
+    border-radius: 5px;
+    padding: 10px;
+  }
+
+  .tbar:last-of-type {
+    margin: 0;
+  }
+
+  .tbar0 {
+    border-bottom: 0px solid #032ab8;
+  }
+
+  .tbar .title {
+    font-size: 20px;
+    padding: 10px 20px;
+    font-weight: bold;
+    color: #333;
+    font-size: 16px;
+    border-bottom: 1px solid #ececee;
+  }
+
+  .tbar .title span {
+    padding: 0 10px 0 0;
+  }
+
+  .tbar .bar {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: center;
+    margin: 0;
+    padding: 0px;
+    height: 190px;
+
+  }
+
+  .con {
+    padding: 20px 0;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-around;
+  }
+
+  .news {
+    width: 25%;
+    margin: 0 20px 0 0;
+    background-color: #fff;
+    box-shadow: 0px 0px 10px #E9E9E9;
+    border-radius: 5px;
+    padding: 10px;
+  }
+
+  .news:last-of-type {
+    margin: 0;
+  }
+
+  .news .title {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 10px 10px 20px;
+    border-bottom: 1px solid #ececee;
+  }
+
+  .news .title .newstits {
+    font-weight: bold;
+    color: #333;
+    font-size: 16px;
+  }
+
+  .news .title .more {
+    text-align: right;
+    cursor: pointer;
+    color: #6c6a6a;
+    font-size: 14px;
+  }
+
+  .news .content {
+    padding: 10px 0;
+    height: 210px;
+    overflow: hidden;
+  }
+
+  .news .content .newsli {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    margin: 0px 0px;
+    padding: 5px 10px;
+    border-bottom: 1px solid #ececee;
+  }
+
+  .news .content .newsli .dot {
+    padding: 0px 8px 0 0;
+    font-size: 18px;
+    height: 25px;
+    line-height: 25px;
+    color: #047cf7;
+  }
+
+  .news .content .newsli .tit {
+    padding: 0px 0;
+    font-size: 14px;
+    flex: 3;
+    height: 25px;
+    overflow: hidden;
+    line-height: 25px;
+    cursor: pointer;
+  }
+
+  // .news .content .newsli .tel{padding: 10px 0;color: #84d1f5;flex: 1;text-align: center;}
+  .news .content .newsli .time {
+    padding: 0px 0;
+    color: #666666;
+    text-align: right;
+    font-size: 14px;
+    width: 100px;
+    height: 25px;
+    line-height: 25px;
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/shebeirizhi/shebeirizhiList.vue b/src/views/shebeirizhi/shebeirizhiList.vue
index 652fbc8..fe920cb 100644
--- a/src/views/shebeirizhi/shebeirizhiList.vue
+++ b/src/views/shebeirizhi/shebeirizhiList.vue
@@ -12,7 +12,7 @@
                   maxlength="20"></el-date-picker>
               </el-form-item>
               <el-form-item label="设备名称">
-                <el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择设备名称">
+                <el-select v-model="listQuery.params.supplierType1" filterable clearable placeholder="请选择设备名称">
                   <el-option v-for="item in supplierType_list" :key="item.id" :label="item.title" :value="item.id" />
                 </el-select>
               </el-form-item>
diff --git a/src/views/shebeitaizhang/shebeitaizhangList.vue b/src/views/shebeitaizhang/shebeitaizhangList.vue
index bb23c49..ccc01f1 100644
--- a/src/views/shebeitaizhang/shebeitaizhangList.vue
+++ b/src/views/shebeitaizhang/shebeitaizhangList.vue
@@ -43,7 +43,7 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="选择楼层">
-                <el-select v-model="listQuery.params.supplierType" filterable clearable placeholder="请选择楼层">
+                <el-select v-model="listQuery.params.supplierType1" filterable clearable placeholder="请选择楼层">
                   <el-option v-for="item in floor_list" :key="item.id" :label="item.title" :value="item.id" />
                 </el-select>
               </el-form-item>
diff --git a/vue.config.js b/vue.config.js
index 35f96af..2cb6d66 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/monitor/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   outputDir: 'monitor-ui',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',