From 5cecb661fce88baebda1019f676f05f2935537b2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 07 三月 2024 17:38:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/default-auditing/index.vue | 5 --
src/views/system/video/index.vue | 2 -
src/views/system/point/index.vue | 5 --
src/views/system/check-result/index.vue | 27 +++++++++----
src/views/system/unit/people/index.vue | 6 ---
src/views/system/check-template/index.vue | 6 ---
src/views/system/default-rule/index.vue | 8 ----
src/views/system/car/index.vue | 2 -
src/views/system/check-rule/index.vue | 5 --
src/views/system/publish/index.vue | 5 --
src/views/system/work-order/index.vue | 5 --
src/views/system/recovery/index.vue | 2 -
src/views/system/face/index.vue | 2 -
src/views/system/unit/index.vue | 6 ---
14 files changed, 19 insertions(+), 67 deletions(-)
diff --git a/src/views/system/car/index.vue b/src/views/system/car/index.vue
index 3fa5a77..b31648b 100644
--- a/src/views/system/car/index.vue
+++ b/src/views/system/car/index.vue
@@ -77,7 +77,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:monitor:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -109,7 +108,6 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
- v-hasPermi="['system:monitor:query']"
>璇︾粏</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/check-result/index.vue b/src/views/system/check-result/index.vue
index 377e376..3a572cd 100644
--- a/src/views/system/check-result/index.vue
+++ b/src/views/system/check-result/index.vue
@@ -70,7 +70,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:checkResult:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -80,7 +79,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:checkResult:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -90,9 +88,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="鑰冩牳瀵硅薄" align="center" prop="checkUnitName" />
<el-table-column label="鑰冩牳" align="center" prop="examineName" />
- <el-table-column label="鑰冩牳鑼冨洿" align="center" prop="examineRange" />
- <el-table-column label="鑰冩牳棰戠巼" align="center" prop="frequency" />
- <el-table-column label="鑰冩牳鍒嗘暟" align="center" prop="checkScore" />
+ <el-table-column label="鑰冩牳鑼冨洿":formatter="examineRangeFormatter" align="center" prop="examineRange" />
+ <el-table-column label="鑰冩牳棰戠巼" :formatter="frequencyFormatter" align="center" prop="frequency" />
+ <el-table-column label="鑰冩牳鍒嗘暟" falign="center" prop="checkScore" />
<el-table-column label="鑰冩牳鏃堕棿" align="center" prop="checkTime" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
@@ -101,21 +99,18 @@
type="text"
icon="el-icon-view"
@click="handleDetail(scope.row)"
- v-hasPermi="['system:checkResult:detail']"
>璇︽儏</el-button>
<el-button
type="text"
size="mini"
icon="el-icon-edit"
@click="handleSetManualScore(scope.row)"
- v-hasPermi="['system:checkResult:edit']"
>浜哄伐鎵撳垎</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:checkResult:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -257,6 +252,22 @@
this.getList();
},
methods: {
+ frequencyFormatter(row) {
+ if (row.frequency === "1") {
+ return "鏈堝害鑰冩牳"
+ }
+ if (row.frequency === "2") {
+ return "瀛ｅ害鑰冩牳"
+ }
+ },
+ examineRangeFormatter(row) {
+ if (row.examineRange === "1") {
+ return "鍒嗗眬鑰冩牳"
+ }
+ if (row.examineRange === "2") {
+ return "甯傚眬鑰冩牳"
+ }
+ },
/** 鏌ヨ鑰冩牳缁撴灉鍒楄〃 */
getList() {
this.loading = true;
diff --git a/src/views/system/check-rule/index.vue b/src/views/system/check-rule/index.vue
index 2544a5c..4172c8b 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">-->
@@ -88,14 +85,12 @@
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>
</template>
</el-table-column>
diff --git a/src/views/system/check-template/index.vue b/src/views/system/check-template/index.vue
index 876c409..efca3d7 100644
--- a/src/views/system/check-template/index.vue
+++ b/src/views/system/check-template/index.vue
@@ -34,7 +34,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:checkTemplate:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -45,7 +44,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:checkTemplate:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -56,7 +54,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:checkTemplate:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -66,7 +63,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:checkTemplate:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -85,14 +81,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:checkTemplate:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:checkTemplate:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/default-auditing/index.vue b/src/views/system/default-auditing/index.vue
index b52c657..b11ffdc 100644
--- a/src/views/system/default-auditing/index.vue
+++ b/src/views/system/default-auditing/index.vue
@@ -48,7 +48,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:auditing:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -59,7 +58,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:auditing:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -70,7 +68,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:auditing:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -102,7 +99,6 @@
type="text"
icon="el-icon-s-check"
@click="handleAuditing(scope.row)"
- v-hasPermi="['system:auditing:auditing']"
>瀹℃牳</el-button>
<!-- <el-button-->
<!-- size="mini"-->
@@ -116,7 +112,6 @@
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:auditing:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/default-rule/index.vue b/src/views/system/default-rule/index.vue
index 1b26798..309f8dd 100644
--- a/src/views/system/default-rule/index.vue
+++ b/src/views/system/default-rule/index.vue
@@ -35,7 +35,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:rule:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -46,7 +45,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:rule:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -57,7 +55,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:rule:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -91,7 +88,6 @@
type="text"
icon="el-icon-zoom-in"
@click="handleUse(scope.row.id, true)"
- v-hasPermi="['system:rule:use']"
>鍚敤</el-button>
<el-button
v-else
@@ -99,28 +95,24 @@
type="text"
icon="el-icon-zoom-in"
@click="handleUse(scope.row.id, false)"
- v-hasPermi="['system:rule:use']"
>鍋滅敤</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-zoom-in"
@click="handleDetail(scope.row)"
- v-hasPermi="['system:rule:detail']"
>璇︽儏</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:rule:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:rule:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/face/index.vue b/src/views/system/face/index.vue
index 7b719d6..d4a297e 100644
--- a/src/views/system/face/index.vue
+++ b/src/views/system/face/index.vue
@@ -77,7 +77,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:monitor:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -109,7 +108,6 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
- v-hasPermi="['system:monitor:query']"
>璇︾粏</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index 73ec4a3..05ca375 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -39,7 +39,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['x:point:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -50,7 +49,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['x:point:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -61,7 +59,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['x:point:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -100,14 +97,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['x:point:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['x:point:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/publish/index.vue b/src/views/system/publish/index.vue
index bbab18a..9f793e7 100644
--- a/src/views/system/publish/index.vue
+++ b/src/views/system/publish/index.vue
@@ -69,7 +69,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 +79,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:publish:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -91,7 +89,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:publish:remove']"
>鍒犻櫎</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -126,14 +123,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>
diff --git a/src/views/system/recovery/index.vue b/src/views/system/recovery/index.vue
index a260dfc..628b3dd 100644
--- a/src/views/system/recovery/index.vue
+++ b/src/views/system/recovery/index.vue
@@ -79,7 +79,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:monitor:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -111,7 +110,6 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
- v-hasPermi="['system:monitor:query']"
>璇︾粏</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/unit/index.vue b/src/views/system/unit/index.vue
index b09b0a5..dc3bf74 100644
--- a/src/views/system/unit/index.vue
+++ b/src/views/system/unit/index.vue
@@ -44,7 +44,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:unit:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -55,7 +54,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:unit:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -66,7 +64,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:unit:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -76,7 +73,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:unit:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -98,14 +94,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:unit:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:unit:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index 59db6de..9c42a78 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -43,7 +43,6 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['system:people:add']"
>鏂板</el-button>
</el-col>
<el-col :span="1.5">
@@ -54,7 +53,6 @@
size="mini"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['system:people:edit']"
>淇敼</el-button>
</el-col>
<el-col :span="1.5">
@@ -65,7 +63,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['system:people:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -75,7 +72,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:people:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -95,14 +91,12 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['system:people:edit']"
>淇敼</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['system:people:remove']"
>鍒犻櫎</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/video/index.vue b/src/views/system/video/index.vue
index 3f4c426..6f20107 100644
--- a/src/views/system/video/index.vue
+++ b/src/views/system/video/index.vue
@@ -77,7 +77,6 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
- v-hasPermi="['system:monitor:export']"
>瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -108,7 +107,6 @@
type="text"
icon="el-icon-view"
@click="handleView(scope.row,scope.index)"
- v-hasPermi="['system:monitor:query']"
>璇︾粏</el-button>
</template>
</el-table-column>
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index 993fa72..e36bb23 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -59,7 +59,6 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['x:work-order:remove']"
>鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
@@ -101,25 +100,21 @@
size="mini"
type="text"
@click="handleAuditing(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>瀹℃牳</el-button>
<el-button
size="mini"
type="text"
@click="handleYwCondition(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>杩愮淮鎯呭喌</el-button>
<el-button
size="mini"
type="text"
@click="handleYwResult(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>杩愮淮缁撴灉</el-button>
<el-button
size="mini"
type="text"
@click="handleCheckResult(scope.row)"
- v-hasPermi="['x:work-order:remove']"
>妫�娴嬬粨鏋�</el-button>
</template>
</el-table-column>
--
Gitblit v1.8.0