picasso vor 2 Jahren
Ursprung
Commit
00a823837f

+ 3 - 1
src/api/certificateManagement/index.ts

@@ -5,8 +5,10 @@ const baseUrl = getOrigin(import.meta.env.VITE_SERVER_URL);
 export default {
   certificateManagement: {
     getList: (params: object) => get('/system/certificate/list', params),
+    getAll: () => get('/system/certificate/getAll'),
     add: (data: object) => post('/system/certificate/add', data),
     edit: (data: object) => put('/system/certificate/edit', data),
     del: (id: number) => del('/system/certificate/delete', { id }),
+    editStatus: (data: object) => post('/system/certificate/editStatus', data),
   }
-}
+}

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

@@ -17,8 +17,11 @@ export default {
     deploy: (data: object) => post('/product/deploy', data),
     undeploy: (data: object) => post('/product/undeploy', data),
     event: (data: object) => get('/product/tsl/event/all', data),
+    getSubList: () => get('/product/sub_list'),
     // 获取插件通信方式类型
     getTypesAll: (data: object) => get('/system/plugins/getTypesAll', data),
+    // 脚本更新
+    script: (data: object) => put('/product/script/update', data),
   },
   category:{
     getList: (params: object) => get('/product/category/list', params),
@@ -77,5 +80,14 @@ export default {
     edit: (params: object) => post('/product/device_tree/info/edit', params),
     detail: (params: object) => get('/product/device_tree/info/detail', params),
     delete: (params: object) => del('/product/device_tree/info/del', params),
+  },
+  device: {
+    getList: (params: object) => get('/product/device/bind_list', params),
+    getSubList: (params: object) => get('/product/device/sub_list', params),
+    mutipleBind: (data: object) => post('/product/device/bind_sub', data),
+    mutipleUnbind: (data: object) => post('/product/device/unbind_sub', data),
+    updateOnlineTimeout: (data: object) => put('/product/device/extend/update', data),
   }
+  
+  
 }

+ 0 - 1
src/views/iot/certificate/component/editParams.vue

@@ -407,7 +407,6 @@ const state = reactive({
 })
 const { proxy } = getCurrentInstance() as any
 const { network_certificate } = proxy.useDict('network_certificate')
-console.log(network_certificate)
 // 打开弹窗
 const openDialog = (row: any) => {
 	if (row) {

+ 81 - 96
src/views/iot/certificate/index.vue

@@ -1,95 +1,73 @@
 <template>
-  <div class="system-dic-container">
-    <el-card shadow="hover">
-      <div class="system-user-search mb15">
-        <el-form :model="state.tableData.param" ref="queryRef" :inline="true" label-width="60px">
-          <el-form-item label="关键字" prop="keyWord">
-            <el-input v-model="state.tableData.param.name" placeholder="请输入关键字" clearable size="default" @keyup.enter="queryList" />
-          </el-form-item>
-          <el-form-item>
-            <el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="queryList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button v-auth="'reset'" size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-			<el-button v-auth="'add'" size="default" type="success" class="ml10" @click="operate('add')">
-				<el-icon>
-					<ele-FolderAdd />
-				</el-icon>
-				新增证书
-			</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+	<div class="system-dic-container">
+		<el-card shadow="hover">
+			<div class="system-user-search mb15">
+				<el-form :model="state.tableData.param" ref="queryRef" :inline="true" label-width="60px">
+					<el-form-item label="关键字" prop="keyWord">
+						<el-input v-model="state.tableData.param.name" placeholder="请输入关键字" clearable size="default" @keyup.enter="queryList" />
+					</el-form-item>
+					<el-form-item>
+						<el-button v-auth="'query'" size="default" type="primary" class="ml10" @click="queryList">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+						<el-button v-auth="'reset'" size="default" @click="resetQuery(queryRef)">
+							<el-icon>
+								<ele-Refresh />
+							</el-icon>
+							重置
+						</el-button>
+						<el-button v-auth="'add'" size="default" type="success" class="ml10" @click="operate('add')">
+							<el-icon>
+								<ele-FolderAdd />
+							</el-icon>
+							新增证书
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
 			<!--  -->
-      <el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
-        <!-- <el-table-column type="selection" width="55" align="center" /> -->
-        <el-table-column v-col="'id'" label="ID" align="center" prop="id" width="60" />
-	    	<el-table-column v-col="'name'" label="证书名称" prop="name" min-width="120" :show-overflow-tooltip="true" />
-	    	<el-table-column v-col="'standard'" label="证书标准" prop="standard" min-width="120" :show-overflow-tooltip="true">
-				<template #default="scope">
-					{{filterStandard(scope.row.standard)}}
-                <!-- <el-button size="small" text type="primary" @click="operate('editParams', scope.row)">编辑</el-button> -->
-                <!-- <el-button size="small" text type="danger" @click="operate('delete', scope.row)">删除</el-button> -->
-            	</template>
-            </el-table-column>
-			<el-table-column v-col="'description'" label="说明" prop="description" min-width="120" :show-overflow-tooltip="true" />
-			<el-table-column v-col="'handle'"  label="操作" width="280" align="center" fixed="right">
-            <template #default="scope">
-                <el-button size="small" v-auth="'edit'" text type="primary" @click="operate('editParams', scope.row)">编辑</el-button>
-                <el-button size="small" v-auth="'del'" text type="danger" @click="operate('delete', scope.row)">删除</el-button>
-            </template>
-            </el-table-column>
-      </el-table>
-      <pagination
-				v-show="state.tableData.total>0"
-				:total="state.tableData.total"
-				v-model:page="state.tableData.param.pageNum"
-				v-model:limit="state.tableData.param.pageSize"
-				@pagination="queryList"
-			/>
-    </el-card>
-	<EditParams ref="editParamsRef" @update="queryList"/>
-  </div>
+			<el-table :data="state.tableData.data" v-loading="state.tableData.loading" style="width: 100%">
+				<!-- <el-table-column type="selection" width="55" align="center" /> -->
+				<el-table-column v-col="'id'" label="ID" align="center" prop="id" width="60" />
+				<el-table-column v-col="'name'" label="证书名称" prop="name" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column v-col="'standard'" label="证书标准" prop="standard" min-width="120" :show-overflow-tooltip="true">
+					<template #default="scope">
+						{{ filterStandard(scope.row.standard) }}
+						<!-- <el-button size="small" text type="primary" @click="operate('editParams', scope.row)">编辑</el-button> -->
+						<!-- <el-button size="small" text type="danger" @click="operate('delete', scope.row)">删除</el-button> -->
+					</template>
+				</el-table-column>
+				<el-table-column v-col="'description'" label="说明" prop="description" min-width="120" :show-overflow-tooltip="true" />
+				<el-table-column label="状态" width="120" align="center">
+					<template #default="scope">
+						<el-switch v-model="scope.row.status" inline-prompt :active-value="1" :inactive-value="0" active-text="启" inactive-text="禁" @change="handleStatusChange(scope.row)"></el-switch>
+					</template>
+				</el-table-column>
+				<el-table-column v-col="'handle'" label="操作" width="180" align="center" fixed="right">
+					<template #default="scope">
+						<el-button size="small" v-auth="'edit'" text type="primary" @click="operate('editParams', scope.row)">编辑</el-button>
+						<el-button size="small" v-auth="'del'" text type="danger" @click="operate('delete', scope.row)">删除</el-button>
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination v-show="state.tableData.total > 0" :total="state.tableData.total" v-model:page="state.tableData.param.pageNum" v-model:limit="state.tableData.param.pageSize" @pagination="queryList" />
+		</el-card>
+		<EditParams ref="editParamsRef" @update="queryList" />
+	</div>
 </template>
 
 <script lang="ts" setup>
-import { toRefs, reactive, onMounted, ref, defineComponent, getCurrentInstance } from 'vue';
+import { reactive, onMounted, ref, getCurrentInstance } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
-import EditDic from './component/edit.vue';
-import Detail from './component/detail.vue';
 import api from '/@/api/certificateManagement';
 import EditParams from './component/editParams.vue';
 
-// 定义接口来定义对象的类型
-interface TableDataRow {
-	id: number;
-	name: string;
-	code: string;
-	stationId: string;
-	loopTypes: number;
-	energyTypes: number;
-	heatingObject: number;
-	heatingTypes: number;
-	heatingArea: string;
-	forRealArea: string;
-	decade: string;
-	status: number;
-}
 const { proxy } = getCurrentInstance() as any;
 const { network_certificate } = proxy.useDict('network_certificate');
-console.log(network_certificate)
 
-const addDicRef = ref();
-const editDicRef = ref();
-const detailRef = ref();
 const previewRef = ref();
 const editParamsRef = ref();
 const buildConfigRef = ref();
@@ -102,10 +80,10 @@ const state = reactive({
 		param: {
 			pageNum: 1,
 			PageSize: 10,
-            status: -1,
+			status: -1,
 			name: ""
 		},
-        total: 0
+		total: 0
 	},
 });
 // 初始化表格数据
@@ -115,7 +93,6 @@ const initTableData = () => {
 const queryList = () => {
 	state.tableData.loading = true
 	api.certificateManagement.getList(state.tableData.param).then((res: any) => {
-		console.log(res)
 		state.tableData.data = res.Info || [];
 		state.tableData.loading = false
 		state.tableData.total = res.total
@@ -123,21 +100,29 @@ const queryList = () => {
 };
 
 const filterStandard = (type: any) => {
-	console.log(network_certificate.value)
-	let data  = network_certificate.value;
 	let opt = network_certificate.value.filter((ele: any) => {
 		return ele.value == type
 	})
-	return opt[0].label
-	console.log(opt)
-	// network_certificate.value.forEach((element: object) => {
-	// 	console.log(element)
-	// 	if(type == element.value) {
-	// 		console.log(type)
-	// 		return element.label
-	// 	}
-	// });
+	return opt[0]?.label
 }
+// 状态修改
+const handleStatusChange = (row: any) => {
+	let text = row.status === 1 ? '启用' : '停用';
+	ElMessageBox.confirm('确认要"' + text + '":"' + row.name + '"楼宇吗?', '警告', {
+		confirmButtonText: '确定',
+		cancelButtonText: '取消',
+		type: 'warning',
+	})
+		.then(function () {
+			return api.certificateManagement.editStatus({ id: row.id, status: row.status });
+		})
+		.then(() => {
+			ElMessage.success(text + '成功');
+		})
+		.catch(function () {
+			row.status = row.status === 0 ? 1 : 0;
+		});
+};
 
 // 页面加载时
 onMounted(() => {
@@ -151,7 +136,7 @@ const resetQuery = (formEl: FormInstance | undefined) => {
 };
 
 const operate = (type: string, row: any) => {
-	switch(type) {
+	switch (type) {
 		case 'preview':
 			console.log(previewRef.value)
 			previewRef.value.openDialog(row)
@@ -178,7 +163,7 @@ const operate = (type: string, row: any) => {
 						queryList();
 					});
 				})
-				.catch(() => {});
+				.catch(() => { });
 			break
 	}
 }

+ 56 - 77
src/views/iot/device-tree/tree/index.vue

@@ -104,88 +104,53 @@
                 </tbody>
               </table>
             </el-tab-pane>
-            <el-tab-pane label="时间周期" name="2">Config</el-tab-pane>
-            <el-tab-pane label="绑定实际设备" name="3">Role</el-tab-pane>
+            <el-tab-pane label="时间周期" name="2">
+			        <el-form :model="ruleForm" ref="formRef" size="default" label-width="110px">
+                <el-form-item label="时间窗口" prop="duration">
+                  <div class="flex">
+                    <el-input v-model="ruleForm.duration" placeholder="请输入" class="w-35" />
+                    <el-select v-model="ruleForm.timeUnit" placeholder="请选择单位">
+                      <el-option v-for="item in unitData" :key="item.value" :label="item.label" :value="item.value" />
+                    </el-select>
+                  </div>
+                </el-form-item>
+                <el-form-item label="类型" prop="template">
+                  <el-select v-model="ruleForm.template" filterable placeholder="请选择类型" class="w-35">
+                    <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.key">
+                      <span style="float: left">{{ item.name }}</span>
+                      <span style="float: right; font-size: 13px">{{ item.key }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="分类" prop="category">
+                  <el-select v-model="ruleForm.category" filterable placeholder="请选择分类" class="w-35">
+                    <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.key">
+                      <span style="float: left">{{ item.name }}</span>
+                      <span style="float: right; font-size: 13px">{{ item.key }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label=" " prop="category">
+                  <el-button type="primary">保存</el-button>
+                </el-form-item>
+              </el-form>
+            </el-tab-pane>
+            <el-tab-pane label="绑定实际设备" name="3">
+              <el-form-item label="选择设备" prop="deviceKey">
+                <el-select v-model="ruleForm.deviceKey" filterable placeholder="请选择设备">
+                  <el-option v-for="item in []" :key="item.key" :label="item.name" :value="item.key">
+                    <span style="float: left">{{ item.name }}</span>
+                    <span style="float: right; font-size: 13px">{{ item.key }}</span>
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-tab-pane>
           </el-tabs>
         </template>
       </LrLayout>
 
       <AddOrUpdate ref="addOrUpdateRef" @finish="getTreeList"/>
     </el-card>
-    <!-- <el-card shadow="hover">
-      <div class="system-user-search mb15">
-        <el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
-          <el-form-item label="产品名称" prop="name">
-            <el-input v-model="tableData.param.name" placeholder="请输入产品名称" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
-          </el-form-item>
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-input v-model="tableData.param.deviceType" placeholder="请输入设备类型" clearable size="default" style="width: 240px" @keyup.enter.native="typeList" />
-          </el-form-item>
-          <el-form-item label="发布状态" prop="status" style="width: 200px;">
-            <el-select v-model="tableData.param.status" placeholder="发布状态" clearable size="default" style="width: 240px">
-              <el-option label="已发布" :value="1" />
-              <el-option label="未发布" :value="0" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间" prop="dateRange">
-            <el-date-picker v-model="tableData.param.dateRange" size="default" style="width: 240px" 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="typeList">
-              <el-icon>
-                <ele-Search />
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" @click="resetQuery(queryRef)">
-              <el-icon>
-                <ele-Refresh />
-              </el-icon>
-              重置
-            </el-button>
-            <el-button size="default" type="success" class="ml10" @click="onOpenAddDic" v-auth="'add'">
-              <el-icon>
-                <ele-FolderAdd />
-              </el-icon>
-              新增产品
-            </el-button>
-            <el-button size="default" type="danger" class="ml10" @click="onRowDel(null)" v-auth="'del'">
-              <el-icon>
-                <ele-Delete />
-              </el-icon>
-              删除
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="标识" prop="key" :show-overflow-tooltip="true" v-col="'key'" />
-        <el-table-column label="名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
-        <el-table-column label="分类" prop="categoryName" :show-overflow-tooltip="true" v-col="'categoryName'" />
-        <el-table-column label="消息协议" prop="messageProtocol" :show-overflow-tooltip="true" v-col="'messageProtocol'" />
-        <el-table-column label="接入方式" prop="transportProtocol" :show-overflow-tooltip="true" v-col="'transportProtocol'" />
-        <el-table-column label="类型" prop="deviceType" :show-overflow-tooltip="true" v-col="'deviceType'" />
-
-        <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
-          <template #default="scope">
-            <el-tag type="success" size="small" v-if="scope.row.status">已发布</el-tag>
-            <el-tag type="info" size="small" v-else>未发布</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" width="150" align="center" fixed="right">
-          <template #default="scope">
-            <router-link :to="'/iotmanager/device/product/detail/' + scope.row.id" class="link-type" style="padding-right: 12px;font-size: 12px;color: #409eff;">
-              <span>详情</span>
-            </router-link>
-            <el-button size="small" text type="warning" @click="onOpenEditDic(scope.row)" v-auth="'edit'">修改</el-button>
-            <el-button size="small" text type="danger" @click="onRowDel(scope.row)" v-auth="'del'">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="tableData.total>0" :total="tableData.total" v-model:page="tableData.param.pageNum" v-model:limit="tableData.param.pageSize" @pagination="typeList" />
-    </el-card>
-    <EditDic ref="editDicRef" @typeList="typeList" /> -->
   </div>
 </template>
 
@@ -224,6 +189,8 @@ interface TableDataState {
   tabName: string
   searchVal: string
   treeDetail: any
+  unitData: any
+  ruleForm: any
 }
 
 export default defineComponent({
@@ -249,7 +216,19 @@ export default defineComponent({
       treeLoading: false,
       tabName: '1',
       searchVal: '',
-      treeDetail: {}
+      treeDetail: {},
+			unitData: [
+				{ label: '秒', value: 1 },
+				{ label: '分', value: 2 },
+				{ label: '时', value: 3 },
+				{ label: '天', value: 4 },
+			],
+      ruleForm: {
+        duration: '',
+        timeUnit: '',
+        template: 'default',
+        category: 'default'
+      }
     });
     // 初始化表格数据
     const initTableData = () => {

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

@@ -0,0 +1,923 @@
+<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) {
+		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: [],
+				},
+			},
+		})
+
+		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
+			})
+		}
+
+		// 多选框选中数据
+		const handleSelectionChange = (selection: any[]) => {
+			state.deviceIds = selection.map((item) => item.id)
+		}
+		// 打开弹窗
+		const openDialog = (row: any | null) => {
+			if (row) {
+                const ids = row.id;
+                api.instance.detail(ids).then((res: any) => {
+                    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;
+                    });
+                    //第一次加载
+                    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)
+			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) => {
+			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) => {
+				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>
+
+

+ 186 - 0
src/views/iot/device/instance/component/subDeviceMutipleBind.vue

@@ -0,0 +1,186 @@
+<template>
+	<div class="mutiple-bind-dialog-wrap">
+		<el-dialog title="批量绑定子设备" v-model="isShowDialog" width="90%">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="small" label-width="110px">
+				<el-form-item label="所属产品" prop="productId">
+					<el-select @change="handleChange" v-model="ruleForm.productId" placeholder="请选择所属产品" style="width: 300px;">
+						<el-option v-for="item in productData" :key="item.id" :label="item.name" :value="item.id" />
+					</el-select>
+					<el-button style="margin-left: 20px;" :disabled="!deviceKeyList.length" v-auth="'mutipleBind'" type="primary" @click="confirmBind()">批量绑定</el-button>
+
+				</el-form-item>
+			</el-form>
+			<el-table :data="tableData.data" style="width: 100%" @selection-change="handleSelectionChange" v-loading="tableData.loading">
+				<el-table-column type="selection" width="55" align="center" />
+				<el-table-column label="标识" prop="key" width="130" :show-overflow-tooltip="true" v-col="'key'" />
+				<el-table-column label="设备名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
+				<el-table-column label="产品名称" prop="productName" :show-overflow-tooltip="true" v-col="'productName'" />
+
+				<el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
+				<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" v-col="'registryTime'"></el-table-column>
+				<el-table-column prop="desc" label="说明" v-col="'desc'"></el-table-column>
+
+			</el-table>
+			<pagination
+				v-show="tableData.total > 0"
+				:total="tableData.total"
+				v-model:page="tableData.param.pageNum"
+				v-model:limit="tableData.param.pageSize"
+				@pagination="getDeviceList"
+			/>
+
+		</el-dialog>
+	</div>
+</template>
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue'
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus'
+
+import 'vue3-json-viewer/dist/index.css'
+
+import { useRoute } from 'vue-router'
+
+import api from '/@/api/device'
+
+interface TableDataState {
+    isShowDialog: boolean,
+	productData: object[],
+	deviceKeyList: string[];
+	gatewayKey: string;
+	tableData: {
+		data: []
+		total: number
+		loading: boolean
+		param: {
+			pageNum: number
+			pageSize: number
+			productId: number
+			status: string
+			dateRange: string[]
+		}
+	},
+	ruleForm: {
+		productId: string|number
+	},
+	rules: {}
+
+
+}
+export default defineComponent({
+	name: 'MutipleBindDialog',
+
+	setup(prop, { emit }) {
+		const route = useRoute()
+		const state = reactive<TableDataState>({
+			gatewayKey: '',
+			deviceKeyList: [],
+			isShowDialog: false,
+			productData: [],
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					pageSize: 10,
+					productId: 0,
+					status: '',
+					dateRange: [],
+				},
+			},
+			ruleForm: {
+				productId: ''
+			},
+			rules: {
+				productId: [{ required: true, message: '所属产品不能为空', trigger: 'blur' }],
+			}
+		})
+
+		const getDeviceList = () => {
+			if(!state.ruleForm.productId) {
+				state.tableData.data = [];
+				state.tableData.total = 0;
+				return;
+			}
+
+			state.tableData.loading = true;
+			api.device.getSubList({
+				"productId": state.ruleForm.productId,
+				"pageSize": state.tableData.param.pageSize,
+				"pageNum": state.tableData.param.pageNum
+			}).then((res: any) => {
+				state.tableData.data = res.device;
+				state.tableData.total = res.Total;
+			}).finally(() => (state.tableData.loading = false));
+
+		};
+
+		const getProductList = () => {
+			api.product.getSubList().then((res: any) => {
+				let productDataList = res.product
+				state.productData = productDataList;
+				state.ruleForm.productId = state.productData[0].id
+				getDeviceList()
+				state.isShowDialog = true;
+			});
+		};
+
+		const openDialog = (gatewayKey: any) => {
+			state.gatewayKey = gatewayKey;
+			getProductList()
+		};
+
+		    // 多选框选中数据
+		const handleSelectionChange = (selection: any[]) => {
+			state.deviceKeyList = selection.map((item) => item.key);
+		};
+
+		const confirmBind = () => {
+			let msg = '是否进行批量绑定?';
+			if (state.deviceKeyList.length === 0) {
+				ElMessage.error('请选择要批量绑定的数据。');
+				return;
+			}
+			ElMessageBox.confirm(msg, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+			.then(() => {
+				api.device.mutipleBind({
+					"gatewayKey":state.gatewayKey,
+					"subKeys": state.deviceKeyList
+				}).then(() => {
+					ElMessage.success('绑定成功');
+					emit('bindSuccess')
+					state.isShowDialog = false;
+				});
+			})
+			.catch(() => { });
+		};
+
+		const handleChange = (productId: number) => {
+			state.ruleForm.productId = productId;
+			getDeviceList()
+		}
+
+		return {
+			openDialog,
+			getProductList,
+			confirmBind,
+			getDeviceList,
+			handleSelectionChange,
+			handleChange,
+			...toRefs(state),
+		}
+	},
+})
+</script>
+
+

+ 143 - 19
src/views/iot/device/instance/detail.vue

@@ -97,12 +97,18 @@
                   <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>
+            </table>
+          </div>
+          <div class="flex" style="margin-top: 20px;" >
+          <el-input type="number" style="width: 380px;margin-right: 20px;" v-model.number="detail.onlineTimeout">
+            <template #prepend>设备超时时间</template>
+            <template #append>秒</template>
+          </el-input>
+          <el-button type="primary" @click="onlineTimeoutUpdate">
+            <el-icon style="font-size: 18px;"><ele-Refresh /></el-icon>更新</el-button>
+          </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">
@@ -277,6 +283,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="onOpenMutipleBind()">批量绑定</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 +327,9 @@
     <EditEvent ref="editEventRef" @typeList="getevent" />
     <EditTab ref="editTabRef" @typeList="gettab" />
     <ListDic ref="listDicRef" />
+    <SubDevice ref="subDeviceRef" />
+    <!-- 子设备-批量绑定弹窗 -->
+    <SubDeviceMutipleBind ref="mutipleBindRef" @bindSuccess="getDeviceTableData" />
 
     <el-dialog v-model="dialogVisible" title="返回Json数据" width="30%">
       <JsonViewer :value="jsonData" boxed sort theme="jv-dark" @click="onKeyclick" />
@@ -301,9 +346,7 @@
 import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
 import functionCom from './component/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';
@@ -311,14 +354,27 @@ 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 SubDeviceMutipleBind from './component/subDeviceMutipleBind.vue';
+import api from '/@/api/device';
 
 import { useRoute } from 'vue-router';
 
-import api from '/@/api/device';
-
 interface TableDataState {
   ids: number[];
+  detail: any;
+  deviceKeyList: string[];
+  deviceTableData: {
+    data: [];
+    total: number;
+    loading: boolean;
+    param: {
+      pageNum: number;
+      pageSize: number;
+      gatewayKey: string;
+      dateRange: string[];
+    };
+  };
   tableData: {
     data: [];
     total: number;
@@ -348,7 +404,7 @@ interface TableDataState {
 }
 export default defineComponent({
   name: 'deviceEditPro',
-  components: { EditDic, EditAttr, EditFun, EditEvent, EditTab, devantd, ListDic, functionCom },
+  components: { SubDeviceMutipleBind, SubDevice, EditDic, EditAttr, EditFun, EditEvent, EditTab, devantd, ListDic, functionCom },
 
 	setup(prop, context) {
 		const route = useRoute();
@@ -358,7 +414,10 @@ export default defineComponent({
 		const listDicRef=ref();
 		const editEventRef = ref();
 		const editTabRef = ref();
+    const subDeviceRef = ref();
+    const mutipleBindRef = ref();
 		const state = reactive<TableDataState>({
+      deviceKeyList: [],
 			areaData:[],
 			isShowDialog: false,
 			dialogVisible: false,
@@ -366,10 +425,21 @@ export default defineComponent({
 			jsonData: '',
 			activeName: '3', // 分类数据
 			activetab: 'attr', // 分类数据
-			detail: [],
+			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,
@@ -399,7 +469,6 @@ export default defineComponent({
 		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;
@@ -407,7 +476,6 @@ export default defineComponent({
 				getrunData();
 				api.product.detail(res.data.product.id).then((res: any) => {
 					state.prodetail = res.data;
-					// console.log(res.data);
 				});
 
 				//第一次加载
@@ -415,17 +483,63 @@ export default defineComponent({
 					state.tableData.data = res.Data;
 					state.tableData.total = res.Total;
 				});
+        getDeviceTableData()
 			});
 
 		});
 
+    const mutipleUnbind = () => {
+      let msg = '是否进行批量解绑?';
+      if (state.deviceKeyList.length === 0) {
+        ElMessage.error('请选择要批量解绑的数据。');
+        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;
+      });
+    };
+
+    // 多选框选中数据
+    const handleSelectionChange = (selection: any[]) => {
+      state.deviceKeyList = selection.map((item) => item.key);
+    };
+        
+    // 打开修改产品弹窗
+    const onOpenDetail = (row: any) => {
+      subDeviceRef.value.openDialog(row)
+    };
 
     const onLogDetail = (row: TableDataRow) => {
       state.jsonData = JSON.parse(row.content);
-      console.log(JSON.parse(row.content));
       state.dialogVisible = true;
     };
 
+    const onOpenMutipleBind = () => {
+      mutipleBindRef.value.openDialog(state.deviceTableData.param.gatewayKey);
+    };
+    
+
     //编辑属性
     const onEditAttr = (row: TableDataRow) => {
       editAttrRef.value.openDialog(row, state.product_id);
@@ -581,7 +695,6 @@ export default defineComponent({
     };
 
     const handleClick = (tab: TabsPaneContext, event: Event) => {
-      console.log(tab, event);
       if (tab.props.name == 4) {
         //获取日志
         getlog();
@@ -617,10 +730,8 @@ export default defineComponent({
               temp[index]['list']=temps
 
           });
-
           state.areaData.properties=temp;
       });
-
     };
 
     const getlogtype = () => {
@@ -632,7 +743,6 @@ export default defineComponent({
     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;
       });
@@ -665,7 +775,14 @@ export default defineComponent({
       });
       tinyArea.render();
     }
+    const onlineTimeoutUpdate = () => {
+      if(!state.detail.onlineTimeout) return ElMessage('请先输入设备超时时间')
+      api.device.updateOnlineTimeout({ id: state.detail.id, onlineTimeout: state.detail.onlineTimeout }).then(() => {
+        ElMessage.success('设置成功')
+      })
+    }
     return {
+      onlineTimeoutUpdate,
       tinyAreas,
       editDicRef,
       editAttrRef,
@@ -673,6 +790,8 @@ export default defineComponent({
       editFunRef,
       editEventRef,
       editTabRef,
+      subDeviceRef,
+      mutipleBindRef,
       onOpenListDetail,
       getrunData,
       getlog,
@@ -686,6 +805,8 @@ export default defineComponent({
       onEditAttr,
       getList,
       getproperty,
+      getDeviceTableData,
+      handleSelectionChange,
       getfunction,
       getevent,
       gettab,
@@ -695,7 +816,10 @@ export default defineComponent({
       onOpenEditAttr,
       onOpenEditFun,
       onOpenEditDic,
+      onOpenDetail,
       handleClick,
+      onOpenMutipleBind,
+      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">

+ 42 - 1
src/views/iot/device/product/component/dataParse.vue

@@ -1,12 +1,53 @@
 <template>
 	<codeEditor class="params" ref="mirrorRef" mode="" :content="content"></codeEditor>
+	<el-button type="primary" style="margin-top:20px" @click="saveCode">保存脚本</el-button>
 </template>
 
 <script lang="ts" setup>
 import { onMounted, ref } from 'vue';
 import codeEditor from '/@/components/codeEditor/index.vue'
+import { ElMessage } from 'element-plus';
+import api from '/@/api/device';
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
+
+const emit = defineEmits(['updateScript'])
+
+const props = defineProps({
+	script: String
+})
+
 const content = ref('')
+const mirrorRef = ref()
+
 onMounted(() => {
-	content.value = '{}'
+	content.value = props.script!
 })
+
+function saveCode() {
+	const data = mirrorRef.value.getValue()
+
+	if (data === '') {
+		return toSave(data)
+	}
+
+	try {
+		eval("(" + data + ")")
+		toSave(data)
+	} catch (error) {
+		ElMessage.error('语法校验未通过')
+	}
+}
+
+function toSave(data: string) {
+	api.product.script({
+		id: route.params.id,
+		scriptInfo: data
+	}).then(() => {
+		ElMessage.success('保存成功')
+		emit('updateScript', data)
+	})
+
+}
 </script>

+ 4 - 2
src/views/iot/device/product/component/deviceIn.vue

@@ -1,6 +1,6 @@
 <template>
 	<el-form ref="formRef" :model="formData" :rules="ruleForm" label-width="80px" @keyup.enter="onSubmit">
-		<el-form-item label="上级分类" prop="parentId">
+		<!-- <el-form-item label="上级分类" prop="parentId">
 			<el-cascader :options="typeData" :props="{ checkStrictly: true, multiple: false, emitPath: false, value: 'id', label: 'name' }" placeholder="请选择关联页面" clearable class="w100" v-model="formData.parentId"></el-cascader>
 		</el-form-item>
 		<el-form-item label="关联页面" prop="menuIds">
@@ -11,7 +11,7 @@
 		</el-form-item>
 		<el-form-item label="接口地址" prop="address">
 			<el-input v-model="formData.address" placeholder="接口地址" />
-		</el-form-item>
+		</el-form-item> -->
 	</el-form>
 </template>
 
@@ -23,6 +23,8 @@ import { ruleRequired } from '/@/utils/validator';
 import { ElMessage } from 'element-plus';
 import apiDatahub from '/@/api/datahub';
 
+// TODO 这个页面还没开始开发
+
 const emit = defineEmits(['getList']);
 
 const showDialog = ref(false);

+ 103 - 43
src/views/iot/device/product/component/editPro.vue

@@ -1,7 +1,7 @@
 <template>
 	<div class="system-edit-dic-container">
 		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '产品'" v-model="isShowDialog" width="769px">
-			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="90px">
+			<el-form :model="ruleForm" ref="formRef" :rules="rules" size="default" label-width="100px">
 				<el-form-item label="产品标识" prop="key">
 					<el-input v-model="ruleForm.key" placeholder="请输入产品标识" :disabled="ruleForm.id" />
 				</el-form-item>
@@ -21,17 +21,8 @@
 					</el-cascader>
 				</el-form-item>
 
-				<!-- <el-form-item label="所属部门" prop="deptId">
-          <el-cascader :options="deptData" :props="{ checkStrictly: true, emitPath: false, value: 'deptId', label: 'deptName' }" placeholder="请选择所属部门" clearable class="w100" v-model="ruleForm.deptId">
-            <template #default="{ node, data }">
-              <span>{{ data.deptName }}</span>
-              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
-            </template>
-          </el-cascader>
-        </el-form-item> -->
-
 				<el-form-item label="消息协议" prop="messageProtocol">
-					<el-select v-model="ruleForm.messageProtocol" placeholder="请选择消息协议" @change="changeMessageProtocol">
+					<el-select v-model="ruleForm.messageProtocol" placeholder="请选择消息协议">
 						<el-option v-for="dict in messageData" :key="dict.types" :label="dict.title" :value="dict.types"> </el-option>
 						<!-- 增加系统默认的mqtt选项 -->
 						<el-option label="Sagoo Mqtt" value="SagooMqtt"> </el-option>
@@ -39,16 +30,56 @@
 				</el-form-item>
 
 				<el-form-item label="传输协议" prop="transportProtocol">
-					<el-select v-model="ruleForm.transportProtocol" placeholder="请选择传输协议">
+					<el-select v-model="ruleForm.transportProtocol" placeholder="请选择传输协议" @change="transportProtocolChange">
 						<el-option v-for="dict in network_server_type" :key="dict.value" :label="dict.label" :value="dict.value"> </el-option>
 					</el-select>
 				</el-form-item>
+				<!-- 1,mqtt协议设备的认证
+	在添加设备的页面,增加MQTT服务协议设备的认证方式的处理。
+	当传输协议选择为:MQTT服务的时候,下面出现 认证方式的下拉列,分别为Basic、AccessToken接入两个下拉选项。
+	Basic方式:
+	选择这个方式的时候:页面出现,用户名及密码输入框。
+	AccessToken接入方式:
+	选择这个方式的时候:页面出现 Aceess Token的输入框
+	2,TCP及其它协议认证
+	这些配合【网络组件】功能中涉及到的设备通讯协议认证的处理。如果涉及到证书的,需要调用【证书管理】功能维护的证书列表。 -->
+				<!-- 设备认证、网络组件服务增加认证方式authType(1=Basic,2=AccessToken,3=证书)
+				涉及接口:产品添加、编辑、扩展信息更新;设备添加、编辑;网络组件服务添加、编辑 -->
+				<!-- 设备认证 -->
+				<template v-if="ruleForm.authType === 1 || ruleForm.authType === 2">
+					<el-form-item label="认证方式" prop="">
+						<el-radio-group v-model="ruleForm.authType">
+							<el-radio :label="1">Basic</el-radio>
+							<el-radio :label="2">AccessToken</el-radio>
+						</el-radio-group>
+					</el-form-item>
+					<template v-if="ruleForm.authType === 1">
+						<el-form-item label="用户名" prop="authUser">
+							<el-input v-model="ruleForm.authUser" placeholder="请输入用户名" />
+						</el-form-item>
+						<el-form-item label="密码" prop="authPasswd">
+							<el-input v-model="ruleForm.authPasswd" placeholder="请输入密码" />
+						</el-form-item>
+					</template>
+					<template v-else>
+						<el-form-item label="Aceess Token" prop="accessToken">
+							<el-input v-model="ruleForm.accessToken" placeholder="请输入Aceess Token" />
+						</el-form-item>
+					</template>
+				</template>
+				<template v-else-if="ruleForm.authType === 3">
+					<el-form-item label="认证证书" prop="certificateId">
+						<el-select v-model="ruleForm.certificateId" placeholder="请选择证书">
+							<el-option v-for="cert in certList" :key="cert.id" :label="cert.name" :value="cert.id"> </el-option>
+						</el-select>
+					</el-form-item>
+				</template>
 
 				<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">
@@ -58,7 +89,7 @@
 			<template #footer>
 				<span class="dialog-footer">
 					<el-button @click="onCancel" size="default">取 消</el-button>
-					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+					<el-button type="primary" @click="onSubmit" :loading="submitLoading" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
 				</span>
 			</template>
 		</el-dialog>
@@ -68,16 +99,25 @@
 <script lang="ts">
 import { reactive, toRefs, defineComponent, ref, unref, getCurrentInstance } from 'vue'
 import api from '/@/api/device'
+import certApi from '/@/api/certificateManagement';
 import uploadVue from '/@/components/upload/index.vue'
 import { ElMessage, UploadProps } from 'element-plus'
 import getOrigin from '/@/utils/origin'
 
 interface RuleFormState {
 	id: number
+	categoryId: number | string
+	messageProtocol: string
+	transportProtocol: string
+	deviceType: string
 	name: string
-	dictType: string
+	authType: string
 	status: number
 	desc: string
+	authUser: string
+	authPasswd: string
+	accessToken: string
+	certificateId: string
 }
 interface DicState {
 	isShowDialog: boolean
@@ -86,7 +126,25 @@ interface DicState {
 	deptData: RuleFormState[]
 	messageData: RuleFormState[]
 	tranData: RuleFormState[]
-	rules: {}
+	rules: {},
+	imageUrl: string
+}
+
+const form = {
+	id: 0,
+	name: '',
+	categoryId: '',
+	messageProtocol: '',
+	transportProtocol: '',
+	deviceType: '设备',
+	status: 1,
+	desc: '',
+	authType: '',
+	authUser: '',
+	authPasswd: '',
+	accessToken: '',
+	certificateId: '',
+
 }
 
 export default defineComponent({
@@ -99,7 +157,10 @@ export default defineComponent({
 		const { proxy } = getCurrentInstance() as any
 		const { network_server_type } = proxy.useDict('network_server_type')
 
-		const state = reactive<DicState>({
+		const certList = ref([])
+		const submitLoading = ref(false)
+
+		const state = reactive<DicState | any>({
 			isShowDialog: false,
 			cateData: [], // 分类数据
 			deptData: [], //
@@ -108,23 +169,13 @@ export default defineComponent({
 			tranData: [], //
 			imageUrl: '', //
 			singleImg: baseURL + '/product/icon/upload',
-
 			ruleForm: {
-				id: 0,
-				name: '',
-				categoryId: '',
-				// deptId: '',
-				messageProtocol: '',
-				transportProtocol: '',
-				deviceType: '设备',
-				status: 1,
-				desc: '',
+				...form
 			},
 			rules: {
 				name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
 				key: [{ required: true, message: '产品标识不能为空', trigger: 'blur' }],
 				parentId: [{ required: true, message: '产品分类不能为空', trigger: 'blur' }],
-				// deptId: [{ required: true, message: '所属部门不能为空', trigger: 'blur' }],
 				messageProtocol: [{ required: true, message: '消息协议不能为空', trigger: 'blur' }],
 				transportProtocol: [{ required: true, message: '传输协议不能为空', trigger: 'blur' }],
 				deviceType: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
@@ -148,9 +199,13 @@ export default defineComponent({
 				state.deptData = res || []
 			})
 			api.product.getTypesAll({ handleType: 'protocol' }).then((res: any) => {
-				console.log(res)
 				state.messageData = res || [];
 			});
+
+			// 证书列表
+			certApi.certificateManagement.getAll().then((res: any) => {
+				certList.value = res.Info || []
+			});
 			// api.product.trunsport_protocol_list({ status: -1 }).then((res: any) => {
 			//   state.tranData = res.data || [];
 			// });
@@ -158,21 +213,20 @@ export default defineComponent({
 				// api.dict.getType(row.dictId).then((res:any)=>{
 				//   state.ruleForm = res.data.dictType
 				// }
-
 				state.imageUrl = row.icon
 
 				state.ruleForm = row
+				if (row.authType === 0) {
+					transportProtocolChange(row.transportProtocol)
+				}
+			} else {
+				state.imageUrl = ""
 			}
 			state.isShowDialog = true
 		}
 		const resetForm = () => {
 			state.ruleForm = {
-				id: 0,
-				name: '',
-				dictType: '',
-				deviceType: '设备',
-				status: 1,
-				desc: '',
+				...form
 			}
 		}
 		// 关闭弹窗
@@ -183,9 +237,12 @@ export default defineComponent({
 		const onCancel = () => {
 			closeDialog()
 		}
-		// 消息协议切换的时候,获取新的传输协议列表
-		const changeMessageProtocol = (handleType) => {
-			console.log(handleType)
+		const transportProtocolChange = (type: string) => {
+			if (type === 'mqtt_server') {
+				state.ruleForm.authType = 1
+			} else {
+				state.ruleForm.authType = 3
+			}
 		}
 		// 新增
 		const onSubmit = () => {
@@ -193,33 +250,36 @@ export default defineComponent({
 			if (!formWrap) return
 			formWrap.validate((valid: boolean) => {
 				if (valid) {
+					submitLoading.value = true
 					if (state.ruleForm.id !== 0) {
 						//修改
 						api.product.edit(state.ruleForm).then(() => {
 							ElMessage.success('产品类型修改成功')
 							closeDialog() // 关闭弹窗
 							emit('typeList')
-						})
+						}).finally(() => submitLoading.value = false)
 					} else {
 						//添加
-						console.log(state.ruleForm)
+						// console.log(state.ruleForm)
 						api.product.add(state.ruleForm).then(() => {
 							ElMessage.success('产品类型添加成功')
 							closeDialog() // 关闭弹窗
 							emit('typeList')
-						})
+						}).finally(() => submitLoading.value = false)
 					}
 				}
 			})
 		}
 
 		return {
+			transportProtocolChange,
+			submitLoading,
+			certList,
 			openDialog,
 			handleAvatarSuccess,
 			closeDialog,
 			onCancel,
 			onSubmit,
-			changeMessageProtocol,
 			network_server_type,
 			formRef,
 			...toRefs(state),

+ 9 - 5
src/views/iot/device/product/detail.vue

@@ -169,7 +169,7 @@
 					<deviceIn></deviceIn>
 				</el-tab-pane>
 				<el-tab-pane label="数据解析" name="4" lazy>
-					<dataParse></dataParse>
+					<dataParse v-if="activeName === '4'" :script="detail.scriptInfo" @updateScript="updateScript"></dataParse>
 				</el-tab-pane>
 			</el-tabs>
 		</div>
@@ -199,6 +199,7 @@ import api from '/@/api/device';
 
 interface TableDataState {
 	ids: number[];
+	detail: any;
 	tableData: {
 		data: [];
 		total: number;
@@ -226,9 +227,9 @@ export default defineComponent({
 		const editTabRef = ref();
 		const state = reactive<TableDataState>({
 			isShowDialog: false,
-			activeName: '3', // 分类数据
+			activeName: '1', // 分类数据
 			activetab: 'attr', // 分类数据
-			detail: [],
+			detail: {},
 			developer_status: 0,
 			tableData: {
 				data: [],
@@ -258,8 +259,6 @@ export default defineComponent({
 			});
 		});
 
-
-
 		//编辑属性
 		const onEditAttr = (row: TableDataRow) => {
 			editAttrRef.value.openDialog(row, route.params.id);
@@ -416,6 +415,10 @@ export default defineComponent({
 			console.log(tab, event);
 		};
 
+		const updateScript = (scriptInfo: string) => {
+			state.detail.scriptInfo  = scriptInfo
+		};
+
 		const CkOption = () => {
 
 			if (state.developer_status == 1) {
@@ -437,6 +440,7 @@ export default defineComponent({
 
 		return {
 			Edit,
+			updateScript,
 			editDicRef,
 			editAttrRef,
 			editFunRef,