From ab1885c3b45e65162bf65543fc289842c9574f50 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 24 九月 2024 11:47:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/model/pre/predict/index.vue |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/model/pre/predict/index.vue b/src/views/model/pre/predict/index.vue
index 1e6ff7f..f9c37e2 100644
--- a/src/views/model/pre/predict/index.vue
+++ b/src/views/model/pre/predict/index.vue
@@ -53,18 +53,18 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="编号" align="center" prop="itemno" />
       <el-table-column label="预测项名" align="center" prop="itemname" />
-      <el-table-column label="类型ID" align="center" prop="itemtypeid" />
+<!--      <el-table-column label="类型ID" align="center" prop="itemtypeid" />-->
       <el-table-column label="类型名称" align="center" prop="itemtypename" />
       <el-table-column label="粒度" align="center" prop="granularity" />
       <el-table-column label="是否融合" align="center" prop="isfuse" />
       <el-table-column label="是否检查" align="center" prop="workchecked" />
-      <el-table-column label="模块ID" align="center" prop="moduleid" />
+<!--      <el-table-column label="模块ID" align="center" prop="moduleid" />-->
       <el-table-column label="排序" align="center" prop="itemorder" />
       <el-table-column label="是否启用" align="center" prop="status" />
-      <el-table-column label="类别ID" align="center" prop="categoryid" />
-      <el-table-column label="数据点ID" align="center" prop="pointid" />
+<!--      <el-table-column label="类别ID" align="center" prop="categoryid" />-->
+<!--      <el-table-column label="数据点ID" align="center" prop="pointid" />-->
       <el-table-column label="数据点名称" align="center" prop="tagname" />
-      <el-table-column label="存放表ID" align="center" prop="resulttableid" />
+<!--      <el-table-column label="存放表ID" align="center" prop="resulttableid" />-->
       <el-table-column label="存放表" align="center" prop="tablename" />
 
       <el-table-column label="操作" align="center" min-width="110" fixed="right">

--
Gitblit v1.9.3