ouyang 2 жил өмнө
parent
commit
c433cf9825

+ 5 - 5
src/api/core/task.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询列表监控调阅任务
 export function listTask(query) {
   return request({
-    url: '/core/task/list',
+    url: '/core/retrievalTask/list',
     method: 'get',
     params: query
   })
@@ -12,7 +12,7 @@ export function listTask(query) {
 // 查询详细监控调阅任务
 export function getTask(id) {
   return request({
-    url: '/core/task/' + id,
+    url: '/core/retrievalTask/' + id,
     method: 'get'
   })
 }
@@ -20,7 +20,7 @@ export function getTask(id) {
 // 新增监控调阅任务
 export function addTask(data) {
   return request({
-    url: '/core/task',
+    url: '/core/retrievalTask',
     method: 'post',
     data: data
   })
@@ -29,7 +29,7 @@ export function addTask(data) {
 // 修改监控调阅任务
 export function updateTask(data) {
   return request({
-    url: '/core/task',
+    url: '/core/retrievalTask',
     method: 'put',
     data: data
   })
@@ -38,7 +38,7 @@ export function updateTask(data) {
 // 删除监控调阅任务
 export function delTask(id) {
   return request({
-    url: '/core/task/' + id,
+    url: '/core/retrievalTask/' + id,
     method: 'delete'
   })
 

+ 157 - 0
src/views/core/task/dialog.info.vue

@@ -0,0 +1,157 @@
+<template>
+    <div class="edu-training-edit">
+        <el-dialog title="调阅详情" :visible.sync="isShow" width="960px">
+            <div class="page-body">
+                <el-form :model="formData" size="small" ref="form" label-position="right" label-width="120px"
+                    label-suffix=":">
+                    <el-row>
+
+                         <el-col :span="12">
+                            <el-form-item prop="type" label="任务名称">{{
+                                formData.taskName
+                            }}</el-form-item>
+                        </el-col>
+
+                        <el-col :span="12">
+                            <el-form-item label="任务状态">
+                                <template>
+                                    <dict-tag :options="dict.type.retrieval_task_status" :value="formData.status"/>
+                                </template>
+                            </el-form-item>
+                        </el-col>
+
+                           <el-col :span="12">
+                            <el-form-item prop="trainingStartDateTime" label="任务时间">{{
+                                formData.planStartTime
+                            }}-{{ formData.planEndTime}}</el-form-item>
+                        </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item prop="dueCount" label="调阅机构">{{
+                            formData.orgName
+                          }}</el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item prop="dueCount" label="调阅角色">{{
+                            formData.roleName
+                          }}</el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item prop="dueCount" label="调阅人">{{
+                            formData.retrievalUserName
+                          }}</el-form-item>
+                      </el-col>
+                          <!-- 培训截止时间 -->
+                          <el-col :span="12">
+                            <el-form-item prop="trainingEndDateTime" label="调阅开始时间">{{
+                                formData.startTime
+                            }}</el-form-item>
+                        </el-col>
+                        <el-col :span="12">
+                          <el-form-item prop="trainingEndDateTime" label="调阅结束时间">{{
+                              formData.endTime
+                            }}</el-form-item>
+                        </el-col>
+
+
+                    </el-row>
+                  <el-table v-loading="loading" :data="formData.taskDataVoList" @selection-change="handleSelectionChange">
+                    <el-table-column label="序号" type="index" align="center">
+                      <template slot-scope="scope">
+                        <span>{{scope.$index + 1}}</span>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="视频主机" align="center" prop="hostName" />
+                    <el-table-column label="视频通道" align="center" prop="channelName" />
+                    <el-table-column label="项目" align="center" prop="project" >
+                      <template slot-scope="scope">
+                        <dict-tag :options="dict.type.core_registration_project" :value="scope.row.project"/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="检查情况" align="center" prop="situation" >
+                      <template slot-scope="scope">
+                      <dict-tag :options="dict.type.core_check_type" :value="scope.row.situation"/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="说明" align="center" prop="remark" />
+                  </el-table>
+                </el-form>
+            </div>
+
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="onHide">关闭</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import { mapState, mapMutations } from "vuex";
+import { getEduTask } from "@/api/core/edu/eduTask";
+import { getTask} from "@/api/core/task";
+export default {
+    components: {},
+  dicts: ['core_registration_project', 'core_check_type'],
+    data() {
+        const params = this.$route.params;
+        return {
+            id: params ? params.id : null,
+            isShow: false,
+            formData: this.reset(),
+        };
+    },
+    props: {},
+    watch: {},
+    computed: {
+        ...mapState(["loginUser"]),
+    },
+    methods: {
+        ...mapMutations([]),
+        reset(other = {}) {
+            return {
+              id: null,
+              taskName: null,
+              status: {},
+              planStartTime: {},
+              planEndTime: null,
+              orgName: null,
+              roleName: null,
+              retrievalUserName: null,
+              startTime: null,
+              endTime:null,
+              taskDataVoList:[],
+                ...other,
+            };
+        },
+        async refresh(id, other) {
+            if (!id) {
+                this.reset(other);
+            }
+            else {
+              getTask(id).then(response => {
+                this.formData = response.data;
+                this.open = true;
+                this.title = "调阅详情";
+              });
+            }
+        },
+        async show(id, other = {}) {
+            this.id = id;
+            await this.refresh(id, other);
+            this.isShow = true;
+        },
+        // 事件
+        onHide() {
+            this.isShow = false;
+        },
+        // 事件
+        //apimark//
+    },
+    mounted() { },
+};
+</script>
+
+<!-- <style lang="less">
+.edu-training-edit {
+}
+</style> -->

+ 21 - 52
src/views/core/task/index.vue

@@ -81,19 +81,19 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" type="index" align="center">
         <template slot-scope="scope">
-          <span>{{(pageNum - 1) * pageSize + scope.$index + 1}}</span>
+          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
       <el-table-column label="任务名称" align="center" prop="taskName" />
       <el-table-column label="开始时间" align="center" prop="planStartTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="结束时间" align="center" prop="planEndTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.planEndTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -104,14 +104,14 @@
       <el-table-column label="调阅角色" align="center" prop="roleName" />
 
       <el-table-column label="调阅开始时间" align="center" prop="startTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="调阅结束时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column label="调阅人" align="center" prop="retrievalUserName" />
       <el-table-column label="异常数" align="center" prop="exceptionCount" />
@@ -121,13 +121,14 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-if="scope.row.status === '2'"
+            @click="lookView(scope.row)"
+            v-if="scope.row.status == 2"
+            v-hasPermi="['core:task:query']"
           >查看</el-button>
         </template>
       </el-table-column>
     </el-table>
-
+        <dialog-info ref="infoDialog" @success="refresh(true)"></dialog-info>
     <pagination
       v-show="total>0"
       :total="total"
@@ -143,9 +144,10 @@
 <script>
 import { listTask, getTask, delTask, addTask, updateTask,roleList } from "@/api/core/task";
 import OrgTree from "@/components/orgTree";
+import DialogInfo from "./dialog.info";
 import {listPlanRole} from "@/api/core/edu/plan";
 export default {
-  components: {OrgTree},
+  components: {OrgTree,DialogInfo},
   name: "Task",
   dicts: ['plan_cycle', 'retrieval_task_status'],
   data() {
@@ -261,6 +263,7 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.dateRange = [];
       this.getList();
     },
     /** 重置按钮操作 */
@@ -281,48 +284,14 @@ export default {
       this.title = "添加监控调阅任务";
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getTask(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改监控调阅任务";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateTask(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addTask(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除监控调阅任务编号为"' + ids + '"的数据项?').then(function() {
-        return delTask(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+    lookView(row) {
+      this.$refs["infoDialog"].show(row.id,{});
+
     },
+
     /** 导出按钮操作 */
     handleExport() {
-      this.download('core/task/export', {
+      this.download('core/retrievalTask/export', {
         ...this.queryParams
       }, `task_${new Date().getTime()}.xlsx`)
     }