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/check-rule/index.vue | 185 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 150 insertions(+), 35 deletions(-)
diff --git a/src/views/system/check-rule/index.vue b/src/views/system/check-rule/index.vue
index 2544a5c..c0458fa 100644
--- a/src/views/system/check-rule/index.vue
+++ b/src/views/system/check-rule/index.vue
@@ -35,7 +35,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:checkRule:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -46,7 +45,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:checkRule:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -57,7 +55,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:checkRule:remove']"
>鍒犻櫎</el-button>
</el-col>
<!-- <el-col :span="1.5">-->
@@ -76,47 +73,73 @@
<el-table v-loading="loading" :data="checkRuleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="瑙勫垯鍚嶇О" align="center" prop="ruleName" />
- <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDetail" />
- <el-table-column label="澶╃綉瑙嗛鐐逛綅鏁�" align="center" prop="videoPointNum" />
- <el-table-column label="杞﹁締鍗″彛鐐逛綅鏁�" align="center" prop="vehicleCheckpointNum" />
- <el-table-column label="浜鸿劯鍗″彛鐐逛綅鏁�" align="center" prop="faceChceckpointNum" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column label="杩愮淮绫诲埆" align="center" prop="category">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['system:checkRule:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['system:checkRule:remove']"
- >鍒犻櫎</el-button>
+ <div v-if="scope.row.category === 1">瑙嗛鐩戞帶</div>
+ <div v-else-if="scope.row.category === 2">杞﹁締璇嗗埆</div>
+ <div v-else-if="scope.row.category === 3">浜鸿劯璇嗗埆</div>
</template>
</el-table-column>
- </el-table>
+ <el-table-column label="瑙勫垯鎻忚堪" align="center" prop="ruleDetail" />
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
+ <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" />
+ <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)"
+ >淇敼</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button>
+ </template>
+ </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"
+ />
+ <div>
<!-- 娣诲姞鎴栦慨鏀硅�冩牳瑙勫垯瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
<el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" />
</el-form-item>
+ <el-form-item label="瑙勫垯绫诲瀷" prop="category">
+ <el-select v-model="form.category" placeholder="瑙勫垯绫诲瀷">
+ <el-option
+ v-for="item in categoryList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="瑙勫垯鎻忚堪" prop="ruleDetail">
- <el-input v-model="form.ruleDetail" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" />
+ <el-input v-model="form.ruleDetail" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ヨ鍒欐弿杩�"/>
</el-form-item>
<el-form-item label="鍙傛暟閰嶇疆" prop="ruleDetail">
<div class="row-warp">
@@ -131,7 +154,6 @@
<div>
<el-input class="input-w" type="number" v-model="form.videoPointNum"/>
</div>
-
</div>
</div>
<div class="row">
@@ -146,7 +168,7 @@
<div class="row-right">
<div>涓嶅皯浜�</div>
<div>
- <el-input class="input-w" type="number" v-model="form.faceChceckpointNum"/></div>
+ <el-input class="input-w" type="number" v-model="form.faceChceckpointNum" /></div>
</div>
</div>
</div>
@@ -158,6 +180,75 @@
</div>
</el-dialog>
</div>
+
+ <!-- 瀹℃牳鑰冩牳瑙勫垯瀵硅瘽妗� -->
+ <el-dialog :title="title" :visible.sync="auditOpen" width="600px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form-item label="瑙勫垯鍚嶇О" prop="ruleName">
+ <el-input v-model="form.ruleName" placeholder="璇疯緭鍏ヨ鍒欏悕绉�" disabled/>
+ </el-form-item>
+ <el-form-item label="瑙勫垯绫诲瀷" prop="category">
+ <el-select v-model="form.category" placeholder="瑙勫垯绫诲瀷" disabled>
+ <el-option
+ v-for="item in categoryList"
+ :key="item.id"
+ :label="item.value"
+ :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瑙勫垯鎻忚堪" prop="ruleDetail">
+ <el-input v-model="form.ruleDetail" type="textarea" show-word-limit maxlength="150" placeholder="璇疯緭鍏ヨ鍒欐弿杩�" disabled/>
+ </el-form-item>
+ <el-form-item label="鍙傛暟閰嶇疆" prop="ruleDetail" disabled>
+ <div class="row-warp">
+ <div class="row">
+ <div class="row-left">鍙傛暟鍚�</div>
+ <div class="row-right">鏉′欢</div>
+ </div>
+ <div class="row">
+ <div class="row-left">澶╃綉瑙嗛鐐逛綅鏁�</div>
+ <div class="row-right">
+ <div>涓嶅皯浜�</div>
+ <div>
+ <el-input class="input-w" type="number" v-model="form.videoPointNum" disabled/>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="row-left">杞﹁締鍗″彛鐐逛綅鏁�</div>
+ <div class="row-right">
+ <div>涓嶅皯浜�</div>
+ <div><el-input class="input-w" type="number" v-model="form.vehicleCheckpointNum" disabled/></div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="row-left">浜鸿劯鍗″彛鐐逛綅鏁�</div>
+ <div class="row-right">
+ <div>涓嶅皯浜�</div>
+ <div>
+ <el-input class="input-w" type="number" v-model="form.faceChceckpointNum" disabled/></div>
+ </div>
+ </div>
+ </div>
+ </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>
</template>
<script>
@@ -165,6 +256,7 @@
export default {
name: "CheckRule",
+ dicts: ['platform_audit_state'],
data() {
return {
// 閬僵灞�
@@ -179,6 +271,12 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ // 杩愮淮绫诲瀷
+ categoryList: [
+ { id: 1, value: '瑙嗛鐩戞帶' },
+ { id: 2, value: '杞﹁締璇嗗埆' },
+ { id: 3, value: '浜鸿劯璇嗗埆' },
+ ],
// 鑰冩牳瑙勫垯琛ㄦ牸鏁版嵁
checkRuleList: [],
daterangeCreateTime: [],
@@ -186,6 +284,8 @@
title: "",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ auditOpen: false,
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -223,6 +323,7 @@
// 鍙栨秷鎸夐挳
cancel() {
this.open = false;
+ this.auditOpen = false;
this.reset();
},
// 琛ㄥ崟閲嶇疆
@@ -270,6 +371,17 @@
this.form = response.data;
this.open = true;
this.title = "淇敼鑰冩牳瑙勫垯";
+
+ });
+ },
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ handleAudit(row) {
+ this.reset();
+ const id = row.id || this.ids
+ getCheckRule(id).then(response => {
+ this.form = response.data;
+ this.auditOpen = true;
+ this.title = "瀹℃牳鑰冩牳瑙勫垯";
});
},
/** 鎻愪氦鎸夐挳 */
@@ -280,12 +392,14 @@
updateCheckRule(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
+ this.auditOpen = false;
this.getList();
});
} else {
addCheckRule(this.form).then(response => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
+ this.auditOpen = false;
this.getList();
});
}
@@ -302,6 +416,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
},
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
this.download('system/checkRule/export', {
--
Gitblit v1.8.0