From d0bec404f2c22ca04e8592f1a2ba0b39eab0be2f Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 22 五月 2023 09:37:03 +0800
Subject: [PATCH] Default Changelist
---
src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue | 489 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 420 insertions(+), 69 deletions(-)
diff --git a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
index e6e1635..5feb9f9 100644
--- a/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
+++ b/src/views/intellectInspect/inspectTaskManage/inspectTask/index.vue
@@ -1,89 +1,140 @@
<template>
<div class="home-container">
- <div style="height: 100%">
+ <div style="height: 100%;display: flex;flex-direction: column;align-items: stretch;">
<el-row class="homeCard">
- <el-col :span="12">
- <div class="grid-content topInfo">
- <el-select v-model="searchType" @change="changeSearch" placeholder="任务名称">
- <el-option label="巡检任务类型" value="巡检任务类型" />
- <el-option label="创建人" value="创建人" />
- <el-option label="巡检班组" value="巡检班组" />
- <el-option label="检查频次" value="检查频次" />
- <el-option label="开始时间" value="开始时间" />
- </el-select>
- <el-input v-model="searchContent" v-if="searchType == '任务名称'" placeholder="请输入任务名称"></el-input>
- <el-input v-else-if="searchType == '检查频次'" v-model="searchContent" placeholder="请输入检查频次">
- <template #append>
- <el-select v-model="searchUnit" placeholder="选择单位">
- <el-option label="分钟" value="分钟" />
- <el-option label="小时" value="小时" />
- <el-option label="天" value="天" />
- </el-select>
- </template>
- </el-input>
- <el-select v-model="searchContent" v-else-if="searchType == '巡检任务类型'" placeholder="请选择任务类型">
- <el-option v-for="(item, index) in typeOptions" :label="item.name" :value="item.value" :key="index" />
- </el-select>
- <el-select v-model="searchContent" v-else-if="searchType == '创建人'" placeholder="请选择创建人">
- <el-option v-for="(item, index) in createrOptions" :label="item.name" :value="item.value" :key="index" />
- </el-select>
- <el-select v-model="searchContent" v-else-if="searchType == '巡检班组'" placeholder="请选择巡检班组">
- <el-option v-for="(item, index) in inspectorOptions" :label="item.name" :value="item.value" :key="index" />
- </el-select>
- <el-date-picker v-model="searchContent" type="date" v-else :placeholder="'请选择' + searchType" size="large" style="margin-right: 20px" />
- <el-button type="primary">查询</el-button>
- <el-button plain>重置</el-button>
- </div>
- </el-col>
+ <div class="basic-line">
+ <span>任务类型：</span>
+ <el-select v-model="tableData.params.workType" clearable filterable class="input-box" placeholder="任务类型">
+ <el-option v-for="item in workTypeList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ </el-select>
+ </div>
+ <div class="basic-line">
+ <span>部门：</span>
+ <el-cascader class="input-box" :options="departmentList" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }"
+ placeholder="请选择部门" clearable v-model="tableData.params.execDepId"
+ @change="changeGroup"
+ > </el-cascader>
+ </div>
+ <div class="basic-line">
+ <span>执行班组：</span>
+ <el-select v-model="tableData.params.execClassgroupId" clearable filterable class="input-box" placeholder="执行班组">
+ <el-option v-for="item in classGroupList" :key="item.id" :label="item.groupName" :value="item.id"></el-option>
+ </el-select>
+ </div>
+ <div style="padding-bottom: 10px">
+ <el-button type="primary" @click="getInspectionTask">查询</el-button>
+ <el-button plain @click="reset">重置</el-button>
+ </div>
</el-row>
<div class="homeCard">
<div class="main-card">
<el-row class="cardTop">
<el-col :span="12" class="mainCardBtn">
- <el-button type="primary" :icon="Plus" size="default" @click="openDialog('新增', {})">新建</el-button>
- <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>
+ <el-button type="primary" :icon="Plus" size="default" @click="openInspectTaskDialog('新增', {})">新增</el-button>
+ <!-- <el-button type="danger" :icon="Delete" size="default" plain>删除</el-button>-->
</el-col>
<el-button type="primary" :icon="Refresh" size="default" />
</el-row>
<el-table ref="multipleTableRef" :data="tableData.inspectTaskData" style="width: 100%" height="calc(100% - 100px)" :header-cell-style="{ background: '#fafafa' }" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" />
- <el-table-column property="name" label="任务名称" width="200" />
- <el-table-column property="type" label="任务类型" />
- <el-table-column property="execClassgroup" label="巡检班组" />
- <el-table-column property="frequency" label="检查频次" />
- <el-table-column property="unit" label="频次单位" />
- <el-table-column property="chainLength" label="巡检链长度" width="160" />
- <el-table-column property="startTime" label="任务开始时间" width="180" />
- <!-- <el-table-column property="validTime" label="任务有效时间" width="180"/>-->
- <el-table-column property="creater" label="创建人" />
- <el-table-column property="createTime" label="创建时间" width="180" />
- <el-table-column property="status" label="状态" width="60" />
+ <el-table-column property="unitName" label="任务名称" />
+ <el-table-column property="workType" label="任务类型">
+ <template #default="scope">
+ <span>
+ {{ parseNumber(scope.row.workType, '任务类型') }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column property="execClassgroupId" label="巡检班组">
+ <template #default="scope">
+ <span>
+ {{ parseNumber(scope.row.execClassgroupId, '巡检班组') }}
+ </span>
+ </template>
+ </el-table-column>
+ <el-table-column property="frequency" label="检查频次">
+ <template #default="scope">
+ <span>
+ {{ scope.row.checkCycle }}
+ </span>
+ <span>
+ {{ scope.row.checkCycleUnit }}
+ </span>
+ </template>
+ </el-table-column>
+ <!-- <el-table-column prop="validTime" label="有效时间" show-overflow-tooltip>-->
+ <!-- <template #default="scope">-->
+ <!-- <span>-->
+ <!-- {{ scope.row.validTime }}-->
+ <!-- </span>-->
+ <!-- <span>-->
+ <!-- {{ parseNumber(scope.row.validTimeUnit, '检查频次') }}-->
+ <!-- </span>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column prop="validTime" label="提醒时间" show-overflow-tooltip>-->
+ <!-- <template #default="scope">-->
+ <!-- <span>-->
+ <!-- {{ scope.row.noticeTime }}-->
+ <!-- </span>-->
+ <!-- <span>-->
+ <!-- {{ parseNumber(scope.row.noticeTimeUnit, '检查频次') }}-->
+ <!-- </span>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column property="firstStartTime" label="任务开始时间" />
+ <el-table-column prop="createUserName" label="创建人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="lastEditUserName" label="最后修改人" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="gmtModitify" label="最后修改时间" show-overflow-tooltip></el-table-column>
+ <el-table-column property="taskUnitStatus" label="状态" width="60">
+ <template #default="scope">
+ <div>
+ <div v-if="scope.row.taskUnitStatus === 1">
+ <el-tag :type="''">
+ {{ '开启' }}
+ </el-tag>
+ </div>
+ <div v-if="scope.row.taskUnitStatus === 2">
+ <el-tag :type="'danger'">
+ {{ '关闭' }}
+ </el-tag>
+ </div>
+ </div>
+ </template>
+ </el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="300">
<template #default="scope">
- <el-button link type="primary" size="small" :icon="View" @click="viewRecord(scope.row)">查看</el-button>
- <el-button link type="primary" size="small" :icon="Edit" @click="openDialog('修改', scope.row)">修改</el-button>
- <el-switch v-model="scope.row.status" inline-prompt active-text="开" inactive-text="关" active-value="开启" inactive-value="关闭" style="margin: 0 10px" />
- <el-button link type="danger" size="small" :icon="Delete" @click="deleteRecord(scope.$index)">删除</el-button>
+ <el-button link type="primary" size="small" :icon="View" @click="openInspectTaskDialog('查看', scope.row)">查看</el-button>
+ <el-button link type="primary" size="small" :icon="Edit" @click="openInspectTaskDialog('修改', scope.row)">修改</el-button>
+ <el-button link type="danger" size="small" :icon="Delete" v-if="scope.row.taskUnitStatus === 2" @click="deleteInspectTask(scope.row)">删除</el-button>
+ <div @click="changeStatus(scope.row)">
+ <el-switch v-model="scope.row.taskUnitStatus" inline-prompt active-text="开" inactive-text="关" :active-value="1" :inactive-value="2" style="margin: 0 10px" />
+ </div>
</template>
</el-table-column>
</el-table>
<div class="pageBtn">
- <el-pagination v-model:currentPage="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 15]" small="false" background layout="total, sizes, prev, pager, next, jumper" :total="100" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+ <el-pagination @size-change="onHandleSizeChange" @current-change="onHandleCurrentChange" :pager-count="5" :page-sizes="[10, 20, 30]" v-model:current-page="tableData.params.pageIndex" background v-model:page-size="tableData.params.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" class="page-position"> </el-pagination>
</div>
</div>
</div>
</div>
- <inspect-task-dialog ref="inspectTaskDialogRef"></inspect-task-dialog>
+ <inspect-task-dialog ref="inspectTaskDialogRef" @refreshInspectTask="getInspectionTask"></inspect-task-dialog>
</div>
</template>
<script lang="ts">
import { toRefs, reactive, ref, onMounted } from 'vue';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-import { ElTable, ElMessage } from 'element-plus';
+import { ElTable, ElMessage, ElMessageBox } from 'element-plus';
import { inspectTaskApi } from '/@/api/intellectInspectSystem/inspectTask';
import inspectTaskDialog from './components/inspectTaskDialog.vue';
-import InspectTask from '/@/views/intellectInspect/inspectTaskManage/inspectTask/components/inspectTaskDialog.vue';
+import { departmentApi } from '/@/api/systemManage/department';
+import { teamManageApi } from '/@/api/systemManage/personShiftManage/teamManage';
+import { inspectPointApi } from '/@/api/intellectInspectSystem/inspectPointManage';
+import { facilityAreaApi } from '/@/api/intellectInspectSystem/facilityAreaManage';
+import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
let global: any = {
homeChartOne: null,
homeChartTwo: null,
@@ -92,14 +143,45 @@
};
interface stateType {
- homeOne: Array<type>;
+ tableData: {
+ inspectTaskData: [];
+ total: number;
+ loading: boolean;
+ params: {
+ pageIndex: number | null;
+ pageSize: number | null;
+ execDepId: number | null;
+ unitName: string | null;
+ workType: number | null;
+ createUserId: number | null;
+ execClassgroupId: number | null;
+ checkCycle: number | null;
+ checkCycleUnit: number | null;
+ };
+ };
+ workTypeList: Array<type>;
+ quotaList: [];
+ departmentList: [];
+ classGroupList: Array<classGroup>;
+ inspectPointAllList: [];
+ regionNameList: [];
+ RFIDList: [];
+ timeType: Array<type>;
}
-interface type {}
+interface type {
+ id: number;
+ name: string;
+}
+interface classGroup {
+ id: number;
+ groupName: string;
+}
export default {
name: 'index',
components: { inspectTaskDialog },
setup() {
- const state = reactive({
+ const inspectTaskDialogRef = ref();
+ const state = reactive<stateType>({
tableData: {
inspectTaskData: [],
total: 0,
@@ -108,21 +190,39 @@
pageIndex: 1,
pageSize: 10,
unitName: null,
+ execDepId: null,
workType: null,
createUserId: null,
execClassgroupId: null,
checkCycle: null,
checkCycleUnit: null
}
- }
+ },
+ workTypeList: [
+ { id: 1, name: '周期任务' },
+ { id: 2, name: '单次任务' }
+ ],
+ quotaList: [],
+ departmentList: [],
+ classGroupList: [],
+ inspectPointAllList: [],
+ regionNameList: [],
+ RFIDList: [],
+ timeType: [
+ { id: 1, name: '分' },
+ { id: 2, name: '小时' },
+ { id: 3, name: '日' },
+ { id: 4, name: '月' },
+ { id: 5, name: '年' }
+ ],
});
//获取巡检任务数据
const getInspectionTask = async () => {
let res = await inspectTaskApi().getInspectTaskList(state.tableData.params);
if (res.data.code === '200') {
- state.tableData.inspectTaskData = res.data.data;
- state.tableData.total = res.data.count;
+ state.tableData.inspectTaskData = res.data.data.records;
+ state.tableData.total = res.data.data.total;
} else {
ElMessage({
type: 'warning',
@@ -131,11 +231,234 @@
}
};
- const openDialog = () => {};
+ //获取部门
+ const getDepartmentData = async () => {
+ let res = await departmentApi().getDepartmentList();
+ if (res.data.code === '200') {
+ state.departmentList = res.data.data;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ //获取部门
+ // const getQuotaList = async () => {
+ // let res = await inspectTaskApi().getQuotaList();
+ // if (res.data.code === '200') {
+ // state.quotaList = res.data.data;
+ // } else {
+ // ElMessage({
+ // type: 'warning',
+ // message: res.data.msg
+ // });
+ // }
+ // };
+ //获取部门
+ const getQuotaList = async () => {
+ let res = await inspectTaskApi().getAllQuotaList();
+ if (res.data.code === '200') {
+ state.quotaList = res.data.data;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ //获取巡检点
+ const getInspectTaskPoint = async () => {
+ let res = await inspectPointApi().getInspectPointAll();
+ if (res.data.code === '200') {
+ state.inspectPointAllList = res.data.data;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ //获取所有设施区域名称
+ const initFacilityAreaType = async () => {
+ let res = await facilityAreaApi().getAllFacilityAreaList();
+ if (res.data.code === '200') {
+ state.regionNameList = JSON.parse(JSON.stringify(res.data.data));
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ //获取所有RFID名称
+ const initRFIDList = async () => {
+ let res = await RFIDApi().getAllRFIDList();
+ if (res.data.code === '200') {
+ state.RFIDList = JSON.parse(JSON.stringify(res.data.data));
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ //获取班组
+ const getClassGroupData = async () => {
+ let res = await teamManageApi().getRecord({ depIp: null, groupName: null, containGroupMemberEnable: null });
+ if (res.data.code === '200') {
+ state.classGroupList = res.data.data;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
+
+ const changeGroup = async () => {
+ if(state.tableData.params.execDepId === null) {
+ state.classGroupList = []
+ }else{
+ let res = await departmentApi().getByDepId({depId:state.tableData.params.execDepId})
+ if(res.data.code === '200'){
+ state.classGroupList = res.data.data
+ }else{
+
+ }
+ }
+ };
+
+ const changeStatus = async (value: { taskUnitStatus: number; id: number }) => {
+ if (value.taskUnitStatus === 2) {
+ ElMessageBox.confirm(`此操作将关闭该巡检任务”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(async () => {
+ let res = await inspectTaskApi().openOrCloseInspectTask({ id: value.id, taskUnitStatus: 2 });
+ if (res.data.code === '200') {
+ await getInspectionTask();
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '关闭成功'
+ });
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ })
+ .catch((error) => {});
+ } else {
+ ElMessageBox.confirm(`此操作将开启该巡检任务”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(async () => {
+ let res = await inspectTaskApi().openOrCloseInspectTask({ id: value.id, taskUnitStatus: 1 });
+ if (res.data.code === '200') {
+ await getInspectionTask();
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '开启成功'
+ });
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ })
+ .catch((error) => {});
+ }
+ await getInspectionTask();
+ };
+
+ // 删除
+ const deleteInspectTask = (row: any) => {
+ ElMessageBox.confirm(`此操作将永久删除该任务：“${row.unitName}”，是否继续?`, '提示', {
+ confirmButtonText: '确认',
+ cancelButtonText: '取消',
+ type: 'warning'
+ })
+ .then(async () => {
+ let res = await inspectTaskApi().deleteInspectTask({ id: row.id });
+ if (res.data.code === '200') {
+ ElMessage({
+ type: 'success',
+ duration: 2000,
+ message: '删除成功'
+ });
+ await getInspectionTask();
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ })
+ .catch(() => {});
+ };
+
+ const openInspectTaskDialog = (type: string, value: {}) => {
+ inspectTaskDialogRef.value.showInspectTaskDialog(type, value, state.workTypeList, state.departmentList, state.timeType, state.classGroupList, state.quotaList, state.inspectPointAllList, state.regionNameList, state.RFIDList);
+ };
+
+ const parseNumber = (value: number, type: string) => {
+ if (type === '任务类型') {
+ return state.workTypeList.find((item) => item.id === value)?.name;
+ } else if (type === '检查频次') {
+ return state.timeType.find((item) => item.id == value)?.name;
+ } else {
+ return state.classGroupList.find((item) => item.id == value)?.groupName;
+ }
+ };
+
+ // 分页改变
+ const onHandleSizeChange = (val: number) => {
+ state.tableData.params.pageSize = val;
+ getInspectionTask();
+ };
+ // 分页改变
+ const onHandleCurrentChange = (val: number) => {
+ state.tableData.params.pageIndex = val;
+ getInspectionTask();
+ };
+
+ const reset = () => {
+ state.tableData.params = {
+ pageIndex: 1,
+ pageSize: 10,
+ unitName: null,
+ execDepId: null,
+ workType: null,
+ createUserId: null,
+ execClassgroupId: null,
+ checkCycle: null,
+ checkCycleUnit: null
+ };
+ };
// 页面加载时
onMounted(() => {
getInspectionTask();
+ getQuotaList();
+ getDepartmentData();
+ getClassGroupData();
+ getInspectTaskPoint();
+ initFacilityAreaType();
+ initRFIDList();
});
return {
@@ -144,8 +467,16 @@
Delete,
Refresh,
Plus,
- openDialog,
+ reset,
+ changeStatus,
+ changeGroup,
+ parseNumber,
+ deleteInspectTask,
getInspectionTask,
+ onHandleSizeChange,
+ onHandleCurrentChange,
+ inspectTaskDialogRef,
+ openInspectTaskDialog,
...toRefs(state)
};
}
@@ -155,15 +486,17 @@
<style scoped lang="scss">
$homeNavLengh: 8;
.home-container {
- height: calc(100vh - 114px);
+ height: calc(100vh - 144px);
box-sizing: border-box;
overflow: hidden;
+ position: relative;
.homeCard {
width: 100%;
padding: 20px;
box-sizing: border-box;
background: #fff;
border-radius: 4px;
+ flex: 0 auto;
.main-card {
width: 100%;
@@ -178,10 +511,18 @@
}
}
.pageBtn {
- height: 60px;
- display: flex;
- align-items: center;
- justify-content: right;
+ position: absolute;
+ width: 100%;
+ z-index: 99;
+ bottom: 0;
+ right: 0;
+ height: 60px;
+ border-radius: 0 0 4px 4px;
+ padding-right: 20px;
+ background: #fff;
+ display: flex;
+ align-items: center;
+ justify-content: right;
.demo-pagination-block + .demo-pagination-block {
margin-top: 10px;
@@ -192,7 +533,7 @@
}
}
&:last-of-type {
- height: calc(100% - 100px);
+ flex: 1;
}
}
.el-row {
@@ -287,4 +628,14 @@
.el-select {
width: 100%;
}
+:deep(.el-textarea.is-disabled .el-textarea__inner) {
+ background-color: var(--el-card-bg-color);
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__inner) {
+ color: var(--el-input-text-color, var(--el-text-color-regular));
+}
+:deep(.el-input.is-disabled .el-input__wrapper) {
+ background-color: var(--el-card-bg-color);
+}
</style>
--
Gitblit v1.9.2