|
|
@@ -1,85 +1,87 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-row :gutter="20">
|
|
|
- <!--机构数据-->
|
|
|
- <el-col :span="24" :xs="24">
|
|
|
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
|
|
|
+ <div class="main-right-box">
|
|
|
+ <!-- 搜索条件 -->
|
|
|
+ <div class="main-search-box">
|
|
|
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
|
|
|
+ <el-form-item label="预警标题" prop="taskName">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.alarmTitle"
|
|
|
+ placeholder="请输入预警标题"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="handleQuery"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
|
|
|
+ <el-form-item label="预警时间" prop="planStartTime">
|
|
|
+ <DataRangePicker clearable
|
|
|
+ v-model="queryParams.alarmDates"
|
|
|
+ style="width: 240px"
|
|
|
+ value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ type="daterange"
|
|
|
+ range-separator="-"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
+ ></DataRangePicker>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
- <el-form-item label="预警标题" prop="taskName">
|
|
|
- <el-input
|
|
|
- v-model="queryParams.alarmTitle"
|
|
|
- placeholder="请输入预警标题"
|
|
|
- clearable
|
|
|
- @keyup.enter.native="handleQuery"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+ <el-form-item label="预警区域" prop="roleId">
|
|
|
+ <!-- <el-select v-model="queryParams.code" placeholder="请选择" clearable>
|
|
|
+ <el-option v-for="item in areaList" :key="item.key" :label="item.value" :value="item.key"></el-option>
|
|
|
+ </el-select>-->
|
|
|
+ <el-cascader placeholder="请选择预警区域" clearable
|
|
|
+ :options="areaList"
|
|
|
+ @change="handleChange"
|
|
|
+ v-model="queryParams.code"
|
|
|
+ ></el-cascader>
|
|
|
+ </el-form-item>
|
|
|
|
|
|
- <el-form-item label="预警时间" prop="planStartTime">
|
|
|
- <el-date-picker clearable
|
|
|
- v-model="queryParams.alarmDates"
|
|
|
- style="width: 240px"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
- type="daterange"
|
|
|
- range-separator="-"
|
|
|
- start-placeholder="开始日期"
|
|
|
- end-placeholder="结束日期"
|
|
|
- :default-time="['00:00:00', '23:59:59']"
|
|
|
- ></el-date-picker>
|
|
|
- </el-form-item>
|
|
|
|
|
|
- <el-form-item label="预警区域" prop="roleId">
|
|
|
-<!-- <el-select v-model="queryParams.code" placeholder="请选择" clearable>
|
|
|
- <el-option v-for="item in areaList" :key="item.key" :label="item.value" :value="item.key"></el-option>
|
|
|
- </el-select>-->
|
|
|
- <el-cascader placeholder="请选择预警区域" clearable
|
|
|
- :options="areaList"
|
|
|
- @change="handleChange"
|
|
|
- v-model="queryParams.code"
|
|
|
- ></el-cascader>
|
|
|
- </el-form-item>
|
|
|
|
|
|
- <el-form-item>
|
|
|
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
+ </el-form>
|
|
|
+ <el-row :gutter="10" >
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
|
+ </el-col>
|
|
|
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ </el-row>
|
|
|
+ </div>
|
|
|
|
|
|
- <el-row :gutter="10" class="mb8">
|
|
|
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
- </el-row>
|
|
|
+ <el-table height="720" v-loading="loading" :data="weatherList" >
|
|
|
+ <el-table-column label="预警标题" align="center" prop="alarmTitle" />
|
|
|
+ <el-table-column label="预警城市" align="center" width="140" prop="city" />
|
|
|
+ <el-table-column label="预警区域" align="center" width="100" prop="area"/>
|
|
|
+ <el-table-column label="预警等级" align="center" width="100" prop="alarmLevel"></el-table-column>
|
|
|
+ <el-table-column label="预警类型" align="center" width="100" prop="alarmType"></el-table-column>
|
|
|
+ <el-table-column label="预警内容" align="center" prop="alarmContent">
|
|
|
+ <template slot-scope="r"><p :title="r.row.alarmContent" class="line-style">{{r.row.alarmContent}}</p></template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="预警发布时间" align="center" prop="alarmTime">
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="weatherList" >
|
|
|
- <el-table-column label="预警标题" align="center" prop="alarmTitle" />
|
|
|
- <el-table-column label="预警城市" align="center" width="140" prop="city" />
|
|
|
- <el-table-column label="预警区域" align="center" width="100" prop="area"/>
|
|
|
- <el-table-column label="预警等级" align="center" width="100" prop="alarmLevel"></el-table-column>
|
|
|
- <el-table-column label="预警类型" align="center" width="100" prop="alarmType"></el-table-column>
|
|
|
- <el-table-column label="预警内容" align="center" prop="alarmContent">
|
|
|
- <template slot-scope="r"><p :title="r.row.alarmContent" class="line-style">{{r.row.alarmContent}}</p></template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="预警发布时间" align="center" prop="alarmTime">
|
|
|
- </el-table-column>
|
|
|
- </el-table>
|
|
|
+ <pagination
|
|
|
+ v-show="total>0"
|
|
|
+ :total="total"
|
|
|
+ :page.sync="queryParams.pageNum"
|
|
|
+ :limit.sync="queryParams.pageSize"
|
|
|
+ @pagination="getList"
|
|
|
+ />
|
|
|
|
|
|
- <pagination
|
|
|
- v-show="total>0"
|
|
|
- :total="total"
|
|
|
- :page.sync="queryParams.pageNum"
|
|
|
- :limit.sync="queryParams.pageSize"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
import { findWeatherList,selectCityInfoVoList} from "@/api/core/weather";
|
|
|
-
|
|
|
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
|
|
|
export default {
|
|
|
- components: {},
|
|
|
+ components: {DataRangePicker},
|
|
|
name: "Weather",
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -139,7 +141,7 @@ export default {
|
|
|
},
|
|
|
handleChange(value){
|
|
|
console.log(value,'value')
|
|
|
- this.queryParams.code=value[1];
|
|
|
+ this.queryParams.code=value[1];
|
|
|
},
|
|
|
|
|
|
/** 搜索按钮操作 */
|