-
+
@@ -11,46 +11,19 @@
-
-
-
-
-
-
{{ item.name }}
-
{{ item.startDate }}
-
{{ item.endDate }}
-
-
-
+
+
+
+ {{ row.name }}
+
+
+
+
+
-
新建节点
@@ -144,27 +117,45 @@ const dataList = ref({
const searchForm = ref({
peroidName: '',
- peroidId: null,
- year: new Date().getFullYear()
+ peroidId: null
})
-const peroidList = ref([
- {
- id: 1,
- name: '1月',
- startDate: '2022-01-01',
- endDate: '2022-01-31'
- },
- {
- id: 2,
- name: '2月',
- startDate: '2022-02-01',
- endDate: '2022-02-28'
+const peroidList = ref([])
+
+onMounted(() => {
+ handleSearchPeroid()
+ if (!searchForm.value.peroidId && peroidList.value.length) {
+ searchForm.value.peroidId = peroidList.value[0].id
+ searchForm.value.peroidName = peroidList.value[0].name
}
-])
+ handleSearchOkr()
+})
+
+async function handleSearchPeroid() {
+ peroidList.value = [
+ {
+ id: 1,
+ name: '2025年寻驾okr',
+ startDate: '2022-01-01',
+ endDate: '2022-01-31'
+ },
+ {
+ id: 2,
+ name: '2024年寻驾okr',
+ startDate: '2022-02-01',
+ endDate: '2022-02-28'
+ }
+ ]
+}
-function peroidChange(val) {
- searchForm.value.peroidName = peroidList.value.find((it) => it.id == val).name
+function handleSelectPeroid(row) {
+ searchForm.value.peroidName = row.name
+ searchForm.value.peroidId = row.id
+ handleSearchOkr()
+}
+
+function handleSearchOkr() {
+ console.log(searchForm.value)
}
function toggleExpand(data, val) {
@@ -196,12 +187,12 @@ function openOkr() {
okrId.value && dialogOkr.value.open(okrId.value)
}
+const dialogOkrInfo = ref(null)
function handleAddNode() {
okrId.value = null
dialogOkrInfo.value.open('create', null)
}
-const dialogOkrInfo = ref(null)
function handleEditOkr() {
dialogOkr.value.close()
dialogOkrInfo.value.open('update', 1)
@@ -239,19 +230,4 @@ function handleEditOkr() {
justify-content: center;
align-items: center;
}
-:deep(.dialog-okr) {
- width: 94vw;
- height: 94vh;
- max-width: 1800px;
- max-height: 1000px;
- margin: 0;
-}
-:deep(.dialog-okr .el-dialog__header) {
- padding: 0 !important;
-}
-:deep(.okr-info-dialog) {
- .el-dialog__body {
- padding-top: 0;
- }
-}
diff --git a/src/views/OKR/Management/Components/OkrTable.vue b/src/views/OKR/Management/Components/OkrTable.vue
new file mode 100644
index 0000000..d6a119f
--- /dev/null
+++ b/src/views/OKR/Management/Components/OkrTable.vue
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+ 【目标】{{ row.name }}
+
+
+
+ 【关键成果】{{ row.channelName }} {{ row.target }}
+ {{ row.targetNum }}
+
+
+ 当前进度:
+ {{ row.currentNum }}
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/OKR/Management/index.vue b/src/views/OKR/Management/index.vue
index fb6d22a..6b1d3c4 100644
--- a/src/views/OKR/Management/index.vue
+++ b/src/views/OKR/Management/index.vue
@@ -8,9 +8,13 @@