From a206ac34469aa9e32d7bd36db783f15c2e9b90d6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期三, 13 三月 2024 10:57:25 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/zgyw-ui
---
src/views/system/publish/index.vue | 59 ++++++++++++++++++++++++++---------------------------------
1 files changed, 26 insertions(+), 33 deletions(-)
diff --git a/src/views/system/publish/index.vue b/src/views/system/publish/index.vue
index d66b793..7c10d18 100644
--- a/src/views/system/publish/index.vue
+++ b/src/views/system/publish/index.vue
@@ -9,9 +9,9 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="timeRange">
+ <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
<el-select
- v-model="queryParams.timeRange"
+ v-model="queryParams.examineRange"
placeholder="鑰冩牳鑼冨洿"
clearable
style="width: 170px"
@@ -39,6 +39,7 @@
/>
</el-select>
</el-form-item>
+
<el-form-item label="鑰冩牳鐘舵��" prop="state">
<el-select
v-model="queryParams.state"
@@ -69,7 +70,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:publish:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -80,7 +80,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:publish:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -91,18 +90,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:publish:remove']"
>鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['system:publish:export']"
- >瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -110,9 +98,9 @@
<el-table v-loading="loading" :data="publishList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鑰冩牳鍚�" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="timeRange" >
+ <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="examineRange" >
<template slot-scope="scope">
- <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.timeRange"/>
+ <dict-tag :options="dict.type.platform_examine_range" :value="scope.row.examineRange"/>
</template>
</el-table-column>
<el-table-column label="鑰冩牳棰戠巼" align="center" prop="frequency">
@@ -120,14 +108,18 @@
<dict-tag :options="dict.type.platform_examine_frequency" :value="scope.row.frequency"/>
</template>
</el-table-column>
+ <el-table-column label="鎶ヨ鍒嗘暟闃堝��" align="center" prop="alarmScore" />
+ <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
+ <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" />
+ </el-form-item>
<el-table-column label="鑰冩牳鐘舵��" align="center" prop="state">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.state"/>
</template>
</el-table-column>
- <el-table-column label="鍒涘缓浜�" align="center" prop="createUser" />
+ <el-table-column label="鍒涘缓浜�" align="center" prop="createUserName" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="淇敼浜�" align="center" prop="updateUser" />
+ <el-table-column label="淇敼浜�" align="center" prop="updateUserName" />
<el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -136,14 +128,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:publish:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:publish:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -159,13 +149,13 @@
<!-- 娣诲姞鎴栦慨鏀硅�冩牳鍙戝竷瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="鑰冩牳鍚�" prop="examineName">
<el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" />
</el-form-item>
<el-form-item label="鑰冩牳妯℃澘" prop="templateId">
- <el-select v-model="queryParams.templateId" @change="handleQuery" clearable placeholder="鑰冩牳妯℃澘">
+ <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘">
<el-option
v-for="item in templateList"
:key="item.id"
@@ -174,9 +164,9 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="鑰冩牳鑼冨洿" prop="timeRange">
+ <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange">
<el-select
- v-model="queryParams.timeRange"
+ v-model="form.examineRange"
placeholder="鑰冩牳鑼冨洿"
clearable
style="width: 170px"
@@ -191,7 +181,7 @@
</el-form-item>
<el-form-item label="鑰冩牳棰戠巼" prop="frequency">
<el-select
- v-model="queryParams.frequency"
+ v-model="form.frequency"
placeholder="鑰冩牳棰戠巼"
clearable
style="width: 170px"
@@ -204,9 +194,12 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
+ <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px"/>
+ </el-form-item>
<el-form-item label="鑰冩牳鐘舵��" prop="state">
<el-select
- v-model="queryParams.state"
+ v-model="form.state"
placeholder="鑰冩牳鐘舵��"
clearable
style="width: 170px"
@@ -233,7 +226,7 @@
<script>
import { listPublish, getPublish, delPublish, addPublish, updatePublish } from "@/api/platform/publish";
-
+import { templateSelect } from "@/api/platform/check-template";
export default {
name: "Publish",
dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency'],
@@ -264,7 +257,7 @@
examineName: null,
frequency: null,
state: null,
- timeRange: null,
+ examineRange: null,
},
// 鑰冩牳妯℃澘
templateList: [],
@@ -280,10 +273,10 @@
this.getTemplateSelect();
},
methods: {
+ /** 鑰冩牳妯℃澘涓嬫媺鍒楄〃 */
getTemplateSelect() {
- // 鑰冩牳妯℃澘涓嬫媺鍒楄〃
- unitSelect().then((res) => {
- this.unitList = res.data;
+ templateSelect().then((res) => {
+ this.templateList = res.data;
})
},
/** 鏌ヨ鑰冩牳鍙戝竷鍒楄〃 */
@@ -305,7 +298,7 @@
this.form = {
examineName: null,
templateId: null,
- timeRange: null,
+ examineRange: null,
frequency: null,
state: null,
createTime: null,
--
Gitblit v1.8.0