From c8bde428a889fc7abe0a89bb6c85182586c495fa Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 11 Dec 2024 17:46:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20team=20=E7=BC=96=E8=BE=91=E5=90=8E?=
 =?UTF-8?q?=E6=9C=AA=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enm_base/team.vue | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/enm_base/team.vue b/src/views/enm_base/team.vue
index 54243c7b..91faafd2 100644
--- a/src/views/enm_base/team.vue
+++ b/src/views/enm_base/team.vue
@@ -136,16 +136,21 @@
 						this.isSaveing = true;
 						let res;
 						if(this.type==='add'){
-							res = this.$API.mtm.team.create.req(that.form);
+							this.$API.mtm.team.create.req(that.form).then(res=>{
+								this.isSaveing = false;
+								this.limitedVisible = false;
+								this.$refs.table.refresh();
+							}).catch(e=>{
+								this.isSaveing = false;
+							})
 						}else{
-							res = this.$API.mtm.team.update.req(that.form.id,that.form);
-						}
-						if(res.err_msg){
-							this.$message.error(res.err_msg);
-						}else{
-							this.isSaveing = false;
-							this.limitedVisible = false;
-							this.$refs.table.refresh();
+							this.$API.mtm.team.update.req(that.form.id,that.form).then(res=>{
+								this.isSaveing = false;
+								this.limitedVisible = false;
+								this.$refs.table.refresh();
+							}).catch(e=>{
+								this.isSaveing = false;
+							})
 						}
 					}
 				})
@@ -154,7 +159,7 @@
 			//编辑班组
 			handleEdit(row){
 				this.type='edit';
-				this.form=row;
+				this.form=Object.assign({},row);
 				this.limitedVisible = true;
 			},
 			//删除班组

From 5d94b203203172629a7f0654a5546d2e90f06bb8 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 11 Dec 2024 17:48:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=B5=8B?=
 =?UTF-8?q?=E7=82=B9=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/em/mpoint.vue      | 23 +++++++++++++-
 src/views/em/mpoint_form.vue | 60 ++++++++++++++++++++++--------------
 2 files changed, 59 insertions(+), 24 deletions(-)

diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
index c11ab022..7e1f3d26 100644
--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@@ -23,11 +23,31 @@
 				>
 			</div>
 			<div class="right-panel">
+				<xtSelect
+					:apiObj="apiObjEm"
+					v-model="query.ep_belong"
+					style="width: 150px"
+					@change="handleQuery"
+					placeholder="所属"
+				>
+					<el-table-column label="编号" prop="number"></el-table-column>
+					<el-table-column label="名称" prop="name"></el-table-column>
+				</xtSelect>
+				<xtSelect
+					:apiObj="apiObjEm"
+					v-model="query.ep_monitored"
+					style="width: 150px"
+					@change="handleQuery"
+					placeholder="所监测"
+				>
+					<el-table-column label="编号" prop="number"></el-table-column>
+					<el-table-column label="名称" prop="name"></el-table-column>
+				</xtSelect>
 				<xtSelect
 					:apiObj="apiObjM"
 					:params="paramsM"
 					v-model="query.material"
-					style="width: 180px"
+					style="width: 150px"
 					@change="handleQuery"
 					placeholder="计量物料"
 				>
@@ -363,6 +383,7 @@ export default {
 			paramsM: {},
 			apiObj: this.$API.enm.mpoint.list,
 			apiObjMplog: null,
+			apiObjEm: this.$API.em.equipment.list,
 			params: {},
 			params1: {},
 			query: {},
diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index 067fc59a..f802c2f4 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -91,25 +91,7 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="24">
-							<el-form-item label="所属设备">
-								<el-select
-									v-model="form.ep_belong"
-									placeholder="所属设备"
-									clearable
-									filterable
-									style="width: 100%"
-									@clear="() => { form.ep_belong=null } "
-								>
-									<el-option
-										v-for="item in epOptions"
-										:key="item.id"
-										:label="item.name"
-										:value="item.id"
-									></el-option>
-								</el-select>
-							</el-form-item>
-						</el-col>
+						
 						<el-col :md="12" :sm="24">
 							<el-form-item
 								label="所属工段"
@@ -220,17 +202,38 @@
 								></el-input>
 							</el-form-item>
 						</el-col>
-						<el-divider />
+						<el-divider/>
+						<el-col :md="12" :sm="24">
+							<el-form-item label="所属设备">
+								<el-select
+									v-model="form.ep_belong"
+									placeholder="所属设备"
+									clearable
+									filterable
+									style="width: 100%"
+									@clear="() => { form.ep_belong=null } "
+								>
+									<el-option
+										v-for="item in epOptions"
+										:key="item.id"
+										:label="item.name"
+										:value="item.id"
+									></el-option>
+								</el-select>
+							</el-form-item>
+						</el-col>
 						<el-col :md="12" :sm="24">
 							<el-form-item
-								label="是否表示运行状态"
+								label="是否表示所属设备运行状态"
 								label-width="220"
 							>
 								<el-switch
-									v-model="form.is_rep_ep_running_state"
+									v-model="form.is_rep_ep0_running_state"
 								/>
 							</el-form-item>
 						</el-col>
+						<el-divider />
+						
 						<el-col :md="12" :sm="24">
 							<el-form-item label="所监测设备">
 								<el-select
@@ -238,6 +241,7 @@
 									placeholder="所监测设备"
 									clearable
 									filterable
+									:value-on-clear="null"
 									style="width: 100%"
 								>
 									<el-option
@@ -249,7 +253,16 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						
+						<el-col :md="12" :sm="24">
+							<el-form-item
+								label="是否表示所监测设备运行状态"
+								label-width="220"
+							>
+								<el-switch
+									v-model="form.is_rep_ep_running_state"
+								/>
+							</el-form-item>
+						</el-col>
 						<el-col :md="8" :sm="24">
 							<el-form-item
 								label="状态量基准值"
@@ -376,6 +389,7 @@ export default {
 				interval: 10,
 				func_on_change: "",
 				is_rep_ep_running_state: false,
+				is_rep_ep0_running_state: false
 			},
 			rules: {
 				name: [{ required: true, message: "请输入测点名称" }],