From 8a3046817d6bf207f38accd0cd6b65d770db3bea Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 12 九月 2025 17:20:08 +0800
Subject: [PATCH] 1. 修改静安第三方接口url地址 2. 修改静安新增设备匹配功能中，上传的经纬度信息为我方的信息
---
src/views/fysp/task/components/CompSubTaskList.vue | 100 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 72 insertions(+), 28 deletions(-)
diff --git a/src/views/fysp/task/components/CompSubTaskList.vue b/src/views/fysp/task/components/CompSubTaskList.vue
index b678652..2ff7199 100644
--- a/src/views/fysp/task/components/CompSubTaskList.vue
+++ b/src/views/fysp/task/components/CompSubTaskList.vue
@@ -1,28 +1,42 @@
<template>
<el-row justify="space-between">
<el-text>鍗曟棩璁″垝</el-text>
- <el-button
- v-show="create && modelValue && modelValue.length > 0"
- type="success"
- size="small"
- @click="add"
- >浠诲姟璋冩暣</el-button
- >
+ <div>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ @click="handleInspectFileDownload"
+ >鍗曟嵁涓嬭浇</el-button
+ >
+ <el-button
+ v-show="create && data && data.length > 0"
+ type="success"
+ size="small"
+ @click="add"
+ >浠诲姟璋冩暣</el-button
+ >
+ </div>
</el-row>
<el-divider />
<div>
<el-scrollbar v-loading="loading" :height="height">
<el-space
- v-if="modelValue && modelValue.length > 0"
+ v-if="data && data.length > 0"
fill
:fill-ratio="100"
direction="vertical"
style="width: 100%"
>
- <ItemSubTask v-for="s in modelValue" :key="s.guid" :item="s">
+ <ItemSubTask v-for="s in data" :key="s.guid" :item="s">
<template #default="{ item }">
<el-space direction="vertical">
- <el-button plain type="primary" size="small" @click="edit(item)"
+ <el-button
+ :disabled="item.status != '鏈墽琛�'"
+ plain
+ type="primary"
+ size="small"
+ @click="edit(item)"
>缂栬緫</el-button
>
<el-button
@@ -38,8 +52,12 @@
</el-space>
<div v-else>
<el-empty description="鏃犱换鍔¤褰�" />
- <el-row justify="center">
- <el-button type="success" size="small" @click="add"
+ <el-row v-if="create" justify="center">
+ <el-button
+ type="success"
+ size="small"
+ :loading="createLoading"
+ @click="add"
>娣诲姞浠诲姟</el-button
>
</el-row>
@@ -49,7 +67,7 @@
<el-dialog
v-model="dialogVisible"
width="600"
- title="涓�閿垱寤烘�讳换鍔�"
+ title="宸℃煡浠诲姟缂栬緫"
destroy-on-close
:close-on-click-modal="false"
:close-on-press-escape="false"
@@ -57,15 +75,18 @@
>
<CompSubTaskEdit
v-model="activeItem"
- @submit="dialogVisible = false"
+ @submit="onEditSubmit"
@cancel="dialogVisible = false"
></CompSubTaskEdit>
</el-dialog>
+ <SceneInspectFile v-model="downloadDialog" :value="downloadSceneList"></SceneInspectFile>
</template>
<script setup>
import { ref, computed, watch, onMounted, onUnmounted } from 'vue';
import { ElMessageBox, ElNotification, ElMessage } from 'element-plus';
import CompSubTaskEdit from './CompSubTaskEdit.vue';
+import SceneInspectFile from "@/views/fysp/scene/SceneInspectFile.vue";
+import subtaskApi from '@/api/fysp/subtaskApi';
const props = defineProps({
modelValue: Array,
@@ -75,14 +96,17 @@
},
// 鏄惁鏄剧ず娣诲姞浠诲姟鎸夐挳
create: Boolean,
- loading: Boolean
+ loading: Boolean,
+ createLoading: Boolean
});
-const dialogVisible = ref(false)
-const activeItem = ref(null)
+const dialogVisible = ref(false);
+const activeItem = ref(null);
const data = computed(() => props.modelValue);
+const downloadDialog = ref(false);
+const downloadSceneList = ref([])
-const emit = defineEmits(['edit', 'add', 'remove', 'update:modelValue']);
+const emit = defineEmits(['submit', 'add', 'remove', 'update:modelValue']);
function remove(item) {
if (item.status == '鏈墽琛�') {
@@ -91,26 +115,46 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- const index = data.value.indexOf(item);
- data.value.splice(index, 1);
+ return subtaskApi.deleteSubtask(item.stguid).then((res) => {
+ if (res == 1) {
+ const index = data.value.indexOf(item);
+ data.value.splice(index, 1);
- emit('update:modelValue', data.value);
- emit('remove', item);
+ emit('update:modelValue', data.value);
+ emit('remove', item);
+ } else {
+ Promise.reject('鍒犻櫎宸℃煡浠诲姟澶辫触');
+ }
+ });
});
}
}
function edit(item) {
- activeItem.value = item
- dialogVisible.value = true
- emit('edit');
+ activeItem.value = item;
+ dialogVisible.value = true;
+}
+
+function onEditSubmit(item) {
+ dialogVisible.value = false;
+ const index = data.value.findIndex((v) => {
+ return item.stguid == v.stguid;
+ });
+ data.value.splice(index, 1, item);
+ emit('update:modelValue', data.value);
+ emit('submit');
}
function add() {
emit('add');
}
-onUnmounted(()=>{
- dialogVisible.value = false
-})
+onUnmounted(() => {
+ dialogVisible.value = false;
+});
+
+function handleInspectFileDownload() {
+ downloadSceneList.value = data.value.map(v=>v.scenseid)
+ downloadDialog.value = true
+}
</script>
--
Gitblit v1.9.3