diff --git a/public/images/network/01.jpg b/public/images/network/01.jpg deleted file mode 100644 index 950b64d7..00000000 Binary files a/public/images/network/01.jpg and /dev/null differ diff --git a/public/images/network/01.png b/public/images/network/01.png new file mode 100644 index 00000000..9ec5cdc8 Binary files /dev/null and b/public/images/network/01.png differ diff --git a/public/images/network/02.jpg b/public/images/network/02.jpg index 745ccacc..950b64d7 100644 Binary files a/public/images/network/02.jpg and b/public/images/network/02.jpg differ diff --git a/public/images/network/03.png b/public/images/network/03.png new file mode 100644 index 00000000..a9e8e8d3 Binary files /dev/null and b/public/images/network/03.png differ diff --git a/public/images/network/03.jpg b/public/images/network/04.jpg similarity index 100% rename from public/images/network/03.jpg rename to public/images/network/04.jpg diff --git a/public/images/network/05.jpg b/public/images/network/05.jpg new file mode 100644 index 00000000..e15d4962 Binary files /dev/null and b/public/images/network/05.jpg differ diff --git a/public/images/network/06.jpg b/public/images/network/06.jpg new file mode 100644 index 00000000..e5a2f45a Binary files /dev/null and b/public/images/network/06.jpg differ diff --git a/src/api/iot-card/cardManagement.ts b/src/api/iot-card/cardManagement.ts new file mode 100644 index 00000000..390685e0 --- /dev/null +++ b/src/api/iot-card/cardManagement.ts @@ -0,0 +1,67 @@ +import server from '@/utils/request' + +/** + * 不分页查询平台对接 + * @param data + */ +export const queryPlatformNoPage = (data: any) => server.post(`/network/card/platform/_query/no-paging`, data) + +/** + * 分页查询物联卡管理列表 + * @param data + */ +export const query = (data: any) => server.post(`/network/card/_query`, data) + +/** + * 激活待激活物联卡 + * @param cardId + */ +export const changeDeploy = (cardId: string) => server.get(`/network/card/${cardId}/_activation`); + +/** + * 停用已激活物联卡 + * @param cardId + */ +export const unDeploy = (cardId: string) => server.get(`/network/card/${cardId}/_deactivate`); + +/** + * 复机已停机物联卡 + * @param cardId + */ +export const resumption = (cardId: string) => server.get(`/network/card/${cardId}/_resumption`); + +/** + * 删除物联卡 + * @param id + */ +export const del = (id: string) => server.remove(`/network/card/${id}`); + + +/** + * 激活待激活物联卡(批量) + * @param data + */ +export const changeDeployBatch = (data: any) => server.get(`/network/card/_activation/_bitch`, data); + +/** + * 停用已激活物联卡(批量) + * @param data + */ +export const unDeployBatch = (data: any) => server.get(`/network/card/_deactivate/_bitch`, data); + +/** + * 复机已停机物联卡(批量) + * @param data + */ +export const resumptionBatch = (data: any) => server.get(`/network/card/_resumption/_bitch`, data); + +/** + * 同步物联卡状态 + */ +export const sync = () => server.get(`/network/card/state/_sync`); + +/** + * 批量删除物联卡 + * @param data + */ +export const removeCards = (data: any) => server.post(`/network/card/batch/_delete`, data); \ No newline at end of file diff --git a/src/components/AIcon/index.tsx b/src/components/AIcon/index.tsx index 4d97fdc9..152420a0 100644 --- a/src/components/AIcon/index.tsx +++ b/src/components/AIcon/index.tsx @@ -29,6 +29,10 @@ const iconKeys = [ 'UploadOutlined', 'PlusCircleOutlined', 'QuestionCircleOutlined', + 'DisconnectOutlined', + 'LinkOutlined', + 'PoweroffOutlined', + 'SwapOutlined', 'BugOutlined', 'BarsOutlined', 'ArrowDownOutlined', diff --git a/src/router/menu.ts b/src/router/menu.ts index 78683b84..2e92daff 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -127,6 +127,10 @@ export default [ path: '/iot-card/Dashboard', component: () => import('@/views/iot-card/Dashboard/index.vue') }, + { + path: '/iot-card/CardManagement', + component: () => import('@/views/iot-card/CardManagement/index.vue') + }, // 北向输出 { path: '/northbound/DuerOS', diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 30e21216..239ee90f 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -55,4 +55,21 @@ export const downloadObject = (record: Record, fileName: string, fo document.body.removeChild(formElement); }; // 是否不是community版本 -export const isNoCommunity = !(localStorage.getItem(SystemConst.VERSION_CODE) === 'community'); \ No newline at end of file +export const isNoCommunity = !(localStorage.getItem(SystemConst.VERSION_CODE) === 'community'); + + +/** + * 生成随机数 + * @param length + * @returns + */ +export const randomString = (length?: number) => { + const tempLength = length || 32; + const chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; + const maxPos = chars.length; + let pwd = ''; + for (let i = 0; i < tempLength; i += 1) { + pwd += chars.charAt(Math.floor(Math.random() * maxPos)); + } + return pwd; +}; diff --git a/src/views/iot-card/CardManagement/index.vue b/src/views/iot-card/CardManagement/index.vue new file mode 100644 index 00000000..6ab563d4 --- /dev/null +++ b/src/views/iot-card/CardManagement/index.vue @@ -0,0 +1,571 @@ + + + + + + diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue index 07151cd1..f84b13fb 100644 --- a/src/views/link/AccessConfig/Detail/index.vue +++ b/src/views/link/AccessConfig/Detail/index.vue @@ -17,6 +17,11 @@ + @@ -30,6 +35,7 @@ import { getProviders, detail } from '@/api/link/accessConfig'; import Media from '../components/Media/index.vue'; import Channel from '../components/Channel/index.vue'; import Edge from '../components/Edge/index.vue'; +import Cloud from '../components/Cloud/index.vue'; // const router = useRouter(); const route = useRoute(); diff --git a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue new file mode 100644 index 00000000..806b33bb --- /dev/null +++ b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue @@ -0,0 +1,624 @@ + + + + + diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue new file mode 100644 index 00000000..79f91f71 --- /dev/null +++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue @@ -0,0 +1,736 @@ + + + + + diff --git a/src/views/link/AccessConfig/components/Cloud/index.vue b/src/views/link/AccessConfig/components/Cloud/index.vue new file mode 100644 index 00000000..dfa6dc39 --- /dev/null +++ b/src/views/link/AccessConfig/components/Cloud/index.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/src/views/link/AccessConfig/components/Media/GB28181.vue b/src/views/link/AccessConfig/components/Media/GB28181.vue index 239486ec..77540348 100644 --- a/src/views/link/AccessConfig/components/Media/GB28181.vue +++ b/src/views/link/AccessConfig/components/Media/GB28181.vue @@ -6,7 +6,7 @@
- + 配置设备信令参数
@@ -511,7 +511,12 @@ import { message, Form } from 'ant-design-vue'; import type { FormInstance } from 'ant-design-vue'; import { getResourcesCurrent, getClusters } from '@/api/link/accessConfig'; -import { DeleteOutlined, PlusOutlined } from '@ant-design/icons-vue'; +import { + DeleteOutlined, + PlusOutlined, + QuestionCircleOutlined, + InfoCircleOutlined, +} from '@ant-design/icons-vue'; import { update, save } from '@/api/link/accessConfig'; interface Form2 { diff --git a/src/views/link/AccessConfig/components/Network.vue b/src/views/link/AccessConfig/components/Network.vue index edd2c5c1..04bebf34 100644 --- a/src/views/link/AccessConfig/components/Network.vue +++ b/src/views/link/AccessConfig/components/Network.vue @@ -6,7 +6,7 @@
- + 选择与设备通信的网络组件
- + 使用选择的消息协议,对网络组件通信数据进行编解码、认证等操作