From fd5face9b6887e72d04c273a632f12100f66c3a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E5=86=A0=E5=AD=A6?= <1109935898@qq.com>
Date: Tue, 27 Aug 2024 17:39:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=9E=E5=AF=9F=E6=8A=A5=E5=91=8A=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
install.bat | 2 +-
src/composables/exportExcel.js | 4 +-
src/router/index.js | 4 +-
src/router/route.shared.js | 20 ++
src/views/DataAnalyse/insight/Index.vue | 44 +++-
.../insight/SharedInsightReport.vue | 91 ++++++-
src/views/DataAnalyse/insight/api.js | 61 +++++
.../insight/components/InsightShare.vue | 60 ++++-
.../insight/components/SharedAccess.vue | 102 ++++++++
.../insight/components/SharedExpired.vue | 38 +++
.../DataAnalyse/insight/img/icon_expire.png | Bin 0 -> 168345 bytes
.../DataAnalyse/insight/img/icon_lock.png | Bin 0 -> 35724 bytes
.../DataAnalyse/insight/report/Report.vue | 1 +
.../insight/report/components/SmallTable.vue | 7 +-
.../insight/report/components/StyledTable.vue | 247 ++++++++++++++++--
.../insight/report/section/CoreConclusion.vue | 11 +-
.../report/section/DecisionIndicators.vue | 47 ++--
.../report/section/OtherKeyIndicators.vue | 10 +-
.../insight/report/section/Overview.vue | 13 +-
.../ProjectNameAndDecisionCriteria.vue | 13 +-
.../insight/report/section/TestingConcept.vue | 68 ++---
.../conceptDiagnosis/ConceptDiagnosis.vue | 2 +-
.../conceptDiagnosis/PeopleDislike.vue | 21 +-
.../section/conceptDiagnosis/PeopleLike.vue | 62 +++--
.../section/conceptDiagnosis/ProductImage.vue | 32 ++-
.../section/conceptDiagnosis/style.scss | 5 +-
src/views/Shared/Index.vue | 11 +
27 files changed, 805 insertions(+), 171 deletions(-)
create mode 100644 src/router/route.shared.js
create mode 100644 src/views/DataAnalyse/insight/components/SharedAccess.vue
create mode 100644 src/views/DataAnalyse/insight/components/SharedExpired.vue
create mode 100644 src/views/DataAnalyse/insight/img/icon_expire.png
create mode 100644 src/views/DataAnalyse/insight/img/icon_lock.png
create mode 100644 src/views/Shared/Index.vue
diff --git a/install.bat b/install.bat
index e5a590db..8872513b 100644
--- a/install.bat
+++ b/install.bat
@@ -22,7 +22,7 @@ npm config set registry %customizeRegistry% && ^
echo ====clear npm cache==== && ^
npm cache clear --force && ^
echo ====install dependency package==== && ^
-npm i --force && ^
+npm ci --force && ^
echo ====finished install, switch back to original npm registry==== && ^
npm config set registry %originalRegistry% && ^
echo ====finish and exit==== && ^
diff --git a/src/composables/exportExcel.js b/src/composables/exportExcel.js
index 455f2c3e..9815b144 100644
--- a/src/composables/exportExcel.js
+++ b/src/composables/exportExcel.js
@@ -38,6 +38,7 @@ function json_to_array(key, jsonData) {
* @param data Array，表体数据
* @param key Array，字段名
* @param title String，标题（会居中显示），即excel表格第一行
+* @param sheetName
* @param filename String，文件名
* @param autoWidth Boolean，是否自动根据key自定义列宽度
*/
@@ -46,6 +47,7 @@ export const exportJsonToExcel = ({
data,
key,
title,
+ sheetName,
filename,
autoWidth
}) => {
@@ -64,7 +66,7 @@ export const exportJsonToExcel = ({
const arr = json_to_array(key, data)
auto_width(ws, arr)
}
- XLSX.utils.book_append_sheet(wb, ws, filename)
+ XLSX.utils.book_append_sheet(wb, ws, sheetName)
XLSX.writeFile(wb, filename + '.xlsx')
}
export default {
diff --git a/src/router/index.js b/src/router/index.js
index 87319ea4..ce34ec66 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@ import TemplateMarket from './route.templateMarket'
import Contact from './route.contact'
import DocumentLibrary from './route.documentLibrary'
import DataStatistics from './route.datastatistics'
+import SharedRoutes from './route.shared'
import { jsonp } from "vue-jsonp";
import { jsonpUrl } from "../config.js";
import { useStore } from "vuex";
@@ -24,6 +25,7 @@ const constantRoutes = [
// }
// ]
// },
+ ...SharedRoutes,
{
path: '/:catchAll(.*)',
redirect: '/error/404',
@@ -471,7 +473,7 @@ const router = createRouter({
})
router.beforeEach(async (to, from, next) => {
// token
- if (!router.options.history.state.back) {
+ if (!to.meta.shared && !router.options.history.state.back) {
await getToken();
}
if (!to.meta.noRedirectLogin) {
diff --git a/src/router/route.shared.js b/src/router/route.shared.js
new file mode 100644
index 00000000..b2c1dbe5
--- /dev/null
+++ b/src/router/route.shared.js
@@ -0,0 +1,20 @@
+const SharedIndex = () => import(/* webpackChunkName: 'shared' */ '@views/Shared/Index.vue')
+
+const SharedInsightReport = () => import(/* webpackChunkName: 'shared' */ '@views/DataAnalyse/insight/SharedInsightReport.vue')
+
+const routes = [
+ {
+ path: '/shared',
+ name: 'Shared',
+ meta: { title: '分享', shared: true },
+ component: SharedIndex,
+ children: [
+ {
+ path: 'insight/:secret',
+ name: 'SharedInsight',
+ component: SharedInsightReport
+ }
+ ]
+ }
+]
+export default routes
diff --git a/src/views/DataAnalyse/insight/Index.vue b/src/views/DataAnalyse/insight/Index.vue
index 467f88d7..8e5714f8 100644
--- a/src/views/DataAnalyse/insight/Index.vue
+++ b/src/views/DataAnalyse/insight/Index.vue
@@ -10,7 +10,7 @@ import InsightShare from './components/InsightShare.vue'
import Report from './report/Report.vue'
-import { getInsightReport } from './api'
+import { getInsightReport, updateInsightReport } from './api'
const route = useRoute()
@@ -53,25 +53,53 @@ function onGenerateReport(isInit) {
}
}
-function onConfirmGenerateReport(isInit) {
+async function onConfirmGenerateReport(isInit) {
+ if(loading.value) {
+ return
+ }
+ loading.value = true
+
// todo
+ const params = {}
+ const data = await updateInsightReport(params)
+
+
+ loading.value = false
}
-
+
diff --git a/src/views/DataAnalyse/insight/SharedInsightReport.vue b/src/views/DataAnalyse/insight/SharedInsightReport.vue
index d54ebaf6..0685113e 100644
--- a/src/views/DataAnalyse/insight/SharedInsightReport.vue
+++ b/src/views/DataAnalyse/insight/SharedInsightReport.vue
@@ -1,11 +1,100 @@
-
+
diff --git a/src/views/DataAnalyse/insight/api.js b/src/views/DataAnalyse/insight/api.js
index 47b2c578..cd9fb1aa 100644
--- a/src/views/DataAnalyse/insight/api.js
+++ b/src/views/DataAnalyse/insight/api.js
@@ -1,7 +1,25 @@
import request from '@/utils/request'
+/**
+ * 新增/修改洞察报告详情
+ * @param data
+ * @returns {*}
+ */
+export function updateInsightReport(data) {
+ return request({
+ url: `/console/insightReport`,
+ method: 'post',
+ data
+ })
+}
+
+/**
+ * 获取洞察报告详情
+ * @param params
+ * @returns {*}
+ */
export function getInsightReport(params) {
return request({
url: `/console/insightReport/${ params.sn }`,
@@ -11,3 +29,46 @@ export function getInsightReport(params) {
}
+
+/**
+ * 分享洞察报告
+ * @param data
+ * @returns {*}
+ */
+export function shareReport(data) {
+ return request({
+ url: `/console/shareReport`,
+ method: 'post',
+ data
+ })
+}
+
+
+/**
+ * 获取洞察报告基本信息
+ * @param params
+ * @returns {*}
+ */
+export function getInsightReportInfoSecret(params) {
+ return request({
+ url: `/console/insightReport/${ params.sn }`,
+ method: 'get',
+ params
+ })
+}
+
+
+
+/**
+ * 获取洞察报告详情 secret
+ * @param params
+ * @returns {*}
+ */
+export function getInsightReportBySecret(params) {
+ return request({
+ url: `/console/insightReport/${ params.sn }`,
+ method: 'get',
+ params
+ })
+}
+
diff --git a/src/views/DataAnalyse/insight/components/InsightShare.vue b/src/views/DataAnalyse/insight/components/InsightShare.vue
index f8850868..39ea7b7c 100644
--- a/src/views/DataAnalyse/insight/components/InsightShare.vue
+++ b/src/views/DataAnalyse/insight/components/InsightShare.vue
@@ -1,13 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
抱歉，您访问的链接已过期
+