diff --git a/public/alj.ico b/public/alj.ico
new file mode 100644
index 0000000000000000000000000000000000000000..33b33cc70b42a5b35d7a94590e6a435051fc7bf0
Binary files /dev/null and b/public/alj.ico differ
diff --git a/public/index.html b/public/index.html
index c054aace067a1cfff4fb1558250cd821fb0aa32f..51f015334f74baf989edb00c39a8868add51465e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>logo.jpg">
+    <link rel="icon" href="<%= BASE_URL %>alj.ico">
     <title>安检设备综合管理平台</title>
   </head>
   <body>
diff --git a/src/assets/images/big-dialog-bgc.png b/src/assets/images/big-dialog-bgc.png
new file mode 100644
index 0000000000000000000000000000000000000000..13c1864830aff95d0836f468cefe9434e819c449
Binary files /dev/null and b/src/assets/images/big-dialog-bgc.png differ
diff --git a/src/utils/config.js b/src/utils/config.js
index 5aa471f50bcabf9b0dddb1b41ea6e67d10cecd38..c49ee3a94fd1b711b7dfe8cba5d3ba7a899b6f56 100644
--- a/src/utils/config.js
+++ b/src/utils/config.js
@@ -1,7 +1,7 @@
 module.exports = {
   // baseUrl: 'localhost:2011'
   // baseUrl: '49.234.81.196:2011'
-  // baseUrl: '192.168.0.101:2011'
+  baseUrl: '192.168.0.105:2011'
   // baseUrl: '120.25.106.20:2011'
-  baseUrl: 'localhost:40000'
+  // baseUrl: 'localhost:40000'
 }
diff --git a/src/views/DataManagement/ReminderSettings.vue b/src/views/DataManagement/ReminderSettings.vue
index 6ae23afb600124cff64dfb1941703d882d94574c..8f845a4acddcb0c20bdb88a374d20061ca6cad80 100644
--- a/src/views/DataManagement/ReminderSettings.vue
+++ b/src/views/DataManagement/ReminderSettings.vue
@@ -9,6 +9,9 @@
           <el-col :span="8">
             <el-card shadow="hover">
               <div style="height: auto">
+                <h3 style="color: #20a0ff">
+                  日报发送设置
+                </h3>
                 <div>
                   <el-form ref="dailyNewspaperForm" :model="dailyNewspaperForm" label-width="110px" class="demo-dynamic" label-position="left">
                     <el-form-item
@@ -41,7 +44,7 @@
                     >
                       <el-input
                         v-model="dailyNewspaperForm.emails[index]"
-                        style="width: 190px;padding-right: 13px"
+                        style="width: 77%;padding-right: 13px"
                       />
                       <el-button @click.prevent="removeDailyNewspaperFormEmail(email)">
                         删除
@@ -67,6 +70,9 @@
           <el-col :span="8">
             <el-card shadow="hover">
               <div style="height: auto">
+                <h3 style="color: #20a0ff">
+                  报警率设置
+                </h3>
                 <el-form ref="policeForm" :model="policeForm" label-width="110px" class="demo-dynamic">
                   <el-form-item
                     prop="police"
@@ -85,7 +91,7 @@
                       required: true, message: '发送间隔时间不能为空', trigger: 'blur'
                     }"
                   >
-                    <el-input-number v-model="policeForm.interval" style="width: 300px" :min="1" :max="1440" />
+                    <el-input-number v-model="policeForm.interval" style="width: 100%" :min="1" :max="1440" />
                   </el-form-item>
                   <el-form-item
                     v-for="(email, index) in policeForm.emails"
@@ -99,7 +105,7 @@
                   >
                     <el-input
                       v-model="policeForm.emails[index]"
-                      style="width: 190px;padding-right: 13px"
+                      style="width: 77%;padding-right: 13px"
                     />
                     <el-button @click.prevent="removePoliceFormEmail(email)">
                       删除
@@ -124,6 +130,9 @@
           <el-col :span="8">
             <el-card shadow="hover">
               <div style="height: auto">
+                <h3 style="color: #20a0ff">
+                  利用率基数设置
+                </h3>
                 <el-form ref="utilizationRatioForm" :model="utilizationRatioForm" label-width="110px" class="demo-dynamic">
                   <el-form-item
                     prop="inactivity"
@@ -164,7 +173,7 @@
                   >
                     <el-input
                       v-model="utilizationRatioForm.emails[index]"
-                      style="width: 190px;padding-right: 13px"
+                      style="width: 77%;padding-right: 13px"
                     />
                     <el-button @click.prevent="removeUtilizationRatioFormEmail(email)">
                       删除
diff --git a/src/views/FacilityManagement/RealTimeDate.vue b/src/views/FacilityManagement/RealTimeDate.vue
index f57bfd4e6ea16c427945cc7f4a265dd5aa8e4cf8..eaa8312cff647efc9b21035a0706e120c1b3429a 100644
--- a/src/views/FacilityManagement/RealTimeDate.vue
+++ b/src/views/FacilityManagement/RealTimeDate.vue
@@ -2,130 +2,7 @@
 <template>
   <div>
     <BreadCrumb :inner="inner" />
-    <EmptyCard>
-      <div slot="EmptyCard">
-        <!-- 查询模块 -->
-        <el-form
-          :inline="true"
-          :model="searchFrom"
-          class="demo-form-inline"
-          style="text-align: center"
-          @submit.native.prevent
-        >
-          <el-form-item>
-            <el-date-picker
-              v-model="searchFrom.startTime"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="开始时间"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-date-picker
-              v-model="searchFrom.endTime"
-              type="date"
-              format="yyyy 年 MM 月 dd 日"
-              value-format="yyyy-MM-dd"
-              placeholder="结束时间"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-input
-              v-model="searchFrom.deviceId"
-              placeholder="请输入设备编号"
-              clearable
-              @input="inputClear"
-              @keyup.enter.native="getData"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="searchFrom.operationType" clearable placeholder="请选择操作类型" @change="getData">
-              <el-option
-                v-for="item in type_options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="getData">
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <!-- 查询模块  /-->
-
-        <!-- 数据表格模块 -->
-        <div v-loading="loading" style="height: 470px">
-          <el-table
-            :data="tableData"
-            stripe
-            size="mini"
-            style="width: 100%"
-            tooltip-effect="dark"
-          >
-            <el-table-column prop="deviceId" label="设备编号" width="100" />
-            <el-table-column
-              prop="preParameters"
-              show-overflow-tooltip
-              label="操作前参数"
-            />
-            <el-table-column
-              prop="content"
-              show-overflow-tooltip
-              label="日志描述"
-            />
-            <el-table-column
-              prop="createTime"
-              label="操作时间"
-              sortable
-              width="190"
-            >
-              <template slot-scope="scope">
-                <i class="el-icon-time" />
-                <span style="margin-left: 10px">{{
-                  scope.row.createTime
-                }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="operationType" label="操作类型" width="120">
-              <template slot-scope="scope">
-                <span
-                  v-if="scope.row.operationType < 3"
-                  style="margin-left: 10px"
-                >{{ scope.row.operationType === 1 ? "插入" : "删除" }}</span>
-                <span v-else style="margin-left: 10px">修改</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="操作用户" width="120" />
-          </el-table>
-        </div>
-        <!-- 数据表格模块 -->
-
-        <!-- 分页 -->
-        <div
-          v-if="pager.totalPage > 10"
-          style="
-            text-align: center;
-            position: relative;
-            bottom: 0;
-            left: 50%;
-            transform: translateX(-50%);
-          "
-        >
-          <el-pagination
-            background
-            layout="prev, pager, next"
-            :total="pager.totalPage"
-            :current-page.sync="pager.currentPage"
-            @current-change="change"
-          />
-        </div>
-        <!-- 分页 /-->
-      </div>
-    </EmptyCard>
+    <EmptyCard />
   </div>
 </template>
 
diff --git a/src/views/NewMainPage.vue b/src/views/NewMainPage.vue
index c0fcce1245977d55b82fee290405f73c126d7a64..0182cf9c2e45eb6c540d6451314029963b4ae4dd 100644
--- a/src/views/NewMainPage.vue
+++ b/src/views/NewMainPage.vue
@@ -141,7 +141,7 @@
             </span><br>
             <span>
               <img src="../assets/images/BaoJinLv.png" style="width: 15px;height: 15px">
-              {{ item.topTenChartVO.alarmRate }}
+              {{ item.topTenChartVO.alarmRate }}%
             </span>
           </div>
           <!--               设备信息文字     -->
diff --git a/src/views/NewMainPageComponents/LeftTop.vue b/src/views/NewMainPageComponents/LeftTop.vue
index e4b12ccced17aba261d2d2c92e74674f690e7f50..b273349068a31bf1e64d6661f813ec5098ee24da 100644
--- a/src/views/NewMainPageComponents/LeftTop.vue
+++ b/src/views/NewMainPageComponents/LeftTop.vue
@@ -2,6 +2,30 @@
   <div style="width:100%;height: 100%;">
     <div style="height: 40px;font-size: 16px;color: white;line-height: 40px;padding-left: 15px">
       设备概况
+      <el-button type="text" @click="zoomEvent">
+        点击打开 Dialog
+      </el-button>
+      <el-dialog ref="imgDialog" :visible.sync="imgVisible" class="publish-dialog" width="820px" :append-to-body="true">
+        <template #title>
+          <span style="color: white">设备概况</span>
+        </template>
+        <div style="position: absolute;left: 260px;top: 300px">
+          <h1 style="color: rgb(9, 145, 194);">
+            设备总数
+          </h1>
+          <h2 style="color: #ffffff;text-align: center">
+            {{ leftTopVO.equipmentNumber }}
+          </h2>
+        </div>
+        <div style="position: absolute;left: 260px;top: 300px">
+          <h1 style="color: rgb(9, 145, 194);">
+            设备总数
+          </h1>
+          <h2 style="color: #ffffff;text-align: center">
+            {{ leftTopVO.onLineNumber }}
+          </h2>
+        </div>
+      </el-dialog>
     </div>
     <div style="height: 28%" />
     <div class="num" style="width: 5%;" />
@@ -32,15 +56,45 @@
 <script>
 export default {
   name: 'LeftTop',
+  data() {
+    return {
+      imgVisible: false
+    }
+  },
   computed: {
     leftTopVO() {
       return this.$store.state.dataPageData.leftTopVO
     }
+  },
+  methods: {
+    zoomEvent() {
+      this.imgVisible = true
+      const dialogEl = this.$refs.imgDialog.$refs.dialog
+      console.log(dialogEl)
+      dialogEl.setAttribute('zoom', 'max')
+      // if (dialogEl.hasAttribute('zoom')) {
+      //   dialogEl.removeAttribute('zoom')
+      // } else {
+      //   dialogEl.setAttribute('zoom', 'max')
+      // }
+    },
+    open() {
+      this.imgVisible = true
+      this.$alert('这是一段内容', '标题名称', {
+        confirmButtonText: '确定',
+        callback: action => {
+          this.$message({
+            type: 'info',
+            message: `action: ${action}`
+          })
+        }
+      })
+    }
   }
 }
 </script>
 
-<style scoped>
+<style scoped lang="less">
 .num {
   display: inline-block;
  /* border: 1px solid #ffffff;*/
@@ -49,4 +103,34 @@ export default {
   color: #ffffff;
   vertical-align: top;text-align: center;
 }
+.zoom-btn {
+  position: absolute;
+  right: 42px;
+  top: 17px;
+  height: 20px;
+  width: 20px;
+  text-align: center;
+  cursor: pointer;
+img {
+  width: 14px;
+}
+}
+.publish-dialog {
+/deep/ .el-dialog {
+&[zoom="max"] {
+   width: 100% !important;
+   height: 100% !important;
+   margin-top: 0 !important;
+ }
+}
+}
+/deep/.el-dialog__header {
+  background-color: transparent!important;
+}
+/deep/.el-dialog {
+  background-color: rgb(12, 20, 36);
+  background-image: url("../../assets/images/big-dialog-bgc.png");
+  background-repeat: no-repeat;
+  background-size:100% 100% ;
+}
 </style>
