From 77eef8ea560d9bca78b7a0f4a7b8869727047ad4 Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Wed, 4 Sep 2024 10:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E6=9F=A5=E8=AF=A2=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=A0=E9=80=92caseno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/demo/cloudQuery.ts | 2 +- src/components/MapboxMaps/MapComponent.vue | 6 +++++- src/components/illegalmining/ShowListComponent/index.vue | 7 +++++++ src/views/demo/degraining/auditinfo/MapList/index.vue | 7 +++++++ src/views/demo/degraining/curbspotcity/MapList/index.vue | 7 +++++++ .../demo/degraining/illegaltreatment/MapList/index.vue | 7 +++++++ src/views/demo/illegalmining/auditinfo/MapList/index.vue | 7 +++++++ .../demo/illegalmining/curbspotcity/MapList/index.vue | 7 +++++++ .../demo/illegalmining/illegaltreatment/MapList/index.vue | 7 +++++++ .../demo/statistical/illegaltreatment/MapList/index.vue | 7 +++++++ src/views/demo/tiankongdi/auditinfo/MapList/index.vue | 7 +++++++ src/views/demo/tiankongdi/curbspotcity/MapList/index.vue | 7 +++++++ src/views/demo/workflow/task/process/audit.vue | 2 ++ 13 files changed, 78 insertions(+), 2 deletions(-) diff --git a/src/api/demo/cloudQuery.ts b/src/api/demo/cloudQuery.ts index f5a3b821..7b788e59 100644 --- a/src/api/demo/cloudQuery.ts +++ b/src/api/demo/cloudQuery.ts @@ -7,7 +7,7 @@ enum Api { LoadCloudQueryById = '/api/DroneCloudQuery/LoadCloudQueryById' } -export function AddDroneTask(params: { geomid: string }) { +export function AddDroneTask(params: { geomid: string, caseno: string }) { return defHttp.post({ url: Api.AddDroneTask + "?geomid=" + params.geomid, params, diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue index e77ebc27..49a08e65 100644 --- a/src/components/MapboxMaps/MapComponent.vue +++ b/src/components/MapboxMaps/MapComponent.vue @@ -282,6 +282,10 @@ type: Array, default: null, }, + caseno: { + type: String, + default: '', + } }); let nextMapControl: Array = reactive([]); @@ -1497,7 +1501,7 @@ message.warning('已有云查询运行，不能再次提交'); } else { let geomidStr = props.geomsList.map((item) => item.key).join(','); - AddDroneTask({ geomid: geomidStr }).then((res) => { + AddDroneTask({ geomid: geomidStr, caseno: props.caseno }).then((res) => { message.success('成功提交云查询'); useCloudQuery.setIdentification(true); }); diff --git a/src/components/illegalmining/ShowListComponent/index.vue b/src/components/illegalmining/ShowListComponent/index.vue index b3bcf9c5..d0933b03 100644 --- a/src/components/illegalmining/ShowListComponent/index.vue +++ b/src/components/illegalmining/ShowListComponent/index.vue @@ -68,6 +68,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -100,6 +101,7 @@ const auditOpen = ref(false); const processId = ref(''); const taskId = ref(''); const type = ref(''); +const auditData = ref() const isRead: any = ref(0); const handoffShow = ref(true) const showDataId = ref() @@ -136,6 +138,7 @@ const goAudit = async (record) => { processId.value = record.processid; taskId.value = record.taskid; type.value = record.type; + auditData.value = record; } const collectItem = (item) => { console.log(item,userStore.getUserInfo) @@ -179,6 +182,7 @@ const prevData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[res.items.length -1].id + auditData.value = res.items[res.items.length -1] }) return }else{ @@ -194,6 +198,7 @@ const prevData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -214,6 +219,7 @@ const nextData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[0].id + auditData.value = res.items[0] }) return }else{ @@ -229,6 +235,7 @@ const nextData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record } const getParams = (data) => { let params = { diff --git a/src/views/demo/degraining/auditinfo/MapList/index.vue b/src/views/demo/degraining/auditinfo/MapList/index.vue index e8386206..17ac061c 100644 --- a/src/views/demo/degraining/auditinfo/MapList/index.vue +++ b/src/views/demo/degraining/auditinfo/MapList/index.vue @@ -195,6 +195,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -230,6 +231,7 @@ const taskId = ref(''); const isRead: any = ref(0); const type = ref(''); + const auditData = ref() const order = ref(0) const auditOpen = ref(false); const showDataId = ref() @@ -312,6 +314,7 @@ processId.value = record.processid; taskId.value = record.taskeid; type.value = record.type; + auditData.value = record; } async function locationFun(record) { emits('changeTask', record); @@ -361,6 +364,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[dataList.value.length - 1].Id + auditData.value = dataList.value[dataList.value.length - 1] return }else{ showDataId.value = prevShowDataId.value @@ -375,6 +379,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -397,6 +402,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[0].Id + auditData.value = dataList.value[0] return }else{ showDataId.value = nextShowDataId.value @@ -411,6 +417,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const cancelCollectItem = (item) => { DeleteCaiKuangTaskCase(item.Fid).then(res => { diff --git a/src/views/demo/degraining/curbspotcity/MapList/index.vue b/src/views/demo/degraining/curbspotcity/MapList/index.vue index d99e9b8e..2f74406c 100644 --- a/src/views/demo/degraining/curbspotcity/MapList/index.vue +++ b/src/views/demo/degraining/curbspotcity/MapList/index.vue @@ -229,6 +229,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -299,6 +300,7 @@ const auditOpen = ref(false); const processId = ref(''); const taskId = ref(''); const type = ref(''); +const auditData = ref() const handoffShow = ref(true) const isRead: any = ref(0); const openCollect = computed(() => { @@ -394,6 +396,7 @@ async function goAudit(record) { processId.value = record.processid; taskId.value = record.taskid; type.value = record.type; + auditData.value = record; } const prevData = async () => { if(prevShowDataId.value === 0){ @@ -414,6 +417,7 @@ const prevData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[res.items.length -1].id + auditData.value = res.items[res.items.length -1] }) return }else{ @@ -429,6 +433,7 @@ const prevData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -449,6 +454,7 @@ const nextData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[0].id + auditData.value = res.items[0] }) return }else{ @@ -464,6 +470,7 @@ const nextData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record } const closeMolder = () => { emits('getInfoList') diff --git a/src/views/demo/degraining/illegaltreatment/MapList/index.vue b/src/views/demo/degraining/illegaltreatment/MapList/index.vue index ba9802d2..574b3097 100644 --- a/src/views/demo/degraining/illegaltreatment/MapList/index.vue +++ b/src/views/demo/degraining/illegaltreatment/MapList/index.vue @@ -196,6 +196,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -231,6 +232,7 @@ const taskId = ref(''); const isRead: any = ref(0); const type = ref(''); + const auditData = ref() const order = ref(0) const auditOpen = ref(false); const showDataId = ref() @@ -312,6 +314,7 @@ processId.value = record.processid; taskId.value = record.taskeid; type.value = record.type; + auditData.value = record; } async function locationFun(record) { emits('changeTask', record); @@ -361,6 +364,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[dataList.value.length - 1].Id + auditData.value = dataList.value[dataList.value.length - 1] return }else{ showDataId.value = prevShowDataId.value @@ -375,6 +379,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -397,6 +402,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[0].Id + auditData.value = dataList.value[0] return }else{ showDataId.value = nextShowDataId.value @@ -411,6 +417,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const cancelCollectItem = (item) => { DeleteCaiKuangTaskCase(item.Fid).then(res => { diff --git a/src/views/demo/illegalmining/auditinfo/MapList/index.vue b/src/views/demo/illegalmining/auditinfo/MapList/index.vue index 46b2d2eb..e103dbac 100644 --- a/src/views/demo/illegalmining/auditinfo/MapList/index.vue +++ b/src/views/demo/illegalmining/auditinfo/MapList/index.vue @@ -195,6 +195,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -230,6 +231,7 @@ const taskId = ref(''); const isRead: any = ref(0); const type = ref(''); + const auditData = ref() const order = ref(0) const auditOpen = ref(false); const showDataId = ref() @@ -312,6 +314,7 @@ processId.value = record.processid; taskId.value = record.taskeid; type.value = record.type; + auditData.value = record; } async function locationFun(record) { emits('changeTask', record); @@ -361,6 +364,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[dataList.value.length - 1].Id + auditData.value = dataList.value[dataList.value.length - 1] return }else{ showDataId.value = prevShowDataId.value @@ -375,6 +379,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -397,6 +402,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[0].Id + auditData.value = dataList.value[0] return }else{ showDataId.value = nextShowDataId.value @@ -411,6 +417,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const cancelCollectItem = (item) => { DeleteCaiKuangTaskCase(item.Fid).then(res => { diff --git a/src/views/demo/illegalmining/curbspotcity/MapList/index.vue b/src/views/demo/illegalmining/curbspotcity/MapList/index.vue index bcb94ade..31f2bce2 100644 --- a/src/views/demo/illegalmining/curbspotcity/MapList/index.vue +++ b/src/views/demo/illegalmining/curbspotcity/MapList/index.vue @@ -230,6 +230,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -300,6 +301,7 @@ const auditOpen = ref(false); const processId = ref(''); const taskId = ref(''); const type = ref(''); +const auditData = ref() const handoffShow = ref(true) const isRead: any = ref(0); const openCollect = computed(() => { @@ -395,6 +397,7 @@ async function goAudit(record) { processId.value = record.processid; taskId.value = record.taskid; type.value = record.type; + auditData.value = record; } const prevData = async () => { if(prevShowDataId.value === 0){ @@ -415,6 +418,7 @@ const prevData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[res.items.length -1].id + auditData.value = res.items[res.items.length -1] }) return }else{ @@ -430,6 +434,7 @@ const prevData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -450,6 +455,7 @@ const nextData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[0].id + auditData.value = res.items[0] }) return }else{ @@ -465,6 +471,7 @@ const nextData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record } const closeMolder = () => { emits('getInfoList') diff --git a/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue b/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue index 5f9edcfa..62855740 100644 --- a/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue +++ b/src/views/demo/illegalmining/illegaltreatment/MapList/index.vue @@ -196,6 +196,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -231,6 +232,7 @@ const taskId = ref(''); const isRead: any = ref(0); const type = ref(''); + const auditData = ref() const order = ref(0) const auditOpen = ref(false); const showDataId = ref() @@ -312,6 +314,7 @@ processId.value = record.processid; taskId.value = record.taskeid; type.value = record.type; + auditData.value = record; } async function locationFun(record) { emits('changeTask', record); @@ -361,6 +364,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[dataList.value.length - 1].Id + auditData.value = dataList.value[dataList.value.length - 1] return }else{ showDataId.value = prevShowDataId.value @@ -375,6 +379,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -397,6 +402,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[0].Id + auditData.value = dataList.value[0] return }else{ showDataId.value = nextShowDataId.value @@ -411,6 +417,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const cancelCollectItem = (item) => { DeleteCaiKuangTaskCase(item.Fid).then(res => { diff --git a/src/views/demo/statistical/illegaltreatment/MapList/index.vue b/src/views/demo/statistical/illegaltreatment/MapList/index.vue index b3be78ee..acd9f673 100644 --- a/src/views/demo/statistical/illegaltreatment/MapList/index.vue +++ b/src/views/demo/statistical/illegaltreatment/MapList/index.vue @@ -197,6 +197,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -231,6 +232,7 @@ const taskId = ref(''); const isRead: any = ref(0); const type = ref(''); + const auditData = ref() const order = ref(0) const auditOpen = ref(false); const showDataId = ref() @@ -312,6 +314,7 @@ processId.value = record.processid; taskId.value = record.taskeid; type.value = record.type; + auditData.value = record; } async function locationFun(record) { emits('changeTask', record); @@ -361,6 +364,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[dataList.value.length - 1].Id + auditData.value = dataList.value[dataList.value.length - 1] return }else{ showDataId.value = prevShowDataId.value @@ -375,6 +379,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -397,6 +402,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[0].Id + auditData.value = dataList.value[0] return }else{ showDataId.value = nextShowDataId.value @@ -411,6 +417,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const cancelCollectItem = (item) => { deleteTaskCase(item.Fid).then(res => { diff --git a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue index db0464b2..89cb920d 100644 --- a/src/views/demo/tiankongdi/auditinfo/MapList/index.vue +++ b/src/views/demo/tiankongdi/auditinfo/MapList/index.vue @@ -196,6 +196,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -230,6 +231,7 @@ const taskId = ref(''); const isRead: any = ref(0); const type = ref(''); + const auditData = ref() const order = ref(0) const auditOpen = ref(false); const showDataId = ref() @@ -312,6 +314,7 @@ processId.value = record.processid; taskId.value = record.taskeid; type.value = record.type; + auditData.value = record; } async function locationFun(record) { emits('changeTask', record); @@ -361,6 +364,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[dataList.value.length - 1].Id + auditData.value = dataList.value[dataList.value.length - 1] return }else{ showDataId.value = prevShowDataId.value @@ -375,6 +379,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -397,6 +402,7 @@ type.value = record.type; handoffShow.value = true showDataId.value = dataList.value[0].Id + auditData.value = dataList.value[0] return }else{ showDataId.value = nextShowDataId.value @@ -411,6 +417,7 @@ taskId.value = record.taskeid; type.value = record.type; handoffShow.value = true + auditData.value = record } const cancelCollectItem = (item) => { deleteTaskCase(item.Fid).then(res => { diff --git a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue index 246e5c2a..be4c2f33 100644 --- a/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue +++ b/src/views/demo/tiankongdi/curbspotcity/MapList/index.vue @@ -279,6 +279,7 @@ :taskId="taskId" :isRead="isRead" :type="type" + :auditData="auditData" @closeModel="closeMolder" /> @@ -366,6 +367,7 @@ const auditOpen = ref(false); const processId = ref(''); const taskId = ref(''); const type = ref(''); +const auditData = ref() const handoffShow = ref(true) const isRead: any = ref(0); const openCollect = computed(() => { @@ -472,6 +474,7 @@ async function goAudit(record) { processId.value = record.processid; taskId.value = record.taskid; type.value = record.type; + auditData.value = record; } const prevData = async () => { if(prevShowDataId.value === 0){ @@ -492,6 +495,7 @@ const prevData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[res.items.length -1].id + auditData.value = res.items[res.items.length -1]; }) return }else{ @@ -507,6 +511,7 @@ const prevData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record; } const nextData = async () => { if(nextShowDataId.value === 0){ @@ -527,6 +532,7 @@ const nextData = async () => { type.value = record.type; handoffShow.value = true showDataId.value = res.items[0].id + auditData.value = res.items[0] }) return }else{ @@ -542,6 +548,7 @@ const nextData = async () => { taskId.value = record.taskid; type.value = record.type; handoffShow.value = true + auditData.value = record; } const closeMolder = () => { emits('getInfoList') diff --git a/src/views/demo/workflow/task/process/audit.vue b/src/views/demo/workflow/task/process/audit.vue index 942ce83b..989130df 100644 --- a/src/views/demo/workflow/task/process/audit.vue +++ b/src/views/demo/workflow/task/process/audit.vue @@ -10,6 +10,7 @@