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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/deviceLog/LogInfo.vue

@@ -6,12 +6,12 @@
        <a-row :gutter="24">
          <a-col :md="6" :sm="6">
            <a-form-item label="设备编号">
              <a-input placeholder="输入设备编号查询" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
            <a-form-item label="设备名称">
              <a-input placeholder="输入设备名称查询" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
@@ -152,7 +152,6 @@
    </div>
    <work-chart-model ref="workChartModel"></work-chart-model>
    <work-history-model ref="workHistoryModel"></work-history-model>

  </div>
</template>

@@ -327,15 +326,22 @@
        // console.log(this.queryParams.collectTime)
        if(this.queryParams.collectTime != undefined){
          this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
          if(!this.queryParams.equipmentId||!this.queryParams.equipmentName){
            this.$notification.warning({
              message:'消息',
              description:"请选择设备"
            });
            return false
          }
          this.queryChart()
        }else{
          // this.$message.warning("请选择时间")
          console.log('触发提示')
          this.$notification.warning({
            message:'消息',
            description:"请选择时间"
          });
        }

        // this.queryList()
      },
      searchReset() {
@@ -417,6 +423,7 @@
              message:'消息',
              description:res.message
            });

          }
        })
      }
@@ -427,11 +434,10 @@
      this.initEquipment();
      // this.queryTreeData();
    },
    mounted() {

    },
    watch: {
      equement(val) {
        console.log('通过watch触发')

        if (val && val.equipmentId) {
          this.$set(this.queryParams, 'equipmentName', val.equipmentName)
          this.$set(this.queryParams, 'equipmentId', val.equipmentId)