diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 0293be3..26be507 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -313,39 +313,44 @@
             <div id="previewOfSiteStatusCentent5"></div>
           </div>
         </div>
-        <div id="previewOfSiteStatusRightBottom">
-          <div class="previewOfSiteStatusTitle">
-            <img
-              src="./../../../static/img/previewOfSiteStatus6.png"
-              alt
-              class="previewOfSiteStatusTitleImg"
-            />
-            <span class="previewOfSiteStatusTitleFont">站点实时报警</span>
-          </div>
-          <div class="previewOfSiteStatusCentent">
-            <div id="previewOfSiteStatusCentent6">
-              <div id="GisRightCententBox2UL">
-                <span v-show="NoBaoJingData" class="NoBaoJing"
-                  >暂无报警数据</span
+        <div class="previewOfSiteStatusCentent">
+          <div id="previewOfSiteStatusCentent6">
+            <div id="GisRightCententBox2UL">
+              <span v-show="NoBaoJingData" class="NoBaoJing">暂无报警数据</span>
+              <div
+                class="GIsRightWaringList"
+                v-for="(item, index) in WaringList"
+                :key="index"
+              >
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :hide-after="1000"
+                  :content="`站点编号${item.siteNo}`"
+                  placement="top"
                 >
-                <div
-                  class="GIsRightWaringList"
-                  v-for="(item, index) in WaringList"
-                  :key="index"
-                >
-                  <!-- @click="WaringListC(item)" -->
-                  <span class="GIsRightWaringListNo">{{
-                    item.createTime
-                  }}</span>
-                  <span class="GIsRightWaringListName">{{
-                    item.siteName
-                  }}</span>
-                  <span
-                    class="GIsRightWaringListType"
-                    :class="[item.warnType == 2 ? 'red' : 'Yellow']"
-                    >{{ item.warnTypeDesc }}</span
-                  >
-                </div>
+                  <div>
+                    <span class="GIsRightWaringListNo">{{
+                      item.createTime
+                    }}</span>
+                    <span class="GIsRightWaringListName">{{
+                      item.siteName
+                    }}</span>
+                    <span
+                      class="GIsRightWaringListType"
+                      :class="[item.warnType == 2 ? 'red' : 'Yellow']"
+                      >{{ item.warnTypeDesc }}</span
+                    >
+                  </div>
+                </el-tooltip>
+                <!-- @click="WaringListC(item)" -->
+                <!-- <span class="GIsRightWaringListNo">{{ item.createTime }}</span>
+                <span class="GIsRightWaringListName">{{ item.siteName }}</span>
+                <span
+                  class="GIsRightWaringListType"
+                  :class="[item.warnType == 2 ? 'red' : 'Yellow']"
+                  >{{ item.warnTypeDesc }}</span
+                > -->
               </div>
             </div>
           </div>
@@ -1145,7 +1150,7 @@
     this.loadQuyuPaiMing();
 
     this.$nextTick(function() {
-      this.timer = setInterval(this.ScrollUp, 50);
+      this.timer = setInterval(this.ScrollUp, 100);
     });
     // 默认从本地session srotage里面读取历史搜索记录ZZJ
     this.getItem();

diff --git a/src/components/site/previewOfSiteStatus.vue b/src/components/site/previewOfSiteStatus.vue
index 0293be3..26be507 100644
--- a/src/components/site/previewOfSiteStatus.vue
+++ b/src/components/site/previewOfSiteStatus.vue
@@ -313,39 +313,44 @@
             <div id="previewOfSiteStatusCentent5"></div>
           </div>
         </div>
-        <div id="previewOfSiteStatusRightBottom">
-          <div class="previewOfSiteStatusTitle">
-            <img
-              src="./../../../static/img/previewOfSiteStatus6.png"
-              alt
-              class="previewOfSiteStatusTitleImg"
-            />
-            <span class="previewOfSiteStatusTitleFont">站点实时报警</span>
-          </div>
-          <div class="previewOfSiteStatusCentent">
-            <div id="previewOfSiteStatusCentent6">
-              <div id="GisRightCententBox2UL">
-                <span v-show="NoBaoJingData" class="NoBaoJing"
-                  >暂无报警数据</span
+        <div class="previewOfSiteStatusCentent">
+          <div id="previewOfSiteStatusCentent6">
+            <div id="GisRightCententBox2UL">
+              <span v-show="NoBaoJingData" class="NoBaoJing">暂无报警数据</span>
+              <div
+                class="GIsRightWaringList"
+                v-for="(item, index) in WaringList"
+                :key="index"
+              >
+                <el-tooltip
+                  class="item"
+                  effect="dark"
+                  :hide-after="1000"
+                  :content="`站点编号${item.siteNo}`"
+                  placement="top"
                 >
-                <div
-                  class="GIsRightWaringList"
-                  v-for="(item, index) in WaringList"
-                  :key="index"
-                >
-                  <!-- @click="WaringListC(item)" -->
-                  <span class="GIsRightWaringListNo">{{
-                    item.createTime
-                  }}</span>
-                  <span class="GIsRightWaringListName">{{
-                    item.siteName
-                  }}</span>
-                  <span
-                    class="GIsRightWaringListType"
-                    :class="[item.warnType == 2 ? 'red' : 'Yellow']"
-                    >{{ item.warnTypeDesc }}</span
-                  >
-                </div>
+                  <div>
+                    <span class="GIsRightWaringListNo">{{
+                      item.createTime
+                    }}</span>
+                    <span class="GIsRightWaringListName">{{
+                      item.siteName
+                    }}</span>
+                    <span
+                      class="GIsRightWaringListType"
+                      :class="[item.warnType == 2 ? 'red' : 'Yellow']"
+                      >{{ item.warnTypeDesc }}</span
+                    >
+                  </div>
+                </el-tooltip>
+                <!-- @click="WaringListC(item)" -->
+                <!-- <span class="GIsRightWaringListNo">{{ item.createTime }}</span>
+                <span class="GIsRightWaringListName">{{ item.siteName }}</span>
+                <span
+                  class="GIsRightWaringListType"
+                  :class="[item.warnType == 2 ? 'red' : 'Yellow']"
+                  >{{ item.warnTypeDesc }}</span
+                > -->
               </div>
             </div>
           </div>
@@ -1145,7 +1150,7 @@
     this.loadQuyuPaiMing();
 
     this.$nextTick(function() {
-      this.timer = setInterval(this.ScrollUp, 50);
+      this.timer = setInterval(this.ScrollUp, 100);
     });
     // 默认从本地session srotage里面读取历史搜索记录ZZJ
     this.getItem();
diff --git a/src/components/sys/user.vue b/src/components/sys/user.vue
index 1e908f5..896ba3f 100644
--- a/src/components/sys/user.vue
+++ b/src/components/sys/user.vue
@@ -223,6 +223,25 @@
         this.resetForm();
         this.dialogInfo.btLoading = false;
       }
+    },
+    "dialogInfo.type"(val) {
+      let formInfo = this.formInfo;
+      switch(val) {
+        case "update":
+          for(let item of formInfo.fieldList) {
+            if(item.value === "login") {
+              item.disabled = true;
+            }
+          }
+          break;
+        case "AddUser":
+          for(let item of formInfo.fieldList) {
+            if(item.value === "login") {
+              item.disabled = false;
+            }
+          }
+          break;
+      }
     }
   },
   methods: {