|
|
@@ -84,7 +84,7 @@
|
|
|
<div>共享方式：</div>
|
|
|
<div>{{ state.resultParams.indexConfig?.shareMethod }}</div>
|
|
|
<div>更新周期：</div>
|
|
|
- <div>{{ state.resultParams.indexConfig?.updateCycle }}</div>
|
|
|
+ <div>{{ state.resultParams.indexConfig?.shareCycle }}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="info">
|
|
|
@@ -92,7 +92,7 @@
|
|
|
<img src="@/assets/images/web/wen-list_table-head-icon-2.png"/>
|
|
|
<div class="text">
|
|
|
<div class="text-title">数据共享来源</div>
|
|
|
- <div class="text-value"><CusEllipsis :value="state.resultParams.indexConfig?.dataShareSource"/></div>
|
|
|
+ <div class="text-value"><CusEllipsis :value="state.resultParams.indexConfig?.dataSource"/></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -101,7 +101,7 @@
|
|
|
<img src="@/assets/images/web/wen-list_table-head-icon-3.png"/>
|
|
|
<div class="text">
|
|
|
<div class="text-title">数据提供来源</div>
|
|
|
- <div class="text-value"><CusEllipsis :value="state.resultParams.indexConfig?.dataProvideSource"/></div>
|
|
|
+ <div class="text-value"><CusEllipsis :value="state.resultParams.indexConfig?.dataOffer"/></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -110,7 +110,7 @@
|
|
|
<img src="@/assets/images/web/wen-list_table-head-icon-4.png"/>
|
|
|
<div class="text">
|
|
|
<div class="text-title">数据量</div>
|
|
|
- <div class="text-value"><CusEllipsis :value="(state.resultParams.indexConfig?.dataTotal || 0) + '条'"/></div>
|
|
|
+ <div class="text-value"><CusEllipsis :value="(state.resultParams.indexConfig?.num || 0) + '条'"/></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -125,7 +125,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="table-content" v-loading="state.tableParams.loading">
|
|
|
- <div class="table-content-result">
|
|
|
+ <div class="table-content-result" v-if="tableConfigCpt.listConfig?.length > 0">
|
|
|
<div class="table-list" v-if="state.tableParams.model === 'list'">
|
|
|
<template v-for="(item, index) in state.tableParams.data">
|
|
|
<div class="list-item __hover">
|
|
|
@@ -224,7 +224,7 @@
|
|
|
import {computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from "vue";
|
|
|
import {useRoute, useRouter} from "vue-router";
|
|
|
import {useAppStore, useWebStore} from "@/stores";
|
|
|
-import {ElLoading} from "element-plus";
|
|
|
+import {ElLoading, ElMessage} from "element-plus";
|
|
|
import {frontGetIndexAndFieldInfo} from "@/api/modules/web/list";
|
|
|
|
|
|
const {proxy} = getCurrentInstance()
|
|
|
@@ -287,38 +287,34 @@ const currentIndexCpt = computed(() => {
|
|
|
return JSON.parse(JSON.stringify(obj))
|
|
|
})
|
|
|
const tableConfigCpt = computed(() => {
|
|
|
- return {
|
|
|
- listCol: 5,
|
|
|
- listConfig: [
|
|
|
- {key: '姓名1', value: 'name', col: 2},
|
|
|
- {key: '性别', value: 'sex', col: 1},
|
|
|
- {key: '出生日期', value: 'a', col: 1},
|
|
|
- {key: '出生日期1', value: 'a', col: 1},
|
|
|
- {key: '出生日期2', value: 'a', col: 3},
|
|
|
- {key: '出生日期3', value: 'a', col: 1},
|
|
|
- {key: '出生日期4', value: 'a', col: 1},
|
|
|
- {key: '出生日期5', value: 'a', col: 1},
|
|
|
- {key: '出生日期6', value: 'a', col: 1},
|
|
|
- {key: '出生日期7', value: 'a', col: 1},
|
|
|
- {key: '出生日期8', value: 'a', col: 1},
|
|
|
- {key: '出生日期9', value: 'a', col: 1},
|
|
|
- ],
|
|
|
+ const listConfig = []
|
|
|
+ const cardConfig = []
|
|
|
+ let cardMain = {}
|
|
|
+ let cardImg = {}
|
|
|
+ state.resultParams.indexConfig?.sysIndexFields?.forEach(v => {
|
|
|
+ if (v.searchShow == 1) {
|
|
|
+ const obj = {key: v.fieldNameCn, value: v.fieldNameEn, col: v.labelLength}
|
|
|
+ listConfig.push(obj)
|
|
|
+ if (v.pictureField == 1) {
|
|
|
+ cardImg = obj
|
|
|
+ } else {
|
|
|
+ cardConfig.push(obj)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ cardMain = cardConfig.shift()
|
|
|
+ const res = {
|
|
|
+ listCol: state.resultParams.indexConfig.columnModelNum,
|
|
|
+ listConfig: listConfig,
|
|
|
hasCard: true,
|
|
|
- cardLayout: 3,
|
|
|
- cardCol: 2,
|
|
|
- cardMain: {key: '姓名', value: 'name', col: 1},
|
|
|
- cardImg: {key: '头像', value: 'avatar', isImg: true},
|
|
|
- cardConfig: [
|
|
|
- {key: '性别', value: 'sex', col: 1},
|
|
|
- {key: '出生日期', value: 'a', col: 2},
|
|
|
- {key: '出生日期1', value: 'a', col: 1},
|
|
|
- {key: '出生日期2', value: 'a', col: 1},
|
|
|
- {key: '出生日期3', value: 'a', col: 1},
|
|
|
- {key: '出生日期4', value: 'a', col: 1},
|
|
|
- {key: '出生日期5', value: 'a', col: 1},
|
|
|
- {key: '出生日期6', value: 'a', col: 1},
|
|
|
- ]
|
|
|
+ cardLayout: state.resultParams.indexConfig.pictureModeCardNum,
|
|
|
+ cardCol: state.resultParams.indexConfig.cardColumnNum,
|
|
|
+ cardMain: cardMain,
|
|
|
+ cardImg: cardImg,
|
|
|
+ cardConfig: cardConfig
|
|
|
}
|
|
|
+ console.log(res)
|
|
|
+ return res
|
|
|
})
|
|
|
|
|
|
const initArea = () => {
|
|
|
@@ -341,11 +337,19 @@ const onDelFilter = (index) => {
|
|
|
state.cascaderParams.value = temp
|
|
|
}
|
|
|
const onSearch = () => {
|
|
|
- state.searchParams = JSON.parse(JSON.stringify({
|
|
|
- text: state.searchText,
|
|
|
- indexKey: state.cascaderParams.value
|
|
|
- }))
|
|
|
- initResultTree()
|
|
|
+ if (state.searchText) {
|
|
|
+ state.searchParams = JSON.parse(JSON.stringify({
|
|
|
+ text: state.searchText,
|
|
|
+ indexKey: state.cascaderParams.value
|
|
|
+ }))
|
|
|
+ initResultTree()
|
|
|
+ } else {
|
|
|
+ ElMessage({
|
|
|
+ message: '请输入关键字进行查询！',
|
|
|
+ grouping: true,
|
|
|
+ type: 'warning',
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
const initResultTree = () => {
|
|
|
state.resultParams.activeTab = ''
|
|
|
@@ -374,51 +378,10 @@ const initResultTree = () => {
|
|
|
}
|
|
|
const getIndexConfig = () => {
|
|
|
state.resultParams.indexConfig = {}
|
|
|
- proxy.$api.frontGetIndexAndFieldInfo(`id=${state.resultParams.activeIndex}`).then(res => {
|
|
|
- console.log(res)
|
|
|
- })
|
|
|
- setTimeout(() => {
|
|
|
- state.resultParams.indexConfig = {
|
|
|
- updateTime: '2024-09-09 14:20:20',
|
|
|
- createTime: '2024-09-09 14:20:20',
|
|
|
- shareMethod: '数据库表',
|
|
|
- updateCycle: 'T+1',
|
|
|
- dataShareSource: '海南省大数据管理局1、海南省大数据管理局2、海南省大数据管理局3',
|
|
|
- dataProvideSource: '海南省大数据管理局',
|
|
|
- dataTotal: '9125815819',
|
|
|
- listCol: 5,
|
|
|
- listConfig: [
|
|
|
- {key: '姓名1', value: 'name', col: 2},
|
|
|
- {key: '性别', value: 'sex', col: 1},
|
|
|
- {key: '出生日期', value: 'a', col: 1},
|
|
|
- {key: '出生日期1', value: 'a', col: 1},
|
|
|
- {key: '出生日期2', value: 'a', col: 3},
|
|
|
- {key: '出生日期3', value: 'a', col: 1},
|
|
|
- {key: '出生日期4', value: 'a', col: 1},
|
|
|
- {key: '出生日期5', value: 'a', col: 1},
|
|
|
- {key: '出生日期6', value: 'a', col: 1},
|
|
|
- {key: '出生日期7', value: 'a', col: 1},
|
|
|
- {key: '出生日期8', value: 'a', col: 1},
|
|
|
- {key: '出生日期9', value: 'a', col: 1},
|
|
|
- ],
|
|
|
- hasCard: true,
|
|
|
- cardLayout: 3,
|
|
|
- cardCol: 2,
|
|
|
- cardMain: {key: '姓名', value: 'name', col: 1},
|
|
|
- cardImg: {key: '头像', value: 'avatar', isImg: true},
|
|
|
- cardConfig: [
|
|
|
- {key: '性别', value: 'sex', col: 1},
|
|
|
- {key: '出生日期', value: 'a', col: 2},
|
|
|
- {key: '出生日期1', value: 'a', col: 1},
|
|
|
- {key: '出生日期2', value: 'a', col: 1},
|
|
|
- {key: '出生日期3', value: 'a', col: 1},
|
|
|
- {key: '出生日期4', value: 'a', col: 1},
|
|
|
- {key: '出生日期5', value: 'a', col: 1},
|
|
|
- {key: '出生日期6', value: 'a', col: 1},
|
|
|
- ]
|
|
|
- }
|
|
|
+ proxy.$api.frontGetIndexAndFieldInfo(`id=${WebStore.searchAreaIndexMap.get(state.resultParams.activeIndex).id}`).then(res => {
|
|
|
+ state.resultParams.indexConfig = res.data
|
|
|
state.ws.list()
|
|
|
- },500)
|
|
|
+ })
|
|
|
}
|
|
|
const onPage = (pageNum, pageSize) => {
|
|
|
state.tableParams.pageNum = pageNum
|
|
|
@@ -439,11 +402,10 @@ onMounted(() => {
|
|
|
} else {
|
|
|
state.searchText = text
|
|
|
if (index) {
|
|
|
- state.cascaderParams.value = index.split(',')
|
|
|
+ state.cascaderParams.value = index.split(',').map(v => Number(v))
|
|
|
}
|
|
|
- const ws: any = new WebSocket('ws://localhost:18375')
|
|
|
+ const ws: any = new WebSocket('/ws-api/smart-ws?userId=1388061846031220738')
|
|
|
let sessionId = ''
|
|
|
- let timestamp = new Date().getTime()
|
|
|
let lastCountParams = ''
|
|
|
let lastCountStep = 0
|
|
|
let lastCountStep_ = 0
|
|
|
@@ -474,20 +436,18 @@ onMounted(() => {
|
|
|
typeCode: type.treeId,
|
|
|
datas: type.children.map(index => ({
|
|
|
indexCode: index.treeId,
|
|
|
- datas: []
|
|
|
}))
|
|
|
}
|
|
|
})
|
|
|
}))
|
|
|
lastCountStep = step
|
|
|
lastCountStep_ = step
|
|
|
- timestamp = new Date().getTime()
|
|
|
const params = {
|
|
|
builder: builder,
|
|
|
keyData: state.searchParams.text,
|
|
|
type: 'count',
|
|
|
sessionId: sessionId,
|
|
|
- timestamp: timestamp,
|
|
|
+ timestamp: new Date().getTime(),
|
|
|
flag: 'run',
|
|
|
orderBy: {}
|
|
|
}
|
|
|
@@ -519,19 +479,19 @@ onMounted(() => {
|
|
|
indexCode: state.resultParams.activeIndex,
|
|
|
type: 'list',
|
|
|
sessionId: sessionId,
|
|
|
- timestamp: timestamp,
|
|
|
+ timestamp: new Date().getTime(),
|
|
|
flag: 'run',
|
|
|
orderBy: {}
|
|
|
}
|
|
|
- lastCountParams = JSON.stringify(params)
|
|
|
- ws.send(lastCountParams)
|
|
|
+ lastListParams = JSON.stringify(params)
|
|
|
+ ws.send(lastListParams)
|
|
|
}
|
|
|
}
|
|
|
ws.onmessage = (e) => {
|
|
|
try {
|
|
|
const json = JSON.parse(e.data)
|
|
|
- if (typeof json === 'string') {
|
|
|
- sessionId = json
|
|
|
+ if (json.type === 'session') {
|
|
|
+ sessionId = json.sessionId
|
|
|
initArea()
|
|
|
} else {
|
|
|
switch (json.type) {
|
|
|
@@ -539,7 +499,7 @@ onMounted(() => {
|
|
|
const p = JSON.parse(lastCountParams)
|
|
|
// 返回为最新批次的
|
|
|
if (json.timestamp == p.timestamp) {
|
|
|
- const resTag = json.datas[0]
|
|
|
+ const resTag = json.datas
|
|
|
const resType = resTag.datas[0]
|
|
|
state.resultParams.tree.forEach(tag => {
|
|
|
if (tag.treeId == resTag.tagCode) {
|
|
|
@@ -583,12 +543,13 @@ onMounted(() => {
|
|
|
}
|
|
|
} break
|
|
|
case 'list': {
|
|
|
- const p = JSON.parse(lastCountParams)
|
|
|
+ const p = JSON.parse(lastListParams)
|
|
|
// 返回为最新批次的
|
|
|
if (json.timestamp == p.timestamp) {
|
|
|
state.tableParams.total = json.records
|
|
|
state.tableParams.data = json.datas
|
|
|
state.tableParams.loading = false
|
|
|
+ lastListParams = ''
|
|
|
}
|
|
|
} break
|
|
|
}
|
CzRger
