Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/zhxf_vue into dev

src/pages/alarms/untreated/index.vue

@@ -37,8 +37,14 @@
                 div(id="alarms" style="width:100%;height:200px;background:#ffffff")
         el-main(style="padding:0px;z-index:1001;height:78vh" class="alarms-untreated-main")
             el-tabs(v-model="activeName" type="border-card" @tab-click="handleClick")
-                el-tab-pane(label="报警列表" name="0")
+                //- el-tab-pane(label="报警列表" name="0")
+                //-     query-list(v-if="activeName == 0" ref="queryList")
+                el-tab-pane(label="全部" name="0")
                     query-list(v-if="activeName == 0" ref="queryList")
+                el-tab-pane(label="特情前" name="1")
+                    query-list(v-if="activeName == 1" ref="queryList")
+                el-tab-pane(label="特情中" name="2")
+                    query-list(v-if="activeName == 2" ref="queryList")
 </template>
 <script>
 import QueryList from '../untreated/query-list'
@@ -46,7 +52,7 @@ export default {
   data() {
     return {
       leftLoading: false,
-      activeName: '0',
+      activeName: 0,
       level: {},
       status: {},
       chartData: null,

src/pages/alarms/untreated/query-list.vue

@@ -17,7 +17,7 @@
                         el-form-item(label="报警状态:")
                             el-select(v-model="dataForm.status" style="width:100px" placeholder="请选择" clearable)
                                 el-option(label="未处理" value=1)
-                                el-option(label="处理中" value=2)
+                                //- el-option(label="处理中" value=2)
                                 el-option(label="已处理" value=3)
                         el-form-item(label="发生时间")
                             el-date-picker(v-model="dataForm.startTime" style="width:180px" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" clearable)
@@ -43,7 +43,7 @@
                         <div v-if='scope.row.eventLevel==3'><el-badge is-dot class="item3"></el-badge>一般</div>
                     template( slot='status' slot-scope="scope")
                         <div v-if='scope.row.status==1'><el-badge is-dot class="item1"></el-badge>未处理</div>
-                        <div v-if='scope.row.status==2'><el-badge is-dot class="item2"></el-badge>处理中</div>
+                        //- <div v-if='scope.row.status==2'><el-badge is-dot class="item2"></el-badge>处理中</div>
                         <div v-if='scope.row.status==3'><el-badge is-dot class="item3"></el-badge>已处理</div>
                     template( slot='eventNumber' slot-scope="scope")
                         font(:title="scope.row.eventNumber") {{scope.row.eventNumber}}
@@ -114,10 +114,12 @@ export default {
     this.initEventType()
   },
   methods: {
-    init() {
-      this.getDataList()
+    init(type) {
+      console.log('type:', type)
+      this.getDataList(type)
     },
-    getDataList(sort, order) {
+    getDataList(type, sort, order) {
+      console.log('--type:', type)
       if (sort === 'event_type_name' || sort === 'eventTypeName') {
         sort = 'event_type'
       }
@@ -126,8 +128,8 @@ export default {
         url: this.$http.adornUrlAlarm(`/alarmsInfo/list`),
         method: 'post',
         data: {
+          type: type == 0 ? null : type,
           status: this.dataForm.status,
-          stationId: localStorage.getItem('stationId'),
           params: this.dataForm.params,
           levelList: this.dataForm.eventLevel,
           startTime: this.dataForm.startTime,

src/pages/ol/kanban/index.vue

@@ -479,7 +479,9 @@ export default {
             if (this.wxyljList) {
               this.wxyljList.forEach((e) => {
                 if (element.id === e.resource_id) {
-                  element.value = e.water_pressure + 'MPa'
+                  element.children.forEach((el) => {
+                    el.value = e.water_pressure + 'MPa'
+                  })
                 }
               })
             }
@@ -490,15 +492,17 @@ export default {
             if (this.hjtcqList) {
               this.hjtcqList.forEach((e) => {
                 if (element.id === e.resource_id) {
-                  if (element.rightName === '温度') {
-                    element.value = e.temperature + '°C'
-                  } else if (element.rightName === '湿度') {
-                    element.value = e.humidity + '%RH'
-                  } else if (element.rightName === '一氧化碳') {
-                    element.value = e.carbon_monoxide + 'PPM'
-                  } else if (element.rightName === '二氧化碳') {
-                    element.value = e.carbon_dioxide + 'PPM'
-                  }
+                  element.children.forEach((el) => {
+                    if (el.rightName === '温度') {
+                      el.value = e.temperature + '°C'
+                    } else if (el.rightName === '湿度') {
+                      el.value = e.humidity + '%RH'
+                    } else if (el.rightName === '一氧化碳') {
+                      el.value = e.carbon_monoxide + 'PPM'
+                    } else if (el.rightName === '二氧化碳') {
+                      el.value = e.carbon_dioxide + 'PPM'
+                    }
+                  })
                 }
               })
             }
@@ -509,7 +513,9 @@ export default {
             if (this.lljList) {
               this.lljList.forEach((e) => {
                 if (element.id === e.resource_id) {
-                  element.value = e.flow_rate + 'm3/h'
+                  element.children.forEach((el) => {
+                    el.value = e.flow_rate + 'm3/h'
+                  })
                 }
               })
             }
@@ -520,7 +526,9 @@ export default {
             if (this.wxywyList) {
               this.wxywyList.forEach((e) => {
                 if (element.id === e.resource_id) {
-                  element.value = e.gauge_height + 'cm'
+                  element.children.forEach((el) => {
+                    el.value = e.gauge_height + 'cm'
+                  })
                 }
               })
             }
@@ -531,7 +539,9 @@ export default {
             if (this.fsyList) {
               this.fsyList.forEach((e) => {
                 if (element.id === e.resource_id) {
-                  element.value = e.wind_speed + 'm/s'
+                  element.children.forEach((el) => {
+                    el.value = e.wind_speed + 'm/s'
+                  })
                 }
               })
             }
@@ -542,7 +552,9 @@ export default {
             if (this.fyyList) {
               this.fyyList.forEach((e) => {
                 if (element.id === e.resource_id) {
-                  element.value = e.wind_pressure + 'pa'
+                  element.children.forEach((el) => {
+                    el.value = e.wind_pressure + 'pa'
+                  })
                 }
               })
             }