From fb1d57f4bce31fe4f8147a144f8ef4afbca0a4cd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 21 二月 2023 13:48:29 +0800
Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0
---
src/views/operate/baseSetting/violation/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/operate/baseSetting/violation/index.vue b/src/views/operate/baseSetting/violation/index.vue
index c4456e7..f5b758f 100644
--- a/src/views/operate/baseSetting/violation/index.vue
+++ b/src/views/operate/baseSetting/violation/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="userList">
- <div class="headerTitle">杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚瑙勪簨椤硅缃�</div>
+<!-- <div class="headerTitle">杩愯惀绠＄悊銆嬪熀纭�璁剧疆銆嬭繚瑙勪簨椤硅缃�</div>-->
<header>
<div class="headerContent">
<div class="search">
@@ -82,7 +82,7 @@
<!-- tools -->
<div class="tools">
<div class="funs">
- <!-- <div class="funsItem">
+ <div class="funsItem">
<el-checkbox v-model="all" @change="selectAll()">鍏ㄩ��</el-checkbox>
</div>
<div class="funsItem">
@@ -94,7 +94,7 @@
:value="item.value" :disabled="item.disabled">
</el-option>
</el-select>
- </div> -->
+ </div>
</div>
<div class="pagination">
<el-pagination
@@ -380,7 +380,7 @@
line-height: 28px;
display: flex;
align-items: center;
- border: 1px solid #17324c;
+ border: 1px solid #ccc;
border-radius: 4px;
font-size: 12px;
margin-left: 10px;
--
Gitblit v1.8.0