Merge remote-tracking branch 'git/main'

# Conflicts: # .obsidian/workspace.json
2 years ago · 732eacb52a
parent 1cd177c460 65fd492ed3
commit 732eacb52a
10 changed files with 248 additions and 92 deletions
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@ -1,13 +1,13 @@
 {
  "commitMessage": "vault backup: {{date}}",
  "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
-  "autoSaveInterval": 30,
+  "autoSaveInterval": 10,
  "autoPushInterval": 0,
-  "autoPullInterval": 30,
+  "autoPullInterval": 10,
  "autoPullOnBoot": true,
  "disablePush": false,
  "pullBeforePush": true,
-  "disablePopups": true,
+  "disablePopups": false,
  "listChangedFilesInMessageBody": true,
  "showStatusBar": true,
  "updateSubmodules": false,
@ -21,11 +21,11 @@
  "changedFilesInStatusBar": true,
  "showedMobileNotice": true,
  "refreshSourceControlTimer": 7000,
-  "showBranchStatusBar": false,
+  "showBranchStatusBar": true,
  "setLastSaveToLastCommit": false,
  "submoduleRecurseCheckout": false,
  "gitDir": "",
-  "showFileMenu": false,
+  "showFileMenu": true,
  "lineAuthor": {
    "show": false,
    "followMovement": "inactive",
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@ -4,18 +4,47 @@
    "type": "split",
    "children": [
      {
-        "id": "328558355efc54e3",
+        "id": "0f4de3f4581c8729",
        "type": "tabs",
        "children": [
          {
-            "id": "28da1e9b0f934392",
+            "id": "1e3113c28f7fef45",
            "type": "leaf",
            "state": {
-              "type": "empty",
-              "state": {}
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Monthly/2023-09.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "998b616c506ba1ca",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Monthly/2023-10.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "7a25e346a13f023b",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Weekly/2023-W45.md",
+                "mode": "preview",
+                "source": false
+              }
            }
          }
-        ]
+        ],
+        "currentTab": 2
      }
    ],
    "direction": "vertical"
@ -45,7 +74,7 @@
            "state": {
              "type": "search",
              "state": {
-                "query": "",
+                "query": "[\"Previous\"]",
                "matchingCase": false,
                "explainSearch": false,
                "collapseAll": false,
@ -102,14 +131,16 @@
      {
        "id": "d9d38115cfe2d18f",
        "type": "tabs",
-        "dimension": 28.846153846153843,
+        "dimension": 35.28846153846154,
        "children": [
          {
            "id": "10d9387b227d46e7",
            "type": "leaf",
            "state": {
              "type": "outline",
-              "state": {}
+              "state": {
+                "file": "Haina/Weekly/2023-W45.md"
+              }
            }
          },
          {
@ -118,6 +149,7 @@
            "state": {
              "type": "backlink",
              "state": {
+                "file": "Haina/Weekly/2023-W45.md",
                "collapseAll": true,
                "extraContext": false,
                "sortOrder": "alphabetical",
@ -141,7 +173,7 @@
      {
        "id": "dc29c441166ca3aa",
        "type": "tabs",
-        "dimension": 35.96153846153846,
+        "dimension": 33.07692307692307,
        "children": [
          {
            "id": "096b5bbba0f2c0d4",
@ -156,16 +188,8 @@
      {
        "id": "9a8ed0fe1b835302",
        "type": "tabs",
-        "dimension": 35.19230769230769,
+        "dimension": 31.63461538461538,
        "children": [
-          {
-            "id": "055353566e60e182",
-            "type": "leaf",
-            "state": {
-              "type": "file-properties",
-              "state": {}
-            }
-          },
          {
            "id": "cfcffea8c60d0b67",
            "type": "leaf",
@ -188,7 +212,7 @@
      }
    ],
    "direction": "horizontal",
-    "width": 245.5
+    "width": 240.5
  },
  "left-ribbon": {
    "hiddenItems": {
@ -207,37 +231,35 @@
      "periodic-notes:Open today": false
    }
  },
-  "active": "28da1e9b0f934392",
+  "active": "7a25e346a13f023b",
  "lastOpenFiles": [
-    "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
-    "Haina/Weekly/2023-W44.md",
+    "Haina/Templates/W-log.md",
    "Haina/Weekly/2023-W45.md",
+    "Haina/Weekly/2023-W44.md",
+    "Haina/Weekly/2023-W43.md",
    "Haina/Monthly/2023-10.md",
-    "Haina/项目/SCRM/SCRM+IM可行性.md",
+    "Haina/Monthly/2023-09.md",
+    "Haina/Weekly/2023-W46.md",
+    "Haina/Templates/D-log.md",
+    "Haina/Templates/M-log.md",
    "Haina/Monthly/2023-11.md",
-    "Haina/Templates/总结.md",
+    "Haina/Monthly/2023-12.md",
+    "Haina/Daily/2023-11-10.md",
+    "Haina/Daily/2023-11-09.md",
    "Haina/Daily/2023-11-01.md",
-    "Haina/Templates/任务 lite.md",
-    "Haina/项目/HT数据分析/2.0总结.md",
-    "Haina/项目/HT数据分析/~$2.0总结.docx",
-    "Haina/项目/HT数据分析/2.0总结.docx",
-    "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
-    "Haina/Templates/任务.md",
+    "Haina/Daily/2023-11-08.md",
+    "Haina/Weekly/2023-11-08.md",
+    "Haina/Weekly/2023-W42.md",
+    "Haina/Weekly/2023-W47.md",
+    "Haina/项目/SCRM/SCRM+IM可行性.md",
    "Haina/项目/HT数据分析/权限管理.md",
-    "Haina/Weekly/2023-W46.md",
-    "Haina/Templates/W-log.md",
-    "Haina/Monthly/2023-09.md",
-    "Haina/Monthly/2023-08.md",
-    "Haina/Daily/2023-11-02.md",
-    "Haina/Templates/D-log.md",
-    "Haina/Daily/2023-10-23.md",
    "Haina/Daily/2023-10-13.md",
+    "Haina/Daily/2023-10-23.md",
+    "conflict-files-obsidian-git.md",
+    "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
+    "Haina/项目/HT数据分析/2.0总结.md",
+    "Haina/Templates/总结.md",
    "Haina/项目/HT数据分析/文旅局数据统计.md",
-    "Haina/项目/SCRM/销售对话沟通.md",
-    "Haina/项目/SCRM/SCRM.md",
-    "Haina/项目/HT数据分析/销售数据管理2.0.md",
-    "Haina/Weekly/2023-W43.md",
-    "Haina/Daily/2023-09-15.md",
    "Haina/Weekly",
    "Haina/Quarterly",
    "Haina/Monthly",
@ -245,6 +267,8 @@
    "Haina/Yearly",
    "Haina/Logs/Daily",
    "Haina/Logs/Weekly",
+    "Haina/Logs/Weekly1",
+    "Haina/Logs/Daily1",
    "Haina/atta/Pasted image 20230907134308.png",
    "Haina/atta/Pasted image 20230907134241.png",
    "Haina/atta/Pasted image 20230907134211.png",
--- a/Haina/Monthly/2023-10.md
+++ b/Haina/Monthly/2023-10.md
@ -1,6 +1,6 @@
 ---
 Created: 2023-10-28 Sat
-Updated: 2023-10-28 05:10 Sat
+Updated: 2023-11-08 00:34 Wed
 tags:
  - 月报
 ---
@ -11,14 +11,87 @@ tags:

 ## 重点工作

-1.
+#### HT统计分析2.0
+
+1. KPI批量设置页面
+2. 年度业绩综合看板: 增加商务订单数据
+3. 业绩统计分布
+4. 销售>业绩数据: 对比数据显示
+5. 顾问销售进度
+6. 调整前端路由权限
+7. 可视化优化
+8. 文旅局服务人数数据: 接口文档; 页面50%
+9. 数据核对
+10. 演示
+11. 优化:
+    - KPI设置操作
+    - 搜索组件默认值
+    - 首页KPI显示
+    - 日期查询的格式, 避免进位到第二天
+    - 数据显示优化
+    - 订单数据-子维度页面：时间轴切换
+
+#### SCRM+IM平台需求
+
+**参考产品:**
+
+1. 独立IM渠道+多渠道社媒集成: [Umnico](https://umnico.com/), [CM.com](https://www.cm.com/), [Twilio](https://www.twilio.com/)等
+   1. 开源工具/产品: darkwire, chatwoot等
+2. 销售流程管理: twenty, salesforce等
+3. [SCRM+IM可行性](Haina/项目/SCRM/SCRM+IM可行性.md)

 ## 维护工作

 ## 未完成

+#### HT统计分析2.0
+
+1. 文旅局服务人数数据: 接口文档; 页面50%
+2. 权限管理
+3. 可视化优化
+
 ## 创新, 突出贡献

 ## 事故

 ---
+
+## Generated by AI
+
+#### HT统计
+
+- 综合看板
+  - 增加了商务订单数据,包括主页、销售进度图等 *([[2023-W44]])*
+  - 新增了以客户国籍为权重的世界地图视图 *([[2023-W44]])*
+  - 新增了销售额数据项 *([[2023-W42]])*
+  - 新增了国内外占比 *([[2023-W42]])*
+- 统计分布
+  - 新增了混合图表,显示小组、销售额、同比/环比数据 *([[2023-W44]])*
+  - 新增了客户国籍数据和图表 *([[2023-W43]], [[2023-W44]])*
+  - 优化搜索组件 *([[2023-W42]])*
+- 销售进度图表
+  - 新增了分组和顾问的进度与目标对比 *([[2023-W44]])*
+  - 顾问销售进度图表 *([[2023-W43]])*
+- 订单子维度
+  - 订单子维度的导出功能 *([[2023-W44]])*
+- 销售业绩
+  - 销售业绩多选组件 *([[2023-W42]])*
+
+##### 优化
+
+- 移动端
+  - 移动端布局调整 *([[2023-W44]])*
+- 搜索组件
+  - 修复了搜索组件的默认值问题 *([[2023-W42]])*
+- KPI配置
+  - 优化了KPI配置流程 *([[2023-W42]], [[2023-W44]])*
+- 数据显示
+  - 优化了数据可视化,包括负值显示、图表同步等 *([[2023-W44]])*
+
+##### 数据核对
+
+- 发现成交率/订单数量与旧版本存在不一致 *([[2023-W44]])*
+
+#### 其他
+
+- 收集了SCRM+IM平台需求,评估了开源工具 *([[2023-W44]])*
--- a/Haina/Templates/D-log.md
+++ b/Haina/Templates/D-log.md
@ -11,17 +11,17 @@ let today = moment(tp.file.title);
 // tR += '# ' + today.format('YYYY/MM/DD - dddd') + '\n';

 // 2023 / Q1 / January / Week 1
-tR += '[[' + today.format('YYYY') + ']] / ';
-tR += '[[' + today.format('YYYY-[Q]Q') + '|' + today.format('[Q]Q') + ']] / ';
-tR += '[[' + today.format('YYYY-MM') + '|' + today.format('MMMM') + ']] / ';
-tR += '[[' + today.format('gggg-[W]ww') + '|' + today.format('[Week] w') + ']]';
+tR += '[[' + today.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';
+tR += '[[' + today.format('[Haina/Quarterly/]YYYY-[Q]Q') + '|' + today.format('[Q]Q') + ']] / ';
+tR += '[[' + today.format('[Haina/Monthly/]YYYY-MM') + '|' + today.format('MMMM') + ']] / ';
+tR += '[[' + today.format('[Haina/Weekly/]gggg-[W]ww') + '|' + today.format('[Week] w') + ']]';
 tR += ' / ';

 // ❮ 2022-12-31 | 2023-01-01 | 2023-01-02 ❯
-tR += '❮ [[' + today.subtract(1, 'days').format('YYYY-MM-DD') + ']]';
+tR += '❮ [[' + today.subtract(1, 'days').format('[Haina/Daily/]YYYY-MM-DD|YYYY-MM-DD') + ']]';
 tR += ' | ' + today.add(1, 'days').format('YYYY-MM-DD dddd') + ' | ';
-tR += '[[' + today.add(1, 'days').format('YYYY-MM-DD') + ']] ❯ / ';
-tR += '[[' + today.add(1, 'weeks').format('gggg-[W]ww|[Week] w') + ']]';
+tR += '[[' + today.add(1, 'days').format('[Haina/Daily/]YYYY-MM-DD|YYYY-MM-DD') + ']] ❯ / ';
+tR += '[[' + today.add(1, 'weeks').format('[Haina/Weekly/]gggg-[W]ww|[Week] w') + ']]';
 today.subtract(1, 'days');
 %>

--- a/Haina/Templates/M-log.md
+++ b/Haina/Templates/M-log.md
@ -11,13 +11,13 @@ let month = moment(tp.file.title);
 // tR += '# ' + month.format('YYYY MMMM') + '';

 // 2023 / Q1
-tR += '[[' + month.format('YYYY') + ']] / ';
-tR += '[[' + month.format('YYYY-[Q]Q|[Q]Q') + ']] / ';
+tR += '[[' + month.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';
+tR += '[[' + month.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';

 // ❮ December | January | February ❯
-tR += '❮ [[' + month.subtract(1, 'months').format('YYYY-MM|MMMM') + ']]';
+tR += '❮ [[' + month.subtract(1, 'months').format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';
 tR += ' | ' + month.add(1, 'months').format('MMMM') + ' | ';
-tR += '[[' + month.add(1, 'months').format('YYYY-MM|MMMM') + ']] ❯';
+tR += '[[' + month.add(1, 'months').format('[Haina/Monthly/]YYYY-MM|MMMM') + ']] ❯';
 month.subtract(1, 'months');
 tR += ' / ';

@ -25,7 +25,7 @@ tR += ' / ';
 const thisMonth = month.month();
 month.startOf('week');
 do {
-    tR += '[[' + month.format('gggg-[W]ww|[Week] w') + ']]';
+    tR += '[[' + month.format('[Haina/Weekly/]gggg-[W]ww|[Week] w') + ']]';
    month.add(1, 'weeks');
    if (month.month() == thisMonth) {
        tR += ' - ';
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@ -11,29 +11,29 @@ let week = moment(tp.file.title);
 // tR += '# ' + week.format('gggg [Week] w') + '';

 // 2023 / Q1 / January
-tR += '[[' + week.format('YYYY') + ']] / ';
-tR += '[[' + week.format('YYYY-[Q]Q|[Q]Q') + ']] / ';
-tR += '[[' + week.format('YYYY-MM|MMMM') + ']]';
+tR += '[[' + week.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';
+tR += '[[' + week.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';
+tR += '[[' + week.format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';
 // If the week crosses a month
 // 2022 / Q4 / December - 2023 / Q1 / January
 if (week.format('M') != week.endOf('week').format('M')) {
    tR += ' - ';
-    tR += '[[' + week.format('YYYY') + ']] / ';
-    tR += '[[' + week.format('YYYY-[Q]Q|[Q]Q') + ']] / ';
-    tR += '[[' + week.format('YYYY-MM|MMMM') + ']]';
+    tR += '[[' + week.format('[Haina/Yearly/]YYYY|YYYY') + ']] / ';
+    tR += '[[' + week.format('[Haina/Quarterly/]YYYY-[Q]Q|[Q]Q') + ']] / ';
+    tR += '[[' + week.format('[Haina/Monthly/]YYYY-MM|MMMM') + ']]';
 }
 tR += ' / ';

 // ❮ Week 52 | Week 1 | Week 2 ❯
-tR += '❮ [[' + week.subtract(1, 'weeks').format('gggg-[W]ww|[Week] w') + ']]';
+tR += '❮ [[' + week.subtract(1, 'weeks').format('[Haina/Weekly/]gggg-[W]ww|[Week] w') + ']]';
 tR += ' | ' + week.add(1, 'weeks').format('[Week] w') + ' | ';
-tR += '[[' + week.add(1, 'weeks').format('gggg-[W]ww|[Week] w') + ']] ❯';
+tR += '[[' + week.add(1, 'weeks').format('[Haina/Weekly/]gggg-[W]ww|[Week] w') + ']] ❯';
 week.subtract(1, 'weeks');
 tR += ' / ';

 // Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday
 for (let day = 0; day < 7; day++) {
-    tR += '[[' + week.weekday(day).format('YYYY-MM-DD|ddd') + ']]';
+    tR += '[[' + week.weekday(day).format('[Haina/Daily/]YYYY-MM-DD|DD ddd') + ']]';
    if (day < 6) {
        tR += ' - ';
    }
@ -41,9 +41,17 @@ for (let day = 0; day < 7; day++) {
 %>

 ---
+
+*<%* tR += moment(tp.file.title).weekday(1).format('YYYY-MM-DD ddd') %>*
+
 ## 上周工作

+### 重点工作
+
 1. <% tp.file.cursor(1) %>

+### 维护工作
+1. 
+
 ## 本周计划
 1. 
--- a/Haina/Weekly/2023-W42.md
+++ b/Haina/Weekly/2023-W42.md
@ -0,0 +1,40 @@
+---
+Created: 2023-11-07 Tue
+Updated: 2023-11-07 23:50 Tue
+tags:
+  - 周报
+---
+
+[[2023]] / [[2023-Q4|Q4]] / [[2023-10|October]] / ❮ [[2023-W41|Week 41]] | Week 42 | [[2023-W43|Week 43]] ❯ / [[2023-10-16|Mon]] - [[2023-10-17|Tue]] - [[2023-10-18|Wed]] - [[2023-10-19|Thu]] - [[2023-10-20|Fri]] - [[2023-10-21|Sat]] - [[2023-10-22|Sun]]
+
+---
+
+*2023-10-17 Tue*
+
+## 上周工作
+
+1. HT统计分析2.0: 业绩统计分析:
+   a. KPI批量设置页面:
+☑ 目的地
+☑ 客群类别
+☑ 客源国籍
+b. 年度业绩:
+i. 目标客户业绩数据
+ii. 增加"营收"数据项
+iii. 增加国内外占比
+c. 业绩统计分布
+☑ 海外目的地
+☑ 目的地国籍
+☑ 去年同期, 上个时间段数据
+☑ 同比, 环比比较
+☑ 增加搜索条件
+d. 优化:
+i. KPI设置操作
+ii. 搜索组件默认值
+iii. 首页KPI显示
+iv. 日期查询的格式, 避免进位到第二天
+v. 销售>业绩数据: 对比数据显示
+
+## 本周计划
+
+1. HT统计分析2.0: 业绩数据: 演示
--- a/Haina/Weekly/2023-W44.md
+++ b/Haina/Weekly/2023-W44.md
@ -1,11 +1,11 @@
 ---
 Created: 2023-10-28 Sat
-Updated: 2023-10-31 17:01 Tue
+Updated: 2023-11-08 00:43 Wed
 tags:
  - 周报
 ---

-[[2023]] / [[2023-Q4|Q4]] / [[2023-10|October]] - [[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W43|Week 43]] | Week 44 | [[2023-W45|Week 45]] ❯ / [[2023-10-30|Monday]] - [[Haina/Daily/2023-10-31|Tuesday]] - [[Haina/Daily/2023-11-01|Wednesday]] - [[2023-11-02|Thursday]] - [[2023-11-03|Friday]] - [[2023-11-04|Saturday]] - [[2023-11-05|Sunday]]
+[[2023]] / [[2023-Q4|Q4]] / [[2023-10|October]] - [[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W43|Week 43]] | Week 44 | [[2023-W45|Week 45]] ❯ / [[2023-10-30|30 Mon]] - [[Haina/Daily/2023-10-31|31 Tue]] - [[Haina/Daily/2023-11-01|01 Wed]] - [[2023-11-02|02 Thu]] - [[2023-11-03|03 Fri]] - [[2023-11-04|04 Sat]] - [[2023-11-05|05 Sun]]

 ---

@ -38,4 +38,4 @@ tags:

 1. SCRM+IM平台调研
 2. HT统计分析
-	1. 权限
+   1. 权限
--- a/Haina/Weekly/2023-W45.md
+++ b/Haina/Weekly/2023-W45.md
@ -1,15 +1,41 @@
 ---
 Created: 2023-10-30 Mon
-Updated: 
+Updated: 2023-11-08 01:13 Wed
 tags:
  - 周报
 ---
-[[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W44|Week 44]] | Week 45 | [[2023-W46|Week 46]] ❯ / [[2023-11-06|Monday]] - [[2023-11-07|Tuesday]] - [[2023-11-08|Wednesday]] - [[2023-11-09|Thursday]] - [[2023-11-10|Friday]] - [[2023-11-11|Saturday]] - [[2023-11-12|Sunday]]
+
+[[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W44|Week 44]] | Week 45 | [[2023-W46|Week 46]] ❯ / [[Haina/Daily/2023-11-06| 06 Mon]] - [[Haina/Daily/2023-11-07|07 Tue]] - [[Haina/Daily/2023-11-08|08 Wed]] - [[Haina/Daily/2023-11-09|09 Thu]] - [[Haina/Daily/2023-11-10|10 Fri]] - [[Haina/Daily/2023-11-11|11 Sat]] - [[Haina/Daily/2023-11-12|12 Sun]]

 ---
+
+*2023-11-07 Tue*
+
 ## 上周工作

-1. 
+### 重点工作
+
+1. HT统计分析 (v2.2)
+   1. #新增 显示版本号, 编译时间
+   2. #新增 权限管理: 登陆身份水印
+   3. 多维度分析 (约30%): 透视计算, 折线图.
+      - #todo 操作选项: 行, 列, 筛选, 叠加; 对比
+   4. 可视化 #优化
+      - 统一搜索组件;
+      - [销售, 订单]来源多选
+      - 订单>子维度: 表格导出
+      - 移动端布局调整
+      - 一些样式
+
+### 维护工作
+
+1. #优化 PayPal收款记录: 
+	- 按状态查询列表; 
+	- 处理太多滞留的记录

 ## 本周计划
-1. 
+
+1. HT统计
+   - 多维度: 操作选项; 对比
+   - 年度对比
+2. Trippest支付页面调整
--- a/Haina/Weekly/2023-W46.md
+++ b/Haina/Weekly/2023-W46.md
@ -1,15 +0,0 @@
---
-Created: 2023-11-01 Wed
-Updated: 
-tags:
-  - 周报
---
-[[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W45|Week 45]] | Week 46 | [[2023-W47|Week 47]] ❯ / [[2023-11-13|Mon]] - [[2023-11-14|Tue]] - [[2023-11-15|Wed]] - [[2023-11-16|Thu]] - [[2023-11-17|Fri]] - [[2023-11-18|Sat]] - [[2023-11-19|Sun]]
-
---
-## 上周工作
-
-1. 
-
-## 本周计划
-1.