From 9a61e46d96536f3299e57f7259ae1c9972256ec6 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 30 九月 2025 09:42:09 +0800
Subject: [PATCH] 1. 隐藏未完成的账户匹配页面 2. 根据第三方新的接口文档修改接口url地址
---
src/views/fysp/data-product/base-data-product/ProdSceneInfo.vue | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/src/views/fysp/data-product/base-data-product/ProdSceneInfo.vue b/src/views/fysp/data-product/base-data-product/ProdSceneInfo.vue
index 0f817a5..1bc9117 100644
--- a/src/views/fysp/data-product/base-data-product/ProdSceneInfo.vue
+++ b/src/views/fysp/data-product/base-data-product/ProdSceneInfo.vue
@@ -2,22 +2,22 @@
<BaseProdProcess
v-model:active="active"
@onStep1="onStep1"
+ @onStep2="onStep2"
+ @onStep3="onStep3"
:loading="loading"
>
- <!-- <template #step1>
- <ProdQueryOpt :loading="loading" @submit="onSearch"> </ProdQueryOpt>
- </template> -->
<template #step2="{ contentHeight }">
<el-table
+ id="prod-scene-table"
:data="tableData"
v-loading="loading"
- :height="viewHeight"
+ :height="contentHeight + 'px'"
table-layout="fixed"
:show-overflow-tooltip="true"
size="small"
border
>
- <el-table-column fixed="left" prop="index" label="缂栧彿" width="40">
+ <el-table-column fixed="left" prop="index" label="缂栧彿" width="50">
</el-table-column>
<el-table-column
fixed="left"
@@ -35,6 +35,8 @@
<el-table-column prop="districtname" label="鍖哄幙" width="90" /> -->
<el-table-column prop="townname" label="琛楅亾" width="110" />
<el-table-column prop="location" label="鍦板潃" width="200" />
+ <el-table-column prop="contacts" label="鑱旂郴浜�" width="70" />
+ <el-table-column prop="contactst" label="鐢佃瘽" width="96" />
<!-- <el-table-column prop="longitude" label="缁忓害" width="110" />
<el-table-column prop="latitude" label="绾害" width="110" /> -->
<!-- <el-table-column
@@ -45,25 +47,19 @@
/> -->
</el-table>
</template>
- <!-- <template #step3></template> -->
</BaseProdProcess>
</template>
<script setup>
import { ref, inject } from 'vue';
import dayjs from 'dayjs';
-import BaseProdProcess from '@/views/fysp/data-product/base-data-product/components/BaseProdProcess.vue';
-import ProdQueryOpt from '@/views/fysp/data-product/base-data-product/components/ProdQueryOpt.vue';
+import BaseProdProcess from '@/views/fysp/data-product/components/BaseProdProcess.vue';
import dataprodbaseApi from '@/api/fysp/dataprodbaseApi.js';
+import { conversionFromTable } from '@/utils/excel';
+import { useProdStepChange } from '@/views/fysp/data-product/prod-step-change.js';
-const active = ref(1);
+const { active, changeActive } = useProdStepChange();
const loading = ref(false);
const tableData = ref([]);
-const viewHeight = inject('viewHeight');
-
-function changeActive() {
- active.value++;
- active.value = active.value > 3 ? 1 : active.value;
-}
function onStep1(opt) {
loading.value = true;
@@ -84,6 +80,18 @@
});
}
+function onStep2() {
+ changeActive();
+}
+
+function onStep3(val) {
+ if (val.downloadType == '1') {
+ loading.value = true;
+ conversionFromTable('prod-scene-table', '宸℃煡鍦烘櫙娓呭崟');
+ loading.value = false;
+ }
+}
+
function timeFormat(row, column, cellValue, index) {
return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss');
}
--
Gitblit v1.9.3