From fbe705e4a28d2ad6a1f6e08a27379146bd7e1eed Mon Sep 17 00:00:00 2001
From: yangyuanshuai <yangyuanshuai@bonc.com.cn>
Date: Thu, 31 Oct 2024 15:21:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                           | 11 ++++++-
 .../dataset/IndexClassMs/IndexClassMs.vue     | 11 +++++--
 .../IndexSearchServiceMs.vue                  | 33 +++++++++----------
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index ab60199..17ab214 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1818,7 +1818,16 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [
         name: 'indexClassManage',
         menuId: 'indexClassManage',
         meta: {
-          title: '指标分类管理',
+          title: '指标分类管理'
+        }
+      },
+      {
+        path: 'indexSearchServiceMs',
+        component: () => import('@/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue'),
+        name: 'IndexSearchServiceMs',
+        menuId: 'indexSearchServiceMs',
+        meta: {
+          title: '指标查询',
           alwaysShow: true,
           type:"ybt",
           sort:4,
diff --git a/src/views/dataset/IndexClassMs/IndexClassMs.vue b/src/views/dataset/IndexClassMs/IndexClassMs.vue
index 4eee44d..21a57d7 100644
--- a/src/views/dataset/IndexClassMs/IndexClassMs.vue
+++ b/src/views/dataset/IndexClassMs/IndexClassMs.vue
@@ -27,8 +27,11 @@ import { ContentWrap } from '@/components/ContentWrap'
 import Write from './components/Write.vue'
 import Detail from './components/Detail.vue'
 import { Dialog } from '@/components/Dialog'
+import router from '@/router'
 
-
+defineOptions({
+  name: 'IndexSearchServiceMs',
+});
 const { t } = useI18n()
 
 const ids = ref<string[]>([])
@@ -55,6 +58,10 @@ const { tableRegister, tableState, tableMethods } = useTable({
 const { loading, dataList, total, currentPage, pageSize } = tableState
 const { getList, refresh } = tableMethods
 
+const lookRule = async (row: any) => {
+  router.push(`/dataset/indexSearchServiceMs`)
+};
+
 const tableColumns = reactive<TableColumn[]>([
   {
     field: 'selection',
@@ -108,7 +115,7 @@ const tableColumns = reactive<TableColumn[]>([
               }}
               onConfirm={() => delData(data.row)}
             ></ElPopconfirm>
-            <ElLink type="primary" underline={false} onClick={() => action(data.row, 'detail')}>
+            <ElLink type="primary" underline={false} onClick={() => lookRule(data.row)}>
               {'查询'}
             </ElLink>
           </>
diff --git a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
index 395f3e3..507273f 100644
--- a/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
+++ b/src/views/dataset/IndexSearchServiceMs/IndexSearchServiceMs.vue
@@ -64,11 +64,11 @@ const tableColumns = reactive<TableColumn[]>([
   },
   {
     field: 'createTime',
-    label: '机构'
+    label: '机构名称'
   },
   {
     field: 'tName',
-    label: '日期'
+    label: '数据日期'
   },
   {
     field: 'tCategory',
@@ -84,16 +84,17 @@ const searchSchema = reactive<FormSchema[]>([
   {
     field: 'orgCode',
     label: '机构',
+    colProps: { span: 100 },
     componentProps: {
       checkStrictly: true,
-      nodeKey: 'id',
-      props: { children: 'childs', label: 'nodeName' },
+      nodeKey: 'key',
+      props: { children: 'childrens', label: 'value' },
       filterable: true,
       multiple: true,
       collapseTags: true,
       showCheckbox: true,
-      // style: { minWidth: '300px' },
-      style: 'width: 100%',
+      style: { minWidth: '200px' },
+      //style: 'width: 100%',
       checkOnClickNode: true,
     },
     component: 'TreeSelect',
@@ -111,10 +112,13 @@ const searchSchema = reactive<FormSchema[]>([
     },
   },
   {
-    field: 'tName',
+    field: 'Datadate',
     label: '日期',
-    componentProps: {},
-    component: 'Input',
+    componentProps: {
+      type: 'date',
+      valueFormat: 'YYYYMMDD',
+    },
+    component: 'DatePicker',
     formItemProps: {
       rules: [required()],
     },
@@ -223,7 +227,7 @@ const onSelectionChange = (selection: TableData[]) => {
   disabled.value = selection.length === 0
 }
 const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event: Event) => {
-  console.log(row,column,cell,event);
+
 }
 
 
@@ -248,14 +252,7 @@ const onContextMenu = (row: any, column: any, cell: HTMLTableCellElement, event:
       @register="tableRegister"
       @refresh="refresh"
       @cell-contextmenu="onContextMenu"
-    >
-      <template #buttons>
-        <ElButton type="primary" @click="AddAction">{{ t('tableDemo.add') }}</ElButton>
-        <ElButton :loading="delLoading" type="primary" :disabled="disabled" @click="delDataBatch()">
-          {{ t('tableDemo.del') }}
-        </ElButton>
-      </template>
-    </Table>
+    />
   </ContentWrap>
 
   <Dialog v-model="dialogVisible" :title="dialogTitle">