|
|
@@ -59,8 +59,7 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="状态" align="center" width="100">
|
|
|
<template #default="scope">
|
|
|
- <el-switch v-model="scope.row.status" active-value="0" inactive-value="1"
|
|
|
- @change="handleStatusChange(scope.row)"></el-switch>
|
|
|
+ {{ getStatusName(scope.row.status) }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="创建时间" align="center" prop="createTime">
|
|
|
@@ -119,8 +118,8 @@
|
|
|
<!-- <el-form-item label="备注"> -->
|
|
|
<el-form-item label="角色有效期">
|
|
|
<!-- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input> -->
|
|
|
- <el-date-picker v-model="form.remark" type="date" placeholder="Pick a day" :disabled-date="disabledDate" value-format="YYYY-MM-DD"
|
|
|
- :shortcuts="shortcuts" :size="size" />
|
|
|
+ <el-date-picker v-model="form.remark" type="date" placeholder="Pick a day" :disabled-date="disabledDate"
|
|
|
+ value-format="YYYY-MM-DD" :shortcuts="shortcuts" :size="size" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
|
@@ -134,7 +133,7 @@
|
|
|
<!-- 分配角色数据权限对话框 -->
|
|
|
<el-dialog :title="title" v-model="openDataScope" width="50vw" append-to-body>
|
|
|
<!-- <el-form :model="form" label-width="80px"> -->
|
|
|
- <el-transfer v-model="warnvalue" :data="warndata" :titles="['未分配', '已分配']"/>
|
|
|
+ <el-transfer v-model="warnvalue" :data="warndata" :titles="['未分配', '已分配']" />
|
|
|
<!-- </el-form> -->
|
|
|
<template #footer>
|
|
|
<div class="dialog-footer">
|
|
|
@@ -147,10 +146,13 @@
|
|
|
</template>
|
|
|
|
|
|
<script setup name="Role">
|
|
|
+import { listEquipment, addEquipment, delEquipment, updateEquipment } from "@/api/data/equipment"
|
|
|
import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
|
|
|
import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";
|
|
|
+import { listEquipmentSbook, updateEquipmentSbook } from "@/api/data/equipmentSbook"
|
|
|
import moment from "moment";
|
|
|
import { listRule, addRule, updateRule, delRule, getRule } from "@/api/data/rule"
|
|
|
+import { listRoleDevice, getRoleDevice, delRoleDevice, addRoleDevice, updateRoleDevice,getRoleDeviceList,deleteByRoleId } from "@/api/data/roleDevice";
|
|
|
|
|
|
|
|
|
const router = useRouter();
|
|
|
@@ -173,9 +175,10 @@ const menuNodeAll = ref(false);
|
|
|
const deptExpand = ref(true);
|
|
|
const deptNodeAll = ref(false);
|
|
|
const deptOptions = ref([]);
|
|
|
-const openDataScope = ref(false);
|
|
|
+const openDataScope = ref();
|
|
|
const menuRef = ref(null);
|
|
|
const deptRef = ref(null);
|
|
|
+const selectRoleId = ref(null);
|
|
|
|
|
|
|
|
|
const warndata = ref([]);
|
|
|
@@ -209,17 +212,17 @@ const data = reactive({
|
|
|
const { queryParams, form, rules } = toRefs(data);
|
|
|
|
|
|
const generateData = () => {
|
|
|
- listRule({pageSize:1000}).then(res => {
|
|
|
- // tabledata.value = res.rows
|
|
|
- const data = []
|
|
|
- for (var index in res.rows) {
|
|
|
- data.push({
|
|
|
- key: index,
|
|
|
- label: res.rows[index].name,
|
|
|
- })
|
|
|
- }
|
|
|
- warndata.value = data
|
|
|
- })
|
|
|
+ listRule({ pageSize: 1000 }).then(res => {
|
|
|
+ // tabledata.value = res.rows
|
|
|
+ const data = []
|
|
|
+ for (var index in res.rows) {
|
|
|
+ data.push({
|
|
|
+ key: index,
|
|
|
+ label: res.rows[index].name,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ warndata.value = data
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
/** 查询角色列表 */
|
|
|
@@ -447,40 +450,71 @@ function dataScopeSelectChange(value) {
|
|
|
}
|
|
|
/** 分配数据权限操作 */
|
|
|
function handleDataScope(row) {
|
|
|
- reset();
|
|
|
- const deptTreeSelect = getDeptTree(row.roleId);
|
|
|
- getRole(row.roleId).then(response => {
|
|
|
- form.value = response.data;
|
|
|
+ // reset();
|
|
|
+ console.log(row)
|
|
|
+ warnvalue.value = [];
|
|
|
+ selectRoleId.value = row.roleId
|
|
|
+ getRoleDeviceList({roleId:row.roleId}).then(response => {
|
|
|
+ console.log(response)
|
|
|
openDataScope.value = true;
|
|
|
- nextTick(() => {
|
|
|
- deptTreeSelect.then(res => {
|
|
|
- nextTick(() => {
|
|
|
- if (deptRef.value) {
|
|
|
- deptRef.value.setCheckedKeys(res.data.checkedKeys);
|
|
|
- }
|
|
|
- });
|
|
|
- });
|
|
|
- });
|
|
|
+ for(var index in response.rows){
|
|
|
+ warnvalue.value.push(response.rows[index].deviceId)
|
|
|
+ }
|
|
|
title.value = "分配告警权限";
|
|
|
});
|
|
|
}
|
|
|
/** 提交按钮(数据权限) */
|
|
|
-function submitDataScope() {
|
|
|
- if (form.value.roleId != undefined) {
|
|
|
- form.value.deptIds = getDeptAllCheckedKeys();
|
|
|
- dataScope(form.value).then(response => {
|
|
|
- proxy.$modal.msgSuccess("修改成功");
|
|
|
- openDataScope.value = false;
|
|
|
- getList();
|
|
|
- });
|
|
|
- }
|
|
|
-}
|
|
|
+
|
|
|
/** 取消按钮(数据权限)*/
|
|
|
function cancelDataScope() {
|
|
|
openDataScope.value = false;
|
|
|
reset();
|
|
|
}
|
|
|
|
|
|
-getList();
|
|
|
-generateData();
|
|
|
+const getStatusName = (value) => {
|
|
|
+ if (value == 0) {
|
|
|
+ return '开启'
|
|
|
+ } else {
|
|
|
+ return '关闭'
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+const submitDataScope = () => {
|
|
|
+ console.log(warnvalue.value)
|
|
|
+ openDataScope.value = false;
|
|
|
+ deleteByRoleId({roleId:selectRoleId.value}).then(res =>{
|
|
|
+ for(var index in warnvalue.value){
|
|
|
+ var obj = {
|
|
|
+ roleId:selectRoleId.value,
|
|
|
+ deviceId:warnvalue.value[index]
|
|
|
+ }
|
|
|
+ addRoleDevice(obj).then(res ={
|
|
|
+
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+}
|
|
|
+
|
|
|
+const getalldata = () => {
|
|
|
+ listEquipmentSbook({ pageSize: 10000 }).then((res) => {
|
|
|
+ const { rows } = res;
|
|
|
+ // devicetabledata.value = rows;
|
|
|
+ var dataList = [];
|
|
|
+ for (var index in res.rows) {
|
|
|
+ dataList.push({
|
|
|
+ key: res.rows[index].id,
|
|
|
+ label: res.rows[index].name,
|
|
|
+ })
|
|
|
+ }
|
|
|
+ warndata.value = dataList
|
|
|
+ console.log(dataList)
|
|
|
+ });
|
|
|
+
|
|
|
+}
|
|
|
+
|
|
|
+onMounted(() => {
|
|
|
+ getList();
|
|
|
+ getalldata();
|
|
|
+});
|
|
|
+
|
|
|
</script>
|