From a4ce6b199cf11f97611d2cb07d40c8f19951d7d6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 1 Nov 2023 14:09:19 +0800
Subject: [PATCH 01/12] vault backup: 2023-11-01 14:09:19

Affected files:
.obsidian/workspace.json
Haina/Weekly/2023-W44.md
---
 .obsidian/workspace.json | 23 +++++++++++++++++------
 Haina/Weekly/2023-W44.md |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 8e6fad3..3012e14 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -38,13 +38,25 @@
               "type": "markdown",
               "state": {
                 "file": "Haina/Weekly/2023-W44.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "5c916dc6d8d28b56",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Weekly/2023-W45.md",
                 "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "325d45b56e24c481",
+            "id": "c07a4451ee574d72",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -129,8 +141,7 @@
               "state": {}
             }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "horizontal",
@@ -246,16 +257,16 @@
   },
   "active": "a2418d046d3b1359",
   "lastOpenFiles": [
+    "Haina/Weekly/2023-W45.md",
+    "Haina/Weekly/2023-W44.md",
     "Haina/项目/SCRM/SCRM+IM可行性.md",
+    "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
     "Haina/项目/HT数据分析/权限管理.md",
     "Haina/项目/HT数据分析/文旅局数据统计.md",
     "Haina/项目/SCRM/销售对话沟通.md",
     "Haina/项目/SCRM/SCRM.md",
-    "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
     "Haina/项目/HT数据分析/销售数据管理2.0.md",
-    "Haina/Weekly/2023-W44.md",
     "Haina/Templates/任务 lite.md",
-    "Haina/Weekly/2023-W45.md",
     "Haina/Weekly/2023-W43.md",
     "Haina/Monthly/2023-09.md",
     "Haina/Daily/2023-09-15.md",
diff --git a/Haina/Weekly/2023-W44.md b/Haina/Weekly/2023-W44.md
index a8158a4..ab8043a 100644
--- a/Haina/Weekly/2023-W44.md
+++ b/Haina/Weekly/2023-W44.md
@@ -38,3 +38,4 @@ tags:
 
 1. SCRM+IM平台调研
 2. HT统计分析
+	1. 权限

From 168c4210ef3d10a6cdb9fa6f25fbf0df9206a990 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 1 Nov 2023 16:30:23 +0800
Subject: [PATCH 02/12] vault backup: 2023-11-01 16:30:23

Affected files:
.obsidian/plugins/obsidian-git/data.json
.obsidian/workspace.json
Haina/Daily/2023-11-01.md
Haina/Templates/D-log.md
Haina/Weekly/2023-W44.md
---
 .obsidian/plugins/obsidian-git/data.json | 10 +++---
 .obsidian/workspace.json                 | 45 ++++++++++++------------
 Haina/Daily/2023-11-01.md                | 16 +++++++++
 Haina/Templates/D-log.md                 |  3 +-
 Haina/Weekly/2023-W44.md                 |  2 +-
 5 files changed, 46 insertions(+), 30 deletions(-)
 create mode 100644 Haina/Daily/2023-11-01.md

diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index 5aad0c3..48aa759 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": 10,
+  "autoSaveInterval": 30,
   "autoPushInterval": 0,
-  "autoPullInterval": 10,
+  "autoPullInterval": 30,
   "autoPullOnBoot": true,
   "disablePush": false,
   "pullBeforePush": true,
-  "disablePopups": false,
+  "disablePopups": true,
   "listChangedFilesInMessageBody": true,
   "showStatusBar": true,
   "updateSubmodules": false,
@@ -21,11 +21,11 @@
   "changedFilesInStatusBar": true,
   "showedMobileNotice": true,
   "refreshSourceControlTimer": 7000,
-  "showBranchStatusBar": true,
+  "showBranchStatusBar": false,
   "setLastSaveToLastCommit": false,
   "submoduleRecurseCheckout": false,
   "gitDir": "",
-  "showFileMenu": true,
+  "showFileMenu": false,
   "lineAuthor": {
     "show": false,
     "followMovement": "inactive",
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 3012e14..9af9321 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -44,31 +44,31 @@
             }
           },
           {
-            "id": "5c916dc6d8d28b56",
+            "id": "8913d5d4d3b22362",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/Weekly/2023-W45.md",
+                "file": "Haina/项目/HT数据分析/权限管理.md",
                 "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "c07a4451ee574d72",
+            "id": "09815a8f0d89f716",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md",
-                "mode": "preview",
+                "file": "Haina/Monthly/2023-10.md",
+                "mode": "source",
                 "source": false
               }
             }
           }
         ],
-        "currentTab": 2
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -162,7 +162,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/Weekly/2023-W44.md"
+                "file": "Haina/项目/HT数据分析/权限管理.md"
               }
             }
           },
@@ -172,7 +172,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/Weekly/2023-W44.md",
+                "file": "Haina/项目/HT数据分析/权限管理.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -191,8 +191,7 @@
               "state": {}
             }
           }
-        ],
-        "currentTab": 1
+        ]
       },
       {
         "id": "dc29c441166ca3aa",
@@ -212,7 +211,7 @@
       {
         "id": "9a8ed0fe1b835302",
         "type": "tabs",
-        "dimension": 31.634615384615383,
+        "dimension": 31.63461538461538,
         "children": [
           {
             "id": "cfcffea8c60d0b67",
@@ -255,39 +254,39 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "a2418d046d3b1359",
+  "active": "8913d5d4d3b22362",
   "lastOpenFiles": [
-    "Haina/Weekly/2023-W45.md",
     "Haina/Weekly/2023-W44.md",
+    "Haina/Monthly/2023-10.md",
+    "Haina/Monthly/2023-09.md",
+    "Haina/Monthly/2023-08.md",
+    "Haina/Daily/2023-11-01.md",
+    "Haina/Daily/2023-11-02.md",
+    "Haina/Weekly/2023-W45.md",
+    "Haina/Templates/D-log.md",
+    "Haina/Templates/W-log.md",
+    "Haina/Daily/2023-10-23.md",
+    "Haina/Daily/2023-10-13.md",
+    "Haina/项目/HT数据分析/权限管理.md",
     "Haina/项目/SCRM/SCRM+IM可行性.md",
     "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
-    "Haina/项目/HT数据分析/权限管理.md",
     "Haina/项目/HT数据分析/文旅局数据统计.md",
     "Haina/项目/SCRM/销售对话沟通.md",
     "Haina/项目/SCRM/SCRM.md",
     "Haina/项目/HT数据分析/销售数据管理2.0.md",
     "Haina/Templates/任务 lite.md",
     "Haina/Weekly/2023-W43.md",
-    "Haina/Monthly/2023-09.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-01.md",
     "Haina/Daily/2023-11-03.md",
-    "Haina/Daily/2023-11-02.md",
-    "Haina/Monthly/2023-10.md",
     "Haina/Logs/2023-W46.md",
     "Haina/Logs/2023-W45.md",
     "Haina/Weekly",
     "Haina/Quarterly",
-    "Haina/Monthly/2023-08.md",
     "Haina/Monthly",
-    "Haina/Daily/2023-10-13.md",
     "Haina/Daily/2023-09-26.md",
     "Haina/Daily",
     "Haina/Yearly",
-    "Haina/Logs/Daily/2023-10-23.md",
     "Haina/Logs/Daily",
     "Haina/Logs/Weekly",
     "Haina/Logs/Weekly1",
diff --git a/Haina/Daily/2023-11-01.md b/Haina/Daily/2023-11-01.md
new file mode 100644
index 0000000..81c09b7
--- /dev/null
+++ b/Haina/Daily/2023-11-01.md
@@ -0,0 +1,16 @@
+---
+Created: 2023-11-01 Wed
+Updated: 2023-11-01 16:20 Wed
+tags:
+  - 日报
+---
+
+[[2023]] / [[2023-Q4|Q4]] / [[2023-11|November]] / [[2023-W44|Week 44]] / ❮ [[2023-10-31]] | 2023-11-01 Wednesday | [[2023-11-02]] ❯ / [[2023-W45|Week 45]]
+
+---
+
+#### HT 统计
+
+1. #新增 增加登陆身份的水印
+
+## TODO
diff --git a/Haina/Templates/D-log.md b/Haina/Templates/D-log.md
index b93530e..7d14cda 100644
--- a/Haina/Templates/D-log.md
+++ b/Haina/Templates/D-log.md
@@ -20,7 +20,8 @@ tR += ' / ';
 // ❮ 2022-12-31 | 2023-01-01 | 2023-01-02 ❯
 tR += '❮ [[' + today.subtract(1, 'days').format('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, 'days').format('YYYY-MM-DD') + ']] ❯ / ';
+tR += '[[' + today.add(1, 'weeks').format('gggg-[W]ww|[Week] w') + ']]';
 today.subtract(1, 'days');
 %>
 
diff --git a/Haina/Weekly/2023-W44.md b/Haina/Weekly/2023-W44.md
index ab8043a..ffc9f43 100644
--- a/Haina/Weekly/2023-W44.md
+++ b/Haina/Weekly/2023-W44.md
@@ -5,7 +5,7 @@ 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]] - [[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|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]]
 
 ---
 

From eccc5a351d368bcbd26732839eeb9b8ddc7ae3e0 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 1 Nov 2023 17:45:16 +0800
Subject: [PATCH 03/12] vault backup: 2023-11-01 17:45:16

Affected files:
.obsidian/workspace.json
Haina/Daily/2023-11-01.md
Haina/Templates/W-log.md
Haina/Weekly/2023-W46.md
---
 .obsidian/workspace.json  | 44 ++++++++++++++++++++++++---------------
 Haina/Daily/2023-11-01.md |  3 ++-
 Haina/Templates/W-log.md  |  2 +-
 Haina/Weekly/2023-W46.md  | 15 +++++++++++++
 4 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 Haina/Weekly/2023-W46.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 9af9321..2c9bff5 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -44,31 +44,31 @@
             }
           },
           {
-            "id": "8913d5d4d3b22362",
+            "id": "5441158c0337ee87",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md",
-                "mode": "preview",
+                "file": "Haina/Daily/2023-11-01.md",
+                "mode": "source",
                 "source": false
               }
             }
           },
           {
-            "id": "09815a8f0d89f716",
+            "id": "8913d5d4d3b22362",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/Monthly/2023-10.md",
-                "mode": "source",
+                "file": "Haina/项目/HT数据分析/权限管理.md",
+                "mode": "preview",
                 "source": false
               }
             }
           }
         ],
-        "currentTab": 3
+        "currentTab": 4
       }
     ],
     "direction": "vertical"
@@ -98,7 +98,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "[\"Previous\"]",
+                "query": "",
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -154,7 +154,7 @@
       {
         "id": "d9d38115cfe2d18f",
         "type": "tabs",
-        "dimension": 35.28846153846154,
+        "dimension": 28.846153846153843,
         "children": [
           {
             "id": "10d9387b227d46e7",
@@ -196,7 +196,7 @@
       {
         "id": "dc29c441166ca3aa",
         "type": "tabs",
-        "dimension": 33.07692307692307,
+        "dimension": 35.96153846153846,
         "children": [
           {
             "id": "096b5bbba0f2c0d4",
@@ -211,8 +211,18 @@
       {
         "id": "9a8ed0fe1b835302",
         "type": "tabs",
-        "dimension": 31.63461538461538,
+        "dimension": 35.19230769230769,
         "children": [
+          {
+            "id": "055353566e60e182",
+            "type": "leaf",
+            "state": {
+              "type": "file-properties",
+              "state": {
+                "file": "Haina/项目/HT数据分析/权限管理.md"
+              }
+            }
+          },
           {
             "id": "cfcffea8c60d0b67",
             "type": "leaf",
@@ -235,7 +245,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 240.5
+    "width": 245.5
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -256,18 +266,19 @@
   },
   "active": "8913d5d4d3b22362",
   "lastOpenFiles": [
+    "Haina/Daily/2023-11-01.md",
     "Haina/Weekly/2023-W44.md",
+    "Haina/Weekly/2023-W45.md",
+    "Haina/Weekly/2023-W46.md",
+    "Haina/项目/HT数据分析/权限管理.md",
+    "Haina/Templates/W-log.md",
     "Haina/Monthly/2023-10.md",
     "Haina/Monthly/2023-09.md",
     "Haina/Monthly/2023-08.md",
-    "Haina/Daily/2023-11-01.md",
     "Haina/Daily/2023-11-02.md",
-    "Haina/Weekly/2023-W45.md",
     "Haina/Templates/D-log.md",
-    "Haina/Templates/W-log.md",
     "Haina/Daily/2023-10-23.md",
     "Haina/Daily/2023-10-13.md",
-    "Haina/项目/HT数据分析/权限管理.md",
     "Haina/项目/SCRM/SCRM+IM可行性.md",
     "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
     "Haina/项目/HT数据分析/文旅局数据统计.md",
@@ -284,7 +295,6 @@
     "Haina/Weekly",
     "Haina/Quarterly",
     "Haina/Monthly",
-    "Haina/Daily/2023-09-26.md",
     "Haina/Daily",
     "Haina/Yearly",
     "Haina/Logs/Daily",
diff --git a/Haina/Daily/2023-11-01.md b/Haina/Daily/2023-11-01.md
index 81c09b7..e94638e 100644
--- a/Haina/Daily/2023-11-01.md
+++ b/Haina/Daily/2023-11-01.md
@@ -1,6 +1,6 @@
 ---
 Created: 2023-11-01 Wed
-Updated: 2023-11-01 16:20 Wed
+Updated: 2023-11-01 17:10 Wed
 tags:
   - 日报
 ---
@@ -12,5 +12,6 @@ tags:
 #### HT 统计
 
 1. #新增 增加登陆身份的水印
+2. #优化 显示版本编译时间
 
 ## TODO
diff --git a/Haina/Templates/W-log.md b/Haina/Templates/W-log.md
index 6cc36d3..5c65aab 100644
--- a/Haina/Templates/W-log.md
+++ b/Haina/Templates/W-log.md
@@ -33,7 +33,7 @@ tR += ' / ';
 
 // Monday - Tuesday - Wednesday - Thursday - Friday - Saturday - Sunday
 for (let day = 0; day < 7; day++) {
-    tR += '[[' + week.weekday(day).format('YYYY-MM-DD|dddd') + ']]';
+    tR += '[[' + week.weekday(day).format('YYYY-MM-DD|ddd') + ']]';
     if (day < 6) {
         tR += ' - ';
     }
diff --git a/Haina/Weekly/2023-W46.md b/Haina/Weekly/2023-W46.md
new file mode 100644
index 0000000..76eaa2e
--- /dev/null
+++ b/Haina/Weekly/2023-W46.md
@@ -0,0 +1,15 @@
+---
+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. 

From e90491dff38261d5cd58b431c978ed282e3d01e9 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 2 Nov 2023 00:27:42 +0800
Subject: [PATCH 04/12] vault backup: 2023-11-02 00:27:42
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
.obsidian/workspace.json
Haina/项目/HT数据分析/权限管理.md
---
 .obsidian/workspace.json                    | 2 +-
 Haina/项目/HT数据分析/权限管理.md | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 2c9bff5..06f81bc 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -62,7 +62,7 @@
               "type": "markdown",
               "state": {
                 "file": "Haina/项目/HT数据分析/权限管理.md",
-                "mode": "preview",
+                "mode": "source",
                 "source": false
               }
             }
diff --git a/Haina/项目/HT数据分析/权限管理.md b/Haina/项目/HT数据分析/权限管理.md
index 657946c..d46634f 100644
--- a/Haina/项目/HT数据分析/权限管理.md
+++ b/Haina/项目/HT数据分析/权限管理.md
@@ -1,6 +1,6 @@
 ---
 Created: 2023-10-23 Mon
-Updated: 2023-10-24 13:44 Tue
+Updated: 2023-11-01 23:57 Wed
 ---
 
 ## 需求
@@ -16,5 +16,6 @@ Updated: 2023-10-24 13:44 Tue
    - 权限角色配置, 路由控制
 3. 借鉴金山文档增加打水印功能防拍照截图。是否有别的建议？是否可行，麻烦你有空的时候给我确认一下啊。该需求为新增，不计入项目开发周期。谢谢
    - 操作限制, 禁用内容复制
-   - 明文水印
+   - [x] 明文水印 ✅ 2023-11-01
    - 盲水印?
+4. 操作记录

From 41434cd32196567331cf670bff068c7cc1b71669 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 2 Nov 2023 11:37:18 +0800
Subject: [PATCH 05/12] vault backup: 2023-11-02 11:37:18

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 06f81bc..2c9bff5 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -62,7 +62,7 @@
               "type": "markdown",
               "state": {
                 "file": "Haina/项目/HT数据分析/权限管理.md",
-                "mode": "source",
+                "mode": "preview",
                 "source": false
               }
             }

From 301aebe07a86b9095ab2a2b40c75e11d4814e0c9 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 2 Nov 2023 12:20:53 +0800
Subject: [PATCH 06/12] vault backup: 2023-11-02 12:20:53
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
.obsidian/workspace.json
Haina/项目/HT数据分析/权限管理.md
---
 .obsidian/workspace.json                    | 2 +-
 Haina/项目/HT数据分析/权限管理.md | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 2c9bff5..06f81bc 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -62,7 +62,7 @@
               "type": "markdown",
               "state": {
                 "file": "Haina/项目/HT数据分析/权限管理.md",
-                "mode": "preview",
+                "mode": "source",
                 "source": false
               }
             }
diff --git a/Haina/项目/HT数据分析/权限管理.md b/Haina/项目/HT数据分析/权限管理.md
index d46634f..fee5115 100644
--- a/Haina/项目/HT数据分析/权限管理.md
+++ b/Haina/项目/HT数据分析/权限管理.md
@@ -1,6 +1,6 @@
 ---
 Created: 2023-10-23 Mon
-Updated: 2023-11-01 23:57 Wed
+Updated: 2023-11-02 11:49 Thu
 ---
 
 ## 需求
@@ -19,3 +19,5 @@ Updated: 2023-11-01 23:57 Wed
    - [x] 明文水印 ✅ 2023-11-01
    - 盲水印?
 4. 操作记录
+   - 路由 + action记录
+   -

From 8318d80090ce63aab3a6c412e3ba554d43b64e17 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 3 Nov 2023 15:36:01 +0800
Subject: [PATCH 07/12] vault backup: 2023-11-03 15:36:01
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
.obsidian/workspace.json
Haina/Templates/总结.md
Haina/项目/HT数据分析/总结.md
---
 .obsidian/workspace.json              | 46 ++++++++++++++++++++-------
 Haina/Templates/总结.md             |  0
 Haina/项目/HT数据分析/总结.md |  6 ++++
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 Haina/Templates/总结.md
 create mode 100644 Haina/项目/HT数据分析/总结.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 06f81bc..e080ef2 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -61,14 +61,38 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md",
+                "file": "Haina/Templates/任务 lite.md",
                 "mode": "source",
                 "source": false
               }
             }
+          },
+          {
+            "id": "124f24a9e204081d",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Templates/总结.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "ac6e0d9309b4f8f0",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/项目/HT数据分析/总结.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
           }
         ],
-        "currentTab": 4
+        "currentTab": 5
       }
     ],
     "direction": "vertical"
@@ -162,7 +186,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md"
+                "file": "Haina/Templates/总结.md"
               }
             }
           },
@@ -172,7 +196,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md",
+                "file": "Haina/Templates/总结.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -219,7 +243,7 @@
             "state": {
               "type": "file-properties",
               "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md"
+                "file": "Haina/Templates/总结.md"
               }
             }
           },
@@ -264,13 +288,17 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "8913d5d4d3b22362",
+  "active": "124f24a9e204081d",
   "lastOpenFiles": [
+    "Haina/Templates/任务 lite.md",
+    "Haina/Templates/总结.md",
+    "Haina/项目/HT数据分析/总结.md",
+    "Haina/Templates/任务.md",
+    "Haina/项目/HT数据分析/权限管理.md",
     "Haina/Daily/2023-11-01.md",
     "Haina/Weekly/2023-W44.md",
     "Haina/Weekly/2023-W45.md",
     "Haina/Weekly/2023-W46.md",
-    "Haina/项目/HT数据分析/权限管理.md",
     "Haina/Templates/W-log.md",
     "Haina/Monthly/2023-10.md",
     "Haina/Monthly/2023-09.md",
@@ -285,13 +313,9 @@
     "Haina/项目/SCRM/销售对话沟通.md",
     "Haina/项目/SCRM/SCRM.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-31.md",
-    "Haina/Daily/2023-11-03.md",
-    "Haina/Logs/2023-W46.md",
-    "Haina/Logs/2023-W45.md",
     "Haina/Weekly",
     "Haina/Quarterly",
     "Haina/Monthly",
diff --git a/Haina/Templates/总结.md b/Haina/Templates/总结.md
new file mode 100644
index 0000000..e69de29
diff --git a/Haina/项目/HT数据分析/总结.md b/Haina/项目/HT数据分析/总结.md
new file mode 100644
index 0000000..8190099
--- /dev/null
+++ b/Haina/项目/HT数据分析/总结.md
@@ -0,0 +1,6 @@
+---
+Created: 2023-11-03 Fri
+Updated: 2023-11-03 15:05 Fri
+tags:
+  - 项目总结
+---

From 15a1b6df791373749cc37f76c3633082bf0a07a6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 3 Nov 2023 16:07:45 +0800
Subject: [PATCH 08/12] vault backup: 2023-11-03 16:07:45
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
.obsidian/workspace.json
Haina/Templates/总结.md
Haina/项目/HT数据分析/2.0总结.md
Haina/项目/HT数据分析/总结.md
---
 .obsidian/workspace.json                 | 26 +++++++-----------------
 Haina/Templates/总结.md                | 14 +++++++++++++
 Haina/项目/HT数据分析/2.0总结.md | 16 +++++++++++++++
 Haina/项目/HT数据分析/总结.md    |  6 ------
 4 files changed, 37 insertions(+), 25 deletions(-)
 create mode 100644 Haina/项目/HT数据分析/2.0总结.md
 delete mode 100644 Haina/项目/HT数据分析/总结.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index e080ef2..b6314eb 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -67,26 +67,14 @@
               }
             }
           },
-          {
-            "id": "124f24a9e204081d",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Templates/总结.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
           {
             "id": "ac6e0d9309b4f8f0",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/HT数据分析/总结.md",
-                "mode": "preview",
+                "file": "Haina/项目/HT数据分析/2.0总结.md",
+                "mode": "source",
                 "source": false
               }
             }
@@ -186,7 +174,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/Templates/总结.md"
+                "file": "Haina/项目/HT数据分析/2.0总结.md"
               }
             }
           },
@@ -196,7 +184,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/Templates/总结.md",
+                "file": "Haina/项目/HT数据分析/2.0总结.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -243,7 +231,7 @@
             "state": {
               "type": "file-properties",
               "state": {
-                "file": "Haina/Templates/总结.md"
+                "file": "Haina/项目/HT数据分析/2.0总结.md"
               }
             }
           },
@@ -288,11 +276,11 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "124f24a9e204081d",
+  "active": "ac6e0d9309b4f8f0",
   "lastOpenFiles": [
     "Haina/Templates/任务 lite.md",
     "Haina/Templates/总结.md",
-    "Haina/项目/HT数据分析/总结.md",
+    "Haina/项目/HT数据分析/2.0总结.md",
     "Haina/Templates/任务.md",
     "Haina/项目/HT数据分析/权限管理.md",
     "Haina/Daily/2023-11-01.md",
diff --git a/Haina/Templates/总结.md b/Haina/Templates/总结.md
index e69de29..72007ae 100644
--- a/Haina/Templates/总结.md
+++ b/Haina/Templates/总结.md
@@ -0,0 +1,14 @@
+---
+tags:
+  - 项目总结
+---
+%% 
+%%
+
+## 项目目标和成果
+
+## 项目过程和管理
+
+## 技术实施和挑战
+
+## 改进和优化
\ No newline at end of file
diff --git a/Haina/项目/HT数据分析/2.0总结.md b/Haina/项目/HT数据分析/2.0总结.md
new file mode 100644
index 0000000..edad607
--- /dev/null
+++ b/Haina/项目/HT数据分析/2.0总结.md
@@ -0,0 +1,16 @@
+---
+Created: 2023-11-03 Fri
+Updated: 2023-11-03 15:05 Fri
+tags:
+  - 项目总结
+---
+%% 
+%%
+
+## 项目目标和成果
+
+## 项目过程和管理
+
+## 技术实施和挑战
+
+## 改进和优化
\ No newline at end of file
diff --git a/Haina/项目/HT数据分析/总结.md b/Haina/项目/HT数据分析/总结.md
deleted file mode 100644
index 8190099..0000000
--- a/Haina/项目/HT数据分析/总结.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-Created: 2023-11-03 Fri
-Updated: 2023-11-03 15:05 Fri
-tags:
-  - 项目总结
----

From 449234d09d0fe4a643d10175fc12ac0a260ef151 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 3 Nov 2023 16:44:17 +0800
Subject: [PATCH 09/12] vault backup: 2023-11-03 16:44:17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
.obsidian/workspace.json
Haina/项目/HT数据分析/2.0总结.md
Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx
---
 .obsidian/workspace.json                      |  16 ++++++-
 Haina/项目/HT数据分析/2.0总结.md      |  41 ++++++++++++++++--
 .../HT统计分析2.0-项目总结书.docx    | Bin 0 -> 17188 bytes
 3 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index b6314eb..774db23 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -78,6 +78,18 @@
                 "source": false
               }
             }
+          },
+          {
+            "id": "bc9a599f983b04ae",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Templates/总结.md",
+                "mode": "source",
+                "source": false
+              }
+            }
           }
         ],
         "currentTab": 5
@@ -278,9 +290,10 @@
   },
   "active": "ac6e0d9309b4f8f0",
   "lastOpenFiles": [
-    "Haina/Templates/任务 lite.md",
+    "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
     "Haina/Templates/总结.md",
     "Haina/项目/HT数据分析/2.0总结.md",
+    "Haina/Templates/任务 lite.md",
     "Haina/Templates/任务.md",
     "Haina/项目/HT数据分析/权限管理.md",
     "Haina/Daily/2023-11-01.md",
@@ -303,7 +316,6 @@
     "Haina/项目/HT数据分析/销售数据管理2.0.md",
     "Haina/Weekly/2023-W43.md",
     "Haina/Daily/2023-09-15.md",
-    "Haina/Daily/2023-10-31.md",
     "Haina/Weekly",
     "Haina/Quarterly",
     "Haina/Monthly",
diff --git a/Haina/项目/HT数据分析/2.0总结.md b/Haina/项目/HT数据分析/2.0总结.md
index edad607..c08402b 100644
--- a/Haina/项目/HT数据分析/2.0总结.md
+++ b/Haina/项目/HT数据分析/2.0总结.md
@@ -1,16 +1,51 @@
 ---
 Created: 2023-11-03 Fri
-Updated: 2023-11-03 15:05 Fri
+Updated: 2023-11-03 16:41 Fri
 tags:
   - 项目总结
 ---
-%% 
+
+%%
 %%
 
 ## 项目目标和成果
 
+项目在1.0版本的基础上，增强可视化，通过图表输出复杂的数据信息，更清晰、直观地体现数据的趋势、联系和逻辑。使管理岗位能迅速了解和跟踪业务情况。
+2023年10月18日第一次发版上线并正式使用，反馈良好。达到项目目标。
+10月下合并商务数据，使数据更全面。并持续根据需求优化，更符合需求方的操作习惯和数据思路。
+
 ## 项目过程和管理
 
+工作内容和负责人
+
+| 工作内容   | 人员          |
+| ------ | ----------- |
+| 需求调研   | 尹诚诚、雷元廷     |
+| 综合数据看板 | 秦乾胜、雷元廷     |
+| 销售业绩跟踪 | 尹诚诚、秦乾胜、雷元廷 |
+| 销售统计分析 | 秦乾胜、雷元廷     |
+| 目标配置   | 秦乾胜、雷元廷     |
+
+#### 优点：
+
+本次2.0升级开发沿用了1.0的技术框架和协作流程，前后端开发协作非常顺利，沟通过程都在接口管理工具上，清晰明确。
+和需求方的沟通也很顺畅，确定了核心功能后并尽可能站在用户角度看问题，在系统交互上尽可能简单易用，风格统一，没有歧义。
+
+#### 不足：
+
+更细粒度的图表分析未达预期
+
 ## 技术实施和挑战
 
-## 改进和优化
\ No newline at end of file
+技术实施上沿用了成熟的后端delphi和框架react，在系统维护上做到了统一，降低了维护成本和学习成本
+前端开发：
+
+1. 增加了编码规范，在多人协作时代码标准化，遵循行业推荐的规范，自动发现和修正JavaScript代码中的问题，降低维护成本。
+2. 使用`npm version`管理版本号，遵循semver规范。
+
+## 改进和优化
+
+#### 需要改进：
+目前的输出是从技术方面的主观和经验确定的方案，希望和需求方在操作习惯、实际业务逻辑、数据思维等方面有更深入的交流。
+#### 需要优化：
+细化权限管理；加强数据的对比联系；数据入口需要更灵活等。
diff --git a/Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx b/Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx
new file mode 100644
index 0000000000000000000000000000000000000000..48d02b39da2193d0e6a95290872eb54e1d622e71
GIT binary patch
literal 17188
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

literal 0
HcmV?d00001


From 53dc62d6ddc206ca906e7f4c79ac6e855f5d3742 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 3 Nov 2023 17:07:06 +0800
Subject: [PATCH 10/12] vault backup: 2023-11-03 17:07:06
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Affected files:
.obsidian/workspace.json
Haina/项目/HT数据分析/2.0总结.md
---
 .obsidian/workspace.json                 |  6 +++---
 Haina/项目/HT数据分析/2.0总结.md | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 774db23..928f318 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -74,7 +74,7 @@
               "type": "markdown",
               "state": {
                 "file": "Haina/项目/HT数据分析/2.0总结.md",
-                "mode": "source",
+                "mode": "preview",
                 "source": false
               }
             }
@@ -290,6 +290,8 @@
   },
   "active": "ac6e0d9309b4f8f0",
   "lastOpenFiles": [
+    "Haina/项目/HT数据分析/~$2.0总结.docx",
+    "Haina/项目/HT数据分析/2.0总结.docx",
     "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
     "Haina/Templates/总结.md",
     "Haina/项目/HT数据分析/2.0总结.md",
@@ -324,8 +326,6 @@
     "Haina/Logs/Daily",
     "Haina/Logs/Weekly",
     "Haina/Logs/Weekly1",
-    "Haina/Logs/Daily1",
-    "Haina/Logs/Quarterly",
     "Haina/atta/Pasted image 20230907134308.png",
     "Haina/atta/Pasted image 20230907134241.png",
     "Haina/atta/Pasted image 20230907134211.png",
diff --git a/Haina/项目/HT数据分析/2.0总结.md b/Haina/项目/HT数据分析/2.0总结.md
index c08402b..7aa4bb1 100644
--- a/Haina/项目/HT数据分析/2.0总结.md
+++ b/Haina/项目/HT数据分析/2.0总结.md
@@ -1,6 +1,6 @@
 ---
 Created: 2023-11-03 Fri
-Updated: 2023-11-03 16:41 Fri
+Updated: 2023-11-03 16:46 Fri
 tags:
   - 项目总结
 ---
@@ -10,9 +10,9 @@ tags:
 
 ## 项目目标和成果
 
-项目在1.0版本的基础上，增强可视化，通过图表输出复杂的数据信息，更清晰、直观地体现数据的趋势、联系和逻辑。使管理岗位能迅速了解和跟踪业务情况。
-2023年10月18日第一次发版上线并正式使用，反馈良好。达到项目目标。
-10月下合并商务数据，使数据更全面。并持续根据需求优化，更符合需求方的操作习惯和数据思路。
+项目在1.0版本的基础上，增强可视化，通过图表输出复杂的数据信息，更清晰、直观地体现数据的趋势、联系和逻辑。使管理岗位能迅速了解和跟踪业务情况。\
+2023年10月18日第一次发版上线并正式使用，反馈良好。达到项目目标。\
+10月下合并商务数据，使数据更全面。并持续根据需求优化，更符合需求方的操作习惯和数据思路。  
 
 ## 项目过程和管理
 
@@ -26,12 +26,12 @@ tags:
 | 销售统计分析 | 秦乾胜、雷元廷     |
 | 目标配置   | 秦乾胜、雷元廷     |
 
-#### 优点：
+### 优点：
 
 本次2.0升级开发沿用了1.0的技术框架和协作流程，前后端开发协作非常顺利，沟通过程都在接口管理工具上，清晰明确。
 和需求方的沟通也很顺畅，确定了核心功能后并尽可能站在用户角度看问题，在系统交互上尽可能简单易用，风格统一，没有歧义。
 
-#### 不足：
+### 不足：
 
 更细粒度的图表分析未达预期
 
@@ -45,7 +45,10 @@ tags:
 
 ## 改进和优化
 
-#### 需要改进：
+### 需要改进：
+
 目前的输出是从技术方面的主观和经验确定的方案，希望和需求方在操作习惯、实际业务逻辑、数据思维等方面有更深入的交流。
-#### 需要优化：
+
+### 需要优化：
+
 细化权限管理；加强数据的对比联系；数据入口需要更灵活等。

From 40c907cc219e2adbdc56d2748f10ea37abc2aec6 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 7 Nov 2023 15:16:43 +0800
Subject: [PATCH 11/12] vault backup: 2023-11-07 15:16:42

Affected files:
.obsidian/plugins/obsidian-enhancing-export/data.json
.obsidian/workspace.json
---
 .../obsidian-enhancing-export/data.json       | 12 ++-
 .obsidian/workspace.json                      | 88 +++----------------
 2 files changed, 24 insertions(+), 76 deletions(-)

diff --git a/.obsidian/plugins/obsidian-enhancing-export/data.json b/.obsidian/plugins/obsidian-enhancing-export/data.json
index 2290c68..0c6fd46 100644
--- a/.obsidian/plugins/obsidian-enhancing-export/data.json
+++ b/.obsidian/plugins/obsidian-enhancing-export/data.json
@@ -41,17 +41,25 @@
     },
     {
       "name": "OPML"
+    },
+    {
+      "name": "Typst"
+    },
+    {
+      "name": "Bibliography"
     }
   ],
   "defaultExportDirectoryMode": "Same",
   "openExportedFile": true,
+  "env": {},
+  "showExportProgressBar": true,
   "lastExportDirectory": {
-    "win32": "e:\\lyt\\Desktop"
+    "win32": "D:\\tmp"
   },
   "lastEditName": "PDF",
   "customDefaultExportDirectory": {
     "win32": "e:\\lyt\\Desktop"
   },
-  "lastExportType": "OpenOffice",
+  "lastExportType": "reStructuredText",
   "version": "1.1.2"
 }
\ No newline at end of file
diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 928f318..3aa1bd5 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -30,69 +30,9 @@
                 "source": false
               }
             }
-          },
-          {
-            "id": "a2418d046d3b1359",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Weekly/2023-W44.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "5441158c0337ee87",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Daily/2023-11-01.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "8913d5d4d3b22362",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Templates/任务 lite.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "ac6e0d9309b4f8f0",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/项目/HT数据分析/2.0总结.md",
-                "mode": "preview",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "bc9a599f983b04ae",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/Templates/总结.md",
-                "mode": "source",
-                "source": false
-              }
-            }
           }
         ],
-        "currentTab": 5
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -165,7 +105,8 @@
               "state": {}
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "horizontal",
@@ -186,7 +127,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/项目/HT数据分析/2.0总结.md"
+                "file": "Haina/项目/SCRM/SCRM+IM可行性.md"
               }
             }
           },
@@ -196,7 +137,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/项目/HT数据分析/2.0总结.md",
+                "file": "Haina/项目/SCRM/SCRM+IM可行性.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -243,7 +184,7 @@
             "state": {
               "type": "file-properties",
               "state": {
-                "file": "Haina/项目/HT数据分析/2.0总结.md"
+                "file": "Haina/项目/SCRM/SCRM+IM可行性.md"
               }
             }
           },
@@ -288,19 +229,20 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "ac6e0d9309b4f8f0",
+  "active": "3bb8f1adc4d09142",
   "lastOpenFiles": [
+    "Haina/Templates/总结.md",
+    "Haina/项目/SCRM/SCRM+IM可行性.md",
+    "Haina/Weekly/2023-W44.md",
+    "Haina/Weekly/2023-W45.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/项目/HT数据分析/2.0总结.md",
-    "Haina/Templates/任务 lite.md",
     "Haina/Templates/任务.md",
     "Haina/项目/HT数据分析/权限管理.md",
-    "Haina/Daily/2023-11-01.md",
-    "Haina/Weekly/2023-W44.md",
-    "Haina/Weekly/2023-W45.md",
     "Haina/Weekly/2023-W46.md",
     "Haina/Templates/W-log.md",
     "Haina/Monthly/2023-10.md",
@@ -310,7 +252,6 @@
     "Haina/Templates/D-log.md",
     "Haina/Daily/2023-10-23.md",
     "Haina/Daily/2023-10-13.md",
-    "Haina/项目/SCRM/SCRM+IM可行性.md",
     "Haina/项目/SCRM/会议_销售对话沟通_10.23_10_06.md",
     "Haina/项目/HT数据分析/文旅局数据统计.md",
     "Haina/项目/SCRM/销售对话沟通.md",
@@ -325,7 +266,6 @@
     "Haina/Yearly",
     "Haina/Logs/Daily",
     "Haina/Logs/Weekly",
-    "Haina/Logs/Weekly1",
     "Haina/atta/Pasted image 20230907134308.png",
     "Haina/atta/Pasted image 20230907134241.png",
     "Haina/atta/Pasted image 20230907134211.png",

From c2589bd39634d75d4e6df9c5e98d890ad37c76fb Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 7 Nov 2023 15:54:05 +0800
Subject: [PATCH 12/12] vault backup: 2023-11-07 15:54:04

Affected files:
.obsidian/workspace.json
---
 .obsidian/workspace.json | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 3aa1bd5..8ac0204 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -25,14 +25,26 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/SCRM/SCRM+IM可行性.md",
+                "file": "Haina/Weekly/2023-W45.md",
+                "mode": "preview",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "def2465523df86f8",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Haina/Weekly/2023-W44.md",
                 "mode": "preview",
                 "source": false
               }
             }
           }
         ],
-        "currentTab": 1
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -127,7 +139,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Haina/项目/SCRM/SCRM+IM可行性.md"
+                "file": "Haina/Weekly/2023-W44.md"
               }
             }
           },
@@ -137,7 +149,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Haina/项目/SCRM/SCRM+IM可行性.md",
+                "file": "Haina/Weekly/2023-W44.md",
                 "collapseAll": true,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -184,7 +196,7 @@
             "state": {
               "type": "file-properties",
               "state": {
-                "file": "Haina/项目/SCRM/SCRM+IM可行性.md"
+                "file": "Haina/Weekly/2023-W44.md"
               }
             }
           },
@@ -229,12 +241,14 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "3bb8f1adc4d09142",
+  "active": "def2465523df86f8",
   "lastOpenFiles": [
-    "Haina/Templates/总结.md",
-    "Haina/项目/SCRM/SCRM+IM可行性.md",
+    "Haina/Monthly/2023-10.md",
     "Haina/Weekly/2023-W44.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",
@@ -245,7 +259,6 @@
     "Haina/项目/HT数据分析/权限管理.md",
     "Haina/Weekly/2023-W46.md",
     "Haina/Templates/W-log.md",
-    "Haina/Monthly/2023-10.md",
     "Haina/Monthly/2023-09.md",
     "Haina/Monthly/2023-08.md",
     "Haina/Daily/2023-11-02.md",