修改设备详情 运行状态不显示

src/components/devantd/index.vue

@@ -20,12 +20,11 @@ const props = defineProps({
 onMounted(() => {
 	const tinyArea = new TinyArea(props.antdid, {
 		height: 60,
-		autoFit: false,
+		autoFit: true,
 		data: props.json,
 		smooth: true,
 		areaStyle: {
 			fill: '#873bf4',
-			
 		},
 	// 	tooltip: {
 	// 		customContent: (title, data) => {

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

@@ -50,8 +50,8 @@
 								</div>
 
 								<div class="statusname">{{item.value}}</div>
-								<div class="cardflex">
-									<devantd :json="item.list" :antdid="item.key" v-if="item.type=='int'"/>
+								<div class="">
+									<devantd :json="item.list" :antdid="item.key" v-if="item.type=='int' || item.type=='float'"/>
 								</div>
 							</div>
 						</div>
@@ -797,7 +797,7 @@ tr {
 .ant-card {
 	box-sizing: border-box;
 	margin: 10px;
-	width: 23.8%;
+	width: 23.5%;
 	color: rgba(0, 0, 0, 0.65);
 	font-size: 14px;
 	font-variant: tabular-nums;

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

@@ -42,6 +42,7 @@
         <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="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'">
           <template #default="scope">
             <el-tag type="success" size="small" v-if="scope.row.status==1">已发布</el-tag>
@@ -138,7 +139,7 @@ export default defineComponent({
     };
     // 打开修改模型弹窗
     const onOpenEdit = (row: TableDataRow) => {
-      editDicRef.value.openDialog(row);
+      editDicRef.value.openDialog({ ...row });
     };
     //打开数据记录
     const onOpenRecord = (row: TableDataRow) => {

src/views/system/datahub/source/component/edit.vue

@@ -145,14 +145,16 @@
 					</el-radio-group>
 				</el-form-item>
 
-					<el-form-item label="主机地址" >
+					<div class="inline">
+						<el-form-item label="主机地址" >
 							<el-input v-model="tabconfig.host" placeholder="请输入主机地址"   />
 						</el-form-item>
 
 						<el-form-item label="端口号">
 							<el-input v-model="tabconfig.port" placeholder="请输入端口号" />
 						</el-form-item>
-
+					</div>
+					<div class="inline">
 						<el-form-item label="用户名">
 							<el-input v-model="tabconfig.user" placeholder="请输入用户名" />
 						</el-form-item>
@@ -160,11 +162,27 @@
 						<el-form-item label="密码">
 							<el-input v-model="tabconfig.passwd" placeholder="请输入密码" />
 						</el-form-item>
-
+					</div>
+					
 						<el-form-item label="数据库名称">
 							<el-input v-model="tabconfig.dbName" placeholder="请输入数据库名称" />
 						</el-form-item>
 
+						<el-form-item label="执行方式" prop="type">
+							<el-radio-group v-model="tabconfig.tabtype" >
+								<el-radio label="tab">数据表</el-radio>
+								<el-radio label="sql">Sql</el-radio>
+							
+							</el-radio-group>
+						</el-form-item>
+						
+						<el-form-item label="">
+							<el-input
+								v-model="textarea2"
+								type="textarea"
+							/>
+						</el-form-item>
+
 						<el-form-item label="表名称">
 							<el-input v-model="tabconfig.tableName" placeholder="请输入表名称" />
 						</el-form-item>
@@ -606,6 +624,9 @@ export default defineComponent({
 });
 </script>
 <style>
+.inline{
+	display: inline-flex;
+}
 .el-input__wrapper {
 	width: 98%;
 }