From a4a3a0d6457fb9318236e8e89fbcf95fed1cd5d6 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期四, 15 八月 2024 17:33:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web
---
src/views/authority/users/index.vue | 93 +++++++---------------------------------------
1 files changed, 15 insertions(+), 78 deletions(-)
diff --git a/src/views/authority/users/index.vue b/src/views/authority/users/index.vue
index ab35e07..9208782 100644
--- a/src/views/authority/users/index.vue
+++ b/src/views/authority/users/index.vue
@@ -64,71 +64,6 @@
</div>
</div>
</div>
- <!-- <a-row>
- <a-col :flex="2"></a-col>
- <a-col :flex="1">
- <a-form :model="formModel" style="margin-top: 30px">
- <a-form-item field="name">
- <a-input
- v-model="formModel.name"
- :style="{ width: '320px' }"
- :placeholder="$t('璇疯緭鍏�')"
- />
- </a-form-item>
- </a-form>
- </a-col>
- <a-col :flex="'200px'" style="text-align: right; margin-top: 30px">
- <a-button type="primary" @click="search" style="margin-right: 20px">
- <template #icon>
- <icon-search />
- </template>
- {{ $t('searchTable.form.search') }}
- </a-button>
- <a-button @click="reset">
- <template #icon>
- <icon-refresh />
- </template>
- {{ $t('searchTable.form.reset') }}
- </a-button>
- </a-col>
- </a-row> -->
- <!-- <a-divider style="margin-top: 0" />
- <a-row style="margin-bottom: 16px">
- <a-col :span="12">
- <a-space>
- <a-button type="primary" :align="'right'" @click="operation(0)"
- >+ 鏂板缓璐︽埛</a-button
- >
- </a-space>
- </a-col>
- <a-col
- :span="12"
- style="display: flex; align-items: center; justify-content: end"
- >
- <a-tooltip :content="$t('searchTable.actions.refresh')">
- <div class="action-icon" @click="search">
- <icon-refresh size="18" />
- </div>
- </a-tooltip>
- <a-dropdown @select="handleSelectDensity">
- <a-tooltip :content="$t('searchTable.actions.density')">
- <div class="action-icon">
- <icon-line-height size="18" />
- </div>
- </a-tooltip>
- <template #content>
- <a-doption
- v-for="item in densityList"
- :key="item.value"
- :value="item.value"
- :class="{ active: item.value === size }"
- >
- <span>{{ item.name }}</span>
- </a-doption>
- </template>
- </a-dropdown>
- </a-col>
- </a-row> -->
<a-table
row-key="id"
:loading="loading"
@@ -191,17 +126,14 @@
@ok="editHandleOk"
>
<a-form :model="editform">
+ <a-form-item field="email" label="鐢ㄦ埛鍚�">
+ <a-input v-model="editform.email" />
+ </a-form-item>
<a-form-item field="name" label="鏄电О">
<a-input v-model="editform.nickName" />
</a-form-item>
- <a-form-item field="userName" label="鐢ㄦ埛鍚�">
- <a-input v-model="editform.userName" />
- </a-form-item>
<a-form-item field="phoneNumber" label="鎵嬫満鍙�">
<a-input v-model="editform.phoneNumber" />
- </a-form-item>
- <a-form-item field="email" label="閭">
- <a-input v-model="editform.email" />
</a-form-item>
</a-form>
</a-modal>
@@ -249,7 +181,7 @@
</div>
</a-modal>
<a-modal
- width="70%"
+ width="50%"
v-model:visible="resourcevisible"
v-if="resourcevisible"
title="鏉冮檺閰嶇疆"
@@ -275,19 +207,18 @@
@check="onCheckMenu"
:fieldNames="{
key: 'menuId',
-
+ title: 'menuName',
children: 'children',
}"
:check-strictly="checkStrictlyMenu"
>
- <template #extra="nodeData">
+ <!-- <template #extra="nodeData">
<div :class="{ 'custom-class': nodeData.menuType == 1 }">
<span>
{{ nodeData.menuName }}
</span>
</div>
- </template>
- <!-- <template #extra="nodeData"> {{ nodeData.menuName }}) </template> -->
+ </template> -->
</a-tree>
<!-- <a-space class="space_select_all">
<a-button type="primary">鍏ㄩ��</a-button>
@@ -456,6 +387,7 @@
import { Modal } from '@arco-design/web-vue';
import Authheader from '@/views/authority/components/authheader.vue';
import { create } from 'lodash';
+ import { queryCanvasList } from "@/api/Agent";
let treeData = ref([]);
let checkedKeys = ref([]);
@@ -507,7 +439,7 @@
let deptvisible = ref(false);
let resourcevisible = ref(false);
let selectUser = ref({});
- // const treeDataList = ref([]);
+ const treeDataList = ref([]);
const checked1 = ref(false);
//琛ㄦ牸澶嶉�夋閫夋嫨
@@ -631,7 +563,7 @@
slotName: 'index',
},
{
- title: t('鐧诲綍鍚�'),
+ title: t('鐢ㄦ埛鍚�'),
dataIndex: 'email',
},
{
@@ -888,7 +820,12 @@
DialogList().then((res) => {
DialogsList.value = res.rows;
+ //鍔犺浇agent
+ queryCanvasList(null).then((r) => {
+
+ });
});
+
fetchData();
OrganizationData('');
MenuData();
--
Gitblit v1.8.0