JX.LI 2 vuotta sitten
vanhempi
commit
5b35139bc0
3 muutettua tiedostoa jossa 15 lisäystä ja 10 poistoa
  1. 1 1
      src/views/datacenter.vue
  2. 5 0
      src/views/forest.vue
  3. 9 9
      src/views/monitor.vue

+ 1 - 1
src/views/datacenter.vue

@@ -20,7 +20,7 @@
               <el-input
                 v-model="searchName"
                 placeholder="请输入名称"
-                @blur="searchByName()"
+                @keyup.enter.native="searchByName()"
                 clearable
                 size="small"
                 prefix-icon="el-icon-search"

+ 5 - 0
src/views/forest.vue

@@ -651,6 +651,7 @@ export default {
       return y + '-' + m + '-' + d
     },
     selectDay(day) { //日历点击
+      this.pageNum = 1
       this.getTodayEvents(day)
       this.getDeptEventCount(day)
       this.getWeather(day)
@@ -1235,6 +1236,10 @@ export default {
       if (data.tag == "eventPush" && that.markersList.filter(item => data.eventCode == item.parameter).length == 0) {
         getEventPush({ eventCode: data.eventCode }).then((res) => {
           if (res.data != undefined) {
+            if(res.data.eventType == 510){
+              res.data.picturePath = "../assets/images/水压.png"
+            }
+       
             //插入到第一条
             this.eventList.unshift(res.data)
             // 插入后删除最后一条 保证列表中为10条数据

+ 9 - 9
src/views/monitor.vue

@@ -677,15 +677,15 @@ export default {
               "                </div>" +
               "                </div>" +
               "                </span>" +
-              "<span>" +
-              '                  <div class="d-l-con">' +
-              '                  <div class="d-l-l-text">' +
-              "                  <h4>厂家:" +
-              (item.brand ? item.brand : "") +
-              "</h4>" +
-              "                </div>" +
-              "                </div>" +
-              "                </span>" +
+              // "<span>" +
+              // '                  <div class="d-l-con">' +
+              // '                  <div class="d-l-l-text">' +
+              // "                  <h4>厂家:" +
+              // (item.brand ? item.brand : "") +
+              // "</h4>" +
+              // "                </div>" +
+              // "                </div>" +
+              // "                </span>" +
               "<span>" +
               '                  <div class="d-l-con">' +
               '                  <div class="d-l-l-text">' +