预案演练代码提交

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

@@ -1,7 +1,12 @@
 <template>
   <div class="app-container">
     <el-row :gutter="20">
-      <el-col :span="24" :xs="24">
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
+        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+                  @click="clickTreeNode" hangsheTree></org-tree>
+      </el-col>
+      <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="编号" prop="id">
             <el-input v-model="queryParams.id" placeholder="请输入编号" clearable
@@ -56,7 +61,7 @@
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
           </el-table-column>
-          <el-table-column  label="演练项目" scoped-slot="drillProjects" align="center" prop="drillProjects">
+          <el-table-column  label="解决方案" scoped-slot="drillProjects" align="center" prop="drillProjects">
             <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
             </template>
@@ -138,6 +143,7 @@ import OrgTree from "@/components/orgTree";
 import kOrgTree from "@/components/k-orgTree";
 import KFileUpload from "@/components/K-FileUpload";
 import tableList from "@/mixins/tableList";
+import {queryKnowledgeList} from "@/api/core/edu/knowledge";
 export default {
   name: "DrillDictionary",
   components: {OrgTree},
@@ -200,12 +206,33 @@ export default {
     reset() {
       this.form = {
         id: null,
+        orgId: this.queryParams.orgId,
         drillType: null,
         drillProjects: null,
         defaultCause: null,
       };
       this.resetForm("form");
     },
+    getDefaultKey(key) {
+      this.queryParams.orgId = key;
+      this.getList();
+    },
+    //单选框状态改变
+    checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.handleQuery();
+    },
+
+    // 节点单击事件
+    clickTreeNode(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
+    initKnowledgeList() {
+      queryKnowledgeList().then(response => {
+        this.knowledgeList = response;
+      })
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;

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

@@ -29,13 +29,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item prop="type" label="演练项目">
-                <el-select v-model="formData.type" clearable placeholder="请选择演练项目">
-                  <el-option
-                    v-for="item in this.drillTypeOptions"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id">
+              <el-form-item label="演练类型" prop="type">
+                <el-select 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>
                 </el-select>
               </el-form-item>
@@ -123,7 +121,7 @@ export default {
       drillTypeOptions: [],
     };
   },
-  dicts: ['edu_type', 'edu_task_status'],
+  dicts: ['core_drill_type', 'edu_task_status'],
   props: {},
   watch: {},
   computed: {

src/views/core/materials/index.vue

@@ -317,7 +317,6 @@ export default {
     checkCanEditOpen(row) {
       return row.createId == this.$store.getters.userId;
     },
-
     // 节点单击事件
     clickTreeNode(data) {
       this.queryParams.orgId = data.id;