diff --git a/src/api/model/em.js b/src/api/model/em.js
index 0f2e92f3..d2fc2250 100644
--- a/src/api/model/em.js
+++ b/src/api/model/em.js
@@ -2,10 +2,10 @@ import config from "@/config"
 import http from "@/utils/request"
 /*EM接口*/
 export default {
-	// 测点集
-	mgroup: {
+	// 设备
+	equipment: {
 		list: {
-			name: "测点集列表",
+			name: "设备列表",
 			req: async function(data){
 				return await http.get(
 					`${config.API_URL}/em/equipment/`,
@@ -14,7 +14,7 @@ export default {
 			}
 		},
 		item: {
-			name: "获取测点集详情",
+			name: "获取设备详情",
 			req: async function(id){
 				return await http.get(
 					`${config.API_URL}/em/equipment/${id}/`
diff --git a/src/api/model/enm.js b/src/api/model/enm.js
index 38e41d2f..5395741b 100644
--- a/src/api/model/enm.js
+++ b/src/api/model/enm.js
@@ -2,74 +2,6 @@ import config from "@/config"
 import http from "@/utils/request"
 /*EM接口*/
 export default {
-	// 测点集
-	mgroup: {
-		list: {
-			name: "测点集列表",
-			req: async function(data){
-				return await http.get(
-					`${config.API_URL}/enm/mgroup/`,
-					data
-				);
-			}
-		},
-		item: {
-			name: "获取测点集详情",
-			req: async function(id){
-				return await http.get(
-					`${config.API_URL}/enm/mgroup/${id}/`
-				);
-			}
-		},
-		update: {
-			name: "更新",
-			req: async function(id, data){
-				return await http.put(
-					`${config.API_URL}/enm/mgroup/${id}/`,
-					data);
-			}
-		},
-        create: {
-			name: "创建",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/mgroup/`,
-					data);
-			}
-		},
-        delete: {
-			name: "删除",
-			req: async function(id){
-				return await http.delete(
-					`${config.API_URL}/enm/mgroup/${id}/`);
-			}
-		},
-		deletes: {
-			name: "批量删除",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/mgroup/deletes/`,
-					data);
-			}
-		},
-        cquery: {
-			name: "复杂查询",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/mgroup/cquery/`,
-					data);
-			}
-		},
-		deleteHard: {
-			name: "批量物理删除",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/mgroup/deletes_hard/`,
-					data);
-			}
-		},
-	},
-	
 	// 测点
 	mpoint: {
 		mplog: {
@@ -146,71 +78,4 @@ export default {
 			}
 		},
 	},
-	//班组
-	team: {
-		list: {
-			name: "班组列表",
-			req: async function(data){
-				return await http.get(
-					`${config.API_URL}/enm/team/`,
-					data
-				);
-			}
-		},
-		item: {
-			name: "获取详情",
-			req: async function(id){
-				return await http.get(
-					`${config.API_URL}/enm/team/${id}/`
-				);
-			}
-		},
-		update: {
-			name: "更新",
-			req: async function(id, data){
-				return await http.put(
-					`${config.API_URL}/enm/team/${id}/`,
-					data);
-			}
-		},
-        create: {
-			name: "创建",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/team/`,
-					data);
-			}
-		},
-		delete: {
-			name: "删除",
-			req: async function(id){
-				return await http.delete(
-					`${config.API_URL}/enm/team/${id}/`);
-			}
-		},
-		deletes: {
-			name: "批量删除",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/team/deletes/`,
-					data);
-			}
-		},
-		cquery: {
-			name: "复杂查询",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/team/cquery/`,
-					data);
-			}
-		},
-		deleteHard: {
-			name: "批量物理删除",
-			req: async function(data){
-				return await http.post(
-					`${config.API_URL}/enm/team/deletes_hard/`,
-					data);
-			}
-		},
-	},
 }
\ No newline at end of file
diff --git a/src/api/model/mtm.js b/src/api/model/mtm.js
new file mode 100644
index 00000000..1a10984c
--- /dev/null
+++ b/src/api/model/mtm.js
@@ -0,0 +1,283 @@
+import config from "@/config"
+import http from "@/utils/request"
+/*EM接口*/
+export default {
+	// 目标
+	goal: {
+		list: {
+			name: "目标列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/mtm/goal/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取目标详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/mtm/goal/${id}/`
+				);
+			}
+		},
+		create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/goal/`,
+					data);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/mtm/goal/${id}/`,
+					data);
+			}
+		},
+        delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/mtm/goal/${id}/`);
+			}
+		},
+		deletes: {
+			name: "批量删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/goal/deletes/`,
+					data);
+			}
+		},
+        cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/goal/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/goal/deletes_hard/`,
+					data);
+			}
+		},
+	},
+	// 产品
+	material: {
+		list: {
+			name: "产品列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/mtm/material/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取产品详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/mtm/material/${id}/`
+				);
+			}
+		},
+		create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/material/`,
+					data);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/mtm/material/${id}/`,
+					data);
+			}
+		},
+        delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/mtm/material/${id}/`);
+			}
+		},
+		deletes: {
+			name: "批量删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/material/deletes/`,
+					data);
+			}
+		},
+        cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/material/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/material/deletes_hard/`,
+					data);
+			}
+		},
+	},
+	// 测点集
+	mgroup: {
+		list: {
+			name: "测点集列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/mtm/mgroup/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取测点集详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/mtm/mgroup/${id}/`
+				);
+			}
+		},
+		create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/mgroup/`,
+					data);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/mtm/mgroup/${id}/`,
+					data);
+			}
+		},
+        delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/mtm/mgroup/${id}/`);
+			}
+		},
+		deletes: {
+			name: "批量删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/mgroup/deletes/`,
+					data);
+			}
+		},
+        cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/mgroup/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/mgroup/deletes_hard/`,
+					data);
+			}
+		},
+	},
+	//班次
+	shift: {
+		name: "班次列表",
+		req: async function(data){
+			return await http.get(
+				`${config.API_URL}/mtm/team/`,
+				data
+			);
+		}
+	},
+	//班组
+	team: {
+		list: {
+			name: "班组列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/mtm/team/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/mtm/team/${id}/`
+				);
+			}
+		},
+		create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/team/`,
+					data);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/mtm/team/${id}/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/mtm/team/${id}/`);
+			}
+		},
+		deletes: {
+			name: "批量删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/team/deletes/`,
+					data);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/team/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/mtm/team/deletes_hard/`,
+					data);
+			}
+		},
+	},
+}
\ No newline at end of file
diff --git a/src/api/model/qm.js b/src/api/model/qm.js
index f8f2c17e..1bbaaf67 100644
--- a/src/api/model/qm.js
+++ b/src/api/model/qm.js
@@ -2,6 +2,7 @@ import config from "@/config"
 import http from "@/utils/request"
 
 export default {
+	//质量分析报告
 	getQuastat: {
 		url: `${config.API_URL}/qm/quastat/`,
 		name: "质量报告分析",
@@ -9,6 +10,7 @@ export default {
 			return await http.get(this.url, data);
 		}
 	},
+	//班组记录添加质量分析
 	createQuastat: {
 		url: `${config.API_URL}/qm/quastat/`,
 		name: "质量报告分析",
@@ -16,6 +18,7 @@ export default {
 			return await http.post(this.url, data);
 		}
 	},
+	//质检项目
 	getTestItem: {
 		url: `${config.API_URL}/qm/testitem/`,
 		name: "质检项目",
diff --git a/src/config/route.js b/src/config/route.js
index ce094f5e..bdeeaad2 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -207,14 +207,14 @@ const routes = [
         "component": "em/equipment"
       },
       {
-        "name": "equipment2",
-        "path": "/em/equipment2",
+        "name": "monitoring",
+        "path": "/em/monitoring",
         "meta": {
           "title": "计量设备",
           "icon": "el-icon-grid",
           "perms": ["equipment"]
         },
-        "component": "em/equipment2"
+        "component": "em/monitoring"
       },
       {
         "name": "em",
@@ -811,6 +811,48 @@ const routes = [
       
     ]
   },
+  {
+    "name": "ungrouped",
+    "path": "/ungrouped",
+    "meta": {
+      "title": "未分组",
+      "icon": "el-icon-grid",
+      "type": "menu",
+      "perms": ["bi"]
+    },
+    "children": [
+      {
+        "name": "mgruop",
+        "path": "/ungrouped/mgruop",
+        "meta": {
+          "title": "测点集",
+          "icon": "el-icon-grid",
+          "perms": ["dataset"]
+        },
+        "component": "ungrouped/mgroup"
+      },
+      {
+        "name": "mpoint",
+        "path": "/ungrouped/mpoint",
+        "meta": {
+          "title": "测点",
+          "icon": "el-icon-grid",
+          "perms": ["dataset"]
+        },
+        "component": "ungrouped/mpoint"
+      },
+      {
+        "name": "goalSetting",
+        "path": "/ungrouped/goalSetting",
+        "meta": {
+          "title": "月度年度目标值",
+          "icon": "el-icon-grid",
+          "perms": ["dataset"]
+        },
+        "component": "ungrouped/goalSetting"
+      },
+    ]
+  },
   {
     "name": "sys",
     "path": "/sys",
@@ -843,6 +885,17 @@ const routes = [
         },
         "component": "sys/dept"
       },
+      {
+        "path": "/sys/team",
+        "name": "team",
+        "meta": {
+          "title": "班组管理",
+          "icon": "el-icon-postcard",
+          "type": "menu",
+          // "perms": ["team"]
+        },
+        "component": "sys/team"
+      },
       {
         "path": "/sys/post",
         "name": "post",
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 5851a265..696f1dda 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -26,6 +26,7 @@
         :apiObj="apiObj"
         row-key="id"
         stripe
+        :params="query"
       >
         <el-table-column type="index" width="50"/>
         <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
@@ -120,8 +121,12 @@ export default {
         save: false,
         permission: false,
       },
-      apiObj: this.$API.rpm.rparty.list,
-      query: {},
+      apiObj: this.$API.em.equipment.list,
+      query: {
+        page:1,
+        page_size:20,
+        type:10
+      },
       selection: [],
       state_: {
           10: '完好',
diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 909d2011..9ce0b4d6 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -100,7 +100,7 @@
             </el-form-item>
           </el-col>
           <el-col :md="12" :sm="24">
-            <el-form-item label="保管人" prop="keeper_name">
+            <el-form-item label="责任人" prop="keeper_name">
               <el-select
                 v-model="form.keeper_name"
                 filterable
@@ -117,13 +117,21 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <!-- <el-col :md="12" :sm="24">
+            <el-form-item label="校/检周期" prop="cycle">
+              <el-input
+                v-model="form.cycle"
+                placeholder="校准或检定周期"
+              />
+            </el-form-item>
+          </el-col> -->
         </el-row>
-        <el-form-item label="设备备注">
+        <el-form-item label="描述">
           <el-input
             type="textarea"
             :rows="4"
             v-model="form.description"
-            placeholder="设备备注"
+            placeholder="描述"
           />
         </el-form-item>
         </el-form>
@@ -140,6 +148,24 @@
 
 <script>
 import {genTree} from "@/utils/verificate";
+const defaultForm = {
+	state:10,
+  count:10,
+  cycle:10,
+  belong_dept:'',
+  keeper_name:'',
+  belong_dept_name:'',
+  name:'',
+  number:'',
+  model:'',
+  factory:'',
+  production_date:'',
+  buy_date:'',
+  parameter:'',
+  place:'',
+  description:'',
+  keeper:'',
+	};
 export default {
   emits: ["success", "closed"],
   data() {
@@ -151,7 +177,10 @@ export default {
         edit: "编辑",
         show: "查看",
       },
-      form: {},
+      form: {
+        type:10,
+        
+      },
       rules: {
           name: [{required: true, message: "请输入", trigger: "blur"}],
           number: [{required: true, message: "请输入", trigger: "blur"}],
diff --git a/src/views/em/equipment2.vue b/src/views/em/monitoring.vue
similarity index 96%
rename from src/views/em/equipment2.vue
rename to src/views/em/monitoring.vue
index ff619b35..f4ae8270 100644
--- a/src/views/em/equipment2.vue
+++ b/src/views/em/monitoring.vue
@@ -26,6 +26,7 @@
         :apiObj="apiObj"
         row-key="id"
         stripe
+        :params="query"
       >
       <el-table-column type="index" width="50"/>
         <el-table-column label="设备编号">
@@ -131,7 +132,7 @@
   ></save-dialog>
 </template>
     <script>
-import saveDialog from "./equipment_form.vue";
+import saveDialog from "./monitoring_form.vue";
 export default {
   name: "rparty",
   components: {
@@ -143,8 +144,12 @@ export default {
         save: false,
         permission: false,
       },
-      apiObj: this.$API.rpm.rparty.list,
-      query: {},
+      apiObj: this.$API.em.equipment.list,
+      query: {
+        page:1,
+        page_size:20,
+        type:20
+      },
       selection: [],
     };
   },
diff --git a/src/views/em/monitoring_form.vue b/src/views/em/monitoring_form.vue
new file mode 100644
index 00000000..c333f6e8
--- /dev/null
+++ b/src/views/em/monitoring_form.vue
@@ -0,0 +1,319 @@
+<template>
+  <el-drawer
+    :title="titleMap[mode]"
+    v-model="visible"
+    :size="1000"
+    destroy-on-close
+    @closed="$emit('closed')"
+  >
+    <el-container v-loading="loading">
+      <el-main style="padding: 0 20px 20px 20px">
+        <el-form
+        ref="Form"
+        :model="form"
+        label-width="100px"
+        label-position="right"
+        :rules="rule1"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="name">
+              <el-input v-model="form.name" placeholder="设备名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备编号" prop="number">
+              <el-input v-model="form.number" placeholder="设备编号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="型号规格" prop="model">
+              <el-input v-model="form.model" placeholder="规格型号规格"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="标准/依据" prop="standard">
+              <el-input
+                v-model="form.standard"
+                placeholder="溯源标准或依据"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="校/检状态" prop="state">
+              <el-select
+                style="width: 100%"
+                v-model="form.state"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in options"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="管理类别" prop="mgmtype">
+              <el-select
+                style="width: 100%"
+                v-model="form.mgmtype"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in mgmoptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="存放位置" prop="place">
+              <el-input v-model="form.place" placeholder="存放位置"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="责任人" prop="keeper">
+              <el-select
+                v-model="form.keeper"
+                filterable
+                style="width: 100%"
+                allow-create
+                default-first-option
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in keeperOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="校/检方式" prop="way">
+              <el-select
+                style="width: 100%"
+                v-model="form.way"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in wayoptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="存放位置" prop="place">
+              <el-input v-model="form.place" placeholder="存放位置"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="使用类别" prop="usetype">
+              <el-select
+                style="width: 100%"
+                v-model="form.usetype"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in useoptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="校/检周期" prop="cycle">
+              <el-input
+                v-model="form.cycle"
+                placeholder="校准或检定周期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="生产厂家" prop="factory">
+          <el-input v-model="form.factory" placeholder="生产厂商及国别"/>
+        </el-form-item>
+        <el-form-item label="备注" prop="description">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.description"
+            placeholder="备注"
+          />
+        </el-form-item>
+      </el-form>
+      </el-main>
+      <el-footer>
+        <el-button type="primary" :loading="isSaveing" @click="submit"
+          >保存</el-button
+        >
+        <el-button @click="visible = false">取消</el-button>
+      </el-footer>
+    </el-container>
+  </el-drawer>
+</template>
+
+<script>
+import {genTree} from "@/utils/verificate";
+export default {
+  emits: ["success", "closed"],
+  data() {
+    return {
+      loading: false,
+      mode: "add",
+      titleMap: {
+        add: "新增计量设备",
+        edit: "编辑计量设备",
+        show: "查看计量设备",
+      },
+      form: {
+        type:10,
+      },
+      rules: {
+          name: [{required: true, message: "请输入", trigger: "blur"}],
+          number: [{required: true, message: "请输入", trigger: "blur"}],
+          keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
+          belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
+        },
+        options: [
+          {
+            value: 10,
+            label: "合格",
+          },
+          {
+            value: 40,
+            label: "禁用",
+          }
+          ,
+          {
+            value: 50,
+            label: "报废",
+          },
+        ],
+        useoptions: [
+          {
+            value: 1,
+            label: "专用",
+          },
+          {
+            value: 2,
+            label: "公用",
+          },
+        ],
+        wayoptions: [
+          {
+            value: 1,
+            label: "外检",
+          },
+          {
+            value: 2,
+            label: "自检",
+          },
+        ],
+        mgmoptions: [
+          {
+            value: 1,
+            label: "A",
+          },
+          {
+            value: 2,
+            label: "B",
+          },
+          {
+            value: 3,
+            label: "C",
+          },
+        ],
+      visible: false,
+      isSaveing: false,
+      keeperOptions: [],
+      depOptions: [],
+      selectionFilters: [],
+      setFiltersVisible: false,
+      belong_dept_options: []
+    };
+  },
+  mounted() {
+    this.getDeptOptions()
+  },
+  methods: {
+    getDeptOptions() {
+        this.$API.system.dept.list.req({page:0, type__in:'dept'}).then(res=>{
+            this.belong_dept_options = genTree(res);
+        })
+    },
+    //显示
+    open(mode = "add") {
+      this.mode = mode;
+      this.visible = true;
+      return this;
+    },
+    //表单提交方法
+    submit() {
+      this.$refs.dialogForm.validate(async (valid) => {
+        if (valid) {
+          this.isSaveing = true;
+          try {
+            var res;
+            if (this.mode == "add") {
+              res = await this.$API.rpm.rparty.create.req(this.form);
+            } else if (this.mode == "edit") {
+              res = await this.$API.rpm.rparty.update.req(
+                this.form.id,
+                this.form
+              );
+            }
+            this.isSaveing = false;
+            this.$emit("success", this.form, this.mode);
+            this.visible = false;
+            this.$message.success("操作成功");
+            return res;
+          } catch (err) {
+            //可以处理校验错误
+            this.isSaveing = false;
+            return err;
+          }
+        }
+      });
+    },
+    //表单注入数据
+    setData(data) {
+      Object.assign(this.form, data);
+    },
+    //设置过滤项
+    setFilters(filters) {
+      this.selectionFilters = filters;
+      this.setFiltersVisible = true;
+    },
+  },
+};
+</script>
+
+<style>
+</style>
diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
index a409cbe3..29fb3a0f 100644
--- a/src/views/em/mpoint.vue
+++ b/src/views/em/mpoint.vue
@@ -44,20 +44,27 @@
                 link
                 type="primary"
                 size="small"
-                @click="table_show(scope.row, scope.$index)"
+                @click="mplog(scope.row)"
+                >原始记录</el-button
+              >
+              <el-button
+                link
+                type="primary"
+                size="small"
+                @click="table_show(scope.row)"
                 >查看</el-button
               >
               <el-button
                 link
                 type="warning"
                 size="small"
-                @click="table_edit(scope.row, scope.$index)"
+                @click="table_edit(scope.row)"
                 v-auth="'rparty.update'"
                 >编辑</el-button
               >
               <el-popconfirm
                 title="确定删除吗？"
-                @confirm="table_del(scope.row, scope.$index)"
+                @confirm="table_del(scope.row)"
               >
                 <template #reference>
                   <el-button link type="danger" size="small" v-auth="'rparty.delete'">删除</el-button>
@@ -74,8 +81,16 @@
     @success="handleSaveSuccess"
     @closed="dialog.save = false"
   ></save-dialog>
+  <el-drawer
+    title="测点原始记录"
+    v-model="logShow"
+    :size="1000"
+    destroy-on-close
+  >
+   1111
+  </el-drawer>
 </template>
-    <script>
+<script>
 import saveDialog from "./mpoint_form.vue";
 export default {
   name: "rparty",
@@ -84,6 +99,7 @@ export default {
   },
   data() {
     return {
+      logShow:false,
       dialog: {
         save: false,
         permission: false,
@@ -108,6 +124,10 @@ export default {
         this.$refs.saveDialog.open("edit").setData(row);
       });
     },
+    //原始测点记录
+    mplog(row){
+      this.logShow = true;
+    },
     //查看
     table_show(row) {
       this.dialog.save = true;
diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
index 33eee883..e2f0a428 100644
--- a/src/views/em/mpoint_form.vue
+++ b/src/views/em/mpoint_form.vue
@@ -29,21 +29,12 @@
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="测点编号" prop="code">
-                <el-input
-                  v-model="form.code"
-                  type="text"
-                  clearable
-                  class="formItem"
-                ></el-input>
+                <el-input v-model="form.code" type="text" clearable class="formItem"></el-input>
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="单位" prop="unit">
-                <el-input 
-                v-model="form.unit" 
-                type="text" 
-                class="formItem"
-                clearable></el-input>
+                <el-input v-model="form.unit" type="text" class="formItem" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
diff --git a/src/views/opm/preheat.vue b/src/views/opm/preheat.vue
index 71ab88be..745016fc 100644
--- a/src/views/opm/preheat.vue
+++ b/src/views/opm/preheat.vue
@@ -711,10 +711,17 @@
 				ticket.transition = id;
 				ticket.title = this.form.name + '-申请';
 				this.tLoading = true
-				this.$API.wf.ticket.create.req(ticket).then((res) => {
-					this.$message.success("提交成功");
-					this.submitOut()
-				}).catch(e=>{this.tLoading=false});
+				if(this.form.ticket!= null&&this.form.ticket!= undefined){
+					this.$API.wf.ticket.ticketHandle.req(this.form.ticket,ticket).then((res) => {
+						this.$message.success("提交成功");
+						this.submitOut()
+					}).catch(e=>{this.tLoading=false});
+				}else{
+					this.$API.wf.ticket.create.req(ticket).then((res) => {
+						this.$message.success("提交成功");
+						this.submitOut()
+					}).catch(e=>{this.tLoading=false});
+				}
 			},
 
 			//退出界面
diff --git a/src/views/opm/soil.vue b/src/views/opm/soil.vue
index 0c27b3c9..63424535 100644
--- a/src/views/opm/soil.vue
+++ b/src/views/opm/soil.vue
@@ -734,8 +734,8 @@
 				ticket.transition = id;
 				ticket.title = this.form.name + '-申请';
 				this.tLoading = true;
-				if(this.oplId!= ""){
-					this.$API.wf.ticket.update.req(this.oplId,ticket).then((res) => {
+				if(this.form.ticket!= null&&this.form.ticket!= undefined){
+					this.$API.wf.ticket.ticketHandle.req(this.form.ticket,ticket).then((res) => {
 						this.$message.success("提交成功");
 						this.submitOut()
 					}).catch(e=>{this.tLoading=false});
@@ -745,7 +745,6 @@
 						this.submitOut()
 					}).catch(e=>{this.tLoading=false});
 				}
-				
 			},
 
 			//退出界面
diff --git a/src/views/opm/space.vue b/src/views/opm/space.vue
index cfb21b3d..6ff3b03a 100644
--- a/src/views/opm/space.vue
+++ b/src/views/opm/space.vue
@@ -915,8 +915,8 @@
 				ticket.transition = id;
 				ticket.title = this.form.name + '-申请';
 				this.tLoading = true;
-				if(this.oplId!= ""){
-					this.$API.wf.ticket.update.req(this.oplId,ticket).then((res) => {
+				if(this.form.ticket!= null&&this.form.ticket!= undefined){
+					this.$API.wf.ticket.ticketHandle.req(this.form.ticket,ticket).then((res) => {
 						this.$message.success("提交成功");
 						this.submitOut()
 					}).catch(e=>{this.tLoading=false});
diff --git a/src/views/rm_enm/handoverLog.vue b/src/views/rm_enm/handoverLog.vue
index f310f3f2..c4ef3b86 100644
--- a/src/views/rm_enm/handoverLog.vue
+++ b/src/views/rm_enm/handoverLog.vue
@@ -36,9 +36,9 @@
                     ></el-option>
                 </el-select>
                 <el-button
-                type="primary"
-                icon="el-icon-search"
-                @click="handleQuery"
+                    type="primary"
+                    icon="el-icon-search"
+                    @click="handleQuery"
                 ></el-button>
             <el-link type="primary" icon="el-icon-plus"  v-auth="'rparty.create'"></el-link>
             </div>
diff --git a/src/views/rm_enm/handover_form.vue b/src/views/rm_enm/handover_form.vue
new file mode 100644
index 00000000..4aefc324
--- /dev/null
+++ b/src/views/rm_enm/handover_form.vue
@@ -0,0 +1,210 @@
+<template>
+    <el-dialog
+      :title="titleMap[mode]"
+      v-model="visible"
+      :size="1000"
+      destroy-on-close
+      @closed="$emit('closed')"
+    >
+      <el-container v-loading="loading">
+        <el-main style="padding: 0 20px 20px 20px">
+          <el-form
+          ref="Form"
+          :model="form"
+          label-width="100px"
+          label-position="right"
+          :rules="rule1"
+        >
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="关联工段" prop="mgroup">
+                <el-input v-model="form.mgroup" placeholder="关联工段"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="班组" prop="team">
+                <el-input v-model="form.team" placeholder="班组"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="当班班次" prop="shift">
+                <el-input v-model="form.shift" placeholder="当班班次"/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="其他备注" prop="note">
+                <el-input v-model="form.note" placeholder="其他备注" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="开始时间" prop="start_time">
+                <el-date-picker
+                    v-model="form.start_time"
+                    type="datetime"
+                    format="YYYY-MM-DD HH:mm"
+                    placeholder="基础月份"
+                    style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="结束时间" prop="end_time">
+                <el-date-picker
+                    v-model="form.end_time"
+                    type="datetime"
+                    format="YYYY-MM-DD HH:mm"
+                    placeholder="对比月份"
+                    style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        </el-main>
+        <el-footer>
+          <el-button type="primary" :loading="isSaveing" @click="submit">保存</el-button>
+          <el-button @click="visible = false">取消</el-button>
+        </el-footer>
+      </el-container>
+    </el-dialog>
+  </template>
+  
+  <script>
+  import {genTree} from "@/utils/verificate";
+  export default {
+    emits: ["success", "closed"],
+    data() {
+      return {
+        loading: false,
+        mode: "add",
+        titleMap: {
+          add: "新增计量设备",
+          edit: "编辑计量设备",
+          show: "查看计量设备",
+        },
+        form: {
+          type:10,
+        },
+        rules: {
+            name: [{required: true, message: "请输入", trigger: "blur"}],
+            number: [{required: true, message: "请输入", trigger: "blur"}],
+            keeper_name: [{required: true, message: "请输入", trigger: "blur"}],
+            belong_dept: [{required: true, message: "请选择", trigger: "blur"}]
+          },
+          options: [
+            {
+              value: 10,
+              label: "合格",
+            },
+            {
+              value: 40,
+              label: "禁用",
+            }
+            ,
+            {
+              value: 50,
+              label: "报废",
+            },
+          ],
+          useoptions: [
+            {
+              value: 1,
+              label: "专用",
+            },
+            {
+              value: 2,
+              label: "公用",
+            },
+          ],
+          wayoptions: [
+            {
+              value: 1,
+              label: "外检",
+            },
+            {
+              value: 2,
+              label: "自检",
+            },
+          ],
+          mgmoptions: [
+            {
+              value: 1,
+              label: "A",
+            },
+            {
+              value: 2,
+              label: "B",
+            },
+            {
+              value: 3,
+              label: "C",
+            },
+          ],
+        visible: false,
+        isSaveing: false,
+        keeperOptions: [],
+        depOptions: [],
+        selectionFilters: [],
+        setFiltersVisible: false,
+        belong_dept_options: []
+      };
+    },
+    mounted() {
+      this.getDeptOptions()
+    },
+    methods: {
+      getDeptOptions() {
+          this.$API.system.dept.list.req({page:0, type__in:'dept'}).then(res=>{
+              this.belong_dept_options = genTree(res);
+          })
+      },
+      //显示
+      open(mode = "add") {
+        this.mode = mode;
+        this.visible = true;
+        return this;
+      },
+      //表单提交方法
+      submit() {
+        this.$refs.dialogForm.validate(async (valid) => {
+          if (valid) {
+            this.isSaveing = true;
+            try {
+              var res;
+              if (this.mode == "add") {
+                res = await this.$API.rpm.rparty.create.req(this.form);
+              } else if (this.mode == "edit") {
+                res = await this.$API.rpm.rparty.update.req(
+                  this.form.id,
+                  this.form
+                );
+              }
+              this.isSaveing = false;
+              this.$emit("success", this.form, this.mode);
+              this.visible = false;
+              this.$message.success("操作成功");
+              return res;
+            } catch (err) {
+              //可以处理校验错误
+              this.isSaveing = false;
+              return err;
+            }
+          }
+        });
+      },
+      //表单注入数据
+      setData(data) {
+        Object.assign(this.form, data);
+      },
+      //设置过滤项
+      setFilters(filters) {
+        this.selectionFilters = filters;
+        this.setFiltersVisible = true;
+      },
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
+  
\ No newline at end of file
diff --git a/src/views/rm_enm/handovereEnter.vue b/src/views/rm_enm/handovereEnter.vue
index e69de29b..7c8640b5 100644
--- a/src/views/rm_enm/handovereEnter.vue
+++ b/src/views/rm_enm/handovereEnter.vue
@@ -0,0 +1,143 @@
+<template>
+    <el-container>
+      <el-header>
+        <div class="left-panel">
+          <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
+         </div>
+        <div class="right-panel">
+          <div class="right-panel-search">
+            <el-input
+              v-model="query.search"
+              placeholder="名称"
+              clearable
+              @keyup.enter="handleQuery"
+            ></el-input>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="handleQuery"
+            ></el-button>
+          </div>
+        </div>
+      </el-header>
+      <el-main class="nopadding">
+        <scTable
+          ref="table"
+          :apiObj="apiObj"
+          row-key="id"
+          stripe
+          :params="query"
+        >
+        <el-table-column type="index" width="50"/>
+          <el-table-column label="关联工段" prop="mgroup_name"></el-table-column>
+          <el-table-column label="班组名称" prop="team_name"></el-table-column>
+          <el-table-column label="当前班次" prop="shift_name"></el-table-column>
+          <el-table-column label="班长" prop="leader_name"></el-table-column>
+          <el-table-column label="值班开始时间" prop="start_time"></el-table-column>
+          <el-table-column label="值班结束时间" prop="end_time"></el-table-column>
+          <el-table-column label="创建时间" prop="create_time"></el-table-column>
+          <el-table-column label="备注" prop="note"></el-table-column>
+          <el-table-column label="操作" fixed="right" align="left">
+            <template #default="scope">
+              <el-link
+                v-if="checkPermission(['equipment.update'])"
+                type="primary"
+                @click="handleEdit(scope)"
+              >
+                编辑
+              </el-link>
+              <el-link
+                v-if="checkPermission(['equipment.delete'])"
+                type="danger"
+                @click="handleDelete(scope)"
+              >
+                删除
+              </el-link>
+            </template>
+          </el-table-column>
+        </scTable>
+      </el-main>
+    </el-container>
+    <save-dialog
+      v-if="dialog.save"
+      ref="saveDialog"
+      @success="handleSaveSuccess"
+      @closed="dialog.save = false"
+    ></save-dialog>
+  </template>
+      <script>
+  import saveDialog from "./handover_form.vue";
+  export default {
+    name: "rparty",
+    components: {
+      saveDialog,
+    },
+    data() {
+      return {
+        dialog: {
+          save: false,
+          permission: false,
+        },
+        apiObj: this.$API.wpm.sflog.list,
+        query: {
+          page:1,
+          page_size:20,
+          type:20
+        },
+        selection: [],
+      };
+    },
+    methods: {
+      //添加
+      add() {
+        this.dialog.save = true;
+        this.$nextTick(() => {
+          this.$refs.saveDialog.open("add");
+        });
+      },
+      //编辑
+      table_edit(row) {
+        this.dialog.save = true;
+        this.$nextTick(() => {
+          this.$refs.saveDialog.open("edit").setData(row);
+        });
+      },
+      //查看
+      table_show(row) {
+        this.dialog.save = true;
+        this.$nextTick(() => {
+          this.$refs.saveDialog.open("show").setData(row);
+        });
+      },
+      //删除
+      async table_del(row) {
+      
+        this.$API.rpm.rparty.delete
+          .req(row.id)
+          .then((res) => {
+            this.$message.success("删除成功");
+  
+            return res;
+          })
+          .catch((err) => {
+            return err;
+          });
+      },
+  
+      //本地更新数据
+      handleSaveSuccess(data, mode) {
+        if (mode == "add") {
+          this.$refs.table.refresh();
+        } else if (mode == "edit") {
+          this.$refs.table.refresh();
+        }
+      },
+      handleQuery() {
+                  this.$refs.table.queryData(this.query)
+              },
+      resetQuery() {
+        this.query = {};
+      },
+    },
+  };
+  </script>
\ No newline at end of file
diff --git a/src/views/sys/team.vue b/src/views/sys/team.vue
new file mode 100644
index 00000000..c35a5ffa
--- /dev/null
+++ b/src/views/sys/team.vue
@@ -0,0 +1,196 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+			</div>
+			<div class="right-panel">
+				<div class="right-panel-search">
+					<el-input v-model="query.search" placeholder="班组名称" clearable @keyup.enter="handleQuery"></el-input>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+				</div>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+				<el-table-column label="#" type="index" width="50"></el-table-column>
+				<el-table-column label="名称" prop="name" min-width="100"></el-table-column>
+				<el-table-column label="班长" prop="leader_name" min-width="100"></el-table-column>
+				<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
+				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="140">
+					<template #default="scope">
+						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-divider direction="vertical"></el-divider>
+						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
+							<template #reference>
+								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<el-dialog :title="titleMap[type]" v-model="limitedVisible">
+		<el-form :model="form" :rules="rules" ref="addForm"  label-width="80px" style="padding: 0 10px;">
+			<el-form-item label="班组名称" prop="name">
+				<el-input v-model="form.name" clearable></el-input>
+			</el-form-item>
+            <el-form-item label="班组班长" prop="leader_name">
+              <span style="display:flex">
+                <el-input readonly v-model="form.leader_name"></el-input>
+                <ehsUserSelect :multiple="false" @submit="getReceptionist"/>
+                </span>
+            </el-form-item>
+            <el-form-item label="所属部门">
+                <el-cascader
+                v-model="form.belong_dept"
+                :options="group"
+                :props="groupsProps"
+                :show-all-levels="false"
+                clearable
+                style="width: 100%"
+                @change="handleChange"
+                ></el-cascader>
+            </el-form-item>
+		</el-form>
+		<template #footer>
+			<el-button @click="limitedVisible=false" >取 消</el-button>
+			<el-button v-if="type!=='show'" type="primary" :loading="isSaving" @click="submitHandle()">保 存</el-button>
+		</template>
+	</el-dialog>
+</template>
+<script>
+	import {genTree} from "@/utils/verificate";
+	const defaultForm = {
+		id:"",
+		name: "",
+		leader:'',
+		leader_name:'',
+		belong_dept:'',
+	};
+	export default {
+		name: 'dept',
+		data() {
+			return {
+				apiObj: this.$API.mtm.team.list,
+				selection: [],
+				checkList: [],
+				search: {
+					keyword: null
+				},
+				query: {},
+				isSaving: false,
+				limitedVisible : false,
+				checkStrictly:true,
+				type: "add",
+				titleMap: {
+					add: '新增班组',
+					edit: '编辑班组',
+					show: '查看班组'
+				},
+                
+				//表单数据
+				form: defaultForm,
+				//验证规则
+				rules: {
+					name: [{required: true, message: '请输入班组名称'}],
+					leader_name: [{required: true, message: '请输入班组班长'}],
+					belong_dept: [{required: true, message: '请选择所属部门'}],
+				},
+                groupsProps: {
+                    multiple: false,
+                    emitPath: false,
+                    checkStrictly: true,
+                },
+                group: [],
+			}
+		},
+		mounted() {
+			this.getList();
+			this.getGroup();
+		},
+		methods: {
+			handleChange(value) {
+                console.log(value);
+                console.log(this.form.belong_dept);
+			},
+			//加载树数据
+			async getGroup() {
+				let res = await this.$API.system.dept.list.req({ page: 0 });
+				this.group = genTree(res);
+			},
+			//获取班组列表
+			getList(){
+				var res = this.$API.system.role.list.req();
+				this.tableData = res.results;
+			},
+			//添加班组
+			roleAdd(){
+				this.limitedVisible = true;
+				this.type = "add";
+				this.form = Object.assign({}, defaultForm);
+			},
+			getReceptionist(data) {
+                this.form.leader=data.id;
+                this.form.leader_name=data.name
+            },
+			submitHandle(){
+				let that = this;
+				this.$refs.addForm.validate( (valid) => {
+					if (valid) {
+						this.isSaveing = true;
+						let res;
+						if(this.type==='add'){
+							res = this.$API.mtm.team.create.req(that.form);
+						}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();
+						}
+					}
+				})
+			},
+
+			//编辑班组
+			roleEdit(row){
+				this.type='edit';
+				this.form=row;
+				this.limitedVisible = true;
+			},
+
+			//删除班组
+			async roleDel(row){
+				var id = row.id;
+				var res = await this.$API.mtm.team.delete.req(id);
+				if(res.err_msg){
+					this.$message.error(res.err_msg)
+				}else{
+					this.$refs.table.refresh();
+					this.$message.success("删除成功")
+				}
+			},
+			//表格选择后回调事件
+			selectionChange(selection){
+				this.selection = selection;
+			},
+			//搜索
+			handleQuery(){
+				this.$refs.table.queryData(this.query)
+			},
+			//本地更新数据
+			handleSaveSuccess(){
+				this.$refs.table.refresh()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.treeMain {width: 100%;height:280px;overflow: auto;border: 1px solid #dcdfe6;margin-bottom: 10px;}
+</style>
diff --git a/src/views/ungrouped/goalSetting.vue b/src/views/ungrouped/goalSetting.vue
new file mode 100644
index 00000000..d5b64cd2
--- /dev/null
+++ b/src/views/ungrouped/goalSetting.vue
@@ -0,0 +1,359 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+			</div>
+			<div class="right-panel">
+				<div class="right-panel-search">
+                    <el-date-picker
+                            v-model="query.year"
+                            type="year"
+                            format="YYYY"
+                            value-format="YYYY"
+                            placeholder="年份"
+                        />
+                        <el-select
+                            v-model="query.mgroup"
+                            placeholder="关联工段"
+                            clearable
+                        >
+                            <el-option
+                            v-for="item in mgroupOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            ></el-option>
+                        </el-select>
+                        <el-select
+                            v-model="query.goal_cate"
+                            placeholder="目标种类"
+                            clearable
+                        >
+                            <el-option
+                            v-for="item in goalOptions"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id"
+                            ></el-option>
+                        </el-select>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+				</div>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+				<el-table-column label="#" type="index" width="50"></el-table-column>
+				<el-table-column label="工段" prop="mgroup_name" min-width="100"></el-table-column>
+				<el-table-column label="目标（项目）" prop="goal_cate_name" min-width="100"></el-table-column>
+				<el-table-column label="1月" prop="goal_val_1"></el-table-column>
+				<el-table-column label="2月" prop="goal_val_2"></el-table-column>
+				<el-table-column label="3月" prop="goal_val_3"></el-table-column>
+				<el-table-column label="4月" prop="goal_val_4"></el-table-column>
+				<el-table-column label="5月" prop="goal_val_5"></el-table-column>
+				<el-table-column label="6月" prop="goal_val_6"></el-table-column>
+				<el-table-column label="7月" prop="goal_val_7"></el-table-column>
+				<el-table-column label="8月" prop="goal_val_8"></el-table-column>
+				<el-table-column label="9月" prop="goal_val_9"></el-table-column>
+				<el-table-column label="10月" prop="goal_val_10"></el-table-column>
+				<el-table-column label="11月" prop="goal_val_11"></el-table-column>
+				<el-table-column label="12月" prop="goal_val_12"></el-table-column>
+				<el-table-column label="年目标值" prop="goal_val"></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="100">
+					<template #default="scope">
+						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-divider direction="vertical"></el-divider>
+						<el-popconfirm title="确定删除吗？" @confirm="handleDel(scope.row)">
+							<template #reference>
+								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<el-dialog :title="titleMap[type]" v-model="limitedVisible">
+		<el-form :model="form" :rules="rules" ref="addForm"  label-width="100px" style="padding: 0 10px;">
+            <el-row>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="年份" prop="year">
+                        <el-date-picker
+                            v-model="form.year"
+                            type="year"
+                            format="YYYY"
+                            value-format="YYYY"
+                            placeholder="年份"
+                            style="width: 100%;"
+                        />
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="关联工段" prop="mgroup">
+                        <el-select
+                            v-model="form.mgroup"
+                            placeholder="关联工段"
+                            clearable
+                            style="width: 100%;"
+                        >
+                            <el-option
+                            v-for="item in mgroupOptions"
+                            :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="目标种类" prop="goal_cate">
+                        <el-select
+                            v-model="form.goal_cate"
+                            placeholder="目标种类"
+                            clearable
+                            style="width: 100%;"
+                        >
+                            <el-option
+                            v-for="item in goalOptions"
+                            :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="年目标值" prop="goal_val">
+                        <el-input-number v-model="form.goal_val" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="1月目标值" prop="goal_val_1">
+                        <el-input-number v-model="form.goal_val_1" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="2月目标值" prop="goal_val_2">
+                        <el-input-number v-model="form.goal_val_2" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="3月目标值" prop="goal_val_3">
+                        <el-input-number v-model="form.goal_val_3" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="4月目标值" prop="goal_val_4">
+                        <el-input-number v-model="form.goal_val_4" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="5月目标值" prop="goal_val_5">
+                        <el-input-number v-model="form.goal_val_5" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="6月目标值" prop="goal_val_6">
+                        <el-input-number v-model="form.goal_val_6" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="7月目标值" prop="goal_val_7">
+                        <el-input-number v-model="form.goal_val_7" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="8月目标值" prop="goal_val_8">
+                        <el-input-number v-model="form.goal_val_8" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="9月目标值" prop="goal_val_9">
+                        <el-input-number v-model="form.goal_val_9" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="10月目标值" prop="goal_val_10">
+                        <el-input-number v-model="form.goal_val_10" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="11月目标值" prop="goal_val_11">
+                        <el-input-number v-model="form.goal_val_11" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                <el-col :md="12" :sm="24">
+                    <el-form-item label="12月目标值" prop="goal_val_12">
+                        <el-input-number v-model="form.goal_val_12" style="width: 100%;" clearable :min="0"  controls-position="right"/>
+                    </el-form-item>
+                </el-col>
+                
+            </el-row>
+		</el-form>
+		<template #footer>
+			<el-button @click="limitedVisible=false" >取 消</el-button>
+			<el-button v-if="type!=='show'" type="primary" :loading="isSaving" @click="submitHandle()">保 存</el-button>
+		</template>
+	</el-dialog>
+</template>
+<script>
+	import {genTree} from "@/utils/verificate";
+	const defaultForm = {
+        year: [{required: true, message: '请选择年份'}],
+					mgroup:'',
+					goal_cate: '',
+					goal_val:'',
+					goal_val_1:'',
+					goal_val_2:'',
+					goal_val_3:'',
+					goal_val_4: '',
+					goal_val_5: '',
+					goal_val_6: '',
+					goal_val_7: '',
+					goal_val_8: '',
+					goal_val_9: '',
+					goal_val_10: '',
+					goal_val_11: '',
+					goal_val_12: '',
+    };
+	export default {
+		name: 'dept',
+		data() {
+			return {
+				apiObj: this.$API.mtm.goal.list,
+				search: {
+					keyword: null
+				},
+				query: {},
+				isSaving: false,
+				limitedVisible : false,
+				checkStrictly:true,
+				type: "add",
+				titleMap: {
+					add: '新增月度年度目标值',
+					edit: '编辑月度年度目标值',
+					show: '查看月度年度目标值'
+				},
+				//表单数据
+				form: {},
+				//验证规则
+				rules: {
+					year: [{required: true, message: '请选择年份'}],
+					mgroup: [{required: true, message: '请选择关联工段'}],
+					goal_cate: [{required: true, message: '请选择目标种类'}],
+					goal_val: [{required: true, message: '请填写年目标值'}],
+					goal_val_1: [{required: true, message: '请填写1月份目标值'}],
+					goal_val_2: [{required: true, message: '请填写2月份目标值'}],
+					goal_val_3: [{required: true, message: '请填写3月份目标值'}],
+					goal_val_4: [{required: true, message: '请填写4月份目标值'}],
+					goal_val_5: [{required: true, message: '请填写5月份目标值'}],
+					goal_val_6: [{required: true, message: '请填写6月份目标值'}],
+					goal_val_7: [{required: true, message: '请填写7月份目标值'}],
+					goal_val_8: [{required: true, message: '请填写8月份目标值'}],
+					goal_val_9: [{required: true, message: '请填写9月份目标值'}],
+					goal_val_10: [{required: true, message: '请填写10月份目标值'}],
+					goal_val_11: [{required: true, message: '请填写11月份目标值'}],
+					goal_val_12: [{required: true, message: '请填写12月份目标值'}],
+					
+				},
+                groupsProps: {
+                    multiple: false,
+                    emitPath: false,
+                    checkStrictly: true,
+                },
+				goalOptions:[],
+                mgroupOptions:[],
+				productList:[],
+			}
+		},
+		mounted() {
+			this.getMgroup();
+			this.getGoals();//目标种类
+		},
+		methods: {
+			// //加载树数据
+			// async getGroup() {
+			// 	let res = await this.$API.system.dept.list.req({ page_size: 3 , type:'dept'});
+			// 	this.group = res.results;
+			// },
+
+            //目标种类
+            getGoals(){
+                let that = this;
+                this.$API.system.dict.list.req({page:0,type__code: "goal_cate"})
+                .then((res) => {
+                    debugger;
+                    console.log(res)
+                    that.goalOptions = res;
+                });
+            },
+			//获取工段列表
+			getMgroup(){
+                this.$API.mtm.mgroup.list.req({page:0}).then(res=>{
+                    this.mgroupOptions = res;
+                })
+			},
+			//添加测点集
+			roleAdd(){
+				this.limitedVisible = true;
+				this.type = "add";
+                this.form = {};
+				this.form = Object.assign({}, defaultForm);
+			},
+			submitHandle(){
+				let that = this;
+				this.$refs.addForm.validate( (valid) => {
+					if (valid) {
+						this.isSaveing = true;
+						if(this.type==='add'){
+							this.$API.mtm.goal.create.req(that.form).then(res=>{
+                                this.isSaveing = false;
+                                this.limitedVisible = false;
+                                this.$refs.table.refresh();
+                            });
+						}else{
+							this.$API.mtm.goal.update.req(that.form.id,that.form).then(res=>{
+                                this.isSaveing = false;
+                                this.limitedVisible = false;
+                                this.$refs.table.refresh();
+                            });
+						}
+					}
+				})
+			},
+			//编辑测点集
+			roleEdit(row){
+				this.type='edit';
+				this.form = Object.assign(defaultForm, row);
+				this.limitedVisible = true;
+			},
+
+			//删除测点集
+			async handleDel(row){
+				var id = row.id;
+				var res = await this.$API.mtm.goal.delete.req(id);
+				if(res.err_msg){
+					this.$message.error(res.err_msg)
+				}else{
+					this.$refs.table.refresh();
+					this.$message.success("删除成功")
+				}
+			},
+			//表格选择后回调事件
+			selectionChange(selection){
+				this.selection = selection;
+			},
+			//搜索
+			handleQuery(){
+				this.$refs.table.queryData(this.query)
+			},
+			//本地更新数据
+			handleSaveSuccess(){
+				this.$refs.table.refresh()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.treeMain {width: 100%;height:280px;overflow: auto;border: 1px solid #dcdfe6;margin-bottom: 10px;}
+</style>
diff --git a/src/views/ungrouped/mgroup.vue b/src/views/ungrouped/mgroup.vue
new file mode 100644
index 00000000..4ffbe3f7
--- /dev/null
+++ b/src/views/ungrouped/mgroup.vue
@@ -0,0 +1,218 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+			</div>
+			<div class="right-panel">
+				<div class="right-panel-search">
+					<el-input v-model="query.search" placeholder="测点集名称" clearable @keyup.enter="handleQuery"></el-input>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+				</div>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+				<el-table-column label="#" type="index" width="50"></el-table-column>
+				<el-table-column label="名称" prop="name" min-width="100"></el-table-column>
+				<el-table-column label="分类" prop="cate" min-width="100">
+					<template #default="scope">
+						<span>{{ cates_[scope.row.cate] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="主要产品" prop="product" min-width="150"></el-table-column>
+				<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
+				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="140">
+					<template #default="scope">
+						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-divider direction="vertical"></el-divider>
+						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
+							<template #reference>
+								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<el-dialog :title="titleMap[type]" v-model="limitedVisible">
+		<el-form :model="form" :rules="rules" ref="addForm"  label-width="80px" style="padding: 0 10px;">
+			<el-form-item label="名称" prop="name">
+				<el-input v-model="form.name" clearable></el-input>
+			</el-form-item>
+			<el-form-item label="分类" prop="cate">
+				<el-select
+					v-model="form.cate"
+					placeholder="分类"
+					clearable
+				>
+					<el-option
+					v-for="item in options"
+					:key="item.value"
+					:label="item.label"
+					:value="item.value"
+					></el-option>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="主要产品">
+				<el-input v-model="form.product" clearable></el-input>
+			</el-form-item>
+            <el-form-item label="所属部门" prop="belong_dept">
+                <el-select
+					v-model="form.belong_dept"
+					placeholder="分类"
+					clearable
+				>
+					<el-option
+					v-for="item in group"
+					:key="item.id"
+					:label="item.name"
+					:value="item.id"
+					></el-option>
+				</el-select>
+            </el-form-item>
+		</el-form>
+		<template #footer>
+			<el-button @click="limitedVisible=false" >取 消</el-button>
+			<el-button v-if="type!=='show'" type="primary" :loading="isSaving" @click="submitHandle()">保 存</el-button>
+		</template>
+	</el-dialog>
+</template>
+<script>
+	import {genTree} from "@/utils/verificate";
+	const defaultForm = {
+		id:"",
+		name: "",
+		cate:'',
+		product:'',
+		belong_dept:'',
+	};
+	export default {
+		name: 'dept',
+		data() {
+			return {
+				apiObj: this.$API.mtm.mgroup.list,
+				search: {
+					keyword: null
+				},
+				query: {},
+				isSaving: false,
+				limitedVisible : false,
+				checkStrictly:true,
+				type: "add",
+				titleMap: {
+					add: '新增测点集',
+					edit: '编辑测点集',
+					show: '查看测点集'
+				},
+				//表单数据
+				form: defaultForm,
+				//验证规则
+				rules: {
+					name: [{required: true, message: '请输入测点集名称'}],
+					cate: [{required: true, message: '请选择分类'}],
+					belong_dept: [{required: true, message: '请选择所属部门'}],
+					
+				},
+                groupsProps: {
+                    multiple: false,
+                    emitPath: false,
+                    checkStrictly: true,
+                },
+				options:[
+					{label:'工段',value:'section'},
+					{label:'其他',value:'other'},
+				],
+				cates_:{
+					'section':'工序',
+					'other':'其他',
+				},
+                group: [],
+				productList:[],
+			}
+		},
+		mounted() {
+			// this.getList();
+			this.getGroup();//获取部门
+			// this.getProduct();//获取产品
+		},
+		methods: {
+			handleChange(value) {
+                console.log(value);
+                console.log(this.form.belong_dept);
+			},
+			//加载树数据
+			async getGroup() {
+				let res = await this.$API.system.dept.list.req({ page_size: 3 , type:'dept'});
+				this.group = res.results;
+			},
+			//获取产品列表
+			getProduct(){
+				var res = this.$API.mtm.product.list.req({page:0});
+				this.productList = res.data;
+			},
+			//添加测点集
+			roleAdd(){
+				this.limitedVisible = true;
+				this.type = "add";
+				this.form = Object.assign({}, defaultForm);
+			},
+			submitHandle(){
+				let that = this;
+				this.$refs.addForm.validate( (valid) => {
+					if (valid) {
+						this.isSaveing = true;
+						let res;
+						if(this.type==='add'){
+							res = this.$API.mtm.mgroup.create.req(that.form);
+						}else{
+							res = this.$API.mtm.mgroup.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();
+						}
+					}
+				})
+			},
+			//编辑测点集
+			roleEdit(row){
+				this.type='edit';
+				this.form = Object.assign(defaultForm, row);
+				this.limitedVisible = true;
+			},
+
+			//删除测点集
+			async roleDel(row){
+				var id = row.id;
+				var res = await this.$API.mtm.team.delete.req(id);
+				if(res.err_msg){
+					this.$message.error(res.err_msg)
+				}else{
+					this.$refs.table.refresh();
+					this.$message.success("删除成功")
+				}
+			},
+			//表格选择后回调事件
+			selectionChange(selection){
+				this.selection = selection;
+			},
+			//搜索
+			handleQuery(){
+				this.$refs.table.queryData(this.query)
+			},
+			//本地更新数据
+			handleSaveSuccess(){
+				this.$refs.table.refresh()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.treeMain {width: 100%;height:280px;overflow: auto;border: 1px solid #dcdfe6;margin-bottom: 10px;}
+</style>
diff --git a/src/views/ungrouped/mpoint.vue b/src/views/ungrouped/mpoint.vue
new file mode 100644
index 00000000..c151b8a6
--- /dev/null
+++ b/src/views/ungrouped/mpoint.vue
@@ -0,0 +1,302 @@
+<template>
+	<el-container>
+		<el-header>
+			<div class="left-panel">
+				<el-button type="primary" icon="el-icon-plus" @click="roleAdd" v-auth="'role.create'"></el-button>
+			</div>
+			<div class="right-panel">
+				<div class="right-panel-search">
+					<el-input v-model="query.search" placeholder="测点集名称" clearable @keyup.enter="handleQuery"></el-input>
+					<el-button type="primary" icon="el-icon-search" @click="handleQuery"></el-button>
+				</div>
+			</div>
+		</el-header>
+		<el-main class="nopadding">
+			<scTable ref="table" :apiObj="apiObj" row-key="id" @selection-change="selectionChange" hidePagination>
+				<el-table-column label="#" type="index" width="50"></el-table-column>
+				<el-table-column label="名称" prop="name" min-width="100"></el-table-column>
+				<el-table-column label="分类" prop="cate" min-width="100">
+					<template #default="scope">
+						<span>{{ cates_[scope.row.cate] }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="主要产品" prop="product" min-width="150"></el-table-column>
+				<el-table-column label="所属部门" prop="belong_dept_name" min-width="150"></el-table-column>
+				<el-table-column label="创建时间" prop="create_time" min-width="150"></el-table-column>
+				<el-table-column label="操作" fixed="right" align="center" width="140">
+					<template #default="scope">
+						<el-button link size="small" @click="roleEdit(scope.row)" v-auth="'team.update'" type="primary">编辑</el-button>
+						<el-divider direction="vertical"></el-divider>
+						<el-popconfirm title="确定删除吗？" @confirm="roleDel(scope.row, scope.$index)">
+							<template #reference>
+								<el-button link size="small" v-auth="'role.delete'" type="danger">删除</el-button>
+							</template>
+						</el-popconfirm>
+					</template>
+				</el-table-column>
+			</scTable>
+		</el-main>
+	</el-container>
+	<el-dialog :title="titleMap[type]" v-model="limitedVisible">
+		<el-form :model="form" :rules="rules" ref="addForm"  label-width="80px" style="padding: 0 10px;">
+			<el-row>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="名称" prop="name">
+						<el-input v-model="form.name" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="测点编号" prop="code">
+						<el-input v-model="form.code" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="单位" prop="unit">
+						<el-input v-model="form.unit" clearable></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="分类">
+						<el-select
+							v-model="form.cate"
+							placeholder="分类"
+							clearable
+							style="width: 100%;"
+						>
+							<el-option
+							v-for="item in options"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="检测设备">
+						<el-select
+							v-model="form.ep_monitored"
+							placeholder="检测设备"
+							clearable
+							style="width: 100%;"
+						>
+							<el-option
+							v-for="item in monitoredOptions"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+							></el-option>
+						</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
+							style="width: 100%;"
+						>
+							<el-option
+							v-for="item in epOptions"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="所在集合">
+						<el-select
+							v-model="form.mgroup"
+							placeholder="所在集合"
+							clearable
+							style="width: 100%;"
+						>
+							<el-option
+							v-for="item in options"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+							></el-option>
+						</el-select>
+					</el-form-item>
+				</el-col>
+				<el-col :md="12" :sm="24">
+					<el-form-item label="所属部门">
+						<el-cascader
+							v-model="form.belong_dept"
+							:options="group"
+							:props="groupsProps"
+							:show-all-levels="false"
+							clearable
+							style="width: 100%"
+							@change="handleChange"
+						></el-cascader>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+		<template #footer>
+			<el-button @click="limitedVisible=false" >取 消</el-button>
+			<el-button v-if="type!=='show'" type="primary" :loading="isSaving" @click="submitHandle()">保 存</el-button>
+		</template>
+	</el-dialog>
+</template>
+<script>
+	import {genTree} from "@/utils/verificate";
+	const defaultForm = {
+		id:"",
+		name: "",
+		cate:'',
+		product:'',
+		belong_dept:'',
+	};
+	export default {
+		name: 'dept',
+		data() {
+			return {
+				apiObj: this.$API.enm.mpoint.list,
+				search: {
+					keyword: null
+				},
+				query: {},
+				isSaving: false,
+				limitedVisible : false,
+				checkStrictly:true,
+				type: "add",
+				titleMap: {
+					add: '新增测点集',
+					edit: '编辑测点集',
+					show: '查看测点集'
+				},
+				//表单数据
+				form: defaultForm,
+				//验证规则
+				rules: {
+					name: [{required: true, message: '请输入测点集名称'}],
+					code: [{required: true, message: '请输入测点集编号'}],
+					unit: [{required: true, message: '请输入测点集单位'}],
+					
+				},
+                groupsProps: {
+                    multiple: false,
+                    emitPath: false,
+                    checkStrictly: true,
+                },
+				options:[
+					{label:'工序',value:'section'},
+					{label:'其他',value:'other'},
+				],
+				cates_:{
+					'section':'工序',
+					'other':'其他',
+				},
+                group: [],
+				options:[],
+				epOptions:[],
+				monitoredOptions:[],
+				
+			}
+		},
+
+		mounted() {
+			// this.getList();
+			this.getGroup();//获取部门
+			this.getEquipment();//获取设备
+			this.getMonitored();//获取检测设备
+			this.getMgroup();//获取集合
+		},
+		methods: {
+			handleChange(value) {
+                console.log(value);
+                console.log(this.form.belong_dept);
+			},
+			//加载树数据
+			async getGroup() {
+				let res = await this.$API.system.dept.list.req({ page: 0 });
+				this.group = genTree(res);
+			},
+			//获取设备列表
+			getEquipment(){
+				this.$API.em.equipment.list.req({page:0,type:10}).then(res=>{
+					this.epOptions = res.data;
+				})
+			},
+			//获取监测设备列表
+			getMonitored(){
+				this.$API.mtm.equipment.list.req({page:0,type:20}).then(res=>{
+					this.monitoredOptions = res.data;
+				})
+				
+			},
+			//获取集合列表
+			getMgroup(){
+				this.$API.mtm.product.list.req({page:0}).then(res=>{
+					this.options = res.data;
+				})
+			},
+			//添加测点集
+			roleAdd(){
+				this.limitedVisible = true;
+				this.type = "add";
+				this.form = Object.assign({}, defaultForm);
+			},
+			submitHandle(){
+				let that = this;
+				this.$refs.addForm.validate( (valid) => {
+					if (valid) {
+						this.isSaveing = true;
+						let res;
+						if(this.type==='add'){
+							res = this.$API.enm.mpoint.create.req(that.form);
+						}else{
+							res = this.$API.enm.mpoint.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();
+						}
+					}
+				})
+			},
+			//编辑测点集
+			roleEdit(row){
+				this.type='edit';
+				this.form=row;
+				this.limitedVisible = true;
+			},
+
+			//删除测点集
+			async roleDel(row){
+				var id = row.id;
+				var res = await this.$API.mtm.team.delete.req(id);
+				if(res.err_msg){
+					this.$message.error(res.err_msg)
+				}else{
+					this.$refs.table.refresh();
+					this.$message.success("删除成功")
+				}
+			},
+			//表格选择后回调事件
+			selectionChange(selection){
+				this.selection = selection;
+			},
+			//搜索
+			handleQuery(){
+				this.$refs.table.queryData(this.query)
+			},
+			//本地更新数据
+			handleSaveSuccess(){
+				this.$refs.table.refresh()
+			}
+		}
+	}
+</script>
+<style scoped>
+	.treeMain {width: 100%;height:280px;overflow: auto;border: 1px solid #dcdfe6;margin-bottom: 10px;}
+</style>