From d6d8996a79eaa486ce019789641fb81e266091bc Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 13 三月 2024 14:27:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/check-rule/index.vue | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/src/views/system/check-rule/index.vue b/src/views/system/check-rule/index.vue
index 2544a5c..b36c119 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,44 +73,56 @@
<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" class-name="small-padding fixed-width">
+ <template slot-scope="scope">
+ <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"
+ />
<!-- 娣诲姞鎴栦慨鏀硅�冩牳瑙勫垯瀵硅瘽妗� -->
<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="璇疯緭鍏ヨ鍒欐弿杩�" />
@@ -179,6 +188,12 @@
showSearch: true,
// 鎬绘潯鏁�
total: 0,
+ // 杩愮淮绫诲瀷
+ categoryList: [
+ { id: 1, value: '瑙嗛鐩戞帶' },
+ { id: 2, value: '杞﹁締璇嗗埆' },
+ { id: 3, value: '浜鸿劯璇嗗埆' },
+ ],
// 鑰冩牳瑙勫垯琛ㄦ牸鏁版嵁
checkRuleList: [],
daterangeCreateTime: [],
--
Gitblit v1.8.0