Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

src/api/dangerManagement/enterSafetyRecords.js

@@ -31,6 +31,14 @@ export function doDelete(query) {
   })
 }
 
+export function doInitFxd(query) {
+  return request({
+    url: '/aqgl/fxyk/fxd/init/fxd',
+    method: 'post',
+    data: query||{}
+  })
+}
+
 
 
 

src/views/dangerManagement/enterSafetyRecords/edit.vue

@@ -12,7 +12,7 @@
                 </el-col>
                 <el-col :span="12">
                     <el-form-item label="风险点"  ref="fxd" prop="fxd">
-                        <el-input :readonly="readonly"  v-model="form.fxd" ></el-input>
+                      <RelSelect style="width: 100%;" :readonly="readonly" src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='form.fxd' ></RelSelect>
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">