From 35d4463599b14444c70b10a67a7376e375f615a4 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 20 Jan 2024 17:33:16 +0800
Subject: [PATCH] 按钮权限
---
src/views/publicSecurity/keynotePlaceManage.vue | 10 ++--
package-lock.json | 45 ++++++++++++++++++++++
src/views/userHouse/houseList.vue | 16 +++++--
src/views/publicSecurity/bailReporting.vue | 17 +++++---
package.json | 1
src/views/userHouse/houseHoldList.vue | 4 +-
src/views/resource/distapch.vue | 16 ++++++-
7 files changed, 87 insertions(+), 22 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3618b62..67f597b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
"babel-polyfill": "^6.26.0",
"classlist-polyfill": "^1.2.0",
"crypto-js": "^4.0.0",
+ "echarts": "^5.4.3",
"element-ui": "^2.15.6",
"js-base64": "^2.5.1",
"js-cookie": "^2.2.0",
@@ -5479,6 +5480,15 @@
"dependencies": {
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
+ }
+ },
+ "node_modules/echarts": {
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
+ "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+ "dependencies": {
+ "tslib": "2.3.0",
+ "zrender": "5.4.4"
}
},
"node_modules/ee-first": {
@@ -14945,6 +14955,11 @@
"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
"dev": true
},
+ "node_modules/tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ },
"node_modules/tty-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -16892,6 +16907,14 @@
"dev": true,
"engines": {
"node": ">=4"
+ }
+ },
+ "node_modules/zrender": {
+ "version": "5.4.4",
+ "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
+ "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+ "dependencies": {
+ "tslib": "2.3.0"
}
}
},
@@ -21326,6 +21349,15 @@
"requires": {
"jsbn": "~0.1.0",
"safer-buffer": "^2.1.0"
+ }
+ },
+ "echarts": {
+ "version": "5.4.3",
+ "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.3.tgz",
+ "integrity": "sha512-mYKxLxhzy6zyTi/FaEbJMOZU1ULGEQHaeIeuMR5L+JnJTpz+YR03mnnpBhbR4+UYJAgiXgpyTVLffPAjOTLkZA==",
+ "requires": {
+ "tslib": "2.3.0",
+ "zrender": "5.4.4"
}
},
"ee-first": {
@@ -29207,6 +29239,11 @@
"integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
"dev": true
},
+ "tslib": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
+ "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
+ },
"tty-browserify": {
"version": "0.0.0",
"resolved": "https://registry.npmmirror.com/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -30821,6 +30858,14 @@
"dev": true
}
}
+ },
+ "zrender": {
+ "version": "5.4.4",
+ "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.4.tgz",
+ "integrity": "sha512-0VxCNJ7AGOMCWeHVyTrGzUgrK4asT4ml9PEkeGirAkKNYXYzoPJCLvmyfdoOXcjTHPs10OZVMfD1Rwg16AZyYw==",
+ "requires": {
+ "tslib": "2.3.0"
+ }
}
}
}
diff --git a/package.json b/package.json
index 48d95f7..de130c1 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,7 @@
"babel-polyfill": "^6.26.0",
"classlist-polyfill": "^1.2.0",
"crypto-js": "^4.0.0",
+ "echarts": "^5.4.3",
"element-ui": "^2.15.6",
"js-base64": "^2.5.1",
"js-cookie": "^2.2.0",
diff --git a/src/views/publicSecurity/bailReporting.vue b/src/views/publicSecurity/bailReporting.vue
index 13dd95c..940b505 100644
--- a/src/views/publicSecurity/bailReporting.vue
+++ b/src/views/publicSecurity/bailReporting.vue
@@ -5,12 +5,12 @@
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="{row, size, index}" slot="menu">
- <el-button :size="size" type="text" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
+ <el-button :size="size" type="text" icon="el-icon-view" v-if="permission.bail_view" plain @click="lookDetail(row, 0)">查 看
</el-button>
- <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1" plain
+ <el-button :size="size" type="text" icon="el-icon-s-check" v-if="row.status == 1 && permission.bail_check" plain
@click="lookDetail(row, 1)">审 核
</el-button>
- <el-button :size="size" type="text" icon="el-icon-delete" plain @click="rowDel(row)">删 除
+ <el-button :size="size" type="text" icon="el-icon-delete" v-if="permission.bail_del" plain @click="rowDel(row)">删 除
</el-button>
</template>
@@ -259,11 +259,14 @@
computed: {
...mapGetters(["permission", "userInfo"]),
permissionList() {
+
+ console.log("permission===>",this.permission);
+
return {
- addBtn: this.vaildData(this.permission.place_add, false),
- viewBtn: this.vaildData(this.permission.place_view, true),
- delBtn: this.vaildData(this.permission.place_delete, true),
- editBtn: this.vaildData(this.permission.place_edit, true),
+ addBtn: this.vaildData(this.permission.bail_add, false),
+ viewBtn: this.vaildData(this.permission.bail_view, true),
+ delBtn: this.vaildData(this.permission.bail_del, true),
+ // editBtn: this.vaildData(this.permission.place_edit, true),
}
},
ids() {
diff --git a/src/views/publicSecurity/keynotePlaceManage.vue b/src/views/publicSecurity/keynotePlaceManage.vue
index 2c2e718..7b55f44 100644
--- a/src/views/publicSecurity/keynotePlaceManage.vue
+++ b/src/views/publicSecurity/keynotePlaceManage.vue
@@ -6,12 +6,12 @@
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot-scope="{row, size}" slot="menu">
- <el-button type="text" :size="size" icon="el-icon-view" plain @click="lookDetail(row, 0)">查 看
+ <el-button type="text" :size="size" icon="el-icon-view" v-if="permission.place_view" plain @click="lookDetail(row, 0)">查 看
</el-button>
- <el-button type="text" :size="size" icon="el-icon-s-check" v-if="row.status == 1" plain
+ <el-button type="text" :size="size" icon="el-icon-s-check" v-if="permission.place_check && row.status == 1" plain
@click="lookDetail(row, 1)">审 核
</el-button>
- <el-button type="text" :size="size" icon="el-icon-delete" plain @click="rowDel(row)">删 除
+ <el-button type="text" :size="size" icon="el-icon-delete" v-if="permission.place_del" plain @click="rowDel(row)">删 除
</el-button>
</template>
@@ -263,8 +263,8 @@
return {
addBtn: this.vaildData(this.permission.place_add, false),
viewBtn: this.vaildData(this.permission.place_view, true),
- delBtn: this.vaildData(this.permission.place_delete, true),
- editBtn: this.vaildData(this.permission.place_edit, true),
+ delBtn: this.vaildData(this.permission.place_del, true),
+ // editBtn: this.vaildData(this.permission.place_edit, true),
}
},
ids() {
diff --git a/src/views/resource/distapch.vue b/src/views/resource/distapch.vue
index 24f290c..5b7f8a8 100644
--- a/src/views/resource/distapch.vue
+++ b/src/views/resource/distapch.vue
@@ -32,7 +32,7 @@
<template slot-scope="{type,disabled}" slot="cronForm">
<el-input placeholder="请选择cron">
- <el-button slot="append" icon="el-icon-s-tools" @click="cronPopover = true"></el-button>
+ <el-button slot="append" icon="el-icon-s-tools" @click="handlerClick()"></el-button>
</el-input>
</template>
@@ -44,7 +44,12 @@
</el-dialog>
- <el-popover v-model="cronPopover">
+
+
+ <el-dialog title="Cron" append-to-body :visible.sync="cronPopover" width="550px">
+ <!-- <el-popover v-model="cronPopover"> -->
+
+ <!-- <div> 测试 </div> -->
<vueCron @change="changeCron" @close="cronPopover=false" i18n="cn"/>
<!-- <el-input
slot="reference"
@@ -52,7 +57,8 @@
placeholder="定时策略"
@click="cronPopover=true"
/> -->
- </el-popover>
+ <!-- </el-popover> -->
+ </el-dialog>
</basic-container>
</template>
@@ -524,6 +530,10 @@
this.loading = false
this.selectionClear()
})
+ },
+ handlerClick(){
+ console.log("111")
+ this.cronPopover = true;
}
}
}
diff --git a/src/views/userHouse/houseHoldList.vue b/src/views/userHouse/houseHoldList.vue
index b6624ee..b9e84a4 100644
--- a/src/views/userHouse/houseHoldList.vue
+++ b/src/views/userHouse/houseHoldList.vue
@@ -11,10 +11,10 @@
<el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.household_delete"
@click="handleDelete">删 除
</el-button>
- <el-button type="success" size="small" plain v-if="this.permission.household_import"
+ <el-button type="success" size="small" plain v-if="permission.household_import"
icon="el-icon-upload2" @click="handleImport">导入
</el-button>
- <el-button type="warning" size="small" plain v-if="this.permission.household_export"
+ <el-button type="warning" size="small" plain v-if="permission.household_export"
icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
diff --git a/src/views/userHouse/houseList.vue b/src/views/userHouse/houseList.vue
index 69c1039..b8f093d 100644
--- a/src/views/userHouse/houseList.vue
+++ b/src/views/userHouse/houseList.vue
@@ -8,23 +8,29 @@
@search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange"
@size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot="menuLeft">
- <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.user_delete"
+ <el-button type="danger" size="small" plain icon="el-icon-delete" v-if="permission.house_del"
@click="handleDelete">删 除
</el-button>
- <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ <!-- <el-button type="success" size="small" plain v-if="userInfo.role_name.includes('admin')"
icon="el-icon-upload2" @click="handleImport">导入
</el-button>
<el-button type="warning" size="small" plain v-if="userInfo.role_name.includes('admin')"
+ icon="el-icon-download" @click="handleExport">导出
+ </el-button> -->
+ <el-button type="success" size="small" plain v-if="permission.house_import"
+ icon="el-icon-upload2" @click="handleImport">导入
+ </el-button>
+ <el-button type="warning" size="small" plain v-if="permission.house_export"
icon="el-icon-download" @click="handleExport">导出
</el-button>
</template>
<template slot-scope="{row, size}" slot="menu">
<el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
- v-if="permission.househould_manager" @click="handleHouseholdManager(row)">住户管理
+ v-if="permission.house_manager" @click="handleHouseholdManager(row)">住户管理
</el-button>
<el-button :size="size" type="text" icon="el-icon-circle-plus-outline"
- v-if="permission.househould_manager" @click="manageLabel(row)">标签
+ v-if="permission.house_tag" @click="manageLabel(row)">标签
</el-button>
</template>
@@ -488,7 +494,7 @@
return {
addBtn: this.vaildData(this.permission.house_add, true),
viewBtn: this.vaildData(this.permission.house_view, true),
- delBtn: this.vaildData(this.permission.house_delete, true),
+ delBtn: this.vaildData(this.permission.house_del, true),
editBtn: this.vaildData(this.permission.house_edit, true)
}
},
--
Gitblit v1.9.3