diff --git a/src/api/model/em.js b/src/api/model/em.js
index ceac5338..0f2e92f3 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 {
-
-	equipment: {
+	// 测点集
+	mgroup: {
 		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}/`
@@ -36,41 +36,38 @@ export default {
 					`${config.API_URL}/em/equipment/`,
 					data);
 			}
-		}
-	},
-	mpoint: {
-		list: {
-			name: "获取列表",
-			req: async function(data){
-				return await http.get(
-					`${config.API_URL}/em/mpoint/`,
-					data
-				);
-			}
 		},
-		item: {
-			name: "获取详情",
+        delete: {
+			name: "删除",
 			req: async function(id){
-				return await http.get(
-					`${config.API_URL}/em/mpoint/${id}/`
-				);
+				return await http.delete(
+					`${config.API_URL}/em/equipment/${id}/`);
 			}
 		},
-		update: {
-			name: "更新",
-			req: async function(id, data){
-				return await http.put(
-					`${config.API_URL}/em/mpoint/${id}/`,
-					data);
-			}
-		},
-        create: {
-			name: "创建",
+		deletes: {
+			name: "批量删除",
 			req: async function(data){
 				return await http.post(
-					`${config.API_URL}/em/mpoint/`,
+					`${config.API_URL}/em/equipment/deletes/`,
 					data);
 			}
-		}
+		},
+        cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/em/equipment/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/em/equipment/deletes_hard/`,
+					data);
+			}
+		},
 	},
+	
 }
\ No newline at end of file
diff --git a/src/api/model/enm.js b/src/api/model/enm.js
new file mode 100644
index 00000000..38e41d2f
--- /dev/null
+++ b/src/api/model/enm.js
@@ -0,0 +1,216 @@
+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: {
+			name: "测点原始记录",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/enm/mplog/`,
+					data
+				);
+			}
+		},
+		list: {
+			name: "测点列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/enm/mpoint/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/enm/mpoint/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/enm/mpoint/${id}/`,
+					data);
+			}
+		},
+        create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/enm/mpoint/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/enm/mpoint/${id}/`);
+			}
+		},
+		deletes: {
+			name: "批量删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/enm/mpoint/deletes/`,
+					data);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/enm/mpoint/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/enm/mpoint/deletes_hard/`,
+					data);
+			}
+		},
+	},
+	//班组
+	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/qm.js b/src/api/model/qm.js
new file mode 100644
index 00000000..f8f2c17e
--- /dev/null
+++ b/src/api/model/qm.js
@@ -0,0 +1,27 @@
+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+	getQuastat: {
+		url: `${config.API_URL}/qm/quastat/`,
+		name: "质量报告分析",
+		get: async function(data={}){
+			return await http.get(this.url, data);
+		}
+	},
+	createQuastat: {
+		url: `${config.API_URL}/qm/quastat/`,
+		name: "质量报告分析",
+		post: async function(data={}){
+			return await http.post(this.url, data);
+		}
+	},
+	getTestItem: {
+		url: `${config.API_URL}/qm/testitem/`,
+		name: "质检项目",
+		get: async function(data={}){
+			return await http.get(this.url, data);
+		}
+	},
+	
+}
diff --git a/src/api/model/wpm.js b/src/api/model/wpm.js
new file mode 100644
index 00000000..66b7c4ce
--- /dev/null
+++ b/src/api/model/wpm.js
@@ -0,0 +1,101 @@
+import config from "@/config"
+import http from "@/utils/request"
+/*EM接口*/
+export default {
+	//值班记录
+	sflog: {
+		list: {
+			name: "值班记录列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/wpm/sflog/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/wpm/sflog/${id}/`
+				);
+			}
+		},
+		update: {
+			name: "更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/wpm/sflog/${id}/`,
+					data);
+			}
+		},
+        create: {
+			name: "创建",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/sflog/`,
+					data);
+			}
+		},
+		delete: {
+			name: "删除",
+			req: async function(id){
+				return await http.delete(
+					`${config.API_URL}/wpm/sflog/${id}/`);
+			}
+		},
+		deletes: {
+			name: "批量删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/sflog/deletes/`,
+					data);
+			}
+		},
+		cquery: {
+			name: "复杂查询",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/sflog/cquery/`,
+					data);
+			}
+		},
+		deleteHard: {
+			name: "批量物理删除",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/wpm/sflog/deletes_hard/`,
+					data);
+			}
+		},
+	},
+	//停机记录
+	stlog: {
+		list: {
+			name: "停机记录列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/wpm/stlog/`,
+					data
+				);
+			}
+		},
+		stsflog: {
+			name: "值班停机关系",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/wpm/stsflog/`,
+					data
+				);
+			}
+		},
+		update: {
+			name: "值班停机关系更新",
+			req: async function(id, data){
+				return await http.put(
+					`${config.API_URL}/wpm/stsflog/${id}/`,
+					data);
+			}
+		},
+	},
+}
\ No newline at end of file
diff --git a/src/config/route.js b/src/config/route.js
index e4bef1f1..ce094f5e 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -214,7 +214,7 @@ const routes = [
           "icon": "el-icon-grid",
           "perms": ["equipment"]
         },
-        "component": "em/equipment"
+        "component": "em/equipment2"
       },
       {
         "name": "em",
@@ -224,7 +224,7 @@ const routes = [
           "icon": "el-icon-grid",
           "perms": ["mpoint"]
         },
-        "component": "em/equipment"
+        "component": "em/mpoint"
       },
     ]
   },
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 2aa4e3d5..c73b86c6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -83,7 +83,7 @@
 			<Side-m v-if="ismobile"></Side-m>
 			<div class="aminui-body el-container">
 				<Topbar v-if="!ismobile"></Topbar>
-				<Tags v-if="!ismobile && layoutTags"></Tags>
+				<!-- <Tags v-if="!ismobile && layoutTags"></Tags> -->
 				<div class="adminui-main" id="adminui-main">
 					<router-view v-slot="{ Component }">
 					    <keep-alive :include="this.$store.state.keepAlive.keepLiveRoute">
@@ -228,10 +228,13 @@
 		},
 		computed:{
 			baseName(){
-				return this.$TOOL.data.get("BASE_INFO").base.base_name;
+				let baseName = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_name:'智能管理平台';
+				return baseName;
 			},
 			baseLogo(){
-				return this.$TOOL.data.get("BASE_INFO").base.base_logo
+				let base_logo = this.$TOOL.data.get("BASE_INFO")!==null?this.$TOOL.data.get("BASE_INFO").base.base_logo:'img/logo.png';
+				
+				return base_logo
 			},
 			ismobile(){
 				return this.$store.state.global.ismobile
diff --git a/src/views/em/equipment.vue b/src/views/em/equipment.vue
index 15ee414e..5851a265 100644
--- a/src/views/em/equipment.vue
+++ b/src/views/em/equipment.vue
@@ -2,9 +2,7 @@
   <el-container>
     <el-header>
       <div class="left-panel">
-        <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'rparty.create'"></el-button>
-        <!-- <el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
-				<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button> -->
+        <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
       </div>
       <div class="right-panel">
         <div class="right-panel-search">
@@ -27,64 +25,76 @@
         ref="table"
         :apiObj="apiObj"
         row-key="id"
-      
         stripe
-       
       >
-        <el-table-column label="#" type="index" width="50"></el-table-column>
-        <el-table-column label="名称" prop="name" width="240"  :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column label="信用代码" prop="number" width="180">
+        <el-table-column type="index" width="50"/>
+        <el-table-column label="设备名称" prop="name" show-overflow-tooltip>
         </el-table-column>
-        <el-table-column
-          label="联系人"
-          prop="contacter"
-        ></el-table-column>
-        <el-table-column
-          label="联系电话"
-          prop="phone"
-        ></el-table-column>
-        <el-table-column
-          label="所属部门"
-          prop="belong_dept"
-          width="180"
-        >
-        <template #default="scope">
-          {{scope.row.belong_dept_name}}
-        </template>
+        <el-table-column label="设备编号" prop="number">
         </el-table-column>
-          <el-table-column
-          label="管理员"
-        >
-        <template #default="scope">
-          <span v-if="scope.row.admin">{{ scope.row.admin_.name }}-{{scope.row.admin_.phone}}</span>
-        </template>
+        <el-table-column label="型号规格" prop="model">
         </el-table-column>
-        
-        <el-table-column label="操作" fixed="right" align="left" width="200">
+        <el-table-column label="生产厂及国别" prop="factory" show-overflow-tooltip>
+        </el-table-column>
+        <el-table-column label="生产日期" prop="production_date">
+        </el-table-column>
+        <el-table-column label="购置日期" prop="buy_date">
+        </el-table-column>
+        <el-table-column label="数量" prop="count">
+        </el-table-column>
+        <el-table-column label="状态">
           <template #default="scope">
-              <el-button
-                link
-                type="primary"
-                size="small"
-                @click="table_show(scope.row, scope.$index)"
-                >查看</el-button
-              >
-              <el-button
-                link
-                type="warning"
-                size="small"
-                @click="table_edit(scope.row, scope.$index)"
-                v-auth="'rparty.update'"
-                >编辑</el-button
-              >
-              <el-popconfirm
-                title="确定删除吗？"
-                @confirm="table_del(scope.row, scope.$index)"
-              >
-                <template #reference>
-                  <el-button link type="danger" size="small" v-auth="'rparty.delete'">删除</el-button>
-                </template>
-              </el-popconfirm>
+            <el-tag v-if="scope.row.state===10" type="success">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state===20" type="warning">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state===30">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else type="danger">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="技术指标" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.parameter }}</template>
+        </el-table-column>
+        <el-table-column label="保管人">
+          <template #default="scope">{{ scope.row.keeper_.username }}</template>
+        </el-table-column>
+        <el-table-column label="存放位置" show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.place }}</template>
+        </el-table-column>
+        <el-table-column label="绑定工序"  show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag v-for="item in scope.row.step_"
+                    :key="item.number"
+                    :label="item.name"
+                    :value="item.number">{{item.name}}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注"  show-overflow-tooltip>
+          <template #default="scope">{{ scope.row.description }}</template>
+        </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.row)"
+            >
+              编辑
+            </el-link>
+            <el-link
+              v-if="checkPermission(['equipment_delete'])"
+              type="danger"
+              @click="handleDelete(scope.row)"
+            >
+              删除
+            </el-link>
           </template>
         </el-table-column>
       </scTable>
@@ -113,6 +123,12 @@ export default {
       apiObj: this.$API.rpm.rparty.list,
       query: {},
       selection: [],
+      state_: {
+          10: '完好',
+          20: '限用',
+          30: '在修',
+          40: '禁用',
+        },
     };
   },
   methods: {
diff --git a/src/views/em/equipment2.vue b/src/views/em/equipment2.vue
new file mode 100644
index 00000000..ff619b35
--- /dev/null
+++ b/src/views/em/equipment2.vue
@@ -0,0 +1,204 @@
+<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
+      >
+      <el-table-column type="index" width="50"/>
+        <el-table-column label="设备编号">
+          <template #default="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+        <el-table-column label="管理类别">
+          <template #default="scope">
+            {{mgmtype_[scope.row.mgmtype]}}
+          </template>
+        </el-table-column>
+        <el-table-column label="校/检方式">
+          <template  #default="scope">{{ waytype_[scope.row.way] }}</template>
+        </el-table-column>
+        <el-table-column label="标准/依据" width="100">
+          <template  #default="scope">{{ scope.row.standard }}</template>
+        </el-table-column>
+        <el-table-column label="校/检周期" width="100">
+          <template #default="scope">{{ scope.row.cycle }}</template>
+        </el-table-column>
+        <el-table-column label="最近一次校准日期" width="140">
+          <template  #default="scope">{{ scope.row.check_date }}</template>
+        </el-table-column>
+        <el-table-column label="下次校准日期">
+          <template #default="scope">
+            <el-tag v-if="scope.row.next_check_date" :type="setClass(scope.row.next_check_date)">
+              {{scope.row.next_check_date}}
+            </el-tag>
+            <div v-else></div>
+          </template>
+        </el-table-column>
+        <el-table-column label="设备名称">
+          <template #default="scope">{{ scope.row.name }}</template>
+        </el-table-column>
+        <el-table-column label="型号规格">
+          <template #default="scope">{{ scope.row.model }}</template>
+        </el-table-column>
+
+        <el-table-column label="生产厂家">
+          <template #default="scope">{{ scope.row.factory }}</template>
+        </el-table-column>
+        <el-table-column label="使用类别">
+          <template #default="scope">{{ usetype_[scope.row.way] }}</template>
+        </el-table-column>
+        <el-table-column label="校/检状态">
+          <template #default="scope">
+            <el-tag v-if="scope.row.state===10" type="success">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else type="danger">
+              {{ state_[scope.row.state] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="保管人">
+          <template #default="scope">
+            {{scope.row.keeper_.username}}
+          </template>
+        </el-table-column>
+        <el-table-column label="存放位置">
+          <template #default="scope">{{ scope.row.place }}</template>
+        </el-table-column>
+        <el-table-column label="绑定工序">
+          <template #default="scope">
+            <el-tag
+              v-for="item in scope.row.step_"
+              :key="item.number"
+              :label="item.name"
+              :value="item.number"
+            >
+              {{ item.name }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注">
+          <template  #default="scope">{{ scope.row.description }}</template>
+        </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 "./equipment_form.vue";
+export default {
+  name: "rparty",
+  components: {
+    saveDialog,
+  },
+  data() {
+    return {
+      dialog: {
+        save: false,
+        permission: false,
+      },
+      apiObj: this.$API.rpm.rparty.list,
+      query: {},
+      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/em/equipment_form.vue b/src/views/em/equipment_form.vue
index dee792e0..909d2011 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -13,85 +13,119 @@
           :model="form"
           :rules="rules"
           :disabled="mode == 'show'"
-          label-width="80px"
+          label-width="100px"
         >
-          <el-row>
-            <el-col :md="8" :sm="12" :xs="24">
-              <el-form-item label="公司名称" prop="name">
-                <el-input
-                  v-model="form.name"
-                  type="text"
-                  clearable
-                  :disabled="mode != 'add'"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="8" :sm="12" :xs="24">
-              <el-form-item label="信用代码" prop="number">
-                <el-input
-                  v-model="form.number"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="8" :sm="12" :xs="24">
-              <el-form-item label="法人">
-                <el-input v-model="form.lawer" type="text" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="8" :sm="12" :xs="24">
-              <el-form-item label="联系人" prop="contacter">
-                <el-input
-                  v-model="form.contacter"
-                  type="text"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="8" :sm="12" :xs="24">
-              <el-form-item label="联系电话" prop="phone">
-                <el-input v-model="form.phone" type="text" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="8" :sm="12" :xs="24">
-              <el-form-item label="联系邮箱">
-                <el-input v-model="form.email" type="text" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="12" :sm="12" :xs="24">
-                <el-form-item label="归属部门">
-                  <el-cascader
-									v-model="form.belong_dept"
-									:options="belong_dept_options"
-								 :props="{
-                  expandTrigger: 'hover', // 次级菜单的展开方式
-                  label: 'label', //
-                  value: 'value', //
-                  checkStrictly: true,
-                  emitPath: false, // 在选中节点改变时，是否返回由该节点所在的各级菜单的值所组成的数组，若设置 false，则只返回该节点的值
-                }"
-									clearable
-									style="width: 100%;">
-								</el-cascader>
-             
-                </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="24" :xs="24">
-              <el-form-item label="企业地址">
-                <el-input v-model="form.address" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :md="24" :sm="24" :xs="24">
-              <el-form-item label="其他说明">
-                <el-input
-                  v-model="form.description"
-                  clearable
-                  type="textarea"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-row>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="设备名称" prop="name">
+              <el-input v-model="form.name" placeholder="设备名称"/>
+            </el-form-item>
+          </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="设备编号" prop="number">
+              <el-input v-model="form.number" placeholder="设备编号"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="型号规格">
+              <el-input v-model="form.model" placeholder="规格型号规格"/>
+            </el-form-item>
+          </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="状态">
+              <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-row>
+        <el-form-item label="生产厂">
+          <el-input v-model="form.factory" placeholder="生产厂"/>
+        </el-form-item>
+        <el-row>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="生产日期">
+              <el-date-picker
+                v-model="form.production_date"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                style="width:100%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="购置日期">
+              <el-date-picker
+                v-model="form.buy_date"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                style="width:100%"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="数量">
+              <el-input v-model="form.count" placeholder="数量"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        
+        <el-form-item label="技术指标">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.parameter"
+            placeholder="技术指标"
+          />
+        </el-form-item>
+        <el-form-item label="存放位置">
+          <el-input v-model="form.place" placeholder="存放位置"/>
+        </el-form-item>
+        <el-row>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="所属部门" prop="belong_dept">
+              <el-cascader :options="depOptions" :props="{ checkStrictly: true,emitPath:false }" ref="demoCascader"
+                           style="width:100%" v-model="form.belong_dept"></el-cascader>
+            </el-form-item>
+          </el-col>
+          <el-col :md="12" :sm="24">
+            <el-form-item label="保管人" prop="keeper_name">
+              <el-select
+                v-model="form.keeper_name"
+                filterable
+                style="width: 100%"
+                allow-create
+                default-first-option
+                placeholder="请选择">
+                <el-option
+                  v-for="item in keeperOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="设备备注">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="form.description"
+            placeholder="设备备注"
+          />
+        </el-form-item>
         </el-form>
       </el-main>
       <el-footer>
@@ -119,13 +153,28 @@ export default {
       },
       form: {},
       rules: {
-        name: [{ required: true, message: "请输入" }],
-        number: [{ required: true, message: "请输入" }],
-        contacter: [{ required: true, message: "请输入" }],
-        phone: [{ required: true, message: "请输入" }],
-      },
+          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: 20,
+          label: '限用'
+        }, {
+          value: 30,
+          label: '在修'
+        }, {
+          value: 40,
+          label: '禁用'
+        }],
       visible: false,
       isSaveing: false,
+      keeperOptions: [],
+      depOptions: [],
       selectionFilters: [],
       setFiltersVisible: false,
       belong_dept_options: []
diff --git a/src/views/em/mpoint.vue b/src/views/em/mpoint.vue
new file mode 100644
index 00000000..a409cbe3
--- /dev/null
+++ b/src/views/em/mpoint.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-container>
+    <el-header>
+      <div class="left-panel">
+        <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>
+        <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
+      </div>
+    </el-header>
+    <el-main class="nopadding">
+      <scTable
+        ref="table"
+        :apiObj="apiObj"
+        row-key="id"
+        stripe
+      >
+        <el-table-column label="#" type="index" width="50"></el-table-column>
+        <el-table-column label="测点名称" prop="name" width="240"  :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="测点编号" prop="code" width="180"></el-table-column>
+        <el-table-column label="单位" prop="unit" width="180"></el-table-column>
+        <el-table-column label="分类" prop="cate" width="180"></el-table-column>
+        <el-table-column label="创建人" prop="create_by"></el-table-column>
+        <el-table-column label="最后编辑人" prop="update_by"></el-table-column>
+        <el-table-column label="所属部门" prop="belong_dept">
+          <template #default="scope">
+            {{scope.row.belong_dept_name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="检测设备" prop="ep_monitored"></el-table-column>
+        <el-table-column label="所属设备" prop="ep_belong"></el-table-column>
+        <el-table-column label="所在集合" prop="mgroup"></el-table-column>
+        <el-table-column label="操作" fixed="right" align="left" width="200">
+          <template #default="scope">
+              <el-button
+                link
+                type="primary"
+                size="small"
+                @click="table_show(scope.row, scope.$index)"
+                >查看</el-button
+              >
+              <el-button
+                link
+                type="warning"
+                size="small"
+                @click="table_edit(scope.row, scope.$index)"
+                v-auth="'rparty.update'"
+                >编辑</el-button
+              >
+              <el-popconfirm
+                title="确定删除吗？"
+                @confirm="table_del(scope.row, scope.$index)"
+              >
+                <template #reference>
+                  <el-button link type="danger" size="small" v-auth="'rparty.delete'">删除</el-button>
+                </template>
+              </el-popconfirm>
+          </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 "./mpoint_form.vue";
+export default {
+  name: "rparty",
+  components: {
+    saveDialog,
+  },
+  data() {
+    return {
+      dialog: {
+        save: false,
+        permission: false,
+      },
+      apiObj: this.$API.enm.mpoint.list,
+      query: {},
+      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/em/mpoint_form.vue b/src/views/em/mpoint_form.vue
new file mode 100644
index 00000000..33eee883
--- /dev/null
+++ b/src/views/em/mpoint_form.vue
@@ -0,0 +1,212 @@
+<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="dialogForm"
+          :model="form"
+          :rules="rules"
+          :disabled="mode == 'show'"
+          label-width="80px"
+        >
+          <el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="测点名称" prop="name">
+                <el-input
+                  v-model="form.name"
+                  type="text"
+                  clearable
+                  :disabled="mode != 'add'"
+                  class="formItem"
+                ></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"
+                  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-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="分类">
+                <el-select
+                    v-model="form.cate"
+                    placeholder="分类"
+                    clearable
+                    class="formItem"
+                  >
+                    <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.belong_dept"
+                    placeholder="所属部门"
+                    clearable
+                    class="formItem"
+                  >
+                    <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
+                    class="formItem"
+                  >
+                    <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.mgroup"
+                    placeholder="所在集合"
+                    clearable
+                    class="formItem"
+                  >
+                    <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-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: {},
+      rules: {
+        name: [{ required: true, message: "请输入" }],
+        number: [{ required: true, message: "请输入" }],
+        contacter: [{ required: true, message: "请输入" }],
+        phone: [{ required: true, message: "请输入" }],
+      },
+      visible: false,
+      isSaveing: false,
+      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.enm.mpoint.create.req(this.form);
+            } else if (this.mode == "edit") {
+              res = await this.$API.enm.mpoint.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>
+.formItem{
+  width: 100%;
+}
+</style>