From 11b40328f7aa7599f89189d0ebcbbdf8773f9e1b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 21 四月 2026 10:41:41 +0800
Subject: [PATCH] 新疆马铃薯 1.巡检记录添加巡检状态和巡检结果展示字段
---
src/views/equipmentManagement/inspectionManagement/index.vue | 519 +++++++++++++++++++++++++++------------------------------
1 files changed, 247 insertions(+), 272 deletions(-)
diff --git a/src/views/equipmentManagement/inspectionManagement/index.vue b/src/views/equipmentManagement/inspectionManagement/index.vue
index f0196b9..d1b75e9 100644
--- a/src/views/equipmentManagement/inspectionManagement/index.vue
+++ b/src/views/equipmentManagement/inspectionManagement/index.vue
@@ -1,12 +1,26 @@
<template>
<div class="app-container">
<el-form :inline="true" :model="queryParams" class="search-form">
- <el-form-item label="鎼滅储">
+ <el-form-item label="宸℃浠诲姟鍚嶇О">
<el-input
- v-model="queryParams.searchAll"
- placeholder="璇疯緭鍏ュ叧閿瓧"
- clearable
- :style="{ width: '100%' }"
+ v-model="queryParams.taskName"
+ placeholder="璇疯緭鍏ュ贰妫�浠诲姟鍚嶇О"
+ clearable
+ style="width: 200px"
+ />
+ </el-form-item>
+ <el-form-item label="鎵�灞炲尯鍩�">
+ <el-tree-select
+ v-model="queryParams.areaId"
+ :data="areaOptions"
+ :props="areaTreeProps"
+ node-key="id"
+ value-key="id"
+ check-strictly
+ clearable
+ filterable
+ placeholder="璇烽�夋嫨鎵�灞炲尯鍩�"
+ style="width: 220px"
/>
</el-form-item>
<el-form-item>
@@ -15,395 +29,356 @@
</el-form-item>
</el-form>
<el-card>
- <!-- 鏍囩椤� -->
- <el-tabs
- v-model="activeTab"
- class="info-tabs"
- @tab-click="handleTabClick"
- >
- <el-tab-pane
- v-for="tab in tabs"
+ <div class="toolbar">
+ <el-radio-group v-model="activeRadio" @change="radioChange">
+ <el-radio-button
+ v-for="tab in radios"
:key="tab.name"
:label="tab.label"
- :name="tab.name"
- />
- </el-tabs>
- <div style="display: flex;flex-direction: row;justify-content: space-between;" v-if="tabName === 'task'">
- <el-radio-group v-model="activeRadio" @change="radioChange">
- <el-radio-button v-for="tab in radios"
- :key="tab.name"
- :label="tab.label"
- :value="tab.name"/>
+ :value="tab.name"
+ />
</el-radio-group>
- <!-- 鎿嶄綔鎸夐挳鍖� -->
<el-space v-if="activeRadio !== 'task'">
<el-button type="primary" :icon="Plus" @click="handleAdd(undefined)">鏂板缓</el-button>
<el-button type="danger" :icon="Delete" @click="handleDelete">鍒犻櫎</el-button>
- <!-- <el-button type="info" plain :icon="Download">瀵煎嚭</el-button> -->
+ <el-button @click="handleOut">瀵煎嚭</el-button>
+ </el-space>
+ <el-space v-else>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
</el-space>
</div>
- <div>
- <div>
- <PIMTable :table-loading="tableLoading"
- :table-data="tableData"
- :column="tableColumns"
- @selection-change="handleSelectionChange"
- :is-selection="true"
- :border="true"
- :table-style="{ width: '100%', height: 'calc(100vh - 30em)' }"
- v-if="tabName === 'task'"
- >
- <template #inspector="{ row }">
- <div class="person-tags">
- <!-- 璋冭瘯淇℃伅锛屼笂绾挎椂鍒犻櫎 -->
- <!-- {{ console.log('inspector data:', row.inspector) }} -->
- <template v-if="row.inspector && row.inspector.length > 0">
- <el-tag
- v-for="(person, index) in row.inspector"
- :key="index"
- size="small"
- type="primary"
- class="person-tag"
- >
- {{ person }}
- </el-tag>
- </template>
- <span v-else class="no-data">--</span>
- </div>
- </template>
- </PIMTable>
- <el-table ref="table" :data="tableData" height="480" v-loading="tableLoading" border v-else style="width: 100%;height: calc(100vh - 25em)">
- <el-table-column label="搴忓彿" type="index" width="60" align="center" />
- <el-table-column prop="deviceName" label="璁惧鍚嶇О" :show-overflow-tooltip="true">
- <template #default="scope">
- {{scope.row.qrCode.deviceName}}
- </template>
- </el-table-column>
- <el-table-column prop="location" label="鎵�鍦ㄤ綅缃弿杩�" :show-overflow-tooltip="true">
- <template #default="scope">
- {{scope.row.qrCode.location}}
- </template>
- </el-table-column>
- <el-table-column prop="scanner" label="宸℃浜�"></el-table-column>
- <el-table-column prop="scanTime" label="宸℃鏃堕棿"></el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔">
- <template #default="scope">
- <el-button link type="primary" @click="handleAdd(scope.row)">鏌ョ湅闄勪欢</el-button>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <pagination
- v-if="total>0"
- :page="pageNum"
- :limit="pageSize"
- :total="total"
- @pagination="handlePagination"
- :layout="'total, prev, pager, next, jumper'"
- />
- </div>
+ <PIMTable
+ :table-loading="tableLoading"
+ :table-data="tableData"
+ :column="tableColumns"
+ :is-selection="true"
+ :border="true"
+ :page="{
+ current: pageNum,
+ size: pageSize,
+ total,
+ layout: 'total, sizes, prev, pager, next, jumper',
+ }"
+ :table-style="{ width: '100%', height: 'calc(100vh - 23em)' }"
+ @selection-change="handleSelectionChange"
+ @pagination="handlePagination"
+ >
+ <template #inspector="{ row }">
+ <div class="person-tags">
+ <template v-if="row.inspector && row.inspector.length > 0">
+ <el-tag
+ v-for="(person, index) in row.inspector"
+ :key="index"
+ size="small"
+ type="primary"
+ class="person-tag"
+ >
+ {{ person }}
+ </el-tag>
+ </template>
+ <span v-else class="no-data">--</span>
+ </div>
+ </template>
+ </PIMTable>
</el-card>
- <form-dia ref="formDia" @closeDia="handleQuery"></form-dia>
- <qr-code-dia ref="qrCodeDia" @closeDia="handleQuery"></qr-code-dia>
- <view-files ref="viewFiles"></view-files>
- <view-qr-code-files ref="viewQrCodeFiles"></view-qr-code-files>
+ <form-dia ref="formDia" @closeDia="handleQuery" />
+ <view-files ref="viewFiles" />
</div>
</template>
<script setup>
import { Delete, Plus } from "@element-plus/icons-vue";
-import { onMounted, ref, reactive, getCurrentInstance, nextTick } from "vue";
-
-// 缁勪欢寮曞叆
-import Pagination from "@/components/Pagination/index.vue";
+import { ElMessageBox } from "element-plus";
+import { getCurrentInstance, nextTick, onMounted, reactive, ref } from "vue";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import FormDia from "@/views/equipmentManagement/inspectionManagement/components/formDia.vue";
-import QrCodeDia from "@/views/equipmentManagement/inspectionManagement/components/qrCodeDia.vue";
import ViewFiles from "@/views/equipmentManagement/inspectionManagement/components/viewFiles.vue";
-import ViewQrCodeFiles from "@/views/equipmentManagement/inspectionManagement/components/viewQrCodeFiles.vue";
-
-// 鎺ュ彛寮曞叆
import {
delTimingTask,
inspectionTaskList,
- timingTaskList
+ timingTaskList,
} from "@/api/inspectionManagement/index.js";
-import {
- delQrCode,
- qrCodeList,
- qrCodeScanRecordList
-} from "@/api/inspectionUpload/index.js";
+import { getDeviceAreaTree } from "@/api/equipmentManagement/deviceArea";
-// 鍏ㄥ眬鍙橀噺
const { proxy } = getCurrentInstance();
const formDia = ref();
-const qrCodeDia = ref();
const viewFiles = ref();
-const viewQrCodeFiles = ref();
-// 鏌ヨ鍙傛暟
const queryParams = reactive({
- searchAll: "",
+ taskName: "",
+ areaId: undefined,
});
-// 鏍囩椤甸厤缃�
-const activeTab = ref("task");
-const tabName = ref("task");
-const tabs = reactive([
- { name: "task", label: "鐢熶骇宸℃" },
- { name: "qrCodeScanRecord", label: "鐜板満宸℃璁板綍" },
-]);
+const areaOptions = ref([]);
+const areaTreeProps = {
+ label: "areaName",
+ children: "children",
+};
-// 鍗曢�夋閰嶇疆
const activeRadio = ref("taskManage");
const radios = reactive([
{ name: "taskManage", label: "瀹氭椂浠诲姟绠＄悊" },
{ name: "task", label: "瀹氭椂浠诲姟璁板綍" },
- { name: "qrCode", label: "浜岀淮鐮佺鐞�" },
]);
-// 琛ㄦ牸鏁版嵁
const selectedRows = ref([]);
const tableData = ref([]);
-const operationsArr = ref([]);
const tableColumns = ref([]);
const tableLoading = ref(false);
const total = ref(0);
const pageNum = ref(1);
const pageSize = ref(10);
-// 鍒楅厤缃�
const columns = ref([
+ {
+ label: "鎵�鍦ㄥ尯鍩�",
+ prop: "areaName",
+ },
{ prop: "taskName", label: "宸℃浠诲姟鍚嶇О", minWidth: 160 },
- { prop: "inspectionLocation", label: "鍦扮偣", minWidth: 120 },
{ prop: "remarks", label: "澶囨敞", minWidth: 150 },
{ prop: "inspector", label: "鎵ц宸℃浜�", minWidth: 150, slot: "inspector" },
{
prop: "frequencyType",
label: "棰戞",
minWidth: 150,
- formatter: (_, __, val) => ({
- DAILY: "姣忔棩",
- WEEKLY: "姣忓懆",
- MONTHLY: "姣忔湀",
- QUARTERLY: "瀛ｅ害"
- }[val] || "")
+ formatData: (value) =>
+ ({
+ DAILY: "姣忔棩",
+ WEEKLY: "姣忓懆",
+ MONTHLY: "姣忔湀",
+ QUARTERLY: "瀛ｅ害",
+ YEARLY: "姣忓勾",
+ }[value] || ""),
},
{
prop: "frequencyDetail",
label: "寮�濮嬫棩鏈熶笌鏃堕棿",
minWidth: 150,
formatter: (row, column, cellValue) => {
- // 鍏堝垽鏂槸鍚︽槸瀛楃涓�
- if (typeof cellValue !== 'string') return '';
- let val = cellValue;
+ if (typeof cellValue !== "string") {
+ return "";
+ }
const replacements = {
- MON: '鍛ㄤ竴',
- TUE: '鍛ㄤ簩',
- WED: '鍛ㄤ笁',
- THU: '鍛ㄥ洓',
- FRI: '鍛ㄤ簲',
- SAT: '鍛ㄥ叚',
- SUN: '鍛ㄦ棩'
+ MON: "鍛ㄤ竴",
+ TUE: "鍛ㄤ簩",
+ WED: "鍛ㄤ笁",
+ THU: "鍛ㄥ洓",
+ FRI: "鍛ㄤ簲",
+ SAT: "鍛ㄥ叚",
+ SUN: "鍛ㄦ棩",
};
- // 浣跨敤姝ｅ垯涓�娆℃�ф浛鎹㈡墍鏈夊尮閰嶉」
- return val.replace(/MON|TUE|WED|THU|FRI|SAT|SUN/g, match => replacements[match]);
- }
+ return cellValue.replace(/MON|TUE|WED|THU|FRI|SAT|SUN/g, (match) => replacements[match]);
+ },
},
{ prop: "registrant", label: "鐧昏浜�", minWidth: 100 },
{ prop: "createTime", label: "鐧昏鏃ユ湡", minWidth: 100 },
]);
-// 鎿嶄綔鍒楅厤缃�
+// 宸℃鐘舵�佸垪锛堜粎瀹氭椂浠诲姟璁板綍鏄剧ず锛�
+const inspectionStatusColumn = {
+ prop: "inspectionStatus",
+ label: "宸℃鐘舵��",
+ minWidth: 100,
+ dataType: "tag",
+ formatData: (value) =>
+ ({
+ 1: "寰呭贰妫�",
+ 2: "宸插贰妫�",
+ }[value] || ""),
+ formatType: (value) =>
+ ({
+ 1: "warning",
+ 2: "success",
+ }[value] || "info"),
+};
+// 宸℃缁撴灉鍒楋紙浠呭畾鏃朵换鍔¤褰曟樉绀猴級
+const inspectionResultColumn = {
+ prop: "inspectionResult",
+ label: "宸℃缁撴灉",
+ minWidth: 100,
+ dataType: "tag",
+ formatData: (value) =>
+ ({
+ 1: "姝ｅ父",
+ 2: "寮傚父",
+ }[value] || ""),
+ formatType: (value) =>
+ ({
+ 1: "success",
+ 2: "error",
+ }[value] || "info"),
+};
+
const getOperationColumn = (operations) => {
- if (!operations || operations.length === 0) return null;
-
- const operationConfig = {
+ if (!operations || operations.length === 0) {
+ return null;
+ }
+ return {
label: "鎿嶄綔",
width: 130,
fixed: "right",
dataType: "action",
- operation: operations.map(op => {
- switch (op) {
- case 'edit':
- return {
- name: "缂栬緫",
- clickFun: handleAdd,
- color: "#409EFF"
- };
- case 'viewFile':
- return {
- name: "鏌ョ湅闄勪欢",
- clickFun: viewFile,
- color: "#67C23A"
- };
- default:
- return null;
- }
- }).filter(Boolean)
+ operation: operations
+ .map((op) => {
+ switch (op) {
+ case "edit":
+ return {
+ name: "缂栬緫",
+ clickFun: handleAdd,
+ color: "#409EFF",
+ };
+ case "viewFile":
+ return {
+ name: "鏌ョ湅闄勪欢",
+ clickFun: viewFile,
+ color: "#67C23A",
+ };
+ default:
+ return null;
+ }
+ })
+ .filter(Boolean),
};
-
- return operationConfig;
};
-const columns1 = ref([
- { prop: "deviceName", label: "璁惧鍚嶇О", minWidth: 160 },
- { prop: "location", label: "鎵�鍦ㄤ綅缃弿杩�", minWidth: 120 },
- { prop: "createBy", label: "鍒涘缓鑰�", minWidth: 100 },
- { prop: "createTime", label: "鍒涘缓鏃堕棿", minWidth: 100 },
-]);
+const loadAreaTree = async () => {
+ const { data } = await getDeviceAreaTree();
+ areaOptions.value = Array.isArray(data) ? data : [];
+};
onMounted(() => {
- radioChange('taskManage');
+ loadAreaTree();
+ radioChange("taskManage");
});
-// 鏍囩椤电偣鍑讳簨浠�
-const handleTabClick = (tab) => {
- tabName.value = tab.props.name;
- tableData.value = [];
- getList();
-};
-
-// 鍗曢�夊彉鍖�
const radioChange = (value) => {
if (value === "taskManage") {
- const operationColumn = getOperationColumn(['edit']);
+ const operationColumn = getOperationColumn(["edit"]);
tableColumns.value = [...columns.value, ...(operationColumn ? [operationColumn] : [])];
- operationsArr.value = ['edit'];
- } else if (value === "task") {
- const operationColumn = getOperationColumn(['viewFile']);
- tableColumns.value = [...columns.value, ...(operationColumn ? [operationColumn] : [])];
- operationsArr.value = ['viewFile'];
} else {
- const operationColumn = getOperationColumn(['edit']);
- tableColumns.value = [...columns1.value, ...(operationColumn ? [operationColumn] : [])];
- operationsArr.value = ['edit'];
+ const operationColumn = getOperationColumn(["viewFile"]);
+ // 瀹氭椂浠诲姟璁板綍娣诲姞宸℃鐘舵�佸垪
+ tableColumns.value = [...columns.value, inspectionStatusColumn, inspectionResultColumn, ...(operationColumn ? [operationColumn] : [])];
}
pageNum.value = 1;
pageSize.value = 10;
getList();
};
-// 鏌ヨ鎿嶄綔
const handleQuery = () => {
pageNum.value = 1;
pageSize.value = 10;
getList();
};
-// 鍒嗛〉澶勭悊
+
const handlePagination = (val) => {
- pageNum.value = val.page;
- pageSize.value = val.limit;
- getList();
-};
-// 鑾峰彇鍒楄〃鏁版嵁
-const getList = () => {
- tableLoading.value = true;
-
- const params = { ...queryParams, size: pageSize.value, current: pageNum.value };
-
- let apiCall;
- if (tabName.value === 'task') {
- switch (activeRadio.value) {
- case "task":
- apiCall = inspectionTaskList(params);
- break;
- case "qrCode":
- apiCall = qrCodeList(params);
- break;
- default:
- apiCall = timingTaskList(params);
- }
- } else {
- apiCall = qrCodeScanRecordList(params);
- }
-
- apiCall.then(res => {
- const rawData = res.data.records || [];
- // 澶勭悊 inspector 瀛楁锛屽皢瀛楃涓茶浆鎹负鏁扮粍锛堥�傜敤浜庢墍鏈夋儏鍐碉級
- tableData.value = rawData.map(item => {
- const processedItem = { ...item };
-
- // 澶勭悊 inspector 瀛楁
- if (processedItem.inspector) {
- if (typeof processedItem.inspector === 'string') {
- // 瀛楃涓叉寜閫楀彿鍒嗗壊
- processedItem.inspector = processedItem.inspector.split(',').map(s => s.trim()).filter(s => s);
- } else if (!Array.isArray(processedItem.inspector)) {
- // 闈炴暟缁勮浆涓烘暟缁�
- processedItem.inspector = [processedItem.inspector];
- }
- } else {
- // 绌哄�艰涓虹┖鏁扮粍
- processedItem.inspector = [];
- }
-
- return processedItem;
- });
- total.value = res.data.total || 0;
- }).finally(() => {
- tableLoading.value = false;
- });
+ pageNum.value = val.page;
+ pageSize.value = val.limit;
+ getList();
};
-// 閲嶇疆鏌ヨ
+const getList = () => {
+ tableLoading.value = true;
+ const params = {
+ ...queryParams,
+ size: pageSize.value,
+ current: pageNum.value,
+ };
+ const apiCall =
+ activeRadio.value === "task" ? inspectionTaskList(params) : timingTaskList(params);
+
+ apiCall
+ .then((res) => {
+ const rawData = res?.data?.records || [];
+ tableData.value = rawData.map((item) => {
+ const processedItem = { ...item };
+ if (processedItem.inspector) {
+ if (typeof processedItem.inspector === "string") {
+ processedItem.inspector = processedItem.inspector
+ .split(",")
+ .map((text) => text.trim())
+ .filter(Boolean);
+ } else if (!Array.isArray(processedItem.inspector)) {
+ processedItem.inspector = [processedItem.inspector];
+ }
+ } else {
+ processedItem.inspector = [];
+ }
+ return processedItem;
+ });
+ total.value = res?.data?.total || 0;
+ })
+ .finally(() => {
+ tableLoading.value = false;
+ });
+};
+
const resetQuery = () => {
- for (const key in queryParams) {
- if (!["pageNum", "pageSize"].includes(key)) {
- queryParams[key] = "";
- }
- }
+ queryParams.taskName = "";
+ queryParams.areaId = undefined;
handleQuery();
};
-// 鏂板 / 缂栬緫
const handleAdd = (row) => {
- const type = row ? 'edit' : 'add';
+ const type = row ? "edit" : "add";
nextTick(() => {
- if (tabName.value === 'task') {
- if (activeRadio.value === "taskManage") {
- formDia.value?.openDialog(type, row);
- } else if (activeRadio.value === "qrCode") {
- qrCodeDia.value?.openDialog(type, row);
- }
- } else {
- viewQrCodeFiles.value?.openDialog(row);
- }
+ formDia.value?.openDialog(type, row);
});
};
-// 鏌ョ湅闄勪欢
const viewFile = (row) => {
nextTick(() => {
viewFiles.value?.openDialog(row);
});
};
-// 鍒犻櫎鎿嶄綔
const handleDelete = () => {
if (!selectedRows.value.length) {
proxy.$modal.msgWarning("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
return;
}
-
- const deleteIds = selectedRows.value.map(item => item.id);
- const api = activeRadio.value === "taskManage" ? delTimingTask : delQrCode;
-
- proxy.$modal.confirm('鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�').then(() => {
- return api(deleteIds);
- }).then(() => {
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- handleQuery();
- }).catch(() => {});
+ const deleteIds = selectedRows.value.map((item) => item.id);
+ proxy.$modal
+ .confirm("鏄惁纭鍒犻櫎鎵�閫夋暟鎹」锛�")
+ .then(() => delTimingTask(deleteIds))
+ .then(() => {
+ proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ handleQuery();
+ })
+ .catch(() => {});
};
-// 澶氶�夊彉鏇�
const handleSelectionChange = (selection) => {
selectedRows.value = selection;
+};
+
+const handleOut = () => {
+ ElMessageBox.confirm("閫変腑鐨勫唴瀹瑰皢琚鍑猴紝鏄惁纭瀵煎嚭锛�", "瀵煎嚭", {
+ confirmButtonText: "纭",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ if (activeRadio.value === "taskManage") {
+ proxy.download("/timingTask/export", {}, "瀹氭椂浠诲姟绠＄悊.xlsx");
+ } else {
+ proxy.download("/inspectionTask/export", {}, "瀹氭椂浠诲姟璁板綍.xlsx");
+ }
+ })
+ .catch(() => {
+ proxy.$modal.msg("宸插彇娑�");
+ });
};
</script>
<style scoped>
+.toolbar {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ margin-bottom: 10px;
+}
+
.person-tags {
display: flex;
flex-wrap: wrap;
@@ -419,4 +394,4 @@
color: #909399;
font-size: 14px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3