1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字...

zhuzhuanzhuan

2024-03-01 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e

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

@@ -4,7 +4,7 @@
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :md="6" :sm="6">
          <a-col :md="4" :sm="4">
            <a-form-item label="设备编号">
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
            </a-form-item>
@@ -14,18 +14,24 @@
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
          <a-col :md="4" :sm="4">
            <a-form-item label="日期">
              <a-date-picker v-model="queryParams.collectTime" :disabledDate="disabledDate" @change="dataChange"
                             format='YYYY-MM-DD'/>
            </a-form-item>
          </a-col>
          <a-col :md="3" :sm="3">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            <a-space>
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-space>
          </a-col>
          <!--<a-col :md="3" :sm="3">-->
            <!--<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>-->
          <!--</a-col>-->
          <!--<a-col :md="2" :sm="2" :xs="2">-->
            <!--<a-button type="primary" @click="searchReset" icon="reload">重置</a-button>-->
          <!--</a-col>-->
        </a-row>
      </a-form>
    </div>
@@ -168,7 +174,7 @@
  import { getAction } from '@/api/manage'
  // import {mapActions} from 'vuex'
  export default {
    components: {
     components: {
      LogList,
      WorkLogList,
      AlarmLogList,
@@ -326,28 +332,21 @@
      },
      searchQuery() {
        // 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.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
        if (!this.queryParams.equipmentId || !this.queryParams.equipmentName) {
          this.$notification.warning({
            message: '消息',
            description: '请选择时间'
            description: '请选择设备'
          })
          return false
        }
        this.queryChart()
        // this.queryList()
      },
      searchReset() {
        this.queryParams = {}
        this.queryParams = {
          collectTime : moment()
      }
        // this.queryList()
        this.equipment = {}
        this.queryChart()