预案演练任务代码提交

src/api/core/drill/drillTask.js

@@ -2,46 +2,39 @@ import request from '@/utils/request'
 
 export function listEduTask(query) {
   return request({
-    url: '/core/eduTask/list',
+    url: '/core/drill/task/list',
     method: 'get',
     params: query
   })
 }
 
-export function getEduTask(id) {
+export function getDrillTask(id) {
   return request({
-    url: '/core/eduTask/' + id,
+    url: '/core/drill/task/' + id,
     method: 'get'
   })
 }
 
-export function addEduTask(data) {
+export function addDrillTask(data) {
   return request({
-    url: '/core/eduTask',
+    url: '/core/drill/task',
     method: 'post',
     data: data
   })
 }
 
-export function recordEduTask(data) {
+export function recordDrillTask(data) {
   return request({
-    url: '/core/eduTask',
+    url: '/core/drill/task',
     method: 'put',
     data: data
   })
 }
 
-export function delEduTask(id) {
+export function delDrillTask(id) {
   return request({
-    url: '/core/eduTask/' + id,
+    url: '/core/drill/task/' + id,
     method: 'delete'
   })
 }
 
-// 查询详细教育任务
-// export function recordEduTask(id) {
-//   return request({
-//     url: '/core/eduTask/' + id,
-//     method: 'get'
-//   })
-// }

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

@@ -139,6 +139,7 @@
 <script>
 import { mapState, mapMutations } from "vuex";
 import { getEduTask } from "@/api/core/edu/eduTask";
+import {getDrillTask} from "@/api/core/drill/drillTask";
 
 export default {
     components: {},
@@ -179,7 +180,7 @@ export default {
                 this.reset(other);
             }
             else {
-                getEduTask(id).then(response => {
+                getDrillTask(id).then(response => {
                     this.formData = response.data;
                     this.formData.signImageList=this.getSingImageList();
                     this.loading = false;

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

@@ -126,101 +126,13 @@
     />
   </el-col>
   </el-row>
-    <!-- 添加或修改教育任务对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="教育培训计划Id" prop="planId">
-          <el-input v-model="form.planId" placeholder="请输入教育培训计划Id" />
-        </el-form-item>
-        <el-form-item label="培训岗位" prop="roleId">
-          <el-input v-model="form.roleId" placeholder="请输入培训岗位" />
-        </el-form-item>
-        <el-form-item label="开始日期" prop="startDate">
-          <el-date-picker clearable
-            v-model="form.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择开始日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="截止日期" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择截止日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="实到人数" prop="actualCount">
-          <el-input v-model="form.actualCount" placeholder="请输入实到人数" />
-        </el-form-item>
-        <el-form-item label="内容">
-          <editor v-model="form.content" :min-height="192"/>
-        </el-form-item>
-        <el-form-item label="培训岗位名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入培训岗位名称" />
-        </el-form-item>
-        <el-form-item label="岗位id集合" prop="roleIds">
-          <el-input v-model="form.roleIds" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="岗位名集合" prop="roleNames">
-          <el-input v-model="form.roleNames" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="学习主题" prop="title">
-          <el-input v-model="form.title" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="总结" prop="note">
-          <el-input v-model="form.note" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="时间" prop="dateTime">
-          <el-date-picker clearable
-            v-model="form.dateTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="应到人数" prop="dueCount">
-          <el-input v-model="form.dueCount" placeholder="请输入应到人数" />
-        </el-form-item>
-        <el-form-item label="主持人" prop="hostId">
-          <el-input v-model="form.hostId" placeholder="请输入主持人" />
-        </el-form-item>
-        <el-form-item label="附件" prop="fileList">
-          <file-upload v-model="form.fileList"/>
-        </el-form-item>
-        <el-form-item label="图片" prop="imageList">
-          <image-upload v-model="form.imageList"/>
-        </el-form-item>
-        <el-form-item label="机构" prop="orgId">
-          <el-input v-model="form.orgId" placeholder="请输入机构" />
-        </el-form-item>
-        <el-form-item label="记录人" prop="recorderId">
-          <el-input v-model="form.recorderId" placeholder="请输入记录人" />
-        </el-form-item>
-        <el-form-item label="机构名称" prop="orgName">
-          <el-input v-model="form.orgName" placeholder="请输入机构名称" />
-        </el-form-item>
-        <el-form-item label="机构" prop="orgPath">
-          <el-input v-model="form.orgPath" placeholder="请输入机构" />
-        </el-form-item>
-        <el-form-item label="pdf下载地址" prop="pdfUrl">
-          <el-input v-model="form.pdfUrl" placeholder="请输入pdf下载地址" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog> -->
-
     <dialog-info ref="infoDialog" @success="handleQuery(true)"></dialog-info>
     <dialog-perform ref="performDialog" @success="handleQuery(true)"></dialog-perform>
   </div>
 </template>
 
 <script>
-import { listEduTask, getEduTask, delEduTask, addEduTask, updateEduTask } from "@/api/core/edu/eduTask";
+import { listEduTask, getEduTask, delEduTask, addEduTask, updateEduTask } from "@/api/core/drill/drillTask";
 import OrgTree from "@/components/orgTree";
 import DialogInfo from "./dialog.info";
 import DialogPerform from "./dialog.perform";
@@ -341,15 +253,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleDetail(id) {
-      console.log("this.$refs",this.$refs["infoDialog"])
       this.$refs["infoDialog"].show(id,{});
-      // this.reset();
-      // const id = row.id || this.ids
-      // getEduTask(id).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "修改教育任务";
-      // });
     },
     /** 提交按钮 */
     submitForm() {

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

@@ -204,7 +204,6 @@ export default {
         getSingImageList() {
             let res = this.formData.taskUserList ? this.formData.taskUserList.filter((x) => x.type === 1 && x.sign == 1)
                 .map((v) => v.signImage).join(",") : null;
-            console.log("getSingImage",res)
             return res;
         },
         getBlob(url, cb) {