25 1/6调整

src/views/contingency/contingencyplan/edit.vue

@@ -4,7 +4,7 @@
         <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="演练名称"  ref="name" prop="name">
+                    <el-form-item label="计划名称"  ref="name" prop="name">
                         <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                     </el-form-item>
                 </el-col>
@@ -120,7 +120,7 @@
                   yldj:'',
                         //ID
                         id:'',
-                        //演练名称
+                        //计划名称
                         name:'',
                         //演练组织单位
                         zzdw:'',

src/views/contingency/contingencyplan/index.vue

@@ -111,7 +111,7 @@
             width: 80
           },
           {
-            label: "演练名称",
+            label: "计划名称",
             prop: "name",
             fieldType: "ftString",
             width: 180

src/views/dangerManagement/enterSafetyRecords/edit.vue

@@ -15,9 +15,10 @@
                           <RelSelect  style="width: 100%;" :readonly="readonly" src='jcsj/common/bm/queryGs' :match="{value:'id',label:'bmmc'}" v-model='form.gsid' ></RelSelect>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="24">
                     <el-form-item label="风险点"  ref="fxd" prop="fxd">
-                      <RelSelect linkage ref='fxds' :linkParams="{gsid:form.gsid}" style="width: 100%;" :readonly="readonly" src='aqgl/fxyk/fxd/init/fxd' :match="{value:'id',label:'fxdName'}" v-model='form.fxd' ></RelSelect>
+                        <el-input :readonly="readonly"  v-model="form.fxds" ></el-input>
+                      <!-- <RelSelect linkage ref='fxds' :linkParams="{gsid:form.gsid}" 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">
@@ -167,9 +168,7 @@
                 },
                 /* form提交时的规则,具体规则参考官网*/
                 rules: {
-                    fxd: [
-                              { required: true}
-                            ],
+
                   fxrq:[
                      { required: true}
                   ],

src/views/train/aqpxjh/edit.vue

@@ -4,7 +4,7 @@
         <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
             <el-row :gutter="24">
                 <el-col :span="12">
-                    <el-form-item label="培训名称"  ref="name" prop="name">
+                    <el-form-item label="计划名称"  ref="name" prop="name">
                         <el-input :readonly="readonly"  v-model="form.name" ></el-input>
                     </el-form-item>
                 </el-col>
@@ -125,7 +125,7 @@
                   pxdj:'',
                         //ID
                         id:'',
-                        //培训名称
+                        //计划名称
                         name:'',
                         //培训组织单位
                         zzdw:'',

src/views/train/aqpxjh/index.vue

@@ -111,7 +111,7 @@
             width: 80
           },
           {
-            label: "培训名称",
+            label: "计划名称",
             prop: "name",
             fieldType: "ftString",
             width: 180