diff --git a/src/views/em/equipment_form.vue b/src/views/em/equipment_form.vue
index 2ab4be25..28cf02ad 100644
--- a/src/views/em/equipment_form.vue
+++ b/src/views/em/equipment_form.vue
@@ -3,7 +3,7 @@
     <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="100px">
-       <el-row>
+          <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="责任部门">
                 <el-cascader v-model="form.belong_dept" :options="group" :props="groupsProps" clearable
@@ -11,7 +11,13 @@
                 </el-cascader>
               </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 mgroups" :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="name">
                 <el-input v-model="form.name" placeholder="设备名称" />
@@ -22,7 +28,27 @@
                 <el-input v-model="form.number" placeholder="设备编号" />
               </el-form-item>
             </el-col>
-			<el-col :md="12" :sm="24">
+            <el-col :md="12" :sm="24" v-if="form.type == 10">
+              <el-form-item
+								label="表明工段运行的方式"
+								label-width="160"
+							>
+              <el-select
+									v-model="form.indicate_mgroup_running"
+									style="width: 100%"
+                  clearable
+                  @clear="() => { form.indicate_mgroup_running=null } "
+								>
+									<el-option
+										v-for="e in iMEnum.values"
+										:key="e.key"
+										:value="e.key"
+										:label="e.text"
+									></el-option>
+								</el-select>
+							</el-form-item>
+            </el-col>
+			      <el-col :md="12" :sm="24">
               <el-form-item label="规格型号" prop="model">
                 <el-input v-model="form.model" placeholder="规格型号" />
               </el-form-item>
@@ -35,15 +61,16 @@
                 </el-select>
               </el-form-item>
             </el-col>
-			<el-col :md="12" :sm="24">
+			      <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 cateOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-divider/>
-
+          </el-row>
+          <el-divider v-if="form.type == 50"/>
+          <el-row v-if="form.type == 50">
             <el-col :md="12" :sm="24">
               <el-form-item label="IP地址" prop="ip">
                 <el-input v-model="form.ip" placeholder="设备IP地址" />
@@ -54,8 +81,6 @@
                 <el-input v-model="form.port" placeholder="设备端口号" />
               </el-form-item>
             </el-col>
-
-
             <el-col :md="12" :sm="24">
               <el-form-item label="登录账号" prop="login_name">
                 <el-input v-model="form.login_name" placeholder="设备登录名" />
@@ -66,9 +91,9 @@
                 <el-input v-model="form.login_pwd" placeholder="设备登录密码" />
               </el-form-item>
             </el-col>
-            <el-divider/>
-
-
+          </el-row>
+          <el-divider/>
+          <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="生产厂">
                 <el-input v-model="form.factory" placeholder="生产厂" />
@@ -121,7 +146,70 @@
               </el-form-item>
             </el-col>
           </el-row>
-
+<el-row>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="简要技术参数">
+                <el-input type="textarea" :rows="3" v-model="form.parameter" placeholder="技术参数" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="备注">
+                <el-input type="textarea" :rows="3" v-model="form.description" placeholder="备注" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider/>
+          <el-row v-if="form.type==20">
+            <el-col :md="12" :sm="24">
+              <el-form-item label="仪表类型">
+                <el-input v-model="form.meter_type" placeholder="仪表类型" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="量程范围">
+                <el-input v-model="form.measurement_range" placeholder="量范" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="管理等级">
+                <el-input v-model="form.management_level" placeholder="管理等级" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="精度等级">
+                <el-input v-model="form.accuracy_level" placeholder="精度等级" />
+              </el-form-item>
+            </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="检定周期(月)">
+                <el-input-number v-model="form.cycle" :precision="1" :min="0" controls-position="right"
+                  style="width: 100%;" placeholder="检定周期（月）" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-divider v-if="form.type==20"/>
+          <el-row>
+            <el-col>
+              <el-form-item label="技术参数">
+                <el-button @click="addJsonItem" type="primary" size="small">添加</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row v-for="(item, $index) in parameter_json" :key="item" :gutter="4">
+            <el-col :span="11">
+              <el-form-item label="参数名">
+                <el-input v-model="item.key" placeholder="参数名" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item label="参数值">
+                <el-input v-model="item.value" placeholder="参数值" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-button @click="delJsonItem($index)" type="danger" size="small">删除</el-button>
+            </el-col>
+          </el-row>
 
         </el-form>
       </el-main>