演练范本库 页面修改

src/components/common/textarea.vue

@@ -2,7 +2,7 @@
   <div class="k-textarea">
     <el-input
       type="textarea"
-      :autosize="{minRows: 4}"
+      :rows="row"
       v-model="pv"
       :maxlength="length"
       :placeholder="placeholder"
@@ -22,6 +22,10 @@ export default {
   watch: {},
   props: {
     value: {},
+    row:{
+      type:Number,
+      default: 5,
+    },
     length: {},
     placeholder: {}
   },
@@ -39,4 +43,4 @@ export default {
     font-size: 12px;
   }
 }
-</style>
+</style>

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

@@ -38,33 +38,34 @@
                   @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> -->
             </el-form>
 
-            <el-row :gutter="10" >
+            <el-row :gutter="10">
               <el-col :span="1.5">
                 <el-button
                   type="primary"
                   icon="el-icon-search"
                   size="mini"
                   @click="handleQuery"
-                  >搜索</el-button
+                >搜索
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -73,7 +74,8 @@
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
-                  >重置</el-button
+                >重置
+                </el-button
                 >
               </el-col>
               <el-col :span="1.5">
@@ -83,7 +85,7 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['core:drillDictionary:add']"
-                  >新增范本
+                >新增范本
                 </el-button>
               </el-col>
               <!--          <el-col :span="1.5">
@@ -124,7 +126,7 @@
               prop="orgName"
             />
 
-            <el-table-column
+<!--            <el-table-column
               label="演练项目"
               align="left"
               header-align="center"
@@ -137,37 +139,34 @@
                   :value="scope.row.drillType"
                 />
               </template>
-            </el-table-column>
-            <el-table-column
-              label="演练类型"
-              align="left"
-              header-align="center"
-              width="180"
-              prop="drillType"
-            >
+            </el-table-column>-->
+            <!--            <el-table-column
+                          label="演练类型"
+                          align="left"
+                          header-align="center"
+                          width="180"
+                          prop="drillType"
+                        >
+                          <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">
-                <dict-tag
-                  :options="dict.type.core_drill_category"
-                  :value="scope.row.drillCategory"
-                />
+                <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
               </template>
             </el-table-column>
-            <!--          <el-table-column  label="演练场景" scoped-slot="drillProjects" align="center" width="180" prop="drillProjects">
-            <template slot-scope="scope">
-              <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
-            </template>
-          </el-table-column>-->
             <el-table-column
               label="预设案由"
               scoped-slot="defaultCause"
+              :show-overflow-tooltip="true"
               align="center"
               prop="defaultCause"
             >
-              <template slot-scope="scope">
-                <div class="ellipsis" :title="scope.row.defaultCause">
-                  {{ scope.row.defaultCause }}
-                </div>
-              </template>
             </el-table-column>
             <el-table-column
               label="操作"
@@ -184,7 +183,7 @@
                   v-if="canEdit(scope.row)"
                   @click="handleUpdate(scope.row)"
                   v-hasPermi="['core:drillDictionary:edit']"
-                  >编辑
+                >编辑
                 </el-button>
                 <BtnTip
                   size="mini"
@@ -193,7 +192,7 @@
                   v-if="canDelete(scope.row)"
                   @click="handleDelete(scope.row)"
                   v-hasPermi="['core:drillDictionary:remove']"
-                  >删除
+                >删除
                 </BtnTip>
               </template>
             </el-table-column>
@@ -217,41 +216,42 @@
       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 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>
-        <!--        <el-form-item label="演练场景" prop="drillProjects">
-          <el-input v-model="form.drillProjects" maxlength="50"  placeholder="请输入演练场景"/>
-        </el-form-item>-->
         <el-form-item label="预设案由" prop="defaultCause">
           <k-textarea
             v-model="form.defaultCause"
             :length="2000"
+            :row="20"
             show-word-limit
             placeholder="请输入预设案由"
           />
@@ -276,12 +276,13 @@ import {
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import BtnTip from "@/components/btnTip";
 import tableList from "@/mixins/tableList";
-import { queryKnowledgeList } from "@/api/core/edu/knowledge";
+import {queryKnowledgeList} from "@/api/core/edu/knowledge";
 import KTextarea from "@/components/common/textarea.vue";
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
+
 export default {
   name: "DrillDictionary",
-  components: { OrgTree, BtnTip, KTextarea },
+  components: {OrgTree, BtnTip, KTextarea},
   dicts: ["core_drill_type", "core_drill_category"],
   mixins: [tableList],
   data() {
@@ -318,9 +319,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        drillType: [{ required: true, message: "请选择演练项目" }],
-        drillCategory: [{ required: true, message: "请选中演练类型" }],
-        defaultCause: [{ required: true, message: "请输入预设案由" }],
+        drillType: [{required: true, message: "请选择演练项目"}],
+        drillCategory: [{required: true, message: "请选中演练类型"}],
+        defaultCause: [{required: true, message: "请输入预设案由"}],
+        drillProjects: [{required: true, message: "请输入演练场景"}],
       },
     };
   },
@@ -386,7 +388,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.$refs["orgTree"].setSelectTop();
-      this.queryParams.checkSub=true;      
+      this.queryParams.checkSub = true;
       this.$refs["orgTree"].setCheckSub(this.queryParams.checkSub)
       this.handleQuery();
     },

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

@@ -419,10 +419,10 @@ export default {
     },
     drillDictionarySelect(data){
       // console.log("selectMaterials",this.formData)
-      if(this.formData.type==null)
+      /*if(this.formData.type==null)
       {
         this.formData.type=parseInt(data[0].drillType);
-      }
+      }*/
       this.formData.presetCase=data[0].defaultCause;
     },
 

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

@@ -406,10 +406,10 @@ export default {
     },
     drillDictionarySelect(data) {
       // console.log("drillDictionarySelect",data);
-      if(this.formData.type==null)
+      /*if(this.formData.type==null)
       {
         this.formData.type=parseInt(data[0].drillType);
-      }
+      }*/
       this.formData.presetCase = data[0].defaultCause;
     },
 

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

@@ -24,10 +24,17 @@
       >
         <!-- 搜索 -->
         <template slot="searchs">
+          <el-form-item label="演练场景" prop="drillProjects">
+            <el-input
+              v-model="search.drillProjects"
+              placeholder="请输入关键字"
+              clearable
+            />
+          </el-form-item>
           <!-- <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-form-item label="演练项目" prop="drillType">
             <el-select v-model="search.drillType" placeholder="请选择演练项目" clearable>
               <el-option
                 v-for="dict in dict.type.core_drill_type"
@@ -46,14 +53,14 @@
                 :value="dict.value"
               />
             </el-select>
-          </el-form-item>
+          </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>
@@ -62,12 +69,21 @@
             <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="defaultCause" align="center" prop="defaultCause">
+          </el-table-column>-->
+          <el-table-column label="演练场景" scoped-slot="drillProjects" align="center" width="180"
+                           prop="drillProjects">
             <template slot-scope="scope">
-              <div class="ellipsis" :title="scope.row.defaultCause">{{ scope.row.defaultCause }}</div>
+              <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
             </template>
           </el-table-column>
+          <el-table-column
+            label="预设案由"
+            scoped-slot="defaultCause"
+            align="center"
+            :show-overflow-tooltip="true"
+            prop="defaultCause"
+          >
+          </el-table-column>
         </template>
       </g-search-table>
     </div>