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

doum

21 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/warningPush.vue

@@ -2,13 +2,6 @@
  <TableLayout :permissions="['business:warningpush:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="报警类型" prop="warningId">
        <el-select v-model="searchForm.warningId" placeholder="请选择" clearable @change="search">
          <el-option label="未推送" value="0"></el-option>
          <el-option label="推送成功" value="1"></el-option>
          <el-option label="推送失败" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="报警分类" prop="warningType">
        <el-select v-model="searchForm.warningType" placeholder="请选择" clearable  @change="search">
          <el-option label="安防事件" value="0"></el-option>
@@ -24,6 +17,9 @@
      <el-form-item label="报警内容" prop="content">
        <el-input v-model="searchForm.content" placeholder="请输入报警内容" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="通知人员" prop="content">
        <el-input v-model="searchForm.memberName" placeholder="请输入通知人员" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="通知状态 " prop="status">
        <el-select v-model="searchForm.status" placeholder="请选择"   clearable @change="search">
          <el-option label="未通知" value="0"></el-option>
@@ -38,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"
@@ -55,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"
@@ -66,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}">
@@ -88,6 +83,7 @@
        <el-table-column prop="region" label="所在位置" min-width="120px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="content" label="报警内容" min-width="180px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="memberName" label="通知人员" min-width="100px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="companyName" label="人员部门" min-width="100px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="status" label="通知状态" min-width="100px">
          <template slot-scope="{row}">
            <span style="color: rgba(245, 154, 35, 0.996);" v-if="row.status === 0">未通知</span>
@@ -134,10 +130,13 @@
      searchForm: {
        id: '',
        warningId: '',
        memberName: null,
        warningType: null,
        title: '',
        content: '',
        status: ''
        status: '',
        queryEndtime:null,
        queryStarttime:null
      }
    }
  },
@@ -149,6 +148,14 @@
      'field.main': 'id'
    })
    this.search()
  },
  methods:{
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.queryStarttime = ''
      this.searchForm.queryEndtime = ''
      this.search()
    }
  }
}
</script>