0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#13846.13671,13974,13188,13222,13639,13975,13668

This commit is contained in:
xieyonghong 2023-05-19 17:57:47 +08:00
parent fc2e324c2f
commit 08d9280fec
15 changed files with 128 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -25,7 +25,7 @@
"event-source-polyfill": "^1.0.31",
"global": "^4.4.0",
"jetlinks-store": "^0.0.3",
"jetlinks-ui-components": "^1.0.16",
"jetlinks-ui-components": "^1.0.18",
"js-cookie": "^3.0.1",
"less": "^4.1.3",
"less-loader": "^11.1.0",

6
src/store/department.ts
View File

@ -2,7 +2,7 @@
import { defineStore } from "pinia";
type DepartmentStateType = {
productId: string;
productId?: string[];
optType: string | undefined;
crossPageKeys: string[];
changedApis: any;
@ -11,7 +11,7 @@ type DepartmentStateType = {
export const useDepartmentStore = defineStore({
id: 'department',
state: (): DepartmentStateType => ({
productId: '',
productId: undefined,
// 设备资产分配弹窗操作类型:
// 1. optType === 'handle': 手动点击资产分配按钮;
// 2. optType === ': 产品资产分配后, 自动弹出设备资产分配
@ -20,7 +20,7 @@ export const useDepartmentStore = defineStore({
changedApis: {},
}),
actions: {
setProductId(value: string) {
setProductId(value?: string[]) {
this.productId = value;
},
setType(value: string | undefined) {

2
src/views/DataCollect/Collector/Tree/Save/index.vue
View File

@ -186,7 +186,7 @@ const endianData = computed(() => {
if (endian === 'BIG') {
return endianIn === 'BIG' ? 'ABCD' : 'BADC';
} else {
return endianIn === 'BIG' ? 'CDBA' : 'DCBA';
return endianIn === 'BIG' ? 'CDAB' : 'DCBA';
}
} else {
return endian === 'BIG' ? 'ABCD' : 'DCBA';

16
src/views/device/Product/Detail/DeviceAccess/accessModal.vue
View File

@ -130,6 +130,7 @@ import { queryList, getAccessConfig } from '@/api/device/product'
import { message } from 'jetlinks-ui-components'
import { useMenuStore } from '@/store/menu';
import { getProductByPluginId } from '@/api/link/plugin'
import { getProviders } from '@/api/link/accessConfig'
type Emit = {
(e: 'submit', data: any): void
@ -219,6 +220,21 @@ const columns = [
type: 'string',
},
},
{
title: '网关类型',
dataIndex: 'provider',
key: 'provider',
search: {
type: 'select',
options: () => {
return new Promise(resolve => {
getProviders().then(res => {
resolve(res.result?.map((item: any) => ({ ...item, label: item.name, value: item.id })) || [])
})
})
},
},
},
{
title: '状态',
dataIndex: 'state',

3
src/views/device/Product/Save/index.vue
View File

@ -309,11 +309,13 @@ const submitData = () => {
.validate()
.then(async () => {
// 新增
loading.value = true
if (props.isAdd === 1) {
if (form.id === '') {
form.id = undefined;
}
const res = await addProduct(form);
loading.value = false
if (res.status === 200) {
message.success('保存成功！');
visible.value = false;
@ -331,6 +333,7 @@ const submitData = () => {
? form.classifiedName
: (form.classifiedName = '');
const res = await editProduct(form);
loading.value = false
if (res.status === 200) {
message.success('保存成功！');
emit('success');

6
src/views/device/Product/index.vue
View File

@ -470,8 +470,8 @@ const query = reactive({
},
{
title: '接入方式',
key: 'accessId',
dataIndex: 'accessId',
key: 'accessName',
dataIndex: 'accessName',
search: {
type: 'select',
options: async () => {
@ -482,7 +482,7 @@ const query = reactive({
typeList.value = [];
typeList.value = resp.result.map((item: any) => ({
label: item.name,
value: item.id,
value: item.name,
}));
res(typeList.value);
});

167
src/views/system/Department/components/AddDeviceOrProductDialog.vue
View File

@ -3,9 +3,10 @@
class="add-device-or-product-dialog-container"
title="绑定"
width="1440px"
:maskClosable="false"
@ok="confirm"
:confirmLoading="loading"
@cancel="emits('update:visible', false)"
@cancel="cancel"
visible
>
<h5 class="row">
@ -28,9 +29,9 @@
<pro-search
type="simple"
:columns="props.queryColumns"
target="category"
@search="(params:any)=>queryParams = {...params}"
:columns="searchColumns"
target="category-bind-modal"
@search="search"
/>
<j-pro-table
ref="tableRef"
@ -175,7 +176,6 @@ const confirm = () => {
return message.warning('请先勾选数据');
}
console.log('table.selectedRows: ', table.selectedRows);
const params = table.selectedRows.map((item: any) => ({
targetType: 'org',
targetId: props.parentId,
@ -187,8 +187,8 @@ const confirm = () => {
),
}));
// 分配产品资产后, 进入设备资产分配,默认查询第一个产品下的设备
departmentStore.setProductId(params[0].assetIdList[0]);
// 分配产品资产后, 进入设备资产分配
departmentStore.setProductId(table.selectedRows.map((item: any) => item.id));
loading.value = true;
bindDeviceOrProductList_api(props.assetType, params)
@ -216,6 +216,26 @@ const columns = props.queryColumns.filter(
(item) => item.dataIndex !== 'action',
);
const searchColumns = computed(() => {
return props.queryColumns.map(item => {
if (departmentStore.productId) {
if (item.dataIndex === 'productName') {
item.search.first = true
item.search.componentProps = {
mode: 'multiple',
"max-tag-count": "responsive"
}
item.search.defaultTermType = 'eq'
item.search.defaultOnceValue = departmentStore.productId
} else if (item.search && 'first' in item.search) {
delete item.search.first
}
}
return item
})
})
const queryParams = ref({});
const table: any = {
_selectedRowKeys: ref<string[]>([]), // 选中项的id
@ -234,19 +254,6 @@ const table: any = {
// 启用批量设置
if (bulkBool.value) {
// 将已勾选的权限和批量设置的权限进行合并，并与自己可选的权限进行比对，取交集作为当前选中的权限
// let newPermission = uniq([
// ...item.selectPermissions,
// ...bulkList.value,
// ]);
// const allPermissions = item.permissionList.map(
// (item: any) => item.value,
// );
// newPermission = intersection(
// newPermission,
// allPermissions,
// );
// item.selectPermissions = newPermission;
// fix: bug#10756
item.selectPermissions = n[1];
// 禁用单独勾选
@ -390,99 +397,40 @@ const table: any = {
});
},
);
// getPermission_api(props.assetType, ids, parentId).then(
// (perResp: any) => {
// console.log('perResp: ', perResp);
// console.log('props.allPermission: ', props.allPermission);
// const permissionObj = {};
// perResp.result.forEach((item: any) => {
// permissionObj[item.assetId] = props.allPermission
// .filter((permission) =>
// item.allPermissions.includes(permission.id),
// )
// .map((item) => ({
// label: item.name,
// value: item.id,
// disabled: true,
// }));
// });
// data.forEach((item) => {
// item.permissionList = permissionObj[item.id];
// item.selectPermissions = ['read'];
// // 产品的状态进行转换处理
// if (props.assetType === 'product') {
// item.state = {
// value:
// item.state === 1
// ? 'online'
// : item.state === 0
// ? 'offline'
// : '',
// text:
// item.state === 1
// ? '正常'
// : item.state === 0
// ? '禁用'
// : '',
// };
// }
// });
// resolve({
// code: 200,
// result: {
// data: data,
// pageIndex,
// pageSize,
// total,
// },
// status: 200,
// });
// },
// );
});
}),
// 整理参数并获取数据
requestFun: async (oParams: any) => {
queryCount.value += 1;
if (props.parentId) {
const terms = [
{
terms: [
{
column: 'id',
termType: 'dim-assets$not',
value: {
assetType: props.assetType,
targets: [
{
type: 'org',
id: props.parentId,
},
],
},
},
{
column: 'productId$product-info',
type: 'and',
value: `id is ${departmentStore.productId}`,
},
],
},
];
let terms = [{
column: 'id',
termType: 'dim-assets$not',
value: {
assetType: props.assetType,
targets: [
{
type: 'org',
id: props.parentId,
},
],
},
type: 'and'
}]
if (
props.assetType !== 'device' ||
!departmentStore.productId ||
queryCount.value > 1 ||
departmentStore.optType === 'handle'
) {
// 非设备|产品id不存在|有其他查询操作(queryCount+1)|设备页面手动点击资产分配, 均删除产品带入的id
terms[0].terms.pop();
// if (
// props.assetType !== 'device' ||
// !departmentStore.productId ||
// queryCount.value > 1 ||
// departmentStore.optType === 'handle'
// ) {
// // 非设备|产品id不存在|有其他查询操作(queryCount+1)|设备页面手动点击资产分配, 均删除产品带入的id
// terms[0].terms.pop();
// }
if (oParams.terms && oParams.terms.length > 0) {
terms = [ ...oParams.terms, ...terms]
}
if (oParams.terms && oParams.terms.length > 0)
terms.unshift({ terms: oParams.terms });
const params = {
...oParams,
sorts: [{ name: 'createTime', order: 'desc' }],
@ -526,6 +474,15 @@ const selectChange = (keys: string[], rows: any[]) => {
table.selectedRows = rows;
table._selectedRowKeys.value = keys;
};
const cancel = () => {
departmentStore.setProductId()
emits('update:visible', false)
}
const search = (query: any) => {
queryParams.value = query
}
</script>
<style lang="less" scoped>

1
src/views/system/Department/components/EditDepartmentDialog.vue
View File

@ -2,6 +2,7 @@
<j-modal
visible
:title="title"
:maskClosable="false"
width="520px"
@cancel="emits('update:visible', false)"
@ok="confirm"

1
src/views/system/Department/components/EditPermissionDialog.vue
View File

@ -4,6 +4,7 @@
title="编辑"
width="500px"
@ok="confirm"
:maskClosable="false"
:confirmLoading="loading"
visible
@cancel="emits('update:visible', false)"

8
src/views/system/Department/components/LeftTree.vue
View File

@ -221,13 +221,15 @@ const openDialog = (row: any = {}) => {
dialog.selectItem = { ...row, sortIndex };
dialog.visible = true;
};
init();
function init() {
const init = () => {
getTree(save ? openDialog : undefined);
watch(selectedKeys, (n) => {
emits('change', n[0]);
});
}
init();
</script>
<style lang="less" scoped>
@ -274,7 +276,7 @@ function init() {
width: calc(100% - 80px);
}
.func-btns {
//display: none;
display: none;
font-size: 14px;
width: 80px;
:deep(.ant-btn-link) {

14
src/views/system/Department/components/NextDialog.vue
View File

@ -4,23 +4,33 @@
title="绑定"
width="520px"
@ok="handleOk"
:maskClosable="false"
class="edit-dialog-container"
@cancel="emits('update:visible',false)"
@cancel="cancel"
>
是否继续分配产品下的具体设备
</j-modal>
</template>
<script setup lang="ts">
const emits = defineEmits(['confirm','update:visible']);
import { useDepartmentStore } from 'store/department'
const emits = defineEmits(['confirm','update:visible']);
const departmentStore = useDepartmentStore();
const props = defineProps<{
visible: boolean;
}>();
const handleOk = () => {
emits('confirm');
emits('update:visible',false)
};
const cancel = () => {
departmentStore.setProductId()
emits('update:visible',false)
}
</script>
<style scoped></style>

2
src/views/system/Department/device/index.vue
View File

@ -269,7 +269,7 @@ const columns = [
rename: 'productId$product-info',
type: 'select',
handleValue(value: string) {
return `id is ${value}`;
return `id in ${value.toString()}`;
},
options: () =>
new Promise((resolve) => {

4
src/views/system/Department/product/index.vue
View File

@ -208,7 +208,7 @@
v-if="dialogs.addShow"
v-model:visible="dialogs.addShow"
:query-columns="columns"
:parent-id="props.parentId"
:parent-id="parentId"
:all-permission="tableData.permissionList"
asset-type="product"
@confirm="table.addConfirm"
@ -218,7 +218,7 @@
v-model:visible="dialogs.editShow"
:ids="dialogs.selectIds"
:permission-list="dialogs.permissList"
:parent-id="props.parentId"
:parent-id="parentId"
:all-permission="tableData.permissionList"
asset-type="product"
@confirm="table.refresh"

25
src/views/system/Menu/Detail/BasicInfo.vue
View File

@ -317,17 +317,20 @@ const form = reactive({
};
form.sourceCode = resp.result.code;
});
// 获取关联菜单
getMenuTree_api({ paging: false }).then((resp: any) => {
form.treeData = resp.result;
});
// 获取资产类型
getAssetsType_api().then((resp: any) => {
form.assetsType = resp.result.map((item: any) => ({
label: item.name,
value: item.id,
}));
});
if (isNoCommunity) {
// 获取关联菜单
getMenuTree_api({ paging: false }).then((resp: any) => {
form.treeData = resp.result;
});
// 获取资产类型
getAssetsType_api().then((resp: any) => {
form.assetsType = resp.result.map((item: any) => ({
label: item.name,
value: item.id,
}));
});
}
},
checkCode: async (_rule: Rule, value: string): Promise<any> => {
if (!value) return Promise.reject('');

5
src/views/system/User/components/EditUserDialog.vue
View File

@ -2,6 +2,7 @@
<j-modal
visible
:title="dialogTitle"
:maskClosable="false"
width="675px"
@ok="confirm"
@cancel="emits('update:visible', false)"
@ -97,7 +98,7 @@
<j-select
v-model:value="form.data.roleIdList"
mode="multiple"
style="width: 100%"
style="width: calc(100% - 40px)"
placeholder="请选择角色"
:options="form.roleOptions"
></j-select>
@ -115,7 +116,7 @@
<j-tree-select
v-model:value="form.data.orgIdList"
show-search
style="width: 100%"
style="width: calc(100% - 40px)"
placeholder="请选择组织"
:tree-data="form.departmentOptions"
:fieldNames="{ label: 'name', value: 'id' }"