From e8bb37d87f6eba04cea7311ce9206e1b53182217 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Sun, 28 Apr 2024 17:02:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20mpoint=5Fform=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/mpoint.vue      | 14 +++++++++-----
 src/views/em/mpoint_form.vue | 12 +++++++++++-
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
index e22a7799..38bf1995 100644
--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@@ -8,18 +8,22 @@
         <el-button type="primary" @click="batchUpdate" v-auth="'mpoint.update'">批量修改</el-button>
       </div>
       <div class="right-panel">
-        <el-select v-model="query.enabled" placeholder="是否启用" @change="handleQuery" clearable>
+        <el-select v-model="query.enabled" placeholder="是否启用" @change="handleQuery" clearable style="width:100px">
           <el-option v-for="e in boolEnum.values" :key="e.key" :value="e.key"
                                 :label="e.text"></el-option>
         </el-select>
-        <el-select v-model="query.type" placeholder="测点类型" @change="handleQuery" clearable>
+        <el-select v-model="query.type" placeholder="测点类型" @change="handleQuery" clearable style="width:100px">
           <el-option v-for="e in mpointTypeEnum.values" :key="e.key" :value="e.key"
                                 :label="e.text"></el-option>
         </el-select>
-        <el-select v-model="query.val_type" placeholder="值类型" @change="handleQuery" clearable>
+        <el-select v-model="query.val_type" placeholder="值类型" @change="handleQuery" clearable style="width:100px">
           <el-option v-for="e in valTypeEnum.values" :key="e.key" :value="e.key"
                                 :label="e.text"></el-option>
         </el-select>
+        <el-select v-model="query.need_display" placeholder="是否展示" @change="handleQuery" clearable style="width:100px">
+          <el-option v-for="e in boolEnum.values" :key="e.key" :value="e.key"
+                                :label="e.text"></el-option>
+        </el-select>
         <el-input
             v-model="query.search"
             placeholder="名称/代号"
@@ -38,7 +42,7 @@
 				<el-table-column type="selection" width="50" />
 				<el-table-column label="名称" prop="name" width="200" show-overflow-tooltip sortable></el-table-column>
         <el-table-column label="别名" prop="nickname" width="120" show-overflow-tooltip sortable></el-table-column>
-        <el-table-column label="代号" prop="code" width="130" show-overflow-tooltip></el-table-column>
+        <el-table-column label="代号" prop="code" width="130" show-overflow-tooltip sortable></el-table-column>
         <el-table-column label="是否启用" width="80">
           <template #default="scope">
               <el-icon v-if="scope.row.enabled" color="green"
@@ -74,7 +78,7 @@
               <el-icon v-else color="red"><CircleCloseFilled /></el-icon>
             </template>
         </el-table-column>
-        <el-table-column label="报告排序" prop="report_sortstr" width="100">
+        <el-table-column label="报告排序" prop="report_sortstr" width="100" sortable>
         </el-table-column>
 				<el-table-column label="创建时间" prop="create_time" show-overflow-tooltip sortable width="160"></el-table-column>
 				<el-table-column label="操作" fixed="right" align="center" width="140">
diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index b4650f89..2ab908f4 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -223,7 +223,17 @@
 							</el-form-item>
 						</el-col>
 						<el-divider/>
-						<el-col :md="24" :sm="24">
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="是否代表所分配工段数据"
+								label-width="220"
+							>
+								<el-switch
+									v-model="form.is_rep_mgroup"
+								/>
+							</el-form-item>
+						</el-col>
+						<el-col :md="12" :sm="24">
 							<el-form-item
 								label="累计量工段分配"
 								label-width="120"