|
|
@@ -8,6 +8,15 @@
|
|
|
v-show="showSearch"
|
|
|
label-width="68px"
|
|
|
>
|
|
|
+ <el-form-item label="指标名称" prop="gatherFeeName">
|
|
|
+ <el-input
|
|
|
+ v-model="queryParams.gatherFeeName"
|
|
|
+ placeholder="请输入指标名称"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ </el-input>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="状态" prop="status">
|
|
|
<el-select
|
|
|
v-model="queryParams.status"
|
|
|
@@ -23,6 +32,32 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="年份" prop="year">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="queryParams.year"
|
|
|
+ type="year"
|
|
|
+ format="yyyy"
|
|
|
+ value-format="yyyy"
|
|
|
+ placeholder="请选择年份"
|
|
|
+ >
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="月份" prop="month">
|
|
|
+ <el-select
|
|
|
+ v-model="queryParams.month"
|
|
|
+ placeholder="请选择月份"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in monthist"
|
|
|
+ :key="dict.value + 'monthist'"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -100,7 +135,9 @@
|
|
|
<el-table-column label="状态" align="center" prop="cancelBy">
|
|
|
<template slot-scope="scope">
|
|
|
<el-tag v-if="scope.row.status == 0" type="danger">预警</el-tag>
|
|
|
- <el-tag v-else-if="scope.row.status == 1" type="success">已解除</el-tag>
|
|
|
+ <el-tag v-else-if="scope.row.status == 1" type="success"
|
|
|
+ >已解除</el-tag
|
|
|
+ >
|
|
|
<el-tag v-else-if="scope.row.status == 2" type="info">已取消</el-tag>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -132,47 +169,47 @@
|
|
|
type="text"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['business:GATHERWARNING:edit']"
|
|
|
- >处理</el-button
|
|
|
+ >处理</el-button
|
|
|
>
|
|
|
<el-popconfirm
|
|
|
title="确定取消吗？"
|
|
|
@confirm="handleCancel(scope.row)"
|
|
|
>
|
|
|
<el-button
|
|
|
- style="margin-left: 5px;"
|
|
|
+ style="margin-left: 5px"
|
|
|
size="mini"
|
|
|
type="text"
|
|
|
slot="reference"
|
|
|
v-hasPermi="['business:GATHERWARNING:remove']"
|
|
|
- >取消</el-button
|
|
|
+ >取消</el-button
|
|
|
>
|
|
|
</el-popconfirm>
|
|
|
</template>
|
|
|
-<!-- <template slot-scope="scope" v-if="scope.row.status != '1'">-->
|
|
|
-<!-- <el-popconfirm title="确定处理吗？" @confirm="handleDeal(scope.row)">-->
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- type="text"-->
|
|
|
-<!-- slot="reference"-->
|
|
|
-<!-- v-hasPermi="['business:GATHERWARNING:edit']"-->
|
|
|
-<!-- >处理</el-button-->
|
|
|
-<!-- >-->
|
|
|
-<!-- </el-popconfirm>-->
|
|
|
+ <!-- <template slot-scope="scope" v-if="scope.row.status != '1'">-->
|
|
|
+ <!-- <el-popconfirm title="确定处理吗？" @confirm="handleDeal(scope.row)">-->
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- type="text"-->
|
|
|
+ <!-- slot="reference"-->
|
|
|
+ <!-- v-hasPermi="['business:GATHERWARNING:edit']"-->
|
|
|
+ <!-- >处理</el-button-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- </el-popconfirm>-->
|
|
|
|
|
|
-<!-- <el-popconfirm-->
|
|
|
-<!-- title="确定取消吗？"-->
|
|
|
-<!-- @confirm="handleCancel(scope.row)"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <el-button-->
|
|
|
-<!-- style="margin-left: 5px;"-->
|
|
|
-<!-- size="mini"-->
|
|
|
-<!-- type="text"-->
|
|
|
-<!-- slot="reference"-->
|
|
|
-<!-- v-hasPermi="['business:GATHERWARNING:remove']"-->
|
|
|
-<!-- >取消</el-button-->
|
|
|
-<!-- >-->
|
|
|
-<!-- </el-popconfirm>-->
|
|
|
-<!-- </template>-->
|
|
|
+ <!-- <el-popconfirm-->
|
|
|
+ <!-- title="确定取消吗？"-->
|
|
|
+ <!-- @confirm="handleCancel(scope.row)"-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <el-button-->
|
|
|
+ <!-- style="margin-left: 5px;"-->
|
|
|
+ <!-- size="mini"-->
|
|
|
+ <!-- type="text"-->
|
|
|
+ <!-- slot="reference"-->
|
|
|
+ <!-- v-hasPermi="['business:GATHERWARNING:remove']"-->
|
|
|
+ <!-- >取消</el-button-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- </el-popconfirm>-->
|
|
|
+ <!-- </template>-->
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
|
|
|
@@ -185,18 +222,24 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改数据采集预警对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ :visible.sync="open"
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ width="500px"
|
|
|
+ append-to-body
|
|
|
+ >
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
|
|
|
-<!-- <el-form-item label="数据类型(0=量化指标数据,1=月报表数据)" prop="type">-->
|
|
|
-<!-- <el-select v-model="form.type" placeholder="请选择数据类型(0=量化指标数据,1=月报表数据)" filterable>-->
|
|
|
-<!-- <el-option-->
|
|
|
-<!-- v-for="dict in dict.type.${dictType}"-->
|
|
|
-<!-- :key="dict.value"-->
|
|
|
-<!-- :label="dict.label"-->
|
|
|
-<!--:value="dict.value"-->
|
|
|
-<!-- ></el-option>-->
|
|
|
-<!-- </el-select>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
+ <!-- <el-form-item label="数据类型(0=量化指标数据,1=月报表数据)" prop="type">-->
|
|
|
+ <!-- <el-select v-model="form.type" placeholder="请选择数据类型(0=量化指标数据,1=月报表数据)" filterable>-->
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- v-for="dict in dict.type.${dictType}"-->
|
|
|
+ <!-- :key="dict.value"-->
|
|
|
+ <!-- :label="dict.label"-->
|
|
|
+ <!--:value="dict.value"-->
|
|
|
+ <!-- ></el-option>-->
|
|
|
+ <!-- </el-select>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
<el-form-item label="数据类型">
|
|
|
<template slot-scope="scope">
|
|
|
<span v-if="form.type == 0">量化指标数据</span>
|
|
|
@@ -204,7 +247,7 @@
|
|
|
</template>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="异常数据名称">
|
|
|
- {{form.gatherFeeName}}
|
|
|
+ {{ form.gatherFeeName }}
|
|
|
</el-form-item>
|
|
|
<el-form-item label="采集参考值">
|
|
|
<template slot-scope="scope">
|
|
|
@@ -239,6 +282,56 @@ export default {
|
|
|
name: "GATHERWARNING",
|
|
|
data() {
|
|
|
return {
|
|
|
+ monthist: [
|
|
|
+ {
|
|
|
+ label: "01月",
|
|
|
+ value: "01月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "02月",
|
|
|
+ value: "02月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "03月",
|
|
|
+ value: "03月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "04月",
|
|
|
+ value: "04月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "05月",
|
|
|
+ value: "05月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "06月",
|
|
|
+ value: "06月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "07月",
|
|
|
+ value: "07月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "08月",
|
|
|
+ value: "08月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "09月",
|
|
|
+ value: "09月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "10月",
|
|
|
+ value: "10月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "11月",
|
|
|
+ value: "11月",
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: "12月",
|
|
|
+ value: "12月",
|
|
|
+ },
|
|
|
+ ],
|
|
|
typeList: [
|
|
|
{ label: "量化指标数据", value: "0" },
|
|
|
{ label: "月报表数据", value: "1" },
|
|
|
@@ -273,6 +366,8 @@ export default {
|
|
|
queryParams: {
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
+ year: null,
|
|
|
+ month: null,
|
|
|
id: null,
|
|
|
createTime: null,
|
|
|
createBy: null,
|
|
|
@@ -338,7 +433,9 @@ export default {
|
|
|
{ required: true, message: "取消时间不能为空", trigger: "blur" },
|
|
|
],
|
|
|
remark: [{ required: true, message: "备注不能为空", trigger: "blur" }],
|
|
|
- collValue:[{ required: true, message: "修改值不能为空", trigger: "blur" }],
|
|
|
+ collValue: [
|
|
|
+ { required: true, message: "修改值不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
@@ -358,8 +455,8 @@ export default {
|
|
|
//处理预警
|
|
|
handleDeal(row) {
|
|
|
this.title = "处理预警";
|
|
|
- // 是否显示弹出层
|
|
|
- this.open = true;
|
|
|
+ // 是否显示弹出层
|
|
|
+ this.open = true;
|
|
|
// deal(row.id).then((res) => {
|
|
|
// this.$modal.msgSuccess("处理成功");
|
|
|
// this.getList();
|
gks