Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue

@@ -236,6 +236,7 @@
        this.queryParam.endDate = v2[1]
      },
      searchQuery() {
        if (this.dates&&this.dates.length>0){
        if (this.queryParam.typeTree == "1") {
          this.queryParam.parentId = this.queryParamEquip.parentId
          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -244,6 +245,13 @@
          this.queryParam.equipmentId = ""
        }
        this.loadData1()
        } else{
          this.$notification.warning({
             message:'提示',
             description:'请选择时间'
          })
        }

        // this.onClearSelected()
      },
      // searchReset() {