Revert "演练项目修改为演练类型"

This reverts commit ec43ab85f32e20bbc0f40e0fee6700fb4be92f3e.

src/views/core/drill/drillDictionary/dialog.info.vue

@@ -10,7 +10,7 @@
           :contentStyle="content_style"
           :label-style="labelStyle"
         >
-          <el-descriptions-item labelClassName="gx_info_label" label="演练类型">
+          <el-descriptions-item labelClassName="gx_info_label" label="演练项目">
             {{
               getLabel(dict.type.core_drill_type, formData.drillType, "未知")
             }}

src/views/core/drill/drillDictionary/index.vue

@@ -38,10 +38,10 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="演练类型" prop="drillType">
+              <el-form-item label="演练项目" prop="drillType">
                 <el-select
                   v-model="queryParams.drillType"
-                  placeholder="请选择演练类型"
+                  placeholder="请选择演练项目"
                   clearable
                 >
                   <el-option
@@ -130,7 +130,7 @@
             />
 
             <el-table-column
-              label="演练类型"
+              label="演练项目"
               align="center"
               width="180"
               prop="drillType"
@@ -226,10 +226,10 @@
       :close="cancel"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="演练类型" prop="drillType" style="width: 100%">
+        <el-form-item label="演练项目" prop="drillType" style="width: 100%">
           <el-select
             v-model="form.drillType"
-            placeholder="请选择演练类型"
+            placeholder="请选择演练项目"
             style="width: 100%"
           >
             <el-option
@@ -331,7 +331,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        drillType: [{required: true, message: "请选择演练类型"}],
+        drillType: [{required: true, message: "请选择演练项目"}],
         drillCategory: [{required: true, message: "请选中演练类型"}],
         defaultCause: [{required: true, message: "请输入预设案由"}],
         drillProjects: [{required: true, message: "请输入演练场景"}],

src/views/core/drill/drillDictionaryBranch/dialog.info.vue

@@ -13,7 +13,7 @@
           <el-descriptions-item span="2" labelClassName="gx_info_label" label="机构名称">
             {{ formData.orgName }}
           </el-descriptions-item>
-          <el-descriptions-item span="2" labelClassName="gx_info_label" label="演练类型">
+          <el-descriptions-item span="2" labelClassName="gx_info_label" label="演练项目">
             {{
               getLabel(dict.type.core_drill_type, formData.drillType, "未知")
             }}

src/views/core/drill/drillDictionaryBranch/index.vue

@@ -37,10 +37,10 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <el-form-item label="演练类型" prop="drillType">
+              <el-form-item label="演练项目" prop="drillType">
                 <el-select
                   v-model="queryParams.drillType"
-                  placeholder="请选择演练类型"
+                  placeholder="请选择演练项目"
                   clearable
                 >
                   <el-option
@@ -129,7 +129,7 @@
             />
 
             <el-table-column
-              label="演练类型"
+              label="演练项目"
               align="center"
               width="180"
               prop="drillType"
@@ -225,10 +225,10 @@
       :close="cancel"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <el-form-item label="演练类型" prop="drillType" style="width: 100%">
+        <el-form-item label="演练项目" prop="drillType" style="width: 100%">
           <el-select
             v-model="form.drillType"
-            placeholder="请选择演练类型"
+            placeholder="请选择演练项目"
             style="width: 100%"
           >
             <el-option
@@ -330,7 +330,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        drillType: [{required: true, message: "请选择演练类型"}],
+        drillType: [{required: true, message: "请选择演练项目"}],
         drillCategory: [{required: true, message: "请选中演练类型"}],
         defaultCause: [{required: true, message: "请输入预设案由"}],
         drillProjects: [{required: true, message: "请输入演练场景"}],

src/views/core/drill/task/dialog.evaluate.vue

@@ -48,7 +48,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="演练类型">{{
+              <el-form-item label="演练项目">{{
                   formData.typeText
                 }}
               </el-form-item>

src/views/core/drill/task/dialog.info.vue

@@ -37,7 +37,7 @@
             {{ formData.recorderName }} </el-descriptions-item
           ><el-descriptions-item
             labelClassName="gx_info_label"
-            label="演练类型"
+            label="演练项目"
           >
             {{ formData.typeText }} </el-descriptions-item
           ><el-descriptions-item
@@ -161,7 +161,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="演练类型">{{
+              <el-form-item label="演练项目">{{
                   formData.typeText
                 }}
               </el-form-item>

src/views/core/drill/task/dialog.newtask.vue

@@ -25,8 +25,8 @@
               </el-form-item>
             </el-col>-->
             <el-col :span="12">
-              <el-form-item label="演练类型" prop="type">
-                <el-select style="width: 100%" v-model="formData.type" placeholder="请选择演练类型">
+              <el-form-item label="演练项目" prop="type">
+                <el-select style="width: 100%" v-model="formData.type" placeholder="请选择演练项目">
                   <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
                              :value="parseInt(dict.value)">
                   </el-option>
@@ -169,7 +169,7 @@ export default {
         drillStartTime: [{required: true, message: "请选择演练开始时间"}],
         drillEndTime: [{required: true, message: "请选择演练结束时间"}],
         drillSite: [{required: true, message: "请输入演练地点"}],
-        type: [{required: true, message: "请选择演练类型"}],
+        type: [{required: true, message: "请选择演练项目"}],
         presetCase: [{required: true, message: "请输入预设案由"}],
         drillSituation: [{required: true, message: "请输入演练情况"}],
         comment: [{required: true, message: "请输入点评总结"}],

src/views/core/drill/task/dialog.perform.vue

@@ -25,8 +25,8 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="演练类型" prop="type">
-                <el-select style="width: 100%;" v-model="formData.type" placeholder="请选择演练类型">
+              <el-form-item label="演练项目" prop="type">
+                <el-select style="width: 100%;" v-model="formData.type" placeholder="请选择演练项目">
                   <el-option v-for="dict in dict.type.core_drill_type" :key="dict.value" :label="dict.label"
                              :value="parseInt(dict.value)">
                   </el-option>
@@ -174,7 +174,7 @@ export default {
         drillStartTime: [{required: true, message: "请选择演练开始时间"}],
         drillEndTime: [{required: true, message: "请选择演练结束时间"}],
         drillSite: [{required: true, message: "请输入演练地点"}],
-        type: [{required: true, message: "请选择演练类型"}],
+        type: [{required: true, message: "请选择演练项目"}],
         presetCase: [{required: true, message: "请输入预设案由"}],
         drillSituation: [{required: true, message: "请输入演练情况"}],
         comment: [{required: true, message: "请输入点评总结"}],

src/views/core/drill/task/dialog.select.drillDictionary.branch.vue

@@ -34,8 +34,8 @@
           <!-- <el-form-item prop="title" label="编号">
             <el-input v-model="search.id" placeholder="请输入编号"></el-input>
           </el-form-item> -->
-                    <el-form-item label="演练类型" prop="drillType">
-                      <el-select v-model="search.drillType" placeholder="请选择演练类型" clearable>
+                    <el-form-item label="演练项目" prop="drillType">
+                      <el-select v-model="search.drillType" placeholder="请选择演练项目" clearable>
                         <el-option
                           v-for="dict in dict.type.core_drill_type"
                           :key="dict.value"
@@ -44,8 +44,8 @@
                         />
                       </el-select>
                     </el-form-item>
-          <!--         <el-form-item label="演练类型" prop="drillCategory">
-                     <el-select v-model="search.drillCategory" placeholder="请选择演练类型" clearable>
+          <!--         <el-form-item label="演练项目" prop="drillCategory">
+                     <el-select v-model="search.drillCategory" placeholder="请选择演练项目" clearable>
                        <el-option
                          v-for="dict in dict.type.core_drill_category"
                          :key="dict.value"
@@ -60,7 +60,7 @@
         <template slot="columns">
           <!-- <el-table-column label="编号" align="center" prop="id"/> -->
           <el-table-column prop="orgName" align="center" label="机构名称" width="180"></el-table-column>
-          <el-table-column label="演练类型" align="center" width="180" prop="drillType">
+          <el-table-column label="演练项目" align="center" width="180" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>

src/views/core/drill/task/dialog.select.drillDictionary.vue

@@ -34,8 +34,8 @@
           <!-- <el-form-item prop="title" label="编号">
             <el-input v-model="search.id" placeholder="请输入编号"></el-input>
           </el-form-item> -->
-                    <el-form-item label="演练类型" prop="drillType">
-                      <el-select v-model="search.drillType" placeholder="请选择演练类型" clearable>
+                    <el-form-item label="演练项目" prop="drillType">
+                      <el-select v-model="search.drillType" placeholder="请选择演练项目" clearable>
                         <el-option
                           v-for="dict in dict.type.core_drill_type"
                           :key="dict.value"
@@ -44,8 +44,8 @@
                         />
                       </el-select>
                     </el-form-item>
-          <!--         <el-form-item label="演练类型" prop="drillCategory">
-                     <el-select v-model="search.drillCategory" placeholder="请选择演练类型" clearable>
+          <!--         <el-form-item label="演练项目" prop="drillCategory">
+                     <el-select v-model="search.drillCategory" placeholder="请选择演练项目" clearable>
                        <el-option
                          v-for="dict in dict.type.core_drill_category"
                          :key="dict.value"
@@ -60,7 +60,7 @@
         <template slot="columns">
           <!-- <el-table-column label="编号" align="center" prop="id"/> -->
           <el-table-column prop="orgName" align="center" label="机构名称" width="180"></el-table-column>
-          <el-table-column label="演练类型" align="center" width="180" prop="drillType">
+          <el-table-column label="演练项目" align="center" width="180" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>

src/views/core/drill/task/index.vue

@@ -31,10 +31,10 @@
                   clearable
                 />
               </el-form-item>
-              <el-form-item label="演练类型" prop="type">
+              <el-form-item label="演练项目" prop="type">
                 <el-select
                   v-model="queryParams.type"
-                  placeholder="请选择演练类型"
+                  placeholder="请选择演练项目"
                   clearable
                 >
                   <el-option
@@ -177,7 +177,7 @@
                         </template>
                       </el-table-column>-->
             <el-table-column
-              label="演练类型"
+              label="演练项目"
               width="200"
               align="center"
               prop="type"