From a632158fce6b43078a81cac993d09417561cc8d4 Mon Sep 17 00:00:00 2001
From: lot <ldj_yt@outlook.com>
Date: Tue, 7 Nov 2023 21:44:28 +0800
Subject: [PATCH 1/4] vault backup: 2023-11-07 21:44:28

Affected files:
.obsidian/workspace.json
---
 .obsidian/workspace.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 8e6fad3..f7874aa 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -201,7 +201,7 @@
       {
         "id": "9a8ed0fe1b835302",
         "type": "tabs",
-        "dimension": 31.634615384615383,
+        "dimension": 31.63461538461538,
         "children": [
           {
             "id": "cfcffea8c60d0b67",

From e56c92b307479cfbb5e3c98ed4bfadf3b08d0bfa Mon Sep 17 00:00:00 2001
From: lot <ldj_yt@outlook.com>
Date: Tue, 7 Nov 2023 22:44:12 +0800
Subject: [PATCH 2/4] vault backup: 2023-11-07 22:44:11

Affected files:
.obsidian/plugins/obsidian-git/data.json
.obsidian/workspace.json
Haina/Weekly/2023-W45.md
---
 .obsidian/plugins/obsidian-git/data.json |  10 +--
 .obsidian/workspace.json                 | 106 ++++++++++++++---------
 Haina/Weekly/2023-W45.md                 |  28 +++++-
 3 files changed, 96 insertions(+), 48 deletions(-)

diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 48aa759..5aad0c3 100644
--- 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",
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 8ac0204..67f5865 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -25,14 +25,14 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/Weekly/2023-W45.md",
+                "file": "Haina/项目/SCRM/SCRM+IM可行性.md",
                 "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "def2465523df86f8",
+            "id": "a2418d046d3b1359",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -42,9 +42,45 @@
                 "source": false
               }
             }
+          },
+          {
+            "id": "4fbd6c4c10530d2e",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Weekly/2023-W45.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "af82a8136a160da8",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Monthly/2023-10.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "325d45b56e24c481",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/项目/HT数据分析/权限管理.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
           }
         ],
-        "currentTab": 2
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -74,7 +110,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "",
+                "query": "[\"Previous\"]",
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -131,7 +167,7 @@
       {
         "id": "d9d38115cfe2d18f",
         "type": "tabs",
-        "dimension": 28.846153846153843,
+        "dimension": 35.28846153846154,
         "children": [
           {
             "id": "10d9387b227d46e7",
@@ -139,7 +175,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/Weekly/2023-W44.md"
+                "file": "Haina/Weekly/2023-W45.md"
               }
             }
           },
@@ -149,7 +185,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/Weekly/2023-W44.md",
+                "file": "Haina/Weekly/2023-W45.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -173,7 +209,7 @@
       {
         "id": "dc29c441166ca3aa",
         "type": "tabs",
-        "dimension": 35.96153846153846,
+        "dimension": 33.07692307692307,
         "children": [
           {
             "id": "096b5bbba0f2c0d4",
@@ -188,18 +224,8 @@
       {
         "id": "9a8ed0fe1b835302",
         "type": "tabs",
-        "dimension": 35.19230769230769,
+        "dimension": 31.63461538461538,
         "children": [
-          {
-            "id": "055353566e60e182",
-            "type": "leaf",
-            "state": {
-              "type": "file-properties",
-              "state": {
-                "file": "Haina/Weekly/2023-W44.md"
-              }
-            }
-          },
           {
             "id": "cfcffea8c60d0b67",
             "type": "leaf",
@@ -222,7 +248,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 245.5
+    "width": 240.5
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -241,37 +267,35 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "def2465523df86f8",
+  "active": "4fbd6c4c10530d2e",
   "lastOpenFiles": [
-    "Haina/Monthly/2023-10.md",
     "Haina/Weekly/2023-W44.md",
+    "Haina/项目/HT数据分析/权限管理.md",
+    "Haina/Monthly/2023-10.md",
+    "Haina/Monthly/2023-09.md",
     "Haina/Weekly/2023-W45.md",
-    "Haina/项目/SCRM/SCRM+IM可行性.md",
-    "Haina/Monthly/2023-11.md",
-    "Haina/Templates/总结.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",
+    "conflict-files-obsidian-git.md",
     "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
-    "Haina/Templates/任务.md",
-    "Haina/项目/HT数据分析/权限管理.md",
+    "Haina/项目/HT数据分析/2.0总结.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/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
+    "Haina/Templates/总结.md",
+    "Haina/Daily/2023-11-01.md",
+    "Haina/项目/SCRM/SCRM+IM可行性.md",
     "Haina/项目/HT数据分析/文旅局数据统计.md",
     "Haina/项目/SCRM/销售对话沟通.md",
     "Haina/项目/SCRM/SCRM.md",
+    "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
     "Haina/项目/HT数据分析/销售数据管理2.0.md",
+    "Haina/Templates/任务 lite.md",
     "Haina/Weekly/2023-W43.md",
     "Haina/Daily/2023-09-15.md",
+    "Haina/Daily/2023-10-23.md",
+    "Haina/Templates/D-log.md",
+    "Haina/Daily/2023-10-31.md",
+    "Haina/Daily/2023-11-03.md",
+    "Haina/Daily/2023-11-02.md",
+    "Haina/Logs/2023-W46.md",
+    "Haina/Logs/2023-W45.md",
     "Haina/Weekly",
     "Haina/Quarterly",
     "Haina/Monthly",
@@ -279,6 +303,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",
diff --git a/Haina/Weekly/2023-W45.md b/Haina/Weekly/2023-W45.md
index 7c54bbd..c0adf2f 100644
--- a/Haina/Weekly/2023-W45.md
+++ b/Haina/Weekly/2023-W45.md
@@ -1,15 +1,37 @@
 ---
 Created: 2023-10-30 Mon
-Updated: 
+Updated: 2023-11-07 22:34 Tue
 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]]
 
 ---
+
 ## 上周工作
 
-1. 
+### 重点工作
+
+1. HT统计分析 (v2.2)
+   - #新增 显示版本号, 编译时间
+   - #新增 权限管理: 登陆身份水印
+   - #优化
+     - 统一搜索组件;
+     - [销售, 订单]来源多选
+     - 订单>子维度: 表格导出
+     - 移动端布局调整
+     - 一些样式
+   - 多维度分析 (约30%): 透视计算, 折线图.
+     - #todo 操作选项: 行, 列, 筛选, 叠加; 对比
+
+### 维护工作
+
+1. #优化 PayPal收款记录: 按状态查询列表; 处理太多滞留的记录
 
 ## 本周计划
-1. 
+
+1. HT统计
+   - 多维度: 操作选项; 对比
+   - 年度对比
+2. Trippest支付页面调整

From 28dd4abf8c28ad5bb133b35ba06e7dac59c33919 Mon Sep 17 00:00:00 2001
From: lot <ldj_yt@outlook.com>
Date: Tue, 7 Nov 2023 23:20:19 +0800
Subject: [PATCH 3/4] vault backup: 2023-11-07 23:20:18

Affected files:
.obsidian/workspace.json
Haina/Monthly/2023-10.md
Haina/Templates/W-log.md
Haina/Weekly/2023-W45.md
Haina/Weekly/2023-W46.md
Haina/Weekly/2023-W47.md
---
 .obsidian/workspace.json | 36 ++++++++++++++++++------------------
 Haina/Monthly/2023-10.md | 14 ++++++++++++--
 Haina/Templates/W-log.md |  3 +++
 Haina/Weekly/2023-W45.md |  4 +++-
 Haina/Weekly/2023-W46.md |  5 ++++-
 Haina/Weekly/2023-W47.md | 18 ++++++++++++++++++
 6 files changed, 58 insertions(+), 22 deletions(-)
 create mode 100644 Haina/Weekly/2023-W47.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 67f5865..42dd8d6 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -56,31 +56,31 @@
             }
           },
           {
-            "id": "af82a8136a160da8",
+            "id": "eeb58bdbb0a334d1",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/Monthly/2023-10.md",
-                "mode": "source",
+                "file": "Haina/Weekly/2023-W46.md",
+                "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "325d45b56e24c481",
+            "id": "1e3113c28f7fef45",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md",
+                "file": "Haina/Monthly/2023-09.md",
                 "mode": "preview",
                 "source": false
               }
             }
           }
         ],
-        "currentTab": 3
+        "currentTab": 4
       }
     ],
     "direction": "vertical"
@@ -175,7 +175,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/Weekly/2023-W45.md"
+                "file": "Haina/Weekly/2023-W46.md"
               }
             }
           },
@@ -185,7 +185,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/Weekly/2023-W45.md",
+                "file": "Haina/Weekly/2023-W46.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -267,17 +267,22 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "4fbd6c4c10530d2e",
+  "active": "eeb58bdbb0a334d1",
   "lastOpenFiles": [
+    "Haina/Weekly/2023-W45.md",
+    "Haina/Weekly/2023-W46.md",
     "Haina/Weekly/2023-W44.md",
-    "Haina/项目/HT数据分析/权限管理.md",
-    "Haina/Monthly/2023-10.md",
+    "Haina/Weekly/2023-W43.md",
     "Haina/Monthly/2023-09.md",
-    "Haina/Weekly/2023-W45.md",
+    "Haina/Templates/W-log.md",
+    "Haina/Weekly/2023-W47.md",
+    "Haina/Monthly/2023-10.md",
+    "Haina/项目/HT数据分析/权限管理.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/Weekly/2023-W46.md",
     "Haina/Templates/总结.md",
     "Haina/Daily/2023-11-01.md",
     "Haina/项目/SCRM/SCRM+IM可行性.md",
@@ -287,15 +292,10 @@
     "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
     "Haina/项目/HT数据分析/销售数据管理2.0.md",
     "Haina/Templates/任务 lite.md",
-    "Haina/Weekly/2023-W43.md",
     "Haina/Daily/2023-09-15.md",
-    "Haina/Daily/2023-10-23.md",
     "Haina/Templates/D-log.md",
     "Haina/Daily/2023-10-31.md",
     "Haina/Daily/2023-11-03.md",
-    "Haina/Daily/2023-11-02.md",
-    "Haina/Logs/2023-W46.md",
-    "Haina/Logs/2023-W45.md",
     "Haina/Weekly",
     "Haina/Quarterly",
     "Haina/Monthly",
diff --git a/Haina/Monthly/2023-10.md b/Haina/Monthly/2023-10.md
index 4bedf9b..ffd984a 100644
--- 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-07 22:58 Tue
 tags:
   - 月报
 ---
@@ -11,7 +11,17 @@ tags:
 
 ## 重点工作
 
-1.
+1. HT统计分析2.0: 业绩统计分析:
+   1. 演示
+   2. 顾问销售进度
+   3. 首页: 各图表增加商务订单数据
+   4. 业绩统计分布:
+      1. 图表
+      2. 加: 客人国籍
+   5. 优化:
+      1. KPI设置操作
+      2. 数据显示优化
+      3. 订单数据-子维度页面：时间轴切换
 
 ## 维护工作
 
diff --git a/Haina/Templates/W-log.md b/Haina/Templates/W-log.md
index 5c65aab..94a2806 100644
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@@ -41,6 +41,9 @@ for (let day = 0; day < 7; day++) {
 %>
 
 ---
+
+*<%* tR += moment(tp.file.title).weekday(1).format('YYYY-MM-DD ddd') %>*
+
 ## 上周工作
 
 1. <% tp.file.cursor(1) %>
diff --git a/Haina/Weekly/2023-W45.md b/Haina/Weekly/2023-W45.md
index c0adf2f..615b4c9 100644
--- a/Haina/Weekly/2023-W45.md
+++ b/Haina/Weekly/2023-W45.md
@@ -1,6 +1,6 @@
 ---
 Created: 2023-10-30 Mon
-Updated: 2023-11-07 22:34 Tue
+Updated: 2023-11-07 23:08 Tue
 tags:
   - 周报
 ---
@@ -9,6 +9,8 @@ tags:
 
 ---
 
+*2023-11-07 Tue*
+
 ## 上周工作
 
 ### 重点工作
diff --git a/Haina/Weekly/2023-W46.md b/Haina/Weekly/2023-W46.md
index 76eaa2e..63b6ae3 100644
--- a/Haina/Weekly/2023-W46.md
+++ b/Haina/Weekly/2023-W46.md
@@ -1,5 +1,5 @@
 ---
-Created: 2023-11-01 Wed
+Created: 2023-11-07 Tue
 Updated: 
 tags:
   - 周报
@@ -7,6 +7,9 @@ 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]]
 
 ---
+
+*2023-11-14 Tue*
+
 ## 上周工作
 
 1. 
diff --git a/Haina/Weekly/2023-W47.md b/Haina/Weekly/2023-W47.md
new file mode 100644
index 0000000..19658d9
--- /dev/null
+++ b/Haina/Weekly/2023-W47.md
@@ -0,0 +1,18 @@
+---
+Created: 2023-11-07 Tue
+Updated: 
+tags:
+  - 周报
+---
+[[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W46|Week 46]] | Week 47 | [[2023-W48|Week 48]] ❯ / [[2023-11-20|Mon]] - [[2023-11-21|Tue]] - [[2023-11-22|Wed]] - [[2023-11-23|Thu]] - [[2023-11-24|Fri]] - [[2023-11-25|Sat]] - [[2023-11-26|Sun]]
+
+---
+
+*2023-11-21 Tue*
+
+## 上周工作
+
+1. 
+
+## 本周计划
+1. 

From 65fd492ed38898b6fe9d9506093308672d5eb4fb Mon Sep 17 00:00:00 2001
From: lot <ldj_yt@outlook.com>
Date: Wed, 8 Nov 2023 01:26:06 +0800
Subject: [PATCH 4/4] vault backup: 2023-11-08 01:26:06

Affected files:
.obsidian/workspace.json
Haina/Monthly/2023-10.md
Haina/Templates/D-log.md
Haina/Templates/M-log.md
Haina/Templates/W-log.md
Haina/Weekly/2023-W42.md
Haina/Weekly/2023-W44.md
Haina/Weekly/2023-W45.md
Haina/Weekly/2023-W46.md
Haina/Weekly/2023-W47.md
---
 .obsidian/workspace.json | 82 +++++++++++--------------------------
 Haina/Monthly/2023-10.md | 87 ++++++++++++++++++++++++++++++++++------
 Haina/Templates/D-log.md | 14 +++----
 Haina/Templates/M-log.md | 10 ++---
 Haina/Templates/W-log.md | 23 ++++++-----
 Haina/Weekly/2023-W42.md | 40 ++++++++++++++++++
 Haina/Weekly/2023-W44.md |  6 +--
 Haina/Weekly/2023-W45.md | 28 +++++++------
 Haina/Weekly/2023-W46.md | 18 ---------
 Haina/Weekly/2023-W47.md | 18 ---------
 10 files changed, 182 insertions(+), 144 deletions(-)
 create mode 100644 Haina/Weekly/2023-W42.md
 delete mode 100644 Haina/Weekly/2023-W46.md
 delete mode 100644 Haina/Weekly/2023-W47.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 42dd8d6..3873b68 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -8,43 +8,31 @@
         "type": "tabs",
         "children": [
           {
-            "id": "73ecf38a860141ec",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
-                "mode": "preview",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "3bb8f1adc4d09142",
+            "id": "1e3113c28f7fef45",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/SCRM/SCRM+IM可行性.md",
+                "file": "Haina/Monthly/2023-09.md",
                 "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "a2418d046d3b1359",
+            "id": "998b616c506ba1ca",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/Weekly/2023-W44.md",
+                "file": "Haina/Monthly/2023-10.md",
                 "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "4fbd6c4c10530d2e",
+            "id": "7a25e346a13f023b",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -54,33 +42,9 @@
                 "source": false
               }
             }
-          },
-          {
-            "id": "eeb58bdbb0a334d1",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Weekly/2023-W46.md",
-                "mode": "preview",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "1e3113c28f7fef45",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Monthly/2023-09.md",
-                "mode": "preview",
-                "source": false
-              }
-            }
           }
         ],
-        "currentTab": 4
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -175,7 +139,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/Weekly/2023-W46.md"
+                "file": "Haina/Weekly/2023-W45.md"
               }
             }
           },
@@ -185,7 +149,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/Weekly/2023-W46.md",
+                "file": "Haina/Weekly/2023-W45.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -267,16 +231,27 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "eeb58bdbb0a334d1",
+  "active": "7a25e346a13f023b",
   "lastOpenFiles": [
+    "Haina/Templates/W-log.md",
     "Haina/Weekly/2023-W45.md",
-    "Haina/Weekly/2023-W46.md",
     "Haina/Weekly/2023-W44.md",
     "Haina/Weekly/2023-W43.md",
+    "Haina/Monthly/2023-10.md",
     "Haina/Monthly/2023-09.md",
-    "Haina/Templates/W-log.md",
+    "Haina/Weekly/2023-W46.md",
+    "Haina/Templates/D-log.md",
+    "Haina/Templates/M-log.md",
+    "Haina/Monthly/2023-11.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/Daily/2023-11-08.md",
+    "Haina/Weekly/2023-11-08.md",
+    "Haina/Weekly/2023-W42.md",
     "Haina/Weekly/2023-W47.md",
-    "Haina/Monthly/2023-10.md",
+    "Haina/项目/SCRM/SCRM+IM可行性.md",
     "Haina/项目/HT数据分析/权限管理.md",
     "Haina/Daily/2023-10-13.md",
     "Haina/Daily/2023-10-23.md",
@@ -284,18 +259,7 @@
     "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
     "Haina/项目/HT数据分析/2.0总结.md",
     "Haina/Templates/总结.md",
-    "Haina/Daily/2023-11-01.md",
-    "Haina/项目/SCRM/SCRM+IM可行性.md",
     "Haina/项目/HT数据分析/文旅局数据统计.md",
-    "Haina/项目/SCRM/销售对话沟通.md",
-    "Haina/项目/SCRM/SCRM.md",
-    "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
-    "Haina/项目/HT数据分析/销售数据管理2.0.md",
-    "Haina/Templates/任务 lite.md",
-    "Haina/Daily/2023-09-15.md",
-    "Haina/Templates/D-log.md",
-    "Haina/Daily/2023-10-31.md",
-    "Haina/Daily/2023-11-03.md",
     "Haina/Weekly",
     "Haina/Quarterly",
     "Haina/Monthly",
diff --git a/Haina/Monthly/2023-10.md b/Haina/Monthly/2023-10.md
index ffd984a..5f842e1 100644
--- a/Haina/Monthly/2023-10.md
+++ b/Haina/Monthly/2023-10.md
@@ -1,6 +1,6 @@
 ---
 Created: 2023-10-28 Sat
-Updated: 2023-11-07 22:58 Tue
+Updated: 2023-11-08 00:34 Wed
 tags:
   - 月报
 ---
@@ -11,24 +11,87 @@ tags:
 
 ## 重点工作
 
-1. HT统计分析2.0: 业绩统计分析:
-   1. 演示
-   2. 顾问销售进度
-   3. 首页: 各图表增加商务订单数据
-   4. 业绩统计分布:
-      1. 图表
-      2. 加: 客人国籍
-   5. 优化:
-      1. KPI设置操作
-      2. 数据显示优化
-      3. 订单数据-子维度页面：时间轴切换
+#### 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]])*
diff --git a/Haina/Templates/D-log.md b/Haina/Templates/D-log.md
index 7d14cda..5975ace 100644
--- 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');
 %>
 
diff --git a/Haina/Templates/M-log.md b/Haina/Templates/M-log.md
index b3ba328..865bfe3 100644
--- 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 += ' - ';
diff --git a/Haina/Templates/W-log.md b/Haina/Templates/W-log.md
index 94a2806..e357d68 100644
--- 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 += ' - ';
     }
@@ -46,7 +46,12 @@ for (let day = 0; day < 7; day++) {
 
 ## 上周工作
 
+### 重点工作
+
 1. <% tp.file.cursor(1) %>
 
+### 维护工作
+1. 
+
 ## 本周计划
 1. 
diff --git a/Haina/Weekly/2023-W42.md b/Haina/Weekly/2023-W42.md
new file mode 100644
index 0000000..3a51ecc
--- /dev/null
+++ 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: 业绩数据: 演示
diff --git a/Haina/Weekly/2023-W44.md b/Haina/Weekly/2023-W44.md
index ffc9f43..ce4e939 100644
--- 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. 权限
diff --git a/Haina/Weekly/2023-W45.md b/Haina/Weekly/2023-W45.md
index 615b4c9..2d77091 100644
--- a/Haina/Weekly/2023-W45.md
+++ b/Haina/Weekly/2023-W45.md
@@ -1,11 +1,11 @@
 ---
 Created: 2023-10-30 Mon
-Updated: 2023-11-07 23:08 Tue
+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]]
 
 ---
 
@@ -16,20 +16,22 @@ tags:
 ### 重点工作
 
 1. HT统计分析 (v2.2)
-   - #新增 显示版本号, 编译时间
-   - #新增 权限管理: 登陆身份水印
-   - #优化
-     - 统一搜索组件;
-     - [销售, 订单]来源多选
-     - 订单>子维度: 表格导出
-     - 移动端布局调整
-     - 一些样式
-   - 多维度分析 (约30%): 透视计算, 折线图.
-     - #todo 操作选项: 行, 列, 筛选, 叠加; 对比
+   1. #新增 显示版本号, 编译时间
+   2. #新增 权限管理: 登陆身份水印
+   3. 多维度分析 (约30%): 透视计算, 折线图.
+      - #todo 操作选项: 行, 列, 筛选, 叠加; 对比
+   4. 可视化 #优化
+      - 统一搜索组件;
+      - [销售, 订单]来源多选
+      - 订单>子维度: 表格导出
+      - 移动端布局调整
+      - 一些样式
 
 ### 维护工作
 
-1. #优化 PayPal收款记录: 按状态查询列表; 处理太多滞留的记录
+1. #优化 PayPal收款记录: 
+	- 按状态查询列表; 
+	- 处理太多滞留的记录
 
 ## 本周计划
 
diff --git a/Haina/Weekly/2023-W46.md b/Haina/Weekly/2023-W46.md
deleted file mode 100644
index 63b6ae3..0000000
--- a/Haina/Weekly/2023-W46.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Created: 2023-11-07 Tue
-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]]
-
----
-
-*2023-11-14 Tue*
-
-## 上周工作
-
-1. 
-
-## 本周计划
-1. 
diff --git a/Haina/Weekly/2023-W47.md b/Haina/Weekly/2023-W47.md
deleted file mode 100644
index 19658d9..0000000
--- a/Haina/Weekly/2023-W47.md
+++ /dev/null
@@ -1,18 +0,0 @@
----
-Created: 2023-11-07 Tue
-Updated: 
-tags:
-  - 周报
----
-[[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / ❮ [[2023-W46|Week 46]] | Week 47 | [[2023-W48|Week 48]] ❯ / [[2023-11-20|Mon]] - [[2023-11-21|Tue]] - [[2023-11-22|Wed]] - [[2023-11-23|Thu]] - [[2023-11-24|Fri]] - [[2023-11-25|Sat]] - [[2023-11-26|Sun]]
-
----
-
-*2023-11-21 Tue*
-
-## 上周工作
-
-1. 
-
-## 本周计划
-1.