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

Merge branch 'dev' of github.com:jetlinks/jetlinks-ui-vue into dev

This commit is contained in:
jackhoo_98 2023-03-29 12:30:01 +08:00
parent f1f4b697a7 6cb8e67da2
commit 14634e0fec
12 changed files with 116 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -76,5 +76,9 @@
"**/*.{html,css,less,md}": [
"prettier --write"
]
},
"volta": {
"node": "18.14.0",
"yarn": "1.22.0"
}
}

2
src/views/home/components/DeviceCountCard.vue
View File

@ -12,7 +12,7 @@
<div class="box-item">
<div class="label">设备数量</div>
<div class="value">{{ deviceNum }}</div>
<img src="/images/home/Group 3793.png" alt="" />
<img src="/images/home/Group3793.png" alt="" />
</div>
</div>
</div>

40
src/views/iot-card/CardManagement/Save.vue
View File

@ -42,6 +42,17 @@
:disabled="type === 'edit'"
/>
</j-form-item>
<j-form-item label="运营商" name="operatorName">
<j-select
allowClear
showSearch
:filter-option="filterOption"
:options="OperatorList"
v-model:value="modelRef.operatorName"
placeholder="请选择运营商"
>
</j-select>
</j-form-item>
<j-form-item label="平台对接" name="platformConfigId">
<j-select
showSearch
@ -55,17 +66,7 @@
</j-select>
</j-form-item>
<j-form-item label="运营商" name="operatorName">
<j-select
allowClear
showSearch
:filter-option="filterOption"
:options="OperatorList"
v-model:value="modelRef.operatorName"
placeholder="请选择运营商"
>
</j-select>
</j-form-item>
<j-form-item label="类型" name="cardType">
<j-select
allowClear
@ -113,7 +114,7 @@ const props = defineProps({
});
const btnLoading = ref<boolean>(false);
const platformConfigList = ref<Record<string, any>[]>([]);
const platformConfigCacheList = ref<Record<string, any>[]>([]);
const formRef = ref();
@ -184,6 +185,12 @@ const rules = {
message: '请选择平台对接',
},
],
operatorName: [
{
required: true,
message: '请选择运营商',
},
],
cardType: [
{
required: true,
@ -200,6 +207,10 @@ const filterOption = (input: string, option: any) => {
);
};
const platformConfigList = computed(() => {
return platformConfigCacheList.value.filter(item => item.operatorName === modelRef.operatorName).map(item => ({ label: item.name, value: item.id }))
})
watch(
() => props.data,
(newValue) => {
@ -209,10 +220,7 @@ watch(
terms: [{ column: 'state', value: 'enabled' }],
}).then((resp: any) => {
if (resp.status === 200) {
platformConfigList.value = resp.result.map((item: any) => ({
label: item.name,
value: item.id,
}));
platformConfigCacheList.value = resp.result
}
});
Object.assign(modelRef, newValue);

14
src/views/iot-card/CardManagement/index.vue
View File

@ -156,11 +156,11 @@
</slot>
</template>
<template #content>
<Ellipsis style="width: calc(100% - 100px)">
<span style="font-size: 16px; font-weight: 600">
<Ellipsis style="width: calc(100% - 100px)">
{{ slotProps.id }}
</span>
</Ellipsis>
</span>
<j-row style="margin-top: 20px">
<j-col :span="8">
<div class="card-item-content-text">
@ -307,6 +307,9 @@
}}
</div>
</template>
<template #operatorName='slotProps'>
{{ OperatorMap[slotProps.operatorName]}}
</template>
<template #cardType="slotProps">
{{ slotProps.cardType.text }}
</template>
@ -423,6 +426,7 @@ import BatchDropdown from '@/components/BatchDropdown/index.vue';
import { BatchActionsType } from '@/components/BatchDropdown/types';
import {usePermissionStore} from "store/permission";
import {useRouterParams} from "@/utils/hooks/useParams";
import { OperatorList, OperatorMap } from '@/views/iot-card/data'
const router = useRouter();
const menuStory = useMenuStore();
@ -505,11 +509,7 @@ const columns = [
width: 120,
search: {
type: 'select',
options: [
{ label: '移动', value: '移动' },
{ label: '电信', value: '电信' },
{ label: '联通', value: '联通' },
],
options: OperatorList,
},
},
{

23
src/views/iot-card/Platform/Detail/index.vue
View File

@ -130,11 +130,11 @@
</template>
<script lang="ts" setup>
import { getImage } from '@/utils/comm';
import PlatformType from '@/views/iot-card/components/PlatformType.vue';
import { queryById, save, update } from '@/api/iot-card/platform';
import { message } from 'jetlinks-ui-components';
import Doc from '../doc/index.vue';
import { platformTypeList } from '../../data'
const router = useRouter();
const route = useRoute();
@ -158,27 +158,6 @@ const form = reactive({
explain: undefined,
});
const platformTypeList = [
{
label: '移动OneLink',
value: 'onelink',
imgUrl: getImage('/iot-card/onelink.png'),
imgSize: ['78px', '20px'],
},
{
label: '电信Ctwing',
value: 'ctwing',
imgUrl: getImage('/iot-card/ctwingcmp.png'),
imgSize: ['52px', '25px'],
},
{
label: '联通Unicom',
value: 'unicom',
imgUrl: getImage('/iot-card/unicom.png'),
imgSize: ['56px', '41px'],
},
];
const rules = {
name: [
{ required: true, message: '请输入名称' },

2
src/views/iot-card/Platform/index.vue
View File

@ -27,7 +27,9 @@
</template>
<template #content>
<h3 class="card-item-content-title">
<Ellipsis>
{{ slotProps.name }}
</Ellipsis>
</h3>
<j-row>
<j-col :span="12">

23
src/views/iot-card/data.ts
View File

@ -1,37 +1,46 @@
import { getImage } from '@/utils/comm';
// 平台类型
export const PlatformTypeList = [
export const platformTypeList = [
{
label: '移动OneLink',
value: 'OneLinkPB',
value: 'onelink',
imgUrl: getImage('/iot-card/onelink.png'),
imgSize: ['78px', '20px'],
},
{
label: '电信Ctwing',
value: 'CtwingCmp',
value: 'ctwing',
imgUrl: getImage('/iot-card/ctwingcmp.png'),
imgSize: ['52px', '25px'],
},
{
label: '联通Unicom',
value: 'UnicomCmp',
value: 'unicom',
imgUrl: getImage('/iot-card/unicom.png'),
imgSize: ['56px', '41px'],
},
];
export const OperatorMap = {
onelink: '移动',
ctwing: '电信',
unicom: '联通',
}
//运营商
export const OperatorList = [
{
label: '移动',
value: '移动',
value: 'onelink',
},
{
label: '电信',
value: '电信',
value: 'ctwing',
},
{
label: '联通',
value: '联通',
value: 'unicom',
},
];

65
src/views/media/Device/Channel/index.vue
View File

@ -47,9 +47,15 @@
>
<j-button type="primary" disabled> 新增 </j-button>
</j-tooltip>
<j-button type="primary" @click="handleAdd" v-else>
新增
</j-button>
<PermissionButton
type="primary"
@click="handleAdd"
hasPermission="media/Device:add"
>
<template #icon
><AIcon type="PlusOutlined" />新增</template
>
</PermissionButton>
</template>
<template #status="slotProps">
<j-space>
@ -64,31 +70,40 @@
</j-space>
</template>
<template #action="slotProps">
<j-space :size="16">
<j-tooltip
<j-space>
<template
v-for="i in getActions(slotProps, 'table')"
:key="i.key"
v-bind="i.tooltip"
>
<j-popconfirm
v-if="i.popConfirm"
v-bind="i.popConfirm"
:disabled="i.disabled"
>
<j-button
:disabled="i.disabled"
style="padding: 0"
type="link"
<PermissionButton
v-if="
i.key !== 'play' && i.key !== 'backPlay'
"
:danger="i.key === 'delete'"
>
<AIcon :type="i.icon" />
</j-button>
</j-popconfirm>
<j-button
style="padding: 0"
:disabled="i.disabled"
:popConfirm="i.popConfirm"
:tooltip="{
...i.tooltip,
}"
@click="i.onClick"
type="link"
v-else
@click="i.onClick && i.onClick(slotProps)"
style="padding: 0px"
:hasPermission="'media/Device:' + i.key"
>
<template #icon
><AIcon :type="i.icon"
/></template>
</PermissionButton>
<!-- 回放/播放不要权限控制 -->
<template v-else>
<j-tooltip :key="i.key" v-bind="i.tooltip">
<j-button
style="padding: 0px"
type="link"
@click="
i.onClick &&
i.onClick(slotProps)
"
>
<j-button
:disabled="i.disabled"
@ -99,6 +114,8 @@
</j-button>
</j-button>
</j-tooltip>
</template>
</template>
</j-space>
</template>
</JProTable>
@ -216,7 +233,7 @@ const getActions = (
if (!data) return [];
const actions = [
{
key: 'edit',
key: 'update',
text: '编辑',
tooltip: {
title: '编辑',

2
src/views/system/Apply/index.vue
View File

@ -325,7 +325,7 @@ const table = {
onClick: () => table.toSave(data.id),
},
{
permission: `${permission}:update`,
permission: `${permission}:action`,
key: 'action',
text: disabled ? '禁用' : '启用',
tooltip: {

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

@ -336,14 +336,14 @@ const table = {
else
return [
{
permission: true,
permission: `${permission}:assert`,
key: 'edit',
tooltip: { title: '编辑' },
icon: 'EditOutlined',
onClick: () => table.clickEdit(data),
},
{
permission: true,
permission: `${permission}:bind`,
key: 'unbind',
tooltip: { title: '解除绑定' },
popConfirm: {

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

@ -345,7 +345,7 @@ const table = {
onClick: () => table.clickEdit(data),
},
{
permission: `${permission}:assert`,
permission: `${permission}:bind`,
key: 'unbind',
tooltip: { title: '解除绑定' },
popConfirm: {

9
src/views/system/Platforms/Api/components/ChooseApi.vue
View File

@ -18,9 +18,14 @@
</j-pro-table>
</div>
<j-button type="primary" @click="save" v-if="props.mode !== 'home'"
>保存</j-button
<PermissionButton
type="primary"
hasPermission="system/Platforms/Setting:update"
@click="save"
v-if="props.mode !== 'home'"
>
保存
</PermissionButton>
</div>
</template>