Browse Source

1.修改设备详情日志分页bug
2.数据源数据建模列表新增标识显示

yukai 2 years ago
parent
commit
484fe1c8c5

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

@@ -264,7 +264,7 @@
             </el-table-column>
             </el-table-column>
           </el-table>
           </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-tab-pane>
       </el-tabs>
       </el-tabs>
     </div>
     </div>

+ 1 - 1
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 :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 type="selection" width="55" align="center" />
         <el-table-column label="ID" align="center" prop="id" width="80" v-col="'id'" />
         <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="name" :show-overflow-tooltip="true" v-col="'name'" />
         <el-table-column label="描述" prop="desc" :show-overflow-tooltip="true" v-col="'desc'" />
         <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'">
         <el-table-column prop="status" label="状态" width="100" align="center" v-col="'status'">

+ 1 - 0
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 :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 type="selection" width="55" align="center" />
         <el-table-column label="ID" align="center" prop="sourceId" width="80" v-col="'sourceId'" />
         <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 label="数据源名称" prop="name" :show-overflow-tooltip="true" v-col="'name'" />
         <el-table-column prop="from" label="数据源类型" width="160" align="center" v-col="'from'">
         <el-table-column prop="from" label="数据源类型" width="160" align="center" v-col="'from'">
           <template #default="scope">
           <template #default="scope">