导出接口

src/views/inspectionWork/completed.vue

@@ -58,7 +58,7 @@ const total = ref(0);
 const deptOptions = ref([]);
 const deptTreeRef = ref(null);
 const tableData = ref([]);
-const props = defineProps<{ eventId: string }>();
+const props = defineProps<{ eventId: string, taskId: string, state: string }>();
 
 const initFormData = reactive({
   area: '',
@@ -136,10 +136,11 @@ const handleSelectionChange = (selection) => {
   ids.value = selection.map((item) => item.id);
 };
 
-const filename = ref('完成情况')
+const filename = '已完成情况';
+
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const handleExport = () => {
-  download2(baseUrl + '/api/riskManagement/inspection/task/children/task/log/'+props.eventId+'/'+initFormData.task_status+'/export', filename.value + '.xlsx');
+  download2(baseUrl + '/api/riskManagement/inspection/task/children/task/log/'+props.taskId+'/'+props.state+'/export', filename + '.xlsx');
 };
 
 onMounted(async () => {

src/views/inspectionWork/incompleted.vue

@@ -43,6 +43,7 @@
 import { onMounted, reactive, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { inspectorDivision, patrolNum_1 } from '@/api/inspectionWork/inspector';
+import { download2 } from '@/utils/request';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -56,7 +57,7 @@ const total = ref(0);
 const deptOptions = ref([]);
 const deptTreeRef = ref(null);
 const tableData = ref([]);
-const props = defineProps<{ eventId: string }>();
+const props = defineProps<{ eventId: string, taskId: string, state: string }>();
 
 const initFormData = reactive({
   area: '',
@@ -134,6 +135,13 @@ const handleSelectionChange = (selection) => {
   ids.value = selection.map((item) => item.id);
 };
 
+const filename = '未完成情况';
+
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const handleExport = () => {
+  download2(baseUrl + '/api/riskManagement/inspection/task/children/task/log/'+props.taskId+'/'+props.state+'/export', filename + '.xlsx');
+};
+
 onMounted(async () => {
   await getTreeSelect();
   fetchUserData();

src/views/inspectionWork/patrolSubResult.vue

@@ -77,6 +77,7 @@
 import { onMounted, reactive, ref } from 'vue';
 import { inspectorDivision, resultList } from '@/api/inspectionWork/inspector';
 import { ElMessage } from 'element-plus';
+import { download2 } from '@/utils/request';
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const downLoadApi = import.meta.env.VITE_APP_BASE_DOWNLOAD_API;
 const loading = ref(true);
@@ -92,6 +93,7 @@ const formattedDivisionData = ref([]);
 const rawDivisionData = ref([]);
 const props = defineProps<{
   eventId: string | number;
+  taskId: string | number;
 }>();
 const initFormData = reactive({
   id: '',
@@ -159,9 +161,12 @@ const handleQuery = () => {
   queryParams.value.page = 1;
   fetchResulData();
 };
+
+const filename = '巡查结果';
 const handleExport = () => {
-  ElMessage.info('导出成功');
+  download2(baseUrl + '/api/riskManagement/inspection/task/children/task/result/'+props.taskId+'/export', filename + '.xlsx');
 };
+
 // 重置查询条件
 const resetQuery = () => {
   queryParams.value = { page: 1, pageSize: 10, nick_name: '', area: '', inspection_result: '' };

src/views/inspectionWork/patrolSubTasks.vue

@@ -49,12 +49,12 @@
             <el-table-column label="执行日期" align="center" prop="create_time" />
             <el-table-column label="已完成" align="center" prop="completed_num">
               <template #default="scope">
-                <el-text class="common-btn-text-primary" @click="handleCompletedClick(scope.row)">{{ scope.row.completed_num }}</el-text>
+                <el-text class="common-btn-text-primary" @click="handleCompletedClick(scope.row, 'completed')">{{ scope.row.completed_num }}</el-text>
               </template>
             </el-table-column>
             <el-table-column label="未完成" align="center" prop="incomplete_num">
               <template #default="scope">
-                <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row)">{{ scope.row.incomplete_num }}</el-text>
+                <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row, 'incomplete')">{{ scope.row.incomplete_num }}</el-text>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -74,10 +74,10 @@
       </el-col>
     </el-row>
   </div>
-  <PatrolSubResult v-if="patrolSubResultState.show" :event-id="patrolSubResultState.eventId" @close="handleCancel" />
+  <PatrolSubResult v-if="patrolSubResultState.show" :event-id="patrolSubResultState.eventId" :taskId="patrolSubResultState.task_id" @close="handleCancel" />
   <PatrolTaskEdit v-if="patrolTaskEditState.show" :event-id="patrolTaskEditState.eventId" @close="handleCancel" @refresh-parent="refreshBoth" />
-  <Completed v-if="completedState.show" :event-id="completedState.eventId" @close="handleCancel" />
-  <Incompleted v-if="incompletedState.show" :event-id="incompletedState.eventId" @close="handleCancel" />
+  <Completed v-if="completedState.show" :event-id="completedState.eventId" :taskId="completedState.task_id" :state="completedState.state" @close="handleCancel" />
+  <Incompleted v-if="incompletedState.show" :event-id="incompletedState.eventId" :taskId="incompletedState.task_id" :state="incompletedState.state" @close="handleCancel" />
 </template>
 <script setup lang="ts">
 import { workDetail, workSubList, updatetask, deleteRisk } from '@/api/inspectionWork/inspector';
@@ -172,15 +172,20 @@ let patrolTaskEditState = reactive({
 });
 let patrolSubResultState = reactive({
   show: false,
-  eventId: ''
+  eventId: '',
+  task_id: ''
 });
 let completedState = reactive({
   show: false,
-  eventId: ''
+  eventId: '',
+  task_id: '',
+  state: ''
 });
 let incompletedState = reactive({
   show: false,
-  eventId: ''
+  eventId: '',
+  task_id: '',
+  state: ''
 });
 const handleCancel = () => {
   patrolTaskEditState.show = false;
@@ -195,18 +200,23 @@ const handleUpdate = () => {
 const handleResult = (row) => {
   if (row) {
     patrolSubResultState.eventId = row.id; // 假设eventId是id字段
+    patrolSubResultState.task_id = row.task_id;
     patrolSubResultState.show = true;
   }
 };
-const handleCompletedClick = (row) => {
+const handleCompletedClick = (row, state) => {
   if (row) {
     completedState.eventId = row.id; // 假设eventId是id字段
+    completedState.task_id = row.task_id;
+    completedState.state = state;
     completedState.show = true;
   }
 };
-const handleIncompletedClick = (row) => {
+const handleIncompletedClick = (row, state) => {
   if (row) {
     incompletedState.eventId = row.id; // 假设eventId是id字段
+    incompletedState.task_id = row.task_id
+    incompletedState.state = state;
     incompletedState.show = true;
   }
 };

src/views/inspectionWork/rescueResourcesCompleted.vue

@@ -43,6 +43,7 @@
 import { onMounted, reactive, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { inspectorDivision, patrolNum } from '@/api/inspectionWork/rescueResources';
+import { download2 } from '@/utils/request';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -56,7 +57,7 @@ const total = ref(0);
 const deptOptions = ref([]);
 const deptTreeRef = ref(null);
 const tableData = ref([]);
-const props = defineProps<{ eventId: string }>();
+const props = defineProps<{ eventId: string, taskId: string, state: string }>();
 
 const initFormData = reactive({
   area: '',
@@ -134,6 +135,13 @@ const handleSelectionChange = (selection) => {
   ids.value = selection.map((item) => item.id);
 };
 
+const filename = '已完成情况';
+
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const handleExport = () => {
+  download2(baseUrl + '/api/riskManagement/rescue/resources/children/task/log/'+props.taskId+'/'+props.state+'/export', filename + '.xlsx');
+};
+
 onMounted(async () => {
   await getTreeSelect();
   fetchUserData();

src/views/inspectionWork/rescueResourcesDetail.vue

@@ -49,12 +49,12 @@
             <el-table-column label="执行日期" align="center" prop="create_time" />
             <el-table-column label="已完成" align="center" prop="completed_num">
               <template #default="scope">
-                <el-text class="common-btn-text-primary" @click="handleCompletedClick(scope.row)">{{ scope.row.completed_num }}</el-text>
+                <el-text class="common-btn-text-primary" @click="handleCompletedClick(scope.row, 'completed')">{{ scope.row.completed_num }}</el-text>
               </template>
             </el-table-column>
             <el-table-column label="未完成" align="center" prop="incomplete_num">
               <template #default="scope">
-                <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row)">{{ scope.row.incomplete_num }}</el-text>
+                <el-text class="common-btn-text-primary" @click="handleIncompletedClick(scope.row, 'incomplete')">{{ scope.row.incomplete_num }}</el-text>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -74,15 +74,15 @@
       </el-col>
     </el-row>
   </div>
-  <RescueResourcesResult v-if="rescueResourcesResultState.show" :event-id="rescueResourcesResultState.eventId" @close="handleCancel" />
+  <RescueResourcesResult v-if="rescueResourcesResultState.show" :event-id="rescueResourcesResultState.eventId" :taskId="rescueResourcesResultState.task_id" @close="handleCancel" />
   <RescueResourcesEdit
     v-if="rescueResourcesEditState.show"
     :event-id="rescueResourcesEditState.eventId"
     @close="handleCancel"
     @refresh-parent="refreshBoth"
   />
-  <RescueResourcesCompleted v-if="rescueResourcesCompletedState.show" :event-id="rescueResourcesCompletedState.eventId" @close="handleCancel" />
-  <RescueResourcesIncomplete v-if="rescueResourcesIncompleteState.show" :event-id="rescueResourcesIncompleteState.eventId" @close="handleCancel" />
+  <RescueResourcesCompleted v-if="rescueResourcesCompletedState.show" :event-id="rescueResourcesCompletedState.eventId" :taskId="rescueResourcesCompletedState.task_id" :state="rescueResourcesCompletedState.state" @close="handleCancel" />
+  <RescueResourcesIncomplete v-if="rescueResourcesIncompleteState.show" :event-id="rescueResourcesIncompleteState.eventId" :taskId="rescueResourcesIncompleteState.task_id" :state="rescueResourcesIncompleteState.state" @close="handleCancel" />
 </template>
 <script setup lang="ts">
 import { workDetail, workSubList, updatetask, deleteRisk } from '@/api/inspectionWork/rescueResources';
@@ -94,6 +94,7 @@ import RescueResourcesCompleted from './rescueResourcesCompleted.vue';
 import RescueResourcesIncomplete from './rescueResourcesIncomplete.vue';
 import { to } from 'await-to-js';
 import { parseTime } from '@/utils/ruoyi';
+import Completed from '@/views/inspectionWork/completed.vue';
 const props = defineProps<{ eventId: string }>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const total = ref(0);
@@ -166,15 +167,20 @@ let rescueResourcesEditState = reactive({
 });
 let rescueResourcesResultState = reactive({
   show: false,
-  eventId: ''
+  eventId: '',
+  task_id: ''
 });
 let rescueResourcesCompletedState = reactive({
   show: false,
-  eventId: ''
+  eventId: '',
+  task_id: '',
+  state: ''
 });
 let rescueResourcesIncompleteState = reactive({
   show: false,
-  eventId: ''
+  eventId: '',
+  task_id: '',
+  state: ''
 });
 const handleCancel = () => {
   rescueResourcesEditState.show = false;
@@ -189,18 +195,23 @@ const handleUpdate = () => {
 const handleResult = (row) => {
   if (row) {
     rescueResourcesResultState.eventId = row.id; // 假设eventId是id字段
+    rescueResourcesResultState.task_id = row.task_id;
     rescueResourcesResultState.show = true;
   }
 };
-const handleCompletedClick = (row) => {
+const handleCompletedClick = (row, state) => {
   if (row) {
     rescueResourcesCompletedState.eventId = row.id; // 假设eventId是id字段
+    rescueResourcesCompletedState.task_id = row.task_id;
+    rescueResourcesCompletedState.state = state;
     rescueResourcesCompletedState.show = true;
   }
 };
-const handleIncompletedClick = (row) => {
+const handleIncompletedClick = (row, state) => {
   if (row) {
     rescueResourcesIncompleteState.eventId = row.id; // 假设eventId是id字段
+    rescueResourcesIncompleteState.task_id = row.task_id;
+    rescueResourcesIncompleteState.state = state;
     rescueResourcesIncompleteState.show = true;
   }
 };

src/views/inspectionWork/rescueResourcesIncomplete.vue

@@ -43,6 +43,7 @@
 import { onMounted, reactive, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { inspectorDivision, patrolNum_1 } from '@/api/inspectionWork/rescueResources';
+import { download2 } from '@/utils/request';
 
 const router = useRouter();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -56,7 +57,7 @@ const total = ref(0);
 const deptOptions = ref([]);
 const deptTreeRef = ref(null);
 const tableData = ref([]);
-const props = defineProps<{ eventId: string }>();
+const props = defineProps<{ eventId: string, taskId: string, state: string }>();
 
 const initFormData = reactive({
   area: '',
@@ -134,6 +135,13 @@ const handleSelectionChange = (selection) => {
   ids.value = selection.map((item) => item.id);
 };
 
+const filename = '未完成情况';
+
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
+const handleExport = () => {
+  download2(baseUrl + '/api/riskManagement/rescue/resources/children/task/log/'+props.taskId+'/'+props.state+'/export', filename + '.xlsx');
+};
+
 onMounted(async () => {
   await getTreeSelect();
   fetchUserData();

src/views/inspectionWork/rescueResourcesResult.vue

@@ -77,6 +77,7 @@
 import { onMounted, reactive, ref } from 'vue';
 import { inspectorDivision, resultList } from '@/api/inspectionWork/inspector';
 import { ElMessage } from 'element-plus';
+import { download2 } from '@/utils/request';
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const downLoadApi = import.meta.env.VITE_APP_BASE_DOWNLOAD_API;
 const loading = ref(true);
@@ -92,6 +93,7 @@ const formattedDivisionData = ref([]);
 const rawDivisionData = ref([]);
 const props = defineProps<{
   eventId: string | number;
+  taskId: string | number;
 }>();
 const initFormData = reactive({
   id: '',
@@ -159,9 +161,11 @@ const handleQuery = () => {
   queryParams.value.page = 1;
   fetchResulData();
 };
+const filename = '巡查结果';
 const handleExport = () => {
-  ElMessage.info('导出成功');
+  download2(baseUrl + '/api/riskManagement/rescue/resources/children/task/result/'+props.taskId+'/export', filename + '.xlsx');
 };
+
 // 重置查询条件
 const resetQuery = () => {
   queryParams.value = { page: 1, pageSize: 10, nick_name: '', area: '', result: '' };