Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

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

@@ -29,7 +29,7 @@
 								<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> 数据时间</div>
 									<div>{{areaData.lastOnlineTime || '未启用'}}</div>
 								</div>
 							</div>
@@ -56,50 +56,57 @@
 							</div>
 						</div>
 
-						
-				
+
+
 					</div>
 				</el-tab-pane>
 
 
 
 
-				<el-tab-pane label="实例信息" name="1">
+				<el-tab-pane label="设备信息" name="1">
 					<div class="pro-box">
 						<div class="protitle">设备信息</div>
-						<el-button type="" :icon="Edit" class="buttonedit" @click="onOpenEditDic(detail)">编辑</el-button>
-					</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>
-									<!-- <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.createdAt }}</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>
-								</tbody>
+                <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>
@@ -117,11 +124,21 @@
                 <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="120" align="center">
+                  <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>
@@ -264,7 +281,7 @@
             </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="getList" />
+          <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>
@@ -403,7 +420,7 @@ export default defineComponent({
 					state.tableData.total = res.Total;
 				});
 			});
-			
+
 		});
 
 
@@ -586,7 +603,7 @@ export default defineComponent({
           let properties=state.areaData.properties;
 
           var temp = new Array();
-          
+
           properties.forEach(function (item, index) {
               let datalist=item.list;
               temp[index] = [];
@@ -594,17 +611,17 @@ export default defineComponent({
               datalist.forEach(function (a, b) {
                  if(b<15){
                   temps.push(a);
-                 } 
+                 }
               });
               temp[index]['name']=item.name
-              temp[index]['key']=item.key 
+              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;
       });
 
@@ -735,6 +752,8 @@ export default defineComponent({
 .content-box .pro-box {
 	display: flex;
 	padding: 10px;
+  justify-content: space-between;
+
 }
 .content-box .pro-box .protitle {
 	font-size: 18px;
@@ -819,10 +838,10 @@ tr {
 .ant-card {
 	box-sizing: border-box;
 	margin: 10px;
-	width: 23.5%;
+	width: 23.2%;
 	font-size: 14px;
 	font-variant: tabular-nums;
-  border: 1px solid #eee;
+  border: 1px solid  var(--next-border-color-light);
 
 	line-height: 1.5;
 	list-style: none;

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

@@ -51,10 +51,10 @@
       </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="ID" align="center" prop="id" width="60" v-col="'id'" />
-	    <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="ID" align="center" prop="id" width="60" v-col="'id'" />-->
+	    <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 label="部门" prop="deptName" :show-overflow-tooltip="true" v-col="'deptName'"/> -->
 
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">
@@ -65,7 +65,9 @@
           </template>
         </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="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 label="操作" width="200" align="center" fixed="right">
           <template #default="scope">
 

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

@@ -4,7 +4,7 @@
 			<div class="cont_box">
 				<div class="title">产品：{{ detail.name }}</div>
 				<div class="pro-status" ><span :class="developer_status==1?'on':'off'"></span>{{developer_status==1?'已发布':'未发布'}}</div>
-			
+
 				<div class="pro-option"  @click="CkOption"> {{developer_status==1?'停用':'启用'}}</div>
 			</div>
 		</div>
@@ -35,7 +35,7 @@
 									<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>
-									
+
 								</tr>
 								<tr class="ant-descriptions-row">
 									<th class="ant-descriptions-item-label ant-descriptions-item-colon">描述</th>
@@ -57,11 +57,21 @@
 								<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="120" align="center">
+									<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>
@@ -246,7 +256,7 @@ export default defineComponent({
 			});
 		});
 
-	
+
 
 		//编辑属性
 		const onEditAttr=(row: TableDataRow)=>{
@@ -297,7 +307,7 @@ export default defineComponent({
 		// 删除产品
 		const onRowDel = (key,type) => {
 			let msg = `此操作将永久删除该数据吗？，是否继续?`;
-			
+
 			if (key.length === 0) {
 				ElMessage.error('请选择要删除的数据。');
 				return;
@@ -417,9 +427,9 @@ export default defineComponent({
 					state.developer_status=1;
 				});
 			}
-			
 
-			
+
+
 
 		}
 

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

@@ -48,13 +48,13 @@
       </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="ID" align="center" prop="id" width="60"  v-col="'id'"/>
+<!--        <el-table-column label="ID" align="center" prop="id" width="60"  v-col="'id'"/>-->
         <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="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="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'">

src/views/system/datahub/modeling/index.vue

@@ -40,7 +40,7 @@
       <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="ID" align="center" prop="id" width="80" v-col="'id'" />
-        <!--				<el-table-column label="模型标识" prop="key" :show-overflow-tooltip="true" />-->
+       <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="desc" :show-overflow-tooltip="true" v-col="'desc'" />
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">

src/views/system/datahub/source/index.vue

@@ -47,6 +47,7 @@
       <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="ID" align="center" prop="sourceId" width="80" v-col="'sourceId'" />
+        <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 prop="from" label="数据源类型" width="160" align="center" v-col="'from'">
           <template #default="scope">