diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue
index 25c6c1a..a2ccf6a 100644
--- a/src/components/common/Header.vue
+++ b/src/components/common/Header.vue
@@ -50,6 +50,7 @@ export default {
           break;
         case "loginout": //退出登录
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "退出成功",
             type: "success",
diff --git a/src/components/message.js b/src/components/message.js
deleted file mode 100644
index 5da2f07..0000000
--- a/src/components/message.js
+++ /dev/null
@@ -1,28 +0,0 @@
-//resetMessage.js
-/**重置message，防止重复点击重复弹出message消息提示 */
-import { Message } from "element-ui";
-
-let messageInstance = null;
-
-const resetMessage = (options) => {
-  if (messageInstance) {
-    messageInstance.close();
-  }
-  Message.closeAll(); //手动关闭所有消息提示实例
-  messageInstance = Message(options);
-  // console.log(Message(options));
-};
-
-["error", "success", "info", "warning"].forEach((type) => {
-  resetMessage[type] = (options) => {
-    if (typeof options === "string") {
-      options = {
-        message: options,
-      };
-    }
-    options.type = type;
-    return resetMessage(options);
-  };
-});
-
-export const message = resetMessage;
diff --git a/src/main.js b/src/main.js
index d0b018c..d56bb3d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,19 +4,16 @@ import router from "./router";
 import store from "./store";
 
 //引入element-ui
-import "../src/assets/css/theme/index.css";
+import "../src/assets/css/theme/index.css"; //l绿色主题
 import ElementUI from "element-ui";
 // import "element-ui/lib/theme-chalk/index.css";
-
-import { message } from "./components/message.js";
-
-Vue.prototype.$message = message;
 Vue.use(ElementUI, {
   size: "small",
 });
+
 //  引入Echarts
-import * as echarts from "echarts";
-Vue.prototype.$echarts = echarts;
+// import * as echarts from "echarts";
+// Vue.prototype.$echarts = echarts;
 
 // // 引入 vue-awesome-swiper
 // import VueAwesomeSwiper from "vue-awesome-swiper";
diff --git a/src/utils/request.js b/src/utils/request.js
index 4720443..32b77b6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -40,23 +40,16 @@ service.interceptors.response.use(
       //   duration: 5 * 1000,
       // });
       if (res.code === 401) {
-        Message({ message: res.msg, type: "error", duration: 5 * 1000 });
+        Message({ message: res.msg, type: "error", duration: 1500 });
         router.push("/login");
       }
-      if (res.code === 100) {
-        Message({
-          showClose: true,
-          message: res.msg,
-          type: "error",
-          duration: 5 * 1000,
-        });
-      }
+
       if (res.code === 500) {
         Message({
           showClose: true,
           message: 服务器错误(500),
           type: "error",
-          duration: 5 * 1000,
+          duration: 1500,
         });
       }
       return Promise.reject(new Error(res.msg || "Error"));
@@ -69,7 +62,7 @@ service.interceptors.response.use(
       message: error.message,
       showClose: true,
       type: "error",
-      duration: 5 * 1000,
+      duration: 1500,
     });
     return Promise.reject(error);
   }
diff --git a/src/views/Login.vue b/src/views/Login.vue
index c68d2f6..5593bed 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -111,6 +111,7 @@ export default {
                 this.$router.push("/realTimeMonitor");
 
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "登录成功",
                   type: "success",
diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue
index 53a7ee7..ffb3853 100644
--- a/src/views/alarmHandling/index.vue
+++ b/src/views/alarmHandling/index.vue
@@ -371,6 +371,7 @@ export default {
     onSubmit() {
       if (this.formdata.starttime > this.formdata.endtime) {
         return this.$message({
+          duration: 1500,
           showClose: true,
           message: "开始日期不能大于结束日期",
           type: "warning",
@@ -459,6 +460,7 @@ export default {
         preset: 255,
       }).then((res) => {
         this.$message({
+          duration: 1500,
           showClose: true,
           message: "手动拍照请求成功！",
           type: "success",
diff --git a/src/views/cameraChannel/components/adddeviceDialog.vue b/src/views/cameraChannel/components/adddeviceDialog.vue
index 0bc4e70..2fb03dc 100644
--- a/src/views/cameraChannel/components/adddeviceDialog.vue
+++ b/src/views/cameraChannel/components/adddeviceDialog.vue
@@ -90,6 +90,7 @@ export default {
                 //this.errorMsg = "";
                 if (res.code == 200) {
                   this.$message({
+                    duration: 1500,
                     showClose: true,
                     message: "添加成功",
                     type: "success",
@@ -103,6 +104,7 @@ export default {
               })
               .catch((err) => {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加失败",
                   type: "error",
diff --git a/src/views/cameraChannel/components/setdevice.vue b/src/views/cameraChannel/components/setdevice.vue
index a0c4092..cc98ff1 100644
--- a/src/views/cameraChannel/components/setdevice.vue
+++ b/src/views/cameraChannel/components/setdevice.vue
@@ -136,6 +136,7 @@ export default {
         .then((res) => {
           this.isShow = false;
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "添加成功",
             type: "success",
@@ -144,6 +145,7 @@ export default {
         })
         .catch((err) => {
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "添加失败",
             type: "error",
diff --git a/src/views/cameraChannel/index.vue b/src/views/cameraChannel/index.vue
index 2f39958..954c4d7 100644
--- a/src/views/cameraChannel/index.vue
+++ b/src/views/cameraChannel/index.vue
@@ -157,6 +157,7 @@ export default {
             this.deviceList(); //刷新
           });
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "success",
             message: "删除成功!",
@@ -164,6 +165,7 @@ export default {
         })
         .catch(() => {
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "info",
             message: "已取消删除",
diff --git a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
index fee7596..557d253 100644
--- a/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
+++ b/src/views/devicePhotoSchedule/components/adddeviceDialog.vue
@@ -142,6 +142,7 @@ export default {
               .then((res) => {
                 this.isShow = false;
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加成功",
                   type: "success",
@@ -150,6 +151,7 @@ export default {
               })
               .catch((err) => {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加失败",
                   type: "error",
diff --git a/src/views/devicePhotoSchedule/components/setdevice.vue b/src/views/devicePhotoSchedule/components/setdevice.vue
index 3cdd019..3e6a8b4 100644
--- a/src/views/devicePhotoSchedule/components/setdevice.vue
+++ b/src/views/devicePhotoSchedule/components/setdevice.vue
@@ -253,6 +253,7 @@ export default {
         })
         .catch((err) => {
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "添加失败",
             type: "error",
diff --git a/src/views/devicePhotoSchedule/index.vue b/src/views/devicePhotoSchedule/index.vue
index a3b1d60..8f803d7 100644
--- a/src/views/devicePhotoSchedule/index.vue
+++ b/src/views/devicePhotoSchedule/index.vue
@@ -194,6 +194,7 @@ export default {
             this.deviceList(); //刷新
           });
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "success",
             message: "删除成功!",
@@ -201,6 +202,7 @@ export default {
         })
         .catch(() => {
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "info",
             message: "已取消删除",
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
index 0135384..3e03f5b 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/addPhotoDialog.vue
@@ -245,6 +245,7 @@ export default {
               .then((res) => {
                 this.isShow = false;
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加成功",
                   type: "success",
@@ -253,6 +254,7 @@ export default {
               })
               .catch((err) => {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加失败",
                   type: "error",
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/gpsPosition.vue b/src/views/management/monitoringEquipment/photographicDevice/components/gpsPosition.vue
index ee1c843..cb507ce 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/gpsPosition.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/gpsPosition.vue
@@ -74,6 +74,7 @@ export default {
               this.loading = false;
               this.i = 0;
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "gps信息已更新",
                 type: "success",
@@ -83,6 +84,7 @@ export default {
               this.loading = false;
               this.i = 0;
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "暂未获取到GPS信息，请稍后再试！！",
                 type: "warning",
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
index 7ac4f4e..231dca3 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/pictureTags.vue
@@ -322,6 +322,7 @@ export default {
           console.log("qing");
           console.log(res);
           this.$message({
+            duration: 1500,
             type: "success",
             message: "绘制保存成功",
             showClose: true,
diff --git a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
index a529c97..7853b11 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/components/videoCapture.vue
@@ -222,6 +222,7 @@ export default {
               this.i = 0;
 
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "查询已更新",
                 type: "success",
@@ -233,6 +234,7 @@ export default {
               this.i = 0;
 
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "暂无响应，请稍后再试！",
                 type: "warning",
diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue
index 3f291bf..8aead54 100644
--- a/src/views/management/monitoringEquipment/photographicDevice/index.vue
+++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue
@@ -3,7 +3,9 @@
     <div class="photoBox">
       <div class="photoGraphicBtnGroup">
         <h4>拍照装置管理</h4>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAddPhoto()" >新增</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAddPhoto()"
+          >新增</el-button
+        >
       </div>
       <!-- <div class="searchBox">
         <el-form :inline="true" :model="formdata" class="demo-form-inline">
@@ -184,7 +186,11 @@
             min-width="80"
             ><template slot-scope="scope"
               >{{ scope.row.batteryCapacity }} /
-              {{ scope.row.batteryVoltage.toFixed(1) == 0.0 ? 0 : scope.row.batteryVoltage.toFixed(1)}}V</template
+              {{
+                scope.row.batteryVoltage.toFixed(1) == 0.0
+                  ? 0
+                  : scope.row.batteryVoltage.toFixed(1)
+              }}V</template
             >
           </el-table-column>
           <el-table-column
@@ -373,7 +379,7 @@ import {
   deleteTerminalJoggle,
   resetTerminalApi,
   setTermGPSJoggle,
-  getSearchInfo
+  getSearchInfo,
 } from "@/utils/api/index";
 import moment from "moment";
 import addPhotoDialog from "./components/addPhotoDialog.vue";
@@ -398,7 +404,7 @@ export default {
         dyId: 0,
         lineId: 0,
         towerId: 0,
-        searchnr:''
+        searchnr: "",
       },
       roleUser: "",
       terminalTableData: [], //表格数据
@@ -525,12 +531,14 @@ export default {
             .then((res) => {
               if (res.code == 200) {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "装置已复位",
                   type: "success",
                 });
               } else {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: res.msg,
                   type: "error",
@@ -540,11 +548,12 @@ export default {
             .catch((err) => {});
         })
         .catch(() => {
-          this.$message({
-            showClose: true,
-            type: "info",
-            message: "已取消删除",
-          });
+          // this.$message({
+          //   duration: 1500,
+          //   showClose: true,
+          //   type: "info",
+          //   message: "已取消删除",
+          // });
         });
     },
     //获取GPS位置
@@ -562,12 +571,14 @@ export default {
           console.log(res);
           if (val == 0) {
             this.$message({
+              duration: 1500,
               message: "关闭GPS",
               type: "success",
               showClose: true,
             });
           } else {
             this.$message({
+              duration: 1500,
               message: "成功开启GPS",
               type: "success",
               showClose: true,
@@ -642,17 +653,19 @@ export default {
             this.terminalList(); //刷新
           });
           this.$message({
+            duration: 1500,
             type: "success",
             message: "删除成功!",
             showClose: true,
           });
         })
         .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-            showClose: true,
-          });
+          // this.$message({
+          //   duration: 1500,
+          //   type: "info",
+          //   message: "已取消删除",
+          //   showClose: true,
+          // });
         });
     },
     //点击分页
@@ -665,7 +678,7 @@ export default {
       this.pageSize = val;
       this.terminalList();
     },
-  }
+  },
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue b/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
index 124145c..53b170b 100644
--- a/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
+++ b/src/views/management/userEquipment/lineInformation/components/addLineDialog.vue
@@ -98,6 +98,7 @@ export default {
               .then((res) => {
                 this.isShow = false;
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加成功",
                   type: "success",
@@ -107,6 +108,7 @@ export default {
               .catch((err) => {
                 console.log(err); //代码错误、请求失败捕获
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加失败",
                   type: "error",
@@ -118,6 +120,7 @@ export default {
                 this.isShow = false;
                 //this.$message.success("修改成功");
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "修改成功",
                   type: "success",
@@ -126,6 +129,7 @@ export default {
               })
               .catch((err) => {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "修改失败",
                   type: "error",
diff --git a/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue b/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue
index aec410d..5cf8413 100644
--- a/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue
+++ b/src/views/management/userEquipment/lineInformation/components/addTowerDialog.vue
@@ -87,6 +87,7 @@ export default {
             })
             .catch((err) => {
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "添加失败",
                 type: "error",
diff --git a/src/views/management/userEquipment/lineInformation/index.vue b/src/views/management/userEquipment/lineInformation/index.vue
index 900d398..809231f 100644
--- a/src/views/management/userEquipment/lineInformation/index.vue
+++ b/src/views/management/userEquipment/lineInformation/index.vue
@@ -174,17 +174,19 @@ export default {
             this.lineList(); //刷新
           });
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "success",
             message: "删除成功!",
           });
         })
         .catch(() => {
-          this.$message({
-            showClose: true,
-            type: "info",
-            message: "已取消删除",
-          });
+          // this.$message({
+          //   duration: 1500,
+          //   showClose: true,
+          //   type: "info",
+          //   message: "已取消删除",
+          // });
         });
     },
     //点击分页
diff --git a/src/views/management/userEquipment/towerInformation/components/addDialog.vue b/src/views/management/userEquipment/towerInformation/components/addDialog.vue
index b15eeef..0fe6454 100644
--- a/src/views/management/userEquipment/towerInformation/components/addDialog.vue
+++ b/src/views/management/userEquipment/towerInformation/components/addDialog.vue
@@ -94,6 +94,7 @@ export default {
               .then((res) => {
                 this.isShow = false;
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加成功",
                   type: "success",
@@ -102,6 +103,7 @@ export default {
               })
               .catch((err) => {
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "添加失败",
                   type: "error",
@@ -114,6 +116,7 @@ export default {
                 this.isShow = false;
                 //this.$message.success("修改成功");
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "修改成功",
                   type: "success",
@@ -123,6 +126,7 @@ export default {
               .catch((err) => {
                 //this.$message.error("修改失败");
                 this.$message({
+                  duration: 1500,
                   showClose: true,
                   message: "修改失败",
                   type: "error",
diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue
index 992e19b..19abada 100644
--- a/src/views/management/userEquipment/towerInformation/index.vue
+++ b/src/views/management/userEquipment/towerInformation/index.vue
@@ -161,6 +161,7 @@ export default {
             this.deviceList(); //刷新
           });
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "success",
             message: "删除成功!",
@@ -168,6 +169,7 @@ export default {
         })
         .catch(() => {
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "info",
             message: "已取消删除",
diff --git a/src/views/realTimeMonitor/components/setschedule.vue b/src/views/realTimeMonitor/components/setschedule.vue
index b6932c7..063778d 100644
--- a/src/views/realTimeMonitor/components/setschedule.vue
+++ b/src/views/realTimeMonitor/components/setschedule.vue
@@ -536,6 +536,7 @@ export default {
           })
           .catch((err) => {
             this.$message({
+              duration: 1500,
               showClose: true,
               message: "添加失败",
               type: "error",
diff --git a/src/views/realTimeMonitor/index.vue b/src/views/realTimeMonitor/index.vue
index 9b45ff3..ceff47d 100644
--- a/src/views/realTimeMonitor/index.vue
+++ b/src/views/realTimeMonitor/index.vue
@@ -543,12 +543,14 @@ export default {
           if (res.code == 200) {
             if (val == 1) {
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "声光报警开启成功",
                 type: "success",
               });
             } else {
               this.$message({
+                duration: 1500,
                 showClose: true,
                 message: "声光报警关闭成功",
                 type: "success",
@@ -558,6 +560,7 @@ export default {
         })
         .catch((err) => {
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "声光报警操作失败",
             type: "error",
@@ -578,6 +581,7 @@ export default {
 
     handleShowErr() {
       this.$message({
+        duration: 1500,
         showClose: true,
         message: "该功能暂未开发,敬请期待",
         type: "warning",
@@ -597,6 +601,7 @@ export default {
       })
         .then((res) => {
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "手动拍照请求成功！",
             type: "success",
@@ -628,6 +633,7 @@ export default {
       })
         .then((res) => {
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "手动拍视频请求成功！",
             type: "success",
@@ -701,6 +707,7 @@ export default {
           clearInterval(this.timer);
           this.timer = null;
           this.$message({
+            duration: 1500,
             showClose: true,
             message: "装置暂无响应，请稍后再试！",
             type: "warning",
diff --git a/src/views/realTimeSearch/index.vue b/src/views/realTimeSearch/index.vue
index dd9c8c7..512f096 100644
--- a/src/views/realTimeSearch/index.vue
+++ b/src/views/realTimeSearch/index.vue
@@ -328,6 +328,7 @@ export default {
     onSubmit() {
       if (this.formdata.starttime > this.formdata.endtime) {
         return this.$message({
+          duration: 1500,
           showClose: true,
           message: "开始日期不能大于结束日期",
           type: "warning",
diff --git a/src/views/system/components/addUser.vue b/src/views/system/components/addUser.vue
index da541e2..1a94338 100644
--- a/src/views/system/components/addUser.vue
+++ b/src/views/system/components/addUser.vue
@@ -104,6 +104,7 @@ export default {
               .then((res) => {
                 if (res.code == 200) {
                   this.$message({
+                    duration: 1500,
                     showClose: true,
                     message: "添加成功",
                     type: "success",
diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue
index 496616b..75b9beb 100644
--- a/src/views/system/globalTools/index.vue
+++ b/src/views/system/globalTools/index.vue
@@ -102,6 +102,7 @@ export default {
           console.log(res);
           if (res.code === 200) {
             this.$message({
+              duration: 1500,
               showClose: true,
               message: "告警可信度设置成功",
               type: "success",
diff --git a/src/views/system/userManagement.vue b/src/views/system/userManagement.vue
index 266c71c..071a687 100644
--- a/src/views/system/userManagement.vue
+++ b/src/views/system/userManagement.vue
@@ -149,6 +149,7 @@ export default {
         })
         .catch(() => {
           this.$message({
+            duration: 1500,
             showClose: true,
             type: "info",
             message: "已取消删除",