1

src/views/iot/device/category/index.vue

@@ -27,7 +27,7 @@
         <el-table-column prop="name" label="分类名称" v-col="'name'" show-overflow-tooltip> </el-table-column>
         
        
-        <el-table-column prop="createdAt" label="创建时间" align="center" min-width="180" v-col="'createdAt'"></el-table-column>
+        <el-table-column prop="desc" label="描述" align="center" min-width="180" v-col="'desc'"></el-table-column>
         <el-table-column label="操作" align="center" width="140" fixed="right">
           <template #default="scope">
             <el-button size="small" type="text" @click="onOpenAdd(scope.row)" v-auth="'add'">新增</el-button>

src/views/iot/device/instance/detail.vue

@@ -11,6 +11,59 @@
 
 		<div class="content-box">
 			<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
+
+				<el-tab-pane label="运行状态" name="3">
+					<div style="background-color: rgb(240, 242, 245); 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}}</div>
+								<div class="cardflex">
+									<devantd :json="item.list" :antdid="item.key" v-if="item.type=='int'"/>
+								</div>
+							</div>
+						</div>
+
+						
+				
+					</div>
+				</el-tab-pane>
+
+
+
+
 				<el-tab-pane label="实例信息" name="1">
 					<div class="pro-box">
 						<div class="protitle">设备信息</div>
@@ -25,21 +78,22 @@
 									<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>
-									<th class="ant-descriptions-item-label ant-descriptions-item-colon">所属部门</th>
-									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deptName }}</td>
+									<!-- <th class="ant-descriptions-item-label ant-descriptions-item-colon">所属部门</th>
+									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deptName }}</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.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>
+									<th class="ant-descriptions-item-label ant-descriptions-item-colon">创建时间</th>
+									<td class="ant-descriptions-item-content" colspan="1">{{ prodetail.createdAt }}</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.createdAt }}</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>
@@ -170,54 +224,7 @@
 						/>
 					</div>
 				</el-tab-pane>
-				<el-tab-pane label="运行状态" name="3">
-					<div style="background-color: rgb(240, 242, 245); 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}}</div>
-								<div class="cardflex">
-									<devantd :json="item.list" :antdid="item.key" v-if="item.type=='int'"/>
-								</div>
-							</div>
-						</div>
-
-						
-				
-					</div>
-				</el-tab-pane>
+		
 
 				<el-tab-pane label="日志管理" name="4">
 					<div class="system-user-search mb15">
@@ -361,7 +368,7 @@ export default defineComponent({
 			dialogVisible: false,
 			logTypeData: [],
 			jsonData: '',
-			activeName: '1', // 分类数据
+			activeName: '3', // 分类数据
 			activetab: 'attr', // 分类数据
 			detail: [],
 			prodetail: [],
@@ -400,6 +407,7 @@ export default defineComponent({
 				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);
@@ -411,6 +419,7 @@ export default defineComponent({
 					state.tableData.total = res.Total;
 				});
 			});
+			
 		});
 
 		const onLogDetail = (row: TableDataRow) => {

src/views/iot/device/instance/index.vue

@@ -55,7 +55,7 @@
 	    <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="productName" :show-overflow-tooltip="true" v-col="'productName'"/>
-        <el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/>
+        <!-- <el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
 
 
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">

src/views/iot/device/product/component/editPro.vue

@@ -23,14 +23,14 @@
           </el-cascader>
         </el-form-item>
 
-        <el-form-item label="所属部门" prop="deptId">
+        <!-- <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> -->
 
 
         <el-form-item label="消息协议" prop="messageProtocol">
@@ -116,7 +116,7 @@ export default defineComponent({
         id: 0,
         name: '',
         categoryId: '',
-        deptId: '',
+        // deptId: '',
         messageProtocol: '',
         transportProtocol: '',
         deviceType: '设备',
@@ -131,7 +131,7 @@ export default defineComponent({
           { required: true, message: "产品标识不能为空", trigger: "blur" }
         ],
         parentId: [{ required: true, message: '产品分类不能为空', trigger: 'blur' }],
-        deptId: [{ 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' }],
@@ -183,6 +183,7 @@ export default defineComponent({
         id: 0,
         name: '',
         dictType: '',
+        deviceType: '设备',
         status: 1,
         desc: ''
       }

src/views/iot/device/product/detail.vue

@@ -21,20 +21,21 @@
 						<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.name }}</td>
+									<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.categoryName }}</td>
-									<th class="ant-descriptions-item-label ant-descriptions-item-colon">所属部门</th>
-									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deptName }}</td>
+									<!-- <th class="ant-descriptions-item-label ant-descriptions-item-colon">所属部门</th>
+									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deptName }}</td> -->
+									<th class="ant-descriptions-item-label ant-descriptions-item-colon">设备类型</th>
+									<td class="ant-descriptions-item-content" colspan="1">{{ detail.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">{{ detail.messageProtocol }}</td>
 									<th class="ant-descriptions-item-label ant-descriptions-item-colon">链接协议</th>
 									<td class="ant-descriptions-item-content" colspan="1">{{ detail.transportProtocol }}</td>
-									<th class="ant-descriptions-item-label ant-descriptions-item-colon">设备类型</th>
-									<td class="ant-descriptions-item-content" colspan="1">{{ detail.deviceType }}</td>
+									
 								</tr>
 								<tr class="ant-descriptions-row">
 									<th class="ant-descriptions-item-label ant-descriptions-item-colon">描述</th>

src/views/iot/device/product/index.vue

@@ -52,7 +52,7 @@
         <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="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/>
+        <!-- <el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
         <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'"/>