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

This reverts commit 68c9866524e906931e74a5346cdc8eccf507f84c.

src/views/menu/rehearsalTask/components/addRehearsalTask.vue

@@ -77,16 +77,16 @@
           </div>
         </div>
       </div>
-      <!-- //演练类型 -->
+      <!-- //演练项目 -->
       <van-field
         readonly
         clickable
         required
         name="picker"
         :value="form.typeText"
-        label="演练类型"
-        :rules="[{ required: true, message: '演练类型不能为空' }]"
-        placeholder="请选择演练类型"
+        label="演练项目"
+        :rules="[{ required: true, message: '演练项目不能为空' }]"
+        placeholder="请选择演练项目"
         @click="showPicker = true"
       />
 
@@ -241,7 +241,7 @@ export default {
       falg: false, //校验是否通过
 
       form: {
-        typeText: '', //演练类型
+        typeText: '', //演练项目类型
         type: '', //演练value
         category: '', //演练类型value
         categoryText: '', //演练类型text
@@ -385,9 +385,9 @@ export default {
       this.$refs.yldialog.initBranch()
     },
 
-    //演练类型确认
+    //演练项目确认
     onConfirm(val) {
-      this.form.typeText = val //演练类型赋值
+      this.form.typeText = val //演练项目赋值
       this.columnsList.forEach(item => {
         if (val == item.dictLabel) {
           this.form.type = item.dictValue

src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -82,7 +82,7 @@
       <div class="mainItem">
         <van-row>
           <van-col :span="8" class="label">
-            <div>演练类型</div>
+            <div>演练项目</div>
           </van-col>
           <van-col :span="16">
             <div>{{ trainingData.typeText }}</div>

src/views/menu/rehearsalTask/index.vue

@@ -20,7 +20,7 @@
               @confirm="onConfirm"
               confirm-button-text="确定"
               @cancel="onCancel"
-
+             
 
               :close-on-click-overlay="false"
             />
@@ -96,7 +96,7 @@
               <div class="wj-title-red" v-else-if="item.status == 4">{{ item.statusText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练类型</div>
+              <div>演练项目</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">

src/views/menu/rehearsalTask/learning.vue

@@ -8,7 +8,7 @@
           <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
         </van-col>
       </van-row>
-
+     
       <van-row>
         <van-col span="12">
           <!-- <van-field
@@ -69,11 +69,11 @@
       </van-row>
       <van-row>
         <van-col span="24">
-          <van-cell title="演练类型" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
+          <van-cell title="演练项目" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
 
           <van-popup v-model="showStatus" round position="bottom">
             <van-picker
-              title="演练类型"
+              title="演练项目"
               show-toolbar
               :columns="columns"
               @confirm="onConfirm"
@@ -83,7 +83,7 @@
             />
           </van-popup>
         </van-col>
-
+      
       </van-row>
       <van-row>
         <van-col span="24">
@@ -118,7 +118,7 @@
             </div>
 
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练类型</div>
+              <div>演练项目</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
@@ -171,8 +171,8 @@ export default {
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
       endShowDate: false, //月份显示隐藏
-      fieldValue: '', //演练类型名称
-      drillType: '',
+      fieldValue: '', //演练项目名称
+      drillType: '', 
       statusValue: ' ', //状态值
       columns: [], //状态数组
       columnsList: [], //状态数组
@@ -222,7 +222,7 @@ export default {
       this.getDictHandler('core_drill_type', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
-
+        
       })
       //获取分页列表
       this.selectListAppHandler()
@@ -252,7 +252,7 @@ export default {
         obj.endTime = this.endDate + '-' + '01'
       }
       if (this.fieldValue) {
-        obj.drillType = this.drillType
+        obj.drillType = this.drillType 
       }
       if (this.activeAl) {
         obj.recStatus = this.activeAl
@@ -350,7 +350,7 @@ export default {
           this.drillType = item.dictValue
         }
       })
-
+      
 
       this.selectListAppHandler()
       this.showStatus = false

src/views/menu/rehearsalTask/optimal.vue

@@ -69,11 +69,11 @@
       </van-row>
       <van-row>
         <van-col span="24">
-          <van-cell title="演练类型" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
+          <van-cell title="演练项目" @click="showStatus = true" is-link arrow-direction="down" :value="fieldValue" />
 
           <van-popup v-model="showStatus" round position="bottom">
             <van-picker
-              title="演练类型"
+              title="演练项目"
               show-toolbar
               :columns="columns"
               @confirm="onConfirm"
@@ -113,7 +113,7 @@
             <div class="titleClass">
               <div class="title">{{ item.title }}</div>
               <div>
-                <van-button
+                <van-button                 
                   type="info"
                   v-if="canCancel(item)"
                   size="small"
@@ -132,7 +132,7 @@
               <div>{{ item.orgName }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练类型</div>
+              <div>演练项目</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
@@ -189,7 +189,7 @@ export default {
       showStatus: false, //状态显示隐藏
       showDate: false, //月份显示隐藏
       endShowDate: false, //月份显示隐藏
-      fieldValue: '', //演练类型名称
+      fieldValue: '', //演练项目名称
       drillType: '',
       statusValue: ' ', //状态值
       columns: [], //状态数组
@@ -245,7 +245,7 @@ export default {
       this.getDictHandler('core_drill_type', res => {
         this.columnsList = res
         this.columns = res.map(item => item.dictLabel)
-      })
+      })      
       //根据登录人机构 初始化默认选中Tab页
       this.initDefaultActiveTab();
       // 根据第一层默认选中的Tab页 初始化第二层Tab 页值

src/views/menu/rehearsalTask/optimal_old.vue

@@ -117,7 +117,7 @@
               <div>{{ item.orgName }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
-              <div>演练类型</div>
+              <div>演练项目</div>
               <div>{{ item.typeText }}</div>
             </div>
             <div class="mainItem" @click="goInfo(item.id)">