Skip to content

Commit 550b882

Browse files
wgzhaowgzhao
committedJul 8, 2024
update
1 parent 6d9a75c commit 550b882

22 files changed

+429
-380
lines changed
 

‎.vscode/extensions.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
{
2-
"recommendations": [
3-
"Vue.volar""]
2+
"recommendations": ["Vue.volar"]
43
}

‎components.d.ts

+64-64
Original file line numberDiff line numberDiff line change
@@ -5,70 +5,70 @@
55
// Read more: https://github.com/vuejs/core/pull/3399
66
export {}
77

8-
declare module 'vue' {
8+
declare module "vue" {
99
export interface GlobalComponents {
10-
AddaxResult: typeof import('./src/components/ods/AddaxResult.vue')['default']
11-
BatchAdd: typeof import('./src/components/ods/BatchAdd.vue')['default']
12-
Breadcrumb: typeof import('./src/components/Breadcrumb.vue')['default']
13-
CmdList: typeof import('./src/components/ods/CmdList.vue')['default']
14-
DialogComp: typeof import('./src/components/ods/DialogComp.vue')['default']
15-
DSTableDetail: typeof import('./src/components/dataservice/DSTableDetail.vue')['default']
16-
DSTableFields: typeof import('./src/components/dataservice/DSTableFields.vue')['default']
17-
FieldsCompare: typeof import('./src/components/ods/FieldsCompare.vue')['default']
18-
HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
19-
L5TEtlBar: typeof import('./src/components/dashboard/L5TEtlBar.vue')['default']
20-
LineChart: typeof import('./src/components/dashboard/LineChart.vue')['default']
21-
LogFiles: typeof import('./src/components/ods/LogFiles.vue')['default']
22-
Login: (typeof import("./src/components/login.vue"))["default"]
23-
LogModal: typeof import('./src/components/ods/LogModal.vue')['default']
24-
MainTable: typeof import('./src/components/ods/MainTable.vue')['default']
25-
MainTableInfo: typeof import('./src/components/dataservice/MainTableInfo.vue')['default']
26-
NavbarThemeSwitcher: typeof import('./src/components/NavbarThemeSwitcher.vue')['default']
27-
PieChart: typeof import('./src/components/dashboard/PieChart.vue')['default']
28-
Register: typeof import('./src/components/Register.vue')['default']
29-
RouterLink: typeof import('vue-router')['RouterLink']
30-
RouterView: typeof import('vue-router')['RouterView']
31-
SceneList: typeof import('./src/components/sp/SceneList.vue')['default']
32-
ShowLogs: typeof import('./src/components/sp/ShowLogs.vue')['default']
33-
SpCmdList: typeof import('./src/components/sp/SpCmdList.vue')['default']
34-
SpComp: typeof import('./src/components/sp/SpComp.vue')['default']
35-
SpDetail: typeof import('./src/components/sp/SpDetail.vue')['default']
36-
SpLineage: typeof import('./src/components/sp/SpLineage.vue')['default']
37-
SpRequiresList: typeof import('./src/components/sp/SpRequiresList.vue')['default']
38-
TableUsed: typeof import('./src/components/ods/TableUsed.vue')['default']
39-
VApp: (typeof import("vuetify/components"))["VApp"]
40-
VBtn: (typeof import("vuetify/components"))["VBtn"]
41-
VCard: (typeof import("vuetify/components"))["VCard"]
42-
VCardActions: (typeof import("vuetify/components"))["VCardActions"]
43-
VCardText: (typeof import("vuetify/components"))["VCardText"]
44-
VCardTitle: (typeof import("vuetify/components"))["VCardTitle"]
45-
VChip: (typeof import("vuetify/components"))["VChip"]
46-
VCol: (typeof import("vuetify/components"))["VCol"]
47-
VContainer: (typeof import("vuetify/components"))["VContainer"]
48-
VDataTable: (typeof import("vuetify/components"))["VDataTable"]
49-
VDataTableServer: (typeof import("vuetify/components"))["VDataTableServer"]
50-
VDataTableVirtual: (typeof import("vuetify/components"))["VDataTableVirtual"]
51-
VDialog: (typeof import("vuetify/components"))["VDialog"]
52-
VDivider: (typeof import("vuetify/components"))["VDivider"]
53-
VForm: (typeof import("vuetify/components"))["VForm"]
54-
VIcon: (typeof import("vuetify/components"))["VIcon"]
55-
VList: (typeof import("vuetify/components"))["VList"]
56-
VListItem: (typeof import("vuetify/components"))["VListItem"]
57-
VListItemTitle: (typeof import("vuetify/components"))["VListItemTitle"]
58-
VMenu: (typeof import("vuetify/components"))["VMenu"]
59-
VProgressLinear: (typeof import("vuetify/components"))["VProgressLinear"]
60-
VResponsive: (typeof import("vuetify/components"))["VResponsive"]
61-
VRow: (typeof import("vuetify/components"))["VRow"]
62-
VSelect: (typeof import("vuetify/components"))["VSelect"]
63-
VSheet: (typeof import("vuetify/components"))["VSheet"]
64-
VSpacer: (typeof import("vuetify/components"))["VSpacer"]
65-
VSwitch: (typeof import("vuetify/components"))["VSwitch"]
66-
VTab: (typeof import("vuetify/components"))["VTab"]
67-
VTabs: (typeof import("vuetify/components"))["VTabs"]
68-
VTextarea: (typeof import("vuetify/components"))["VTextarea"]
69-
VTextField: (typeof import("vuetify/components"))["VTextField"]
70-
VToolbar: (typeof import("vuetify/components"))["VToolbar"]
71-
VWindow: (typeof import("vuetify/components"))["VWindow"]
72-
VWindowItem: (typeof import("vuetify/components"))["VWindowItem"]
10+
AddaxResult: (typeof import("./src/components/ods/AddaxResult.vue"))["default"];
11+
BatchAdd: (typeof import("./src/components/ods/BatchAdd.vue"))["default"];
12+
Breadcrumb: (typeof import("./src/components/Breadcrumb.vue"))["default"];
13+
CmdList: (typeof import("./src/components/ods/CmdList.vue"))["default"];
14+
DialogComp: (typeof import("./src/components/ods/DialogComp.vue"))["default"];
15+
DSTableDetail: (typeof import("./src/components/dataservice/DSTableDetail.vue"))["default"];
16+
DSTableFields: (typeof import("./src/components/dataservice/DSTableFields.vue"))["default"];
17+
FieldsCompare: (typeof import("./src/components/ods/FieldsCompare.vue"))["default"];
18+
HelloWorld: (typeof import("./src/components/HelloWorld.vue"))["default"];
19+
L5TEtlBar: (typeof import("./src/components/dashboard/L5TEtlBar.vue"))["default"];
20+
LineChart: (typeof import("./src/components/dashboard/LineChart.vue"))["default"];
21+
LogFiles: (typeof import("./src/components/ods/LogFiles.vue"))["default"];
22+
Login: (typeof import("./src/components/login.vue"))["default"];
23+
LogModal: (typeof import("./src/components/ods/LogModal.vue"))["default"];
24+
MainTable: (typeof import("./src/components/ods/MainTable.vue"))["default"];
25+
MainTableInfo: (typeof import("./src/components/dataservice/MainTableInfo.vue"))["default"];
26+
NavbarThemeSwitcher: (typeof import("./src/components/NavbarThemeSwitcher.vue"))["default"];
27+
PieChart: (typeof import("./src/components/dashboard/PieChart.vue"))["default"];
28+
Register: (typeof import("./src/components/Register.vue"))["default"];
29+
RouterLink: (typeof import("vue-router"))["RouterLink"];
30+
RouterView: (typeof import("vue-router"))["RouterView"];
31+
SceneList: (typeof import("./src/components/sp/SceneList.vue"))["default"];
32+
ShowLogs: (typeof import("./src/components/sp/ShowLogs.vue"))["default"];
33+
SpCmdList: (typeof import("./src/components/sp/SpCmdList.vue"))["default"];
34+
SpComp: (typeof import("./src/components/sp/SpComp.vue"))["default"];
35+
SpDetail: (typeof import("./src/components/sp/SpDetail.vue"))["default"];
36+
SpLineage: (typeof import("./src/components/sp/SpLineage.vue"))["default"];
37+
SpRequiresList: (typeof import("./src/components/sp/SpRequiresList.vue"))["default"];
38+
TableUsed: (typeof import("./src/components/ods/TableUsed.vue"))["default"];
39+
VApp: (typeof import("vuetify/components"))["VApp"];
40+
VBtn: (typeof import("vuetify/components"))["VBtn"];
41+
VCard: (typeof import("vuetify/components"))["VCard"];
42+
VCardActions: (typeof import("vuetify/components"))["VCardActions"];
43+
VCardText: (typeof import("vuetify/components"))["VCardText"];
44+
VCardTitle: (typeof import("vuetify/components"))["VCardTitle"];
45+
VChip: (typeof import("vuetify/components"))["VChip"];
46+
VCol: (typeof import("vuetify/components"))["VCol"];
47+
VContainer: (typeof import("vuetify/components"))["VContainer"];
48+
VDataTable: (typeof import("vuetify/components"))["VDataTable"];
49+
VDataTableServer: (typeof import("vuetify/components"))["VDataTableServer"];
50+
VDataTableVirtual: (typeof import("vuetify/components"))["VDataTableVirtual"];
51+
VDialog: (typeof import("vuetify/components"))["VDialog"];
52+
VDivider: (typeof import("vuetify/components"))["VDivider"];
53+
VForm: (typeof import("vuetify/components"))["VForm"];
54+
VIcon: (typeof import("vuetify/components"))["VIcon"];
55+
VList: (typeof import("vuetify/components"))["VList"];
56+
VListItem: (typeof import("vuetify/components"))["VListItem"];
57+
VListItemTitle: (typeof import("vuetify/components"))["VListItemTitle"];
58+
VMenu: (typeof import("vuetify/components"))["VMenu"];
59+
VProgressLinear: (typeof import("vuetify/components"))["VProgressLinear"];
60+
VResponsive: (typeof import("vuetify/components"))["VResponsive"];
61+
VRow: (typeof import("vuetify/components"))["VRow"];
62+
VSelect: (typeof import("vuetify/components"))["VSelect"];
63+
VSheet: (typeof import("vuetify/components"))["VSheet"];
64+
VSpacer: (typeof import("vuetify/components"))["VSpacer"];
65+
VSwitch: (typeof import("vuetify/components"))["VSwitch"];
66+
VTab: (typeof import("vuetify/components"))["VTab"];
67+
VTabs: (typeof import("vuetify/components"))["VTabs"];
68+
VTextarea: (typeof import("vuetify/components"))["VTextarea"];
69+
VTextField: (typeof import("vuetify/components"))["VTextField"];
70+
VToolbar: (typeof import("vuetify/components"))["VToolbar"];
71+
VWindow: (typeof import("vuetify/components"))["VWindow"];
72+
VWindowItem: (typeof import("vuetify/components"))["VWindowItem"];
7373
}
7474
}

‎src/App.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import defaultLayout from "@/layouts/default.vue";
77
</template>
88

99
<style>
10-
tbody tr:nth-of-type(odd) {
10+
/* tbody tr:nth-of-type(odd) {
1111
background-color: rgba(134, 138, 147, 0.2);
12-
}
12+
} */
1313
</style>

‎src/components/dashboard/L5TEtlBar.vue

-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,5 @@ onMounted(() => {
5353
data.value = res.data;
5454
});
5555
});
56-
5756
</script>
5857
<style></style>

‎src/components/dataservice/DSTableDetail.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ const actions = ref([
143143
},
144144
{ title: "JSON", type: "jobConf", comp: "JobConf", api: "jobConf/" },
145145
{ title: "日志", type: "logFiles", comp: "LogFiles", api: "logFiles/" }
146-
])
146+
]);
147147
148148
const fetchData = () => {
149149
axios.get(apiPrefix.value + "dsTable/" + props.d).then(res => {

‎src/components/ods/AddaxResult.vue

+15-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<dialog-comp title="按照名称显示最近15条记录" v-model="dialog">
44
<v-data-table-virtual
55
v-if="d"
6-
:items="d"
6+
:items="results"
77
:headers="headers"
88
density="compact"
99
class="elevation-1"
@@ -12,13 +12,15 @@
1212
</dialog-comp>
1313
</template>
1414
<script setup lang="ts">
15-
import { ref } from "vue";
15+
import { ref, onMounted } from "vue";
1616
import DialogComp from "./DialogComp.vue";
17+
import OdsService from "@/service/maintable/odsService";
18+
19+
const props = defineProps(["d"]);
1720
18-
defineProps(["d"]);
1921
const dialog = defineModel({ required: true, default: true });
2022
21-
const headers = ref([
23+
const headers = [
2224
{ title: "日期", value: "startDay" },
2325
{ title: "名称", value: "spname" },
2426
{ title: "任务开始时间", value: "startTime" },
@@ -28,6 +30,14 @@ const headers = ref([
2830
{ title: "速度（行）", value: "recSpeed" },
2931
{ title: "总记录数", value: "totalRec" },
3032
{ title: "错误记录数", value: "totalErr" }
31-
]);
33+
];
34+
35+
const results = ref([]);
36+
37+
onMounted(() => {
38+
OdsService.fetchAddaxResult(props.d).then(res => {
39+
results.value = res.data;
40+
});
41+
});
3242
</script>
3343
<style></style>

‎src/components/ods/CmdList.vue

+19-9
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
<dialog-comp title="命令列表" v-model="dialog">
44
<v-data-table
55
:headers="headers"
6-
:items="d"
6+
:items="cmds"
77
density="compact"
88
no-data-text="无数据"
99
v-model:expanded="expanded"
1010
show-expand
1111
item-value="comText"
12+
hide-default-footer
1213
>
1314
<template v-slot:item.flag="{ value }">
1415
<v-chip :color="getColor(value)">{{ value }}</v-chip>
@@ -29,38 +30,47 @@
2930
</dialog-comp>
3031
</template>
3132
<script setup lang="ts">
32-
import { ref } from "vue";
33+
import { ref, onMounted } from "vue";
3334
import OdsService from "@/service/maintable/odsService";
3435
import DialogComp from "./DialogComp.vue";
3536
3637
const dialog = defineModel({ required: true, default: true });
3738
const props = defineProps(["d"]);
38-
const item = ref();
39+
interface Item {
40+
comIdx: number;
41+
comKind: string;
42+
startTime: string;
43+
endTime: string;
44+
flag: string;
45+
comText: string;
46+
}
47+
48+
const cmds = ref<Item[]>();
3949
const expanded = ref([]);
40-
const headers = ref([
50+
const headers = [
4151
{ title: "执行顺序", key: "comIdx" },
4252
{ title: "命令类型", key: "comKind" },
4353
{ title: "执行开始时间", key: "startTime" },
4454
{ title: "执行结束时间", key: "endTime" },
4555
{ title: "状态", key: "flag" },
4656
{ title: "操作", key: "" },
4757
{ title: "", key: "data-table-expand" }
48-
]);
58+
];
4959
50-
const getColor = (flag: string) => {
60+
function getColor(flag: string) {
5161
if (flag === "Y") {
5262
return "green";
5363
} else if (flag === "N") {
5464
return "red";
5565
} else {
5666
return "blue";
5767
}
58-
};
68+
}
5969
6070
onMounted(() => {
61-
OdsService.fetchCmdList(props.d.value)
71+
OdsService.fetchCmdList(props.d)
6272
.then(res => {
63-
item.value = res.data;
73+
cmds.value = res.data;
6474
})
6575
.catch(err => {
6676
console.log(err);

‎src/components/ods/DialogComp.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<v-dialog v-model="dialog" @keyup.esc="dialog = false">
2+
<v-dialog v-model="dialog" v-if="dialog" @keyup.esc="dialog = false">
33
<v-card>
44
<v-card-title>
55
{{ title }}
@@ -15,7 +15,7 @@
1515
</template>
1616
</v-list-item>
1717
<v-card-text>
18-
<slot name="default" />
18+
<slot />
1919
</v-card-text>
2020
<v-card-actions v-if="$slots.actions">
2121
<slot name="actions" />

‎src/components/ods/FieldsCompare.vue

+22-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<dialog-comp title="字段对比" v-model="dialog">
44
<v-data-table
55
:headers="headers"
6-
:items="d"
6+
:items="fields"
7+
hide-default-footer
78
density="compact"
89
no-data-text="无数据"
910
>
@@ -21,7 +22,7 @@
2122
<td>{{ item.COLUMN_COMMENT }}</td>
2223
<td>{{ item.TABLE_COMMENT }}</td>
2324
</tr>
24-
<tr class="bg-secondary">
25+
<tr class="bg-gray-500">
2526
<td>目标表</td>
2627
<td>{{ item.COL_NAME }}</td>
2728
<td>{{ item.COL_TYPE_FULL }}</td>
@@ -40,8 +41,23 @@ import { ref, onMounted } from "vue";
4041
import OdsService from "@/service/maintable/odsService";
4142
import DialogComp from "./DialogComp.vue";
4243
43-
const props = defineProps(["d"]);
44-
const item = ref();
44+
const props = defineProps({ d: String });
45+
46+
interface Item {
47+
IDX: number;
48+
COLUMN_NAME_ORIG: string;
49+
DATA_TYPE: string;
50+
DATA_LENGTH: number;
51+
DATA_PRECISION: number;
52+
DATA_SCALE: number;
53+
COLUMN_COMMENT: string;
54+
TABLE_COMMENT: string;
55+
COL_NAME: string;
56+
COL_TYPE_FULL: string;
57+
COL_COMMENT: string;
58+
TBL_COMMENT: string;
59+
}
60+
const fields = ref<Item>();
4561
const dialog = defineModel({ required: true, default: true });
4662
4763
const headers = ref([
@@ -95,10 +111,9 @@ const headers1 = ref([
95111
// }
96112
]);
97113
onMounted(() => {
98-
console.log(props.d);
99-
OdsService.fetchFieldsCompare(props.d.value)
114+
OdsService.fetchFieldsCompare(props.d)
100115
.then(res => {
101-
item.value = res.data;
116+
fields.value = res.data;
102117
})
103118
.catch(err => {
104119
console.log(err);

0 commit comments

Comments
 (0)
Please sign in to comment.