Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/views/business/warningPush.vue

@@ -34,7 +34,7 @@
            clearable
            value-format="yyyy-MM-dd HH:mm:ss"
            class="w200"
            placeholder="开始时间" />
            placeholder="开始时间" /> 至
        <el-date-picker
            v-model="searchForm.queryEndtime"
            type="datetime"
@@ -51,10 +51,10 @@
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:warningpush:create', 'business:warningpush:delete']">
<!--      <ul class="toolbar" v-permissions="['business:warningpush:create', 'business:warningpush:delete']">
        <li><el-button type="primary" @click="$refs.operaWarningPushWindow.open('新建报警推送记录')" icon="el-icon-plus" v-permissions="['business:warningpush:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:warningpush:delete']">删除</el-button></li>
      </ul>
      </ul>-->
      <el-table
        :height="tableHeightNew"
        v-loading="isWorking.search"
@@ -62,8 +62,7 @@
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="createDate" label="发生时间" min-width="150px"></el-table-column>
         <el-table-column prop="createDate" label="发生时间" min-width="150px"></el-table-column>
        <el-table-column prop="warningName" label="报警类型" min-width="120px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="warningType" label="报警分类" min-width="100px">
          <template slot-scope="{row}">
@@ -135,7 +134,9 @@
        warningType: null,
        title: '',
        content: '',
        status: ''
        status: '',
        queryEndtime:null,
        queryStarttime:null
      }
    }
  },
@@ -147,6 +148,14 @@
      'field.main': 'id'
    })
    this.search()
  },
  methods:{
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.queryStarttime = ''
      this.searchForm.queryEndtime = ''
      this.search()
    }
  }
}
</script>