From e926916dc724ff9d57ff201fb7509d55ad1983e7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 22 Aug 2021 10:32:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/views/securityGuard/securityGuard.vue | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 2b3a007..8479eab 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -27,7 +27,6 @@
@row-update="rowUpdate"
:row-style="rowStyle"
@row-save="rowSave"
- @row-click="rowClick"
:before-open="beforeOpen"
:page.sync="page"
@search-change="searchChange"
@@ -110,14 +109,13 @@
</template>
<template slot-scope="{ type, size, row }" slot="menu">
- <!-- <el-button
- style="display:none"
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="addOrUpdateHandle(row.id)"
- >修改
- </el-button> -->
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
<el-button
icon="el-icon-edit"
:size="size"
@@ -140,7 +138,11 @@
<el-tag v-if="row.sex == 1">男</el-tag>
<el-tag v-if="row.sex == 2">女</el-tag>
</template>
-
+ <template slot-scope="{ row }" slot="deptId">
+ <el-tag class="rowClickSelf" @click="rowClickSelf(row.deptId)">{{
+ row.$deptId
+ }}</el-tag>
+ </template>
<template slot-scope="{ row }" slot="tenantName">
<el-tag>{{ row.tenantName }}</el-tag>
</template>
@@ -396,6 +398,7 @@
align: "center",
index: true,
delBtnText: "注销",
+ menuWidth: 276,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -968,9 +971,17 @@
//行点击事件
rowClick(row) {
+ // console.log(row, 111);
this.$router.push({
path: "/securityGuardDetail",
query: { row: JSON.stringify(row) },
+ });
+ },
+ rowClickSelf(row) {
+ console.log(row, "baoan");
+ this.$router.push({
+ path: "/securityUnitChild",
+ query: { fromSecunityGuardId: row },
});
},
nodeClick(data) {
@@ -1461,7 +1472,7 @@
};
</script>
-<style>
+<style lang="scss" scoped>
.box {
height: 800px;
}
@@ -1473,4 +1484,9 @@
.box .el-scrollbar__wrap {
overflow: scroll;
}
+.rowClickSelf {
+ &:hover {
+ cursor: pointer;
+ }
+}
</style>
\ No newline at end of file
--
Gitblit v1.9.3