演练范本库 页面修改,

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

@@ -38,20 +38,20 @@
                   @keyup.enter.native="handleQuery"
                 />
               </el-form-item>
-              <!--              <el-form-item label="演练项目" prop="drillType">
-                              <el-select
-                                v-model="queryParams.drillType"
-                                placeholder="请选择演练项目"
-                                clearable
-                              >
-                                <el-option
-                                  v-for="dict in dict.type.core_drill_type"
-                                  :key="dict.value"
-                                  :label="dict.label"
-                                  :value="dict.value"
-                                />
-                              </el-select>
-                            </el-form-item>-->
+              <el-form-item label="演练项目" prop="drillType">
+                <el-select
+                  v-model="queryParams.drillType"
+                  placeholder="请选择演练项目"
+                  clearable
+                >
+                  <el-option
+                    v-for="dict in dict.type.core_drill_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
               <!-- <el-form-item>
 
           </el-form-item> -->
@@ -126,7 +126,7 @@
               prop="orgName"
             />
 
-<!--            <el-table-column
+            <el-table-column
               label="演练项目"
               align="left"
               header-align="center"
@@ -139,7 +139,7 @@
                   :value="scope.row.drillType"
                 />
               </template>
-            </el-table-column>-->
+            </el-table-column>
             <!--            <el-table-column
                           label="演练类型"
                           align="left"
@@ -216,34 +216,34 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <!--        <el-form-item label="演练项目" prop="drillType" style="width: 100%">
-                  <el-select
-                    v-model="form.drillType"
-                    placeholder="请选择演练项目"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.core_drill_type"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="演练类型" prop="drillCategory" style="width: 100%">
-                  <el-select
-                    v-model="form.drillCategory"
-                    placeholder="请选择演练类型"
-                    style="width: 100%"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.core_drill_category"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>-->
+        <el-form-item label="演练项目" prop="drillType" style="width: 100%">
+          <el-select
+            v-model="form.drillType"
+            placeholder="请选择演练项目"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in dict.type.core_drill_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <!--    <el-form-item label="演练类型" prop="drillCategory" style="width: 100%">
+             <el-select
+               v-model="form.drillCategory"
+               placeholder="请选择演练类型"
+               style="width: 100%"
+             >
+               <el-option
+                 v-for="dict in dict.type.core_drill_category"
+                 :key="dict.value"
+                 :label="dict.label"
+                 :value="dict.value"
+               ></el-option>
+             </el-select>
+           </el-form-item>-->
         <el-form-item label="演练场景" prop="drillProjects">
           <el-input v-model="form.drillProjects" maxlength="50" placeholder="请输入演练场景"/>
         </el-form-item>

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

@@ -34,42 +34,42 @@
           <!-- <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-option
-                v-for="dict in dict.type.core_drill_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <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"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>-->
+                    <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"
+                          :label="dict.label"
+                          :value="dict.value"
+                        />
+                      </el-select>
+                    </el-form-item>
+          <!--         <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"
+                         :label="dict.label"
+                         :value="dict.value"
+                       />
+                     </el-select>
+                   </el-form-item>-->
         </template>
 
         <!-- 表格 -->
         <template slot="columns">
           <el-table-column label="编号" align="center" prop="id"/>
           <el-table-column prop="orgName" label="机构名称" width="200"></el-table-column>
-<!--          <el-table-column label="演练项目" align="center" prop="drillType">
+          <el-table-column label="演练项目" align="center" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column label="演练类型" scoped-slot="drillCategory" align="center" prop="drillCategory">
-            <template slot-scope="scope">
-              <dict-tag :options="dict.type.core_drill_category" :value="scope.row.drillCategory"/>
-            </template>
-          </el-table-column>-->
+          <!--     <el-table-column label="演练类型" scoped-slot="drillCategory" align="center" prop="drillCategory">
+                 <template slot-scope="scope">
+                   <dict-tag :options="dict.type.core_drill_category" :value="scope.row.drillCategory"/>
+                 </template>
+               </el-table-column>-->
           <el-table-column label="演练场景" scoped-slot="drillProjects" align="center" width="180"
                            prop="drillProjects">
             <template slot-scope="scope">
@@ -99,7 +99,7 @@ import GSearchTable from "@/components/table/gx.search.table.vue";
 // import { ruleListForOrg } from "@/api/resumption/rule.js";
 export default {
   components: {GSearchTable},
-  dicts: ['core_drill_type','core_drill_category'],
+  dicts: ['core_drill_type', 'core_drill_category'],
   data() {
     return {
       isShow: false,
@@ -107,7 +107,7 @@ export default {
       // ruleList: [],
       search: {
         id: null,
-        drillProjects:null,
+        drillProjects: null,
         drillType: null,
         orgId: this.$store.getters.orgId,
       },
@@ -130,8 +130,8 @@ export default {
     show(type) {
       console.log("show", type)
       this.search = this.emptySearch();
-      if (type){
-        this.search.drillType =  type.toString();
+      if (type) {
+        this.search.drillType = type.toString();
       }
       this.isShow = true;
       this.selectList = this.defaultSelect;
@@ -160,7 +160,7 @@ export default {
         orgId: this.$store.getters.orgId,
       };
     },
-    getOne(type){
+    getOne(type) {
 
     },