Browse Source

3.2.1 绑定设备

vera_min 2 năm trước cách đây
mục cha
commit
58c3db95a7

+ 5 - 0
src/api/device/index.ts

@@ -71,6 +71,11 @@ export default {
     tagedit: (data: object) => put('/product/tsl/tag/edit', data),
     tagdel: (productId: number,key:string) => del('/product/tsl/tag/del', { productId,key }),
   },
+  device: {
+    getList: (params: object) => get('/product/device/bind_list', params),
+    mutipleBind: (data: object) => post('/product/device/bind_sub', data),
+    mutipleUnbind: (data: object) => post('/product/device/unbind_sub', data),
+  }
   
   
 }

+ 954 - 0
src/views/iot/device/instance/component/subDevice.vue

@@ -0,0 +1,954 @@
+<template>
+	<div class="system-dic-container">
+		<el-dialog title="子设备详情" v-model="isShowSubDeviceDialog" width="80%">
+			<div class="content">
+				<div class="cont_box">
+					<div class="title">设备:{{ detail.name }}</div>
+					<div class="pro-status"><span :class="developer_status == 2 ? 'on' : 'off'"></span>{{ developer_status == 2 ? '在线' : '离线' }}</div>
+
+					<!-- <div class="pro-option" @click="CkOption">{{ developer_status == 2 ? '下线' : '上线' }}</div> -->
+				</div>
+			</div>
+
+			<div class="content-box">
+				<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+					<el-tab-pane label="运行状态" name="3">
+						<div style="display: flex; padding: 10px; flex-wrap: wrap">
+							<div class="ant-card">
+								<div class="ant-card-body">
+									<div class="cardflex">
+										<div>设备状态</div>
+										<div @click="getrunData()" style="cursor: pointer">
+											<el-icon style="font-size: 18px">
+												<ele-Refresh />
+											</el-icon>
+										</div>
+									</div>
+
+									<div class="statusname" v-if="areaData.status == 0">未启用</div>
+									<div class="statusname" v-if="areaData.status == 1">离线</div>
+									<div class="statusname" v-if="areaData.status == 2">在线</div>
+									<div class="cardflex comtest">
+										<div>数据时间</div>
+										<div>{{ areaData.lastOnlineTime || '未启用' }}</div>
+									</div>
+								</div>
+							</div>
+
+							<div class="ant-card" v-for="(item, index) in areaData.properties" :key="index">
+								<div class="ant-card-body">
+									<div class="cardflex">
+										<div>{{ item.name }}</div>
+										<div style="cursor: pointer">
+											<el-icon style="font-size: 18px" @click="getrunData()">
+												<ele-Refresh />
+											</el-icon>
+											<el-icon style="font-size: 18px; margin-left: 10px" @click="onOpenListDetail(item)">
+												<ele-Expand />
+											</el-icon>
+										</div>
+									</div>
+
+									<div class="statusname">{{ item.value }}{{ item.unit }}</div>
+									<div class="">
+										<devantd :json="item.list" :antdid="item.key" v-if="item.type == 'int' || item.type == 'float'" />
+									</div>
+								</div>
+							</div>
+						</div>
+					</el-tab-pane>
+					<el-tab-pane label="设备信息" name="1">
+						<div class="pro-box">
+							<div class="protitle">设备信息</div>
+							<div>
+								<el-button type="primary" @click="onOpenEditDic(detail)">编辑</el-button>
+							</div>
+						</div>
+
+						<div class="ant-descriptions-view">
+							<table>
+								<tbody>
+									<tr class="ant-descriptions-row">
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">设备标识</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ detail.key }}</td>
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">设备名称</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ detail.name }}</td>
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">所属产品</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ detail.productName }}</td>
+									</tr>
+									<tr class="ant-descriptions-row">
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">消息协议</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.messageProtocol }}</td>
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">链接协议</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.transportProtocol }}</td>
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">设备类型</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.deviceType }}</td>
+									</tr>
+									<tr class="ant-descriptions-row">
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">固件版本</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.version }}</td>
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">注册时间</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.updatedAt }}</td>
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">最后上线时间</th>
+										<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.lastOnlineTime || '' }}</td>
+									</tr>
+									<tr class="ant-descriptions-row">
+										<th class="ant-descriptions-item-label ant-descriptions-item-colon">说明</th>
+										<td class="ant-descriptions-item-content" colspan="5">{{ prodetail.desc }}</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+					</el-tab-pane>
+					<el-tab-pane label="物模型" name="2">
+						<div class="wu-box">
+							<el-tabs type="border-card" v-model="activetab" @tab-click="wuhandleClick">
+								<el-tab-pane label="属性定义" name="attr">
+									<div class="wu-title">
+										<div class="title">属性定义</div>
+										<div>
+											<el-button type="primary" @click="onOpenEditAttr()">添加</el-button>
+										</div>
+									</div>
+
+									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'attr'">
+										<el-table-column label="属性标识" align="center" prop="key" />
+										<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column prop="valueType" label="数据类型" width="100" align="center">
+											<template #default="scope">
+												<span>{{ scope.row.valueType.type }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="decimals" label="精度" width="60" align="center">
+											<template #default="scope">
+												<span>{{ scope.row.valueType.decimals }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="unit" label="单位" width="60" align="center">
+											<template #default="scope">
+												<span>{{ scope.row.valueType.unit }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="accessMode" label="是否只读" width="120" align="center">
+											<template #default="scope">
+												<el-tag type="info" size="small" v-if="scope.row.accessMode">只读</el-tag>
+												<el-tag type="success" size="small" v-else>读写</el-tag>
+											</template>
+										</el-table-column>
+										<el-table-column label="说明" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="操作" width="300" align="center" fixed="right">
+											<template #default="scope">
+												<el-button size="small" text type="warning" @click="onEditAttr(scope.row)">修改</el-button>
+												<el-button size="small" text type="danger" @click="onRowDel(scope.row.key, 'attr')">删除</el-button>
+											</template>
+										</el-table-column>
+									</el-table>
+								</el-tab-pane>
+								<el-tab-pane label="功能定义" name="fun">
+									<div class="wu-title">
+										<div class="title">功能定义</div>
+										<div>
+											<el-button type="primary" @click="onOpenEditFun()">添加</el-button>
+										</div>
+									</div>
+
+									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'fun'">
+										<el-table-column label="功能标识" align="center" prop="key" />
+										<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+
+										<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="操作" width="300" align="center" fixed="right">
+											<template #default="scope">
+												<el-button size="small" text type="warning" @click="onEditFun(scope.row)">修改</el-button>
+												<el-button size="small" text type="danger" @click="onRowDel(scope.row.key, 'fun')">删除</el-button>
+											</template>
+										</el-table-column>
+									</el-table>
+								</el-tab-pane>
+								<el-tab-pane label="事件定义" name="event">
+									<div class="wu-title">
+										<div class="title">事件定义</div>
+										<div>
+											<el-button type="primary" @click="onOpenEditEvent()">添加</el-button>
+										</div>
+									</div>
+
+									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'event'">
+										<el-table-column label="事件标识" align="center" prop="key" />
+										<el-table-column label="名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column prop="level" label="事件级别" width="120" align="center">
+											<template #default="scope">
+												<el-tag type="primary" size="small" v-if="scope.row.level == 0">普通</el-tag>
+												<el-tag type="warning" size="small" v-if="scope.row.level == 1">警告</el-tag>
+												<el-tag type="danger" size="small" v-if="scope.row.level == 2">紧急</el-tag>
+											</template>
+										</el-table-column>
+										<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+
+										<el-table-column label="操作" width="300" align="center" fixed="right">
+											<template #default="scope">
+												<el-button size="small" text type="warning" @click="onEditEvent(scope.row)">修改</el-button>
+												<el-button size="small" text type="danger" @click="onRowDel(scope.row.key, 'event')">删除</el-button>
+											</template>
+										</el-table-column>
+									</el-table>
+								</el-tab-pane>
+								<el-tab-pane label="标签定义" name="tab">
+									<div class="wu-title">
+										<div class="title">标签定义</div>
+										<div>
+											<el-button type="primary" @click="onOpenEditTab()">添加</el-button>
+										</div>
+									</div>
+
+									<el-table style="width: 100%" :data="tableData.data" v-if="activetab == 'tab'">
+										<el-table-column label="属性标识" align="center" prop="key" />
+										<el-table-column label="属性名称" prop="name" :show-overflow-tooltip="true" />
+										<el-table-column prop="valueType" label="数据类型" width="120" align="center">
+											<template #default="scope">
+												<span>{{ scope.row.valueType.type }}</span>
+											</template>
+										</el-table-column>
+										<el-table-column prop="accessMode" label="是否只读" width="120" align="center">
+											<template #default="scope">
+												<el-tag type="info" size="small" v-if="scope.row.accessMode">只读</el-tag>
+												<el-tag type="success" size="small" v-else>读写</el-tag>
+											</template>
+										</el-table-column>
+										<el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" />
+										<el-table-column label="操作" width="300" align="center" fixed="right">
+											<template #default="scope">
+												<el-button size="small" text type="warning" @click="onEditTag(scope.row)">修改</el-button>
+												<el-button size="small" text type="danger" @click="onRowDel(scope.row.key, 'tab')">删除</el-button>
+											</template>
+										</el-table-column>
+									</el-table>
+								</el-tab-pane>
+							</el-tabs>
+							<pagination
+								v-show="tableData.total > 0"
+								:total="tableData.total"
+								v-model:page="tableData.param.pageNum"
+								v-model:limit="tableData.param.pageSize"
+								@pagination="getList"
+							/>
+						</div>
+					</el-tab-pane>
+					<el-tab-pane label="设备功能" name="5">
+						<functionCom :device-key="detail.key" :product-key="prodetail.key" v-if="detail.key && prodetail.key"></functionCom>
+					</el-tab-pane>
+					<el-tab-pane label="日志管理" name="4">
+						<div class="system-user-search mb15">
+							<el-form :model="logtableData.param" ref="queryRef" :inline="true" label-width="68px">
+								<el-form-item label="日志类型" prop="types">
+									<el-select v-model="logtableData.param.types" placeholder="日志类型" clearable size="default">
+										<el-option v-for="item in logTypeData" :key="item" :label="item" :value="item" />
+									</el-select>
+								</el-form-item>
+
+								<el-form-item label="创建时间" prop="dateRange">
+									<el-date-picker
+										v-model="logtableData.param.dateRange"
+										size="default"
+										value-format="YYYY-MM-DD"
+										type="daterange"
+										range-separator="-"
+										start-placeholder="开始日期"
+										end-placeholder="结束日期"
+									></el-date-picker>
+								</el-form-item>
+								<el-form-item>
+									<el-button size="default" type="primary" class="ml10" @click="getlog">
+										<el-icon>
+											<ele-Search />
+										</el-icon>
+										查询
+									</el-button>
+									<el-button size="default" @click="resetQuery(queryRef)">
+										<el-icon>
+											<ele-Refresh />
+										</el-icon>
+										重置
+									</el-button>
+								</el-form-item>
+							</el-form>
+						</div>
+						<el-table style="width: 100%" :data="logtableData.data">
+							<el-table-column label="类型" align="center" prop="type" />
+							<el-table-column label="时间" prop="ts" :show-overflow-tooltip="true" />
+
+							<el-table-column label="内容" prop="content" :show-overflow-tooltip="true" />
+							<el-table-column label="操作" width="300" align="center" fixed="right">
+								<template #default="scope">
+									<el-button size="small" text type="warning" @click="onLogDetail(scope.row)">查看</el-button>
+								</template>
+							</el-table-column>
+						</el-table>
+
+						<pagination
+							v-show="logtableData.total > 0"
+							:total="logtableData.total"
+							v-model:page="logtableData.param.pageNum"
+							v-model:limit="logtableData.param.pageSize"
+							@pagination="getlog"
+						/>
+					</el-tab-pane>
+				</el-tabs>
+			</div>
+		</el-dialog>
+
+		<EditDic ref="editDicRef" @typeList="typeList" />
+		<EditAttr ref="editAttrRef" @typeList="getproperty" />
+		<EditFun ref="editFunRef" @typeList="getfunction" />
+		<EditEvent ref="editEventRef" @typeList="getevent" />
+		<EditTab ref="editTabRef" @typeList="gettab" />
+		<ListDic ref="listDicRef" />
+
+		<el-dialog v-model="dialogVisible" title="返回Json数据" width="30%">
+			<JsonViewer :value="jsonData" boxed sort theme="jv-dark" @click="onKeyclick" />
+
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="dialogVisible = false">关闭</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue'
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
+import functionCom from './function.vue'
+
+import 'vue3-json-viewer/dist/index.css'
+
+import EditDic from '../../product/component/editPro.vue'
+import EditAttr from '../../product/component/editAttr.vue'
+import EditFun from '../../product/component/editFun.vue'
+import EditEvent from '../../product/component/editEvent.vue'
+import EditTab from '../../product/component/editTab.vue'
+import devantd from '/@/components/devantd/index.vue'
+import ListDic from './list.vue'
+
+import { useRoute } from 'vue-router'
+
+import api from '/@/api/device'
+
+interface TableDataState {
+	ids: number[]
+	deviceIds: number[]
+    detail: object[]
+    isShowSubDeviceDialog: boolean
+	deviceTableData: {
+		data: []
+		total: number
+		loading: boolean
+		param: {
+			pageNum: number
+			pageSize: number
+			gatewayKey: string
+			// status: string;
+			dateRange: string[]
+		}
+	}
+	tableData: {
+		data: []
+		total: number
+		loading: boolean
+		param: {
+			pageNum: number
+			pageSize: number
+			name: string
+			deviceType: string
+			status: string
+			dateRange: string[]
+		}
+	}
+	logtableData: {
+		data: []
+		total: number
+		loading: boolean
+		param: {
+			pageNum: number
+			pageSize: number
+			name: string
+			deviceType: string
+			status: string
+			dateRange: string[]
+		}
+	}
+}
+export default defineComponent({
+	name: 'deviceEditPro',
+	components: { EditDic, EditAttr, EditFun, EditEvent, EditTab, devantd, ListDic, functionCom },
+
+	setup(prop, context) {
+		console.log(prop)
+		const route = useRoute()
+		const editDicRef = ref()
+		const editAttrRef = ref()
+		const editFunRef = ref()
+		const listDicRef = ref()
+		const editEventRef = ref()
+		const editTabRef = ref()
+		const state = reactive<TableDataState>({
+			deviceIds: [],
+			areaData: [],
+			isShowDialog: false,
+			dialogVisible: false,
+            isShowSubDeviceDialog: false,
+			logTypeData: [],
+			jsonData: '',
+			activeName: '3', // 分类数据
+			activetab: 'attr', // 分类数据
+			detail: [],
+			prodetail: [],
+			product_id: 0,
+			developer_status: 0,
+			deviceTableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					gatewayKey: '',
+					pageSize: 10,
+					dateRange: [],
+				},
+			},
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					productId: 0,
+					pageSize: 10,
+					status: '',
+					dateRange: [],
+				},
+			},
+			logtableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					productId: 0,
+					pageSize: 10,
+					status: '',
+					dateRange: [],
+				},
+			},
+		})
+
+		onMounted(() => {
+			// const ids = route.params && route.params.id;
+			// api.instance.detail(ids).then((res: any) => {
+			//     console.log(res)
+			// 	state.detail = res.data;
+			// 	state.developer_status = res.data.status;
+			// 	state.tableData.param.productId = res.data.product.id;
+			// 	state.product_id = res.data.product.id;
+			// 	getrunData();
+			// 	api.product.detail(res.data.product.id).then((res: any) => {
+			// 		state.prodetail = res.data;
+			// 		// console.log(res.data);
+			// 	});
+			// 	//第一次加载
+			// 	api.model.property(state.tableData.param).then((res: any) => {
+			// 		state.tableData.data = res.Data;
+			// 		state.tableData.total = res.Total;
+			// 	});
+			//     getDeviceTableData()
+			// });
+		})
+
+		const getDeviceTableData = () => {
+			state.deviceTableData.param.gatewayKey = state.detail.key
+			api.device.getList(state.deviceTableData.param).then((res: any) => {
+				state.deviceTableData.data = res.list
+				state.deviceTableData.total = res.Total
+				console.log(res)
+			})
+		}
+
+		// 多选框选中数据
+		const handleSelectionChange = (selection: any[]) => {
+			state.deviceIds = selection.map((item) => item.id)
+		}
+		// 打开弹窗
+		const openDialog = (row: any | null) => {
+			if (row) {
+				// state.ruleForm = row;
+                console.log(row)
+                const ids = row.id;
+                api.instance.detail(ids).then((res: any) => {
+                    console.log(res)
+                    state.detail = res.data;
+                    state.developer_status = res.data.status;
+                    state.tableData.param.productId = res.data.product.id;
+                    state.product_id = res.data.product.id;
+                    getrunData();
+                    api.product.detail(res.data.product.id).then((productRes: any) => {
+                        state.prodetail = productRes.data;
+                        console.log(productRes.data);
+                    });
+                    //第一次加载
+                    api.model.property(state.tableData.param).then((modelRes: any) => {
+                        state.tableData.data = modelRes.Data;
+                        state.tableData.total = modelRes.Total;
+                    });
+                    getDeviceTableData()
+                });
+			}
+			  state.isShowSubDeviceDialog = true;
+		}
+
+		const onLogDetail = (row: TableDataRow) => {
+			state.jsonData = JSON.parse(row.content)
+			console.log(JSON.parse(row.content))
+			state.dialogVisible = true
+		}
+
+		//编辑属性
+		const onEditAttr = (row: TableDataRow) => {
+			editAttrRef.value.openDialog(row, state.product_id)
+		}
+
+		//编辑功能
+		const onEditFun = (row: TableDataRow) => {
+			editFunRef.value.openDialog(row, state.product_id)
+		}
+
+		//编辑事件
+		const onEditEvent = (row: TableDataRow) => {
+			editEventRef.value.openDialog(row, state.product_id)
+		}
+
+		//编辑标签
+		const onEditTag = (row: TableDataRow) => {
+			editTabRef.value.openDialog(row, state.product_id)
+		}
+
+		//打开添加属性弹窗
+		const onOpenEditAttr = () => {
+			editAttrRef.value.openDialog({ product_id: state.product_id, id: 0, accessMode: 0 })
+		}
+
+		//打开添加功能弹窗
+		const onOpenEditFun = () => {
+			editFunRef.value.openDialog({ product_id: state.product_id, id: 0 })
+		}
+		//打开添加事件弹窗
+		const onOpenEditEvent = () => {
+			editEventRef.value.openDialog({ product_id: state.product_id, id: 0, level: 0 })
+		}
+
+		//打开添加事件弹窗
+		const onOpenEditTab = () => {
+			editTabRef.value.openDialog({ product_id: state.product_id, id: 0, accessMode: 0 })
+		}
+
+		//查看日志列表
+		const onOpenListDetail = (row: TableDataRow) => {
+			listDicRef.value.openDialog(row, state.detail.id)
+		}
+
+		// 打开修改产品弹窗
+		const onOpenEditDic = (row: TableDataRow) => {
+			editDicRef.value.openDialog(row)
+		}
+
+		// 删除产品
+		const onRowDel = (key, type) => {
+			let msg = `此操作将永久删除该数据吗?,是否继续?`
+
+			if (key.length === 0) {
+				ElMessage.error('请选择要删除的数据。')
+				return
+			}
+			ElMessageBox.confirm(msg, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					if (type == 'attr') {
+						api.model.propertydel(state.product_id, key).then(() => {
+							ElMessage.success('删除成功')
+							getproperty()
+						})
+					}
+					if (type == 'fun') {
+						api.model.functiondel(state.product_id, key).then(() => {
+							ElMessage.success('删除成功')
+							getfunction()
+						})
+					}
+					if (type == 'event') {
+						api.model.eventdel(state.product_id, key).then(() => {
+							ElMessage.success('删除成功')
+							getevent()
+						})
+					}
+					if (type == 'tab') {
+						api.model.tagdel(state.product_id, key).then(() => {
+							ElMessage.success('删除成功')
+							tagdel()
+						})
+					}
+				})
+				.catch(() => {})
+		}
+
+		//根据不同类型获取列表
+		const getList = () => {
+			switch (state.activetab) {
+				case 'attr':
+					getproperty()
+					break
+				case 'fun':
+					getfunction()
+					break
+				case 'event':
+					getevent()
+					break
+				case 'tab':
+					gettab()
+					break
+			}
+		}
+
+		const getproperty = () => {
+			api.model.property(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.Data
+				state.tableData.total = res.Total
+			})
+		}
+
+		const getfunction = () => {
+			api.model.function(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.Data
+				state.tableData.total = res.Total
+			})
+		}
+		const getevent = () => {
+			api.model.event(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.Data
+				state.tableData.total = res.Total
+			})
+		}
+
+		const gettab = () => {
+			api.model.tag(state.tableData.param).then((res: any) => {
+				state.tableData.data = res.Data
+				state.tableData.total = res.Total
+			})
+		}
+
+		const wuhandleClick = (tab: TabsPaneContext) => {
+			state.activetab = tab.props.name
+			switch (tab.props.name) {
+				case 'attr':
+					getproperty()
+					break
+				case 'fun':
+					getfunction()
+					break
+				case 'event':
+					getevent()
+					break
+				case 'tab':
+					gettab()
+					break
+			}
+		}
+
+		const handleClick = (tab: TabsPaneContext, event: Event) => {
+			console.log(tab, event)
+			if (tab.props.name == 4) {
+				//获取日志
+				getlog()
+				getlogtype()
+			} else if (tab.props.name == 2) {
+				getList()
+			} else if (tab.props.name == 3) {
+				getrunData()
+			}
+		}
+
+		const getrunData = () => {
+			api.instance.getrun_status({ id: state.detail.id }).then((res: any) => {
+				state.areaData = res
+				let properties = state.areaData.properties || []
+
+				var temp = new Array()
+
+				properties.forEach(function (item, index) {
+					let datalist = item.list || []
+					temp[index] = []
+					var temps = new Array()
+					datalist.forEach(function (a, b) {
+						if (b < 15) {
+							temps.push(a)
+						}
+					})
+					temp[index]['name'] = item.name
+					temp[index]['key'] = item.key
+					temp[index]['type'] = item.type
+					temp[index]['unit'] = item.unit
+					temp[index]['value'] = item.value
+					temp[index]['list'] = temps
+				})
+
+				state.areaData.properties = temp
+			})
+		}
+
+		const getlogtype = () => {
+			api.instance.getlogcate({}).then((res: any) => {
+				state.logTypeData = res.list
+			})
+		}
+
+		const getlog = () => {
+			state.logtableData.param.deviceKey = state.detail.key
+			api.instance.getLogList(state.logtableData.param).then((res: any) => {
+				console.log(res, '22222222')
+				state.logtableData.data = res.list
+				state.logtableData.total = res.Total
+			})
+		}
+
+		const CkOption = () => {
+			if (state.developer_status == 2) {
+				api.instance.devoffline({ id: state.detail.id }).then((res: any) => {
+					ElMessage.success('操作成功')
+					state.developer_status = 1
+				})
+			} else {
+				api.instance.devonline({ id: state.detail.id }).then((res: any) => {
+					ElMessage.success('操作成功')
+					state.developer_status = 2
+				})
+			}
+		}
+		const tinyAreas = () => {
+			var data = state.data
+
+			const tinyArea = new TinyArea('container', {
+				height: 60,
+				autoFit: false,
+				data,
+				smooth: true,
+				areaStyle: {
+					fill: '#d6e3fd',
+				},
+			})
+			tinyArea.render()
+		}
+		return {
+			tinyAreas,
+			editDicRef,
+			editAttrRef,
+			listDicRef,
+			editFunRef,
+			editEventRef,
+			editTabRef,
+			onOpenListDetail,
+			getrunData,
+			getlog,
+			getlogtype,
+			onLogDetail,
+			CkOption,
+			onRowDel,
+			onEditFun,
+			onEditEvent,
+			onEditTag,
+			onEditAttr,
+			getList,
+			getproperty,
+			getDeviceTableData,
+			handleSelectionChange,
+			getfunction,
+			getevent,
+			gettab,
+			wuhandleClick,
+            openDialog,
+			onOpenEditTab,
+			onOpenEditEvent,
+			onOpenEditAttr,
+			onOpenEditFun,
+			onOpenEditDic,
+			handleClick,
+			...toRefs(state),
+		}
+	},
+})
+</script>
+  <style>
+.content {
+	background: #fff;
+	width: 100%;
+	padding: 20px;
+}
+.content-box {
+	background: #fff;
+	width: 100%;
+	padding: 20px;
+	margin-top: 20px;
+}
+.cont_box {
+	display: flex;
+}
+.cont_box .title {
+	font-size: 24px;
+}
+.cont_box .pro-status {
+	line-height: 40px;
+	margin-left: 30px;
+}
+.cont_box .pro-status .on {
+	background: #52c41a;
+}
+.cont_box .pro-status .off {
+	background: #c41a1a;
+}
+.cont_box .pro-status span {
+	position: relative;
+	top: -1px;
+	display: inline-block;
+	width: 6px;
+	height: 6px;
+	vertical-align: middle;
+	border-radius: 50%;
+	margin-right: 5px;
+}
+.cont_box .pro-option {
+	line-height: 40px;
+	margin-left: 10px;
+	color: #1890ff;
+	cursor: pointer;
+}
+.content-box .pro-box {
+	display: flex;
+	padding: 10px;
+	justify-content: space-between;
+}
+.content-box .pro-box .protitle {
+	font-size: 18px;
+	font-weight: bold;
+	line-height: 35px;
+}
+.content-box .pro-box .buttonedit {
+	border: 0px;
+	color: #1890ff;
+}
+table {
+	border-collapse: collapse;
+	text-indent: initial;
+	border-spacing: 2px;
+}
+tbody {
+	box-sizing: border-box;
+	display: table-row-group;
+	vertical-align: middle;
+	border-color: inherit;
+}
+
+tr {
+	display: table-row;
+	vertical-align: inherit;
+	border-color: inherit;
+}
+.ant-descriptions-view {
+	width: 100%;
+	overflow: hidden;
+	border-radius: 4px;
+}
+.ant-descriptions-view {
+	border: 1px solid #e8e8e8;
+}
+.ant-descriptions-view table {
+	width: 100%;
+	table-layout: fixed;
+}
+.ant-descriptions-view > table {
+	table-layout: auto;
+}
+.ant-descriptions-row {
+	border-bottom: 1px solid #e8e8e8;
+}
+.ant-descriptions-item-label {
+	color: rgba(0, 0, 0, 0.85);
+	font-weight: 400;
+	font-size: 14px;
+	line-height: 1.5;
+}
+.ant-descriptions-item-label {
+	padding: 16px 24px;
+	border-right: 1px solid #e8e8e8;
+}
+.ant-descriptions-item-label {
+	background-color: #fafafa;
+}
+.ant-descriptions-item-content {
+	padding: 16px 24px;
+	border-right: 1px solid #e8e8e8;
+	display: table-cell;
+	color: rgba(0, 0, 0, 0.65);
+	font-size: 14px;
+	line-height: 1.5;
+}
+.wu-box {
+	border: #e8e8e8 solid 1px;
+	padding: 20px;
+	width: 100%;
+}
+.wu-box .wu-title {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	padding: 20px;
+	border-bottom: #e8e8e8 1px solid;
+}
+.wu-box .wu-title .title {
+	font-size: 18px;
+}
+.ant-card {
+	box-sizing: border-box;
+	margin: 10px;
+	width: 23.2%;
+	font-size: 14px;
+	font-variant: tabular-nums;
+	border: 1px solid var(--next-border-color-light);
+
+	line-height: 1.5;
+	list-style: none;
+	font-feature-settings: 'tnum';
+	position: relative;
+	border-radius: 2px;
+	transition: all 0.3s;
+}
+.ant-card-body {
+	padding: 24px;
+	zoom: 1;
+}
+.cardflex {
+	display: flex;
+	justify-content: space-between;
+}
+.statusname {
+	font-size: 30px;
+	margin-top: 10px;
+	margin-bottom: 15px;
+}
+.comtest {
+	margin-top: 20px;
+	height: 30px;
+	line-height: 30px;
+}
+</style>
+
+

+ 158 - 1
src/views/iot/device/instance/detail.vue

@@ -277,6 +277,42 @@
 
           <pagination v-show="logtableData.total > 0" :total="logtableData.total" v-model:page="logtableData.param.pageNum" v-model:limit="logtableData.param.pageSize" @pagination="getlog" />
         </el-tab-pane>
+        <el-tab-pane v-if="prodetail.deviceType == '网关'" label="子设备" name="6">
+          <div class="wu-box">
+            <div class="wu-title">
+              <div class="title">子设备列表</div>
+              <div>
+                <el-button v-auth="'mutipleBind'" type="primary" @click="mutipleBind()">批量绑定</el-button>
+                <el-button :disabled="!deviceKeyList.length" type="primary" @click="mutipleUnbind()">批量解绑</el-button>
+              </div>
+            </div>
+
+          <el-table :data="deviceTableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="deviceTableData.loading">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="标识" prop="key" width="130" :show-overflow-tooltip="true" />
+            <el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" />
+            <el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" />
+
+            <el-table-column prop="status" label="状态" width="100" align="center">
+              <template #default="scope">
+                <el-tag type="info" size="small" v-if="scope.row.status==1">离线</el-tag>
+                <el-tag type="success" size="small" v-if="scope.row.status==2">在线</el-tag>
+                <el-tag type="info" size="small" v-if="scope.row.status==0">未启用</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="registryTime" label="激活时间" align="center" width="150"></el-table-column>
+            <el-table-column prop="desc" label="说明"></el-table-column>
+
+            <el-table-column label="操作" width="80" align="center" fixed="right">
+              <template #default="scope">
+                <el-button size="small" text type="warning" v-auth="'detail'" @click="onOpenDetail(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination v-show="deviceTableData.total>0" :total="deviceTableData.total" v-model:page="deviceTableData.param.pageNum" v-model:limit="deviceTableData.param.pageSize" @pagination="getDeviceTableData" />
+          </div>
+
+        </el-tab-pane>
       </el-tabs>
     </div>
     <EditDic ref="editDicRef" @typeList="typeList" />
@@ -285,6 +321,7 @@
     <EditEvent ref="editEventRef" @typeList="getevent" />
     <EditTab ref="editTabRef" @typeList="gettab" />
     <ListDic ref="listDicRef" />
+    <SubDevice ref="subDeviceRef" />
 
     <el-dialog v-model="dialogVisible" title="返回Json数据" width="30%">
       <JsonViewer :value="jsonData" boxed sort theme="jv-dark" @click="onKeyclick" />
@@ -311,14 +348,29 @@ import EditEvent from '../product/component/editEvent.vue';
 import EditTab from '../product/component/editTab.vue';
 import devantd from '/@/components/devantd/index.vue';
 import ListDic from './component/list.vue';
+import SubDevice from './component/subDevice.vue';
 
 
 import { useRoute } from 'vue-router';
 
 import api from '/@/api/device';
+import { AnyAaaaRecord } from 'dns';
 
 interface TableDataState {
   ids: number[];
+  deviceKeyList: string[];
+  deviceTableData: {
+    data: [];
+    total: number;
+    loading: boolean;
+    param: {
+      pageNum: number;
+      pageSize: number;
+      gatewayKey: string;
+      // status: string;
+      dateRange: string[];
+    };
+  };
   tableData: {
     data: [];
     total: number;
@@ -348,7 +400,7 @@ interface TableDataState {
 }
 export default defineComponent({
   name: 'deviceEditPro',
-  components: { EditDic, EditAttr, EditFun, EditEvent, EditTab, devantd, ListDic, functionCom },
+  components: { SubDevice, EditDic, EditAttr, EditFun, EditEvent, EditTab, devantd, ListDic, functionCom },
 
 	setup(prop, context) {
 		const route = useRoute();
@@ -358,7 +410,9 @@ export default defineComponent({
 		const listDicRef=ref();
 		const editEventRef = ref();
 		const editTabRef = ref();
+    const subDeviceRef = ref();
 		const state = reactive<TableDataState>({
+      deviceKeyList: [],
 			areaData:[],
 			isShowDialog: false,
 			dialogVisible: false,
@@ -370,6 +424,17 @@ export default defineComponent({
 			prodetail: [],
 			product_id: 0,
 			developer_status: 0,
+      deviceTableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					gatewayKey: '',
+					pageSize: 10,
+					dateRange: [],
+				},
+			},
 			tableData: {
 				data: [],
 				total: 0,
@@ -415,10 +480,94 @@ export default defineComponent({
 					state.tableData.data = res.Data;
 					state.tableData.total = res.Total;
 				});
+        getDeviceTableData()
 			});
 
 		});
 
+    const mutipleBind = () => {
+      let msg = '是否进行批量绑定?';
+      if (state.deviceKeyList.length === 0) {
+        ElMessage.error('请选择要批量绑定的数据。');
+        return;
+      }
+      console.log(state.deviceKeyList)
+      console.log(state.deviceKeyList.length)
+        // return
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          api.device.mutipleBind({
+            "gatewayKey":state.deviceTableData.param.gatewayKey,
+            "subKeys": state.deviceKeyList
+          }).then(() => {
+            ElMessage.success('绑定成功');
+            // typeList();
+            getDeviceTableData();
+          });
+        })
+        .catch(() => { });
+    }
+
+    const mutipleUnbind = () => {
+      let msg = '是否进行批量解绑?';
+      if (state.deviceKeyList.length === 0) {
+        ElMessage.error('请选择要批量解绑的数据。');
+        return;
+      }
+      console.log(state.deviceKeyList)
+      console.log(state.deviceKeyList.length)
+        // return
+      ElMessageBox.confirm(msg, '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          api.device.mutipleUnbind({
+            "gatewayKey":state.deviceTableData.param.gatewayKey,
+            "subKeys": state.deviceKeyList
+          }).then(() => {
+            ElMessage.success('解绑成功');
+            // typeList();
+            getDeviceTableData();
+          });
+        })
+        .catch(() => { });
+    }
+
+    
+
+    const getDeviceTableData = () => {
+      state.deviceTableData.param.gatewayKey = state.detail.key;
+      api.device.getList(state.deviceTableData.param).then((res: any) => {
+        state.deviceTableData.data = res.list;
+        state.deviceTableData.total = res.Total;
+        console.log(res)
+        console.log(state.deviceTableData.data)
+      });
+    };
+
+    // 多选框选中数据
+    const handleSelectionChange = (selection: any[]) => {
+      console.log(selection)
+      console.log(typeof selection)
+      // selection.forEach((item:any) => {
+      //   console.log(item)
+      //   state.deviceKeyList.push(item.key)
+      // })
+      state.deviceKeyList = selection.map((item) => item.key);
+      console.log(state.deviceKeyList)
+      console.log(typeof state.deviceKeyList)
+    };
+        
+    // 打开修改产品弹窗
+    const onOpenDetail = (row: any) => {
+      subDeviceRef.value.openDialog(row)
+    };
 
     const onLogDetail = (row: TableDataRow) => {
       state.jsonData = JSON.parse(row.content);
@@ -426,6 +575,8 @@ export default defineComponent({
       state.dialogVisible = true;
     };
 
+    
+
     //编辑属性
     const onEditAttr = (row: TableDataRow) => {
       editAttrRef.value.openDialog(row, state.product_id);
@@ -673,6 +824,7 @@ export default defineComponent({
       editFunRef,
       editEventRef,
       editTabRef,
+      subDeviceRef,
       onOpenListDetail,
       getrunData,
       getlog,
@@ -686,6 +838,8 @@ export default defineComponent({
       onEditAttr,
       getList,
       getproperty,
+      getDeviceTableData,
+      handleSelectionChange,
       getfunction,
       getevent,
       gettab,
@@ -695,7 +849,10 @@ export default defineComponent({
       onOpenEditAttr,
       onOpenEditFun,
       onOpenEditDic,
+      onOpenDetail,
       handleClick,
+      mutipleBind,
+      mutipleUnbind,
       ...toRefs(state),
     };
   },

+ 1 - 1
src/views/iot/device/instance/index.vue

@@ -66,7 +66,7 @@
         </el-table-column>
         <el-table-column prop="registryTime" label="激活时间" align="center" width="150" v-col="'registryTime'"></el-table-column>
         <!--        <el-table-column prop="lastOnlineTime" label="最后上线时间" align="center" width="150" v-col="'lastOnlineTime'"></el-table-column>-->
-        <el-table-column prop="registryTime" label="说明" v-col="'desc'"></el-table-column>
+        <el-table-column prop="desc" label="说明" v-col="'desc'"></el-table-column>
 
         <el-table-column label="操作" width="200" align="center" fixed="right">
           <template #default="scope">

+ 6 - 3
src/views/iot/device/product/component/editPro.vue

@@ -47,8 +47,9 @@
 				<el-form-item label="设备类型" prop="deviceType">
 					<el-radio-group v-model="ruleForm.deviceType">
 						<el-radio label="设备">设备</el-radio>
-
 						<el-radio label="网关">网关</el-radio>
+						<el-radio label="子设备">子设备</el-radio>
+
 					</el-radio-group>
 				</el-form-item>
 				<el-form-item label="产品描述	" prop="desc">
@@ -86,7 +87,8 @@ interface DicState {
 	deptData: RuleFormState[]
 	messageData: RuleFormState[]
 	tranData: RuleFormState[]
-	rules: {}
+	rules: {},
+	imageUrl: string
 }
 
 export default defineComponent({
@@ -158,10 +160,11 @@ export default defineComponent({
 				// api.dict.getType(row.dictId).then((res:any)=>{
 				//   state.ruleForm = res.data.dictType
 				// }
-
 				state.imageUrl = row.icon
 
 				state.ruleForm = row
+			}else {
+				state.imageUrl = ""
 			}
 			state.isShowDialog = true
 		}