From 3720832246b43f7d9d879b8e0a7f66a6a33fed06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E9=98=94?= Date: Thu, 7 Nov 2024 09:11:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=87=E6=A0=87=E9=9B=86?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=8C=87=E6=A0=87=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=90=BA=E5=B8=A6=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 + .../PreViewFile/src/PreViewFile.vue | 4 +- .../ProcedureRule/ProcedureRule.vue | 23 ++ .../ProcedureRule/components/BasicInfo.vue | 105 ++++++++ .../ProcedureRule/components/ParamConfig.vue | 105 ++++++++ .../components/ProcedureConfig.vue | 105 ++++++++ .../IndexProcess/ProcedureRule/constants.ts | 0 .../IndexProcess/PureSqlRule/PureSqlRule.vue | 23 ++ .../PureSqlRule/components/BasicInfo.vue | 105 ++++++++ .../PureSqlRule/components/SQLRule.vue | 105 ++++++++ .../PureSqlRule/components/SetParams.vue | 105 ++++++++ .../IndexProcess/PureSqlRule/constants.ts | 0 src/views/IndexProcess/SqlRule/SqlRule.vue | 31 +++ .../SqlRule/components/BasicInfo.vue | 105 ++++++++ .../SqlRule/components/FieldInfo.vue | 105 ++++++++ .../SqlRule/components/ParamConfig.vue | 105 ++++++++ .../SqlRule/components/SearchStucter.vue | 105 ++++++++ .../SqlRule/components/TargetPeek.vue | 105 ++++++++ src/views/IndexProcess/SqlRule/constants.ts | 0 src/views/dataset/CodeRepItem/CodeRepItem.vue | 3 +- .../dataset/CodeRepTarget/CodeRepTarget.vue | 7 + .../dataset/IndexMannageMs/IndexMannageMs.vue | 10 +- src/views/dataset/RepIndexSet/RepIndexSet.vue | 10 +- src/views/dataset/RepSetRule/RepSetRule.vue | 21 +- .../dataset/RepSetRule/components/Write.vue | 202 +------------- src/views/demo/components/Detail.vue | 20 -- src/views/demo/components/Write.vue | 63 ----- src/views/demo/demo.vue | 255 ------------------ 28 files changed, 1285 insertions(+), 544 deletions(-) create mode 100644 src/views/IndexProcess/ProcedureRule/ProcedureRule.vue create mode 100644 src/views/IndexProcess/ProcedureRule/components/BasicInfo.vue create mode 100644 src/views/IndexProcess/ProcedureRule/components/ParamConfig.vue create mode 100644 src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue create mode 100644 src/views/IndexProcess/ProcedureRule/constants.ts create mode 100644 src/views/IndexProcess/PureSqlRule/PureSqlRule.vue create mode 100644 src/views/IndexProcess/PureSqlRule/components/BasicInfo.vue create mode 100644 src/views/IndexProcess/PureSqlRule/components/SQLRule.vue create mode 100644 src/views/IndexProcess/PureSqlRule/components/SetParams.vue create mode 100644 src/views/IndexProcess/PureSqlRule/constants.ts create mode 100644 src/views/IndexProcess/SqlRule/SqlRule.vue create mode 100644 src/views/IndexProcess/SqlRule/components/BasicInfo.vue create mode 100644 src/views/IndexProcess/SqlRule/components/FieldInfo.vue create mode 100644 src/views/IndexProcess/SqlRule/components/ParamConfig.vue create mode 100644 src/views/IndexProcess/SqlRule/components/SearchStucter.vue create mode 100644 src/views/IndexProcess/SqlRule/components/TargetPeek.vue create mode 100644 src/views/IndexProcess/SqlRule/constants.ts delete mode 100644 src/views/demo/components/Detail.vue delete mode 100644 src/views/demo/components/Write.vue delete mode 100644 src/views/demo/demo.vue diff --git a/package.json b/package.json index 23002af..00991ba 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "axios": "^1.5.1", "base64-js": "~1.5.1", "dayjs": "^1.11.10", + "docx-preview": "^0.3.2", "driver.js": "^1.3.0", "echarts": "^5.4.3", "echarts-wordcloud": "^2.1.0", @@ -48,6 +49,7 @@ "mitt": "^3.0.1", "mockjs": "^1.1.0", "nprogress": "^0.2.0", + "pdfjs-dist": "^2.11.338", "pinia": "^2.1.7", "pinia-plugin-persist": "^1.0.0", "qrcode": "^1.5.3", diff --git a/src/components/PreViewFile/src/PreViewFile.vue b/src/components/PreViewFile/src/PreViewFile.vue index 3c12fcf..08050fa 100644 --- a/src/components/PreViewFile/src/PreViewFile.vue +++ b/src/components/PreViewFile/src/PreViewFile.vue @@ -140,8 +140,8 @@ init(); } .download{ position: absolute; - font-size:1.3rem; - top:13px; + font-size:1.2rem; + top:15px; right:15px; } #docx-container { diff --git a/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue b/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue new file mode 100644 index 0000000..2a4a8f6 --- /dev/null +++ b/src/views/IndexProcess/ProcedureRule/ProcedureRule.vue @@ -0,0 +1,23 @@ + + \ No newline at end of file diff --git a/src/views/IndexProcess/ProcedureRule/components/BasicInfo.vue b/src/views/IndexProcess/ProcedureRule/components/BasicInfo.vue new file mode 100644 index 0000000..7d28c61 --- /dev/null +++ b/src/views/IndexProcess/ProcedureRule/components/BasicInfo.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/ProcedureRule/components/ParamConfig.vue b/src/views/IndexProcess/ProcedureRule/components/ParamConfig.vue new file mode 100644 index 0000000..7d28c61 --- /dev/null +++ b/src/views/IndexProcess/ProcedureRule/components/ParamConfig.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/ProcedureRule/components/ProcedureConfig.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/ProcedureRule/constants.ts b/src/views/IndexProcess/ProcedureRule/constants.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue b/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue new file mode 100644 index 0000000..57a9864 --- /dev/null +++ b/src/views/IndexProcess/PureSqlRule/PureSqlRule.vue @@ -0,0 +1,23 @@ + + \ No newline at end of file diff --git a/src/views/IndexProcess/PureSqlRule/components/BasicInfo.vue b/src/views/IndexProcess/PureSqlRule/components/BasicInfo.vue new file mode 100644 index 0000000..7d28c61 --- /dev/null +++ b/src/views/IndexProcess/PureSqlRule/components/BasicInfo.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/PureSqlRule/components/SQLRule.vue b/src/views/IndexProcess/PureSqlRule/components/SQLRule.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/PureSqlRule/components/SQLRule.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/PureSqlRule/components/SetParams.vue b/src/views/IndexProcess/PureSqlRule/components/SetParams.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/PureSqlRule/components/SetParams.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/PureSqlRule/constants.ts b/src/views/IndexProcess/PureSqlRule/constants.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/views/IndexProcess/SqlRule/SqlRule.vue b/src/views/IndexProcess/SqlRule/SqlRule.vue new file mode 100644 index 0000000..e30f644 --- /dev/null +++ b/src/views/IndexProcess/SqlRule/SqlRule.vue @@ -0,0 +1,31 @@ + + \ No newline at end of file diff --git a/src/views/IndexProcess/SqlRule/components/BasicInfo.vue b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue new file mode 100644 index 0000000..7d28c61 --- /dev/null +++ b/src/views/IndexProcess/SqlRule/components/BasicInfo.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/SqlRule/components/FieldInfo.vue b/src/views/IndexProcess/SqlRule/components/FieldInfo.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/SqlRule/components/FieldInfo.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/SqlRule/components/ParamConfig.vue b/src/views/IndexProcess/SqlRule/components/ParamConfig.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/SqlRule/components/ParamConfig.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/SqlRule/components/SearchStucter.vue b/src/views/IndexProcess/SqlRule/components/SearchStucter.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/SqlRule/components/SearchStucter.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/SqlRule/components/TargetPeek.vue b/src/views/IndexProcess/SqlRule/components/TargetPeek.vue new file mode 100644 index 0000000..65b13d9 --- /dev/null +++ b/src/views/IndexProcess/SqlRule/components/TargetPeek.vue @@ -0,0 +1,105 @@ + + + + \ No newline at end of file diff --git a/src/views/IndexProcess/SqlRule/constants.ts b/src/views/IndexProcess/SqlRule/constants.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/views/dataset/CodeRepItem/CodeRepItem.vue b/src/views/dataset/CodeRepItem/CodeRepItem.vue index e27a76f..446ff40 100644 --- a/src/views/dataset/CodeRepItem/CodeRepItem.vue +++ b/src/views/dataset/CodeRepItem/CodeRepItem.vue @@ -24,6 +24,7 @@ import { getWidth } from '@/utils'; import { Upload } from '@/components/Upload' import { saveRepDataProblemApi } from '@/api/reporting/RepDataProblem/RepDataProblem' import {useRoute} from "vue-router" + const route = useRoute(); const pageQuery = ref(route || null); const indexsetCode = pageQuery.value?.query?.indexsetCode; @@ -67,7 +68,7 @@ const tableColumns = reactive([ field: 'indexsetCode', label: '指标集编码', hidden:true, - value:indexsetCode + }, { field: 'code', diff --git a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue index ad15394..ecfa4bd 100644 --- a/src/views/dataset/CodeRepTarget/CodeRepTarget.vue +++ b/src/views/dataset/CodeRepTarget/CodeRepTarget.vue @@ -23,6 +23,12 @@ import { getWidth } from '@/utils'; import Detail from './components/Detail.vue' import { Upload } from '@/components/Upload' +import {useRoute} from "vue-router" + +const route = useRoute(); +const pageQuery = ref(route || null); +const indexsetCode = pageQuery.value?.query?.indexsetCode; + const { t } = useI18n() const ids = ref([]) @@ -138,6 +144,7 @@ const setSearchParams = (data: any) => { searchParams.value = data getList() } +setSearchParams({indexsetCode:indexsetCode}); const dialogVisible = ref(false) const dialogTitle = ref('') diff --git a/src/views/dataset/IndexMannageMs/IndexMannageMs.vue b/src/views/dataset/IndexMannageMs/IndexMannageMs.vue index bd48d0a..eefed2e 100644 --- a/src/views/dataset/IndexMannageMs/IndexMannageMs.vue +++ b/src/views/dataset/IndexMannageMs/IndexMannageMs.vue @@ -14,10 +14,14 @@ import { ElButton, ElLink, ElLoading, ElPopconfirm, ElMessage } from 'element-pl import { ContentWrap } from '@/components/ContentWrap' import CodeRepItem from '@/views/dataset/CodeRepItem/CodeRepItem.vue';//指标定义界面 import CodeRepTarget from '@/views/dataset/CodeRepTarget/CodeRepTarget.vue';//指标属性界面 - import Write from './components/Write.vue' import { Dialog } from '@/components/Dialog' +import {useRoute} from 'vue-router'; +const route = useRoute(); + +const pageQuery = ref(route || null); +const indexsetCode = pageQuery.value?.query?.indexsetCode; const { t } = useI18n() /** * 指标定义 @@ -111,10 +115,10 @@ const handleClick=(tab: any, event: Event | undefined)=> { - + - + diff --git a/src/views/dataset/RepIndexSet/RepIndexSet.vue b/src/views/dataset/RepIndexSet/RepIndexSet.vue index 6f789e4..e0785dc 100644 --- a/src/views/dataset/RepIndexSet/RepIndexSet.vue +++ b/src/views/dataset/RepIndexSet/RepIndexSet.vue @@ -41,7 +41,7 @@ let frequency_param_LIST = ref([]); //获取字典项 const getDictInfoList = async ()=>{ const res = await getIndexType({ paramName: 'frequency_param', systemCode: 'ordb' }); - frequency_param_LIST = transfDictList(res.body.result); + frequency_param_LIST.value = transfDictList(res.body.result); } getDictInfoList(); @@ -98,8 +98,7 @@ const tableColumns = reactive([ label: '频度', slots:{ default:(data)=>{ - console.log(data.row.frequency,frequency_param_LIST[data.row.frequency].label); - return {frequency_param_LIST[data.row.frequency].label} + return {data.row.frequency?frequency_param_LIST.value[data.row.frequency]?.label:''} } } }, @@ -115,7 +114,7 @@ const tableColumns = reactive([ const node = indexType_param_LIST.value.filter(item=>{ return item.id == data.row.indexsetType })[0]; - return {node?node.nodeName:''} + return {node?node?.nodeName:''} } } }, @@ -266,7 +265,6 @@ const action = async (row: TableData, type: string) => { /** 指标集数据配置 **/ const getDataConfig = (data)=>{ - console.log(data); router.push({ name:'indexMannageMs', query:{ @@ -375,7 +373,7 @@ const exportExcel = async () => { v-if="actionType !== 'detail'" ref="writeRef" :current-row="currentRow" - :indexTypeParam = "IndexTypeParamsList" + :indexTypeParam="IndexTypeParamsList" :action-type="actionType" /> diff --git a/src/views/dataset/RepSetRule/RepSetRule.vue b/src/views/dataset/RepSetRule/RepSetRule.vue index 394240f..d0593e6 100644 --- a/src/views/dataset/RepSetRule/RepSetRule.vue +++ b/src/views/dataset/RepSetRule/RepSetRule.vue @@ -13,7 +13,7 @@ import { TableData } from '@/api/dataset/RepSetRule/types' import { useTable } from '@/hooks/web/useTable' import { useI18n } from '@/hooks/web/useI18n' import { Table, TableColumn } from '@/components/Table' -import { ElButton, ElLink, ElLoading, ElPopconfirm, ElMessage } from 'element-plus' +import { ElButton, ElLink, ElLoading, ElPopconfirm, ElMessage,ElDropdown,ElDropdownMenu,ElDropdownItem } from 'element-plus' import { Search } from '@/components/Search' import { FormSchema } from '@/components/Form' import { ContentWrap } from '@/components/ContentWrap' @@ -229,8 +229,9 @@ const action = async (row: TableData, type: string) => { dialogVisible.value = true } } - -const AddAction = () => { +let RuleType = ref(''); +const AddAction = (ruleType: string) => { + RuleType.value = ruleType; dialogTitle.value = t('tableDemo.add') currentRow.value = undefined dialogVisible.value = true @@ -316,7 +317,18 @@ const exportExcel = async () => { @refresh="refresh" >