From f18ff6df94830a0147f372f031fa94ab5402ead8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 18 三月 2024 15:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/publish/index.vue | 199 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 153 insertions(+), 46 deletions(-)
diff --git a/src/views/system/publish/index.vue b/src/views/system/publish/index.vue
index d66b793..2d98b26 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,30 +108,44 @@
<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="createTime" />
- <el-table-column label="淇敼浜�" align="center" prop="updateUser" />
- <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" />
+ <el-table-column label="淇敼浜�" align="center" prop="updateUserName" />
+ <el-table-column label="淇敼鏃堕棿" align="center" prop="updateTime" width="170px" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="auditState">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.platform_audit_state" :value="scope.row.auditState"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="瀹℃牳浜�" align="center" prop="auditUser" />
+ <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="auditTime" width="170px"/>
+ <el-table-column label="瀹℃牳鎰忚" align="center" prop="auditDescription" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
+ icon="el-icon-s-check"
+ @click="handleAudit(scope.row)"
+ >瀹℃牳</el-button>
+ <el-button
+ size="mini"
+ 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>
@@ -156,16 +158,16 @@
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
-
+ <div>
<!-- 娣诲姞鎴栦慨鏀硅�冩牳鍙戝竷瀵硅瘽妗� -->
<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 +176,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"
@@ -185,28 +187,31 @@
v-for="dict in dict.type.platform_examine_range"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
+ :value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
- <el-form-item label="鑰冩牳棰戠巼" prop="frequency">
- <el-select
- v-model="queryParams.frequency"
- placeholder="鑰冩牳棰戠巼"
- clearable
- style="width: 170px"
- >
+ <el-form-item label="鑰冩牳棰戠巼">
+ <el-select
+ v-model="form.frequency"
+ placeholder="鑰冩牳棰戠巼"
+ clearable
+ style="width: 170px"
+ >
<el-option
v-for="dict in dict.type.platform_examine_frequency"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
+ :value="parseInt(dict.value)"
/>
</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"
@@ -215,7 +220,7 @@
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
- :value="dict.value"
+ :value="parseInt(dict.value)"
/>
</el-select>
</el-form-item>
@@ -228,15 +233,103 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
+
+ <!-- 瀹℃牳鑰冩牳鍙戝竷瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="auditOpen" width="500px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-form-item label="鑰冩牳鍚�" prop="examineName">
+ <el-input v-model="form.examineName" placeholder="璇疯緭鍏ヨ�冩牳鍚�" disabled/>
+ </el-form-item>
+ <el-form-item label="鑰冩牳妯℃澘" prop="templateId">
+ <el-select v-model="form.templateId" placeholder="鑰冩牳妯℃澘" disabled>
+ <el-option
+ v-for="item in templateList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鑰冩牳鑼冨洿" prop="examineRange" >
+ <el-select
+ v-model="form.examineRange"
+ placeholder="鑰冩牳鑼冨洿"
+ clearable
+ style="width: 170px"
+ disabled
+ >
+ <el-option
+ v-for="dict in dict.type.platform_examine_range"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="鑰冩牳棰戠巼" prop="frequency" >
+ <el-select
+ v-model="form.frequency"
+ placeholder="鑰冩牳棰戠巼"
+ clearable
+ style="width: 170px"
+ disabled
+ >
+ <el-option
+ v-for="dict in dict.type.platform_examine_frequency"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎶ヨ鍒嗘暟闃堝��" prop="alarmScore">
+ <el-input v-model="form.alarmScore" placeholder="璇疯緭鍏ュ垎鏁�" style="width: 170px" disabled/>
+ </el-form-item>
+ <el-form-item label="鑰冩牳鐘舵��" prop="state">
+ <el-select
+ v-model="form.state"
+ placeholder="鑰冩牳鐘舵��"
+ clearable
+ style="width: 170px"
+ disabled
+ >
+ <el-option
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鎻忚堪" prop="description">
+ <el-input v-model="form.description" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" disabled/>
+ </el-form-item>
+ <el-form-item label="瀹℃牳缁撴灉" prop="auditState" >
+ <el-radio-group v-model="form.auditState">
+ <el-radio :label="1">閫氳繃</el-radio>
+ <el-radio :label="2">椹冲洖</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="瀹℃牳璇存槑" prop="auditDescription" >
+ <el-input v-model="form.auditDescription" type="textarea" show-word-limit maxlength="100" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ </div>
</div>
</template>
<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'],
+ dicts: ['sys_normal_disable','platform_examine_range','platform_examine_frequency','platform_audit_state'],
data() {
return {
// 閬僵灞�
@@ -257,6 +350,7 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ auditOpen: false,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -264,7 +358,7 @@
examineName: null,
frequency: null,
state: null,
- timeRange: null,
+ examineRange: null,
},
// 鑰冩牳妯℃澘
templateList: [],
@@ -280,10 +374,10 @@
this.getTemplateSelect();
},
methods: {
+ /** 鑰冩牳妯℃澘涓嬫媺鍒楄〃 */
getTemplateSelect() {
- // 鑰冩牳妯℃澘涓嬫媺鍒楄〃
- unitSelect().then((res) => {
- this.unitList = res.data;
+ templateSelect().then((res) => {
+ this.templateList = res.data;
})
},
/** 鏌ヨ鑰冩牳鍙戝竷鍒楄〃 */
@@ -298,6 +392,7 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.auditOpen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -305,7 +400,7 @@
this.form = {
examineName: null,
templateId: null,
- timeRange: null,
+ examineRange: null,
frequency: null,
state: null,
createTime: null,
@@ -348,6 +443,16 @@
this.title = "淇敼鑰冩牳鍙戝竷";
});
},
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleAudit(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getPublish(id).then(response => {
+ this.form = response.data;
+ this.auditOpen = true;
+ this.title = "瀹℃牳鑰冩牳鍙戝竷";
+ });
+ },
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
@@ -356,12 +461,14 @@
updatePublish(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
+ this.auditOpen = false;
this.getList();
});
} else {
addPublish(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ this.auditOpen = false;
this.getList();
});
}
--
Gitblit v1.8.0