Merge remote-tracking branch 'origin/main'

.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"
 }

.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",

.obsidian/workspace.json

@@ -25,14 +25,14 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Haina/项目/SCRM/SCRM+IM可行性.md",
+                "file": "Haina/Weekly/2023-W45.md",
                 "mode": "preview",
                 "source": false
               }
             }
           },
           {
-            "id": "a2418d046d3b1359",
+            "id": "def2465523df86f8",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -42,18 +42,6 @@
                 "source": false
               }
             }
-          },
-          {
-            "id": "325d45b56e24c481",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Haina/项目/HT数据分析/权限管理.md",
-                "mode": "preview",
-                "source": false
-              }
-            }
           }
         ],
         "currentTab": 2
@@ -86,7 +74,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "[\"Previous\"]",
+                "query": "",
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -143,7 +131,7 @@
       {
         "id": "d9d38115cfe2d18f",
         "type": "tabs",
-        "dimension": 35.28846153846154,
+        "dimension": 28.846153846153843,
         "children": [
           {
             "id": "10d9387b227d46e7",
@@ -180,13 +168,12 @@
               "state": {}
             }
           }
-        ],
+        ]
-        "currentTab": 1
       },
       {
         "id": "dc29c441166ca3aa",
         "type": "tabs",
-        "dimension": 33.07692307692307,
+        "dimension": 35.96153846153846,
         "children": [
           {
             "id": "096b5bbba0f2c0d4",
@@ -201,8 +188,18 @@
       {
         "id": "9a8ed0fe1b835302",
         "type": "tabs",
-        "dimension": 31.63461538461538,
+        "dimension": 35.19230769230769,
         "children": [
+          {
+            "id": "055353566e60e182",
+            "type": "leaf",
+            "state": {
+              "type": "file-properties",
+              "state": {
+                "file": "Haina/Weekly/2023-W44.md"
+              }
+            }
+          },
           {
             "id": "cfcffea8c60d0b67",
             "type": "leaf",
@@ -225,7 +222,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 240.5
+    "width": 245.5
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -244,44 +241,44 @@
       "periodic-notes:Open today": false
     }
   },
-  "active": "a2418d046d3b1359",
+  "active": "def2465523df86f8",
   "lastOpenFiles": [
+    "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",
+    "Haina/项目/HT数据分析/~$2.0总结.docx",
+    "Haina/项目/HT数据分析/2.0总结.docx",
+    "Haina/项目/HT数据分析/HT统计分析2.0-项目总结书.docx",
+    "Haina/Templates/任务.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/项目/SCRM/会议_销售对话沟通_10.23_10_06.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",
-    "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",
-    "Haina/Logs/Daily1",
-    "Haina/Logs/Quarterly",
     "Haina/atta/Pasted image 20230907134308.png",
     "Haina/atta/Pasted image 20230907134241.png",
     "Haina/atta/Pasted image 20230907134211.png",

Haina/Daily/2023-11-01.md

@@ -0,0 +1,17 @@
+---
+Created: 2023-11-01 Wed
+Updated: 2023-11-01 17:10 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. #新增 增加登陆身份的水印
+2. #优化 显示版本编译时间
+
+## TODO

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');
 %>
 

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 += ' - ';
     }

Haina/Templates/总结.md

@@ -0,0 +1,14 @@
+---
+tags:
+  - 项目总结
+---
+%% 
+%%
+
+## 项目目标和成果
+
+## 项目过程和管理
+
+## 技术实施和挑战
+
+## 改进和优化

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]]
 
 ---
 
@@ -38,3 +38,4 @@ tags:
 
 1. SCRM+IM平台调研
 2. HT统计分析
+	1. 权限

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. 

Haina/项目/HT数据分析/2.0总结.md

@@ -0,0 +1,54 @@
+---
+Created: 2023-11-03 Fri
+Updated: 2023-11-03 16:46 Fri
+tags:
+  - 项目总结
+---
+
+%%
+%%
+
+## 项目目标和成果
+
+项目在1.0版本的基础上，增强可视化，通过图表输出复杂的数据信息，更清晰、直观地体现数据的趋势、联系和逻辑。使管理岗位能迅速了解和跟踪业务情况。\
+2023年10月18日第一次发版上线并正式使用，反馈良好。达到项目目标。\
+10月下合并商务数据，使数据更全面。并持续根据需求优化，更符合需求方的操作习惯和数据思路。  
+
+## 项目过程和管理
+
+工作内容和负责人
+
+| 工作内容   | 人员          |
+| ------ | ----------- |
+| 需求调研   | 尹诚诚、雷元廷     |
+| 综合数据看板 | 秦乾胜、雷元廷     |
+| 销售业绩跟踪 | 尹诚诚、秦乾胜、雷元廷 |
+| 销售统计分析 | 秦乾胜、雷元廷     |
+| 目标配置   | 秦乾胜、雷元廷     |
+
+### 优点：
+
+本次2.0升级开发沿用了1.0的技术框架和协作流程，前后端开发协作非常顺利，沟通过程都在接口管理工具上，清晰明确。
+和需求方的沟通也很顺畅，确定了核心功能后并尽可能站在用户角度看问题，在系统交互上尽可能简单易用，风格统一，没有歧义。
+
+### 不足：
+
+更细粒度的图表分析未达预期
+
+## 技术实施和挑战
+
+技术实施上沿用了成熟的后端delphi和框架react，在系统维护上做到了统一，降低了维护成本和学习成本
+前端开发：
+
+1. 增加了编码规范，在多人协作时代码标准化，遵循行业推荐的规范，自动发现和修正JavaScript代码中的问题，降低维护成本。
+2. 使用`npm version`管理版本号，遵循semver规范。
+
+## 改进和优化
+
+### 需要改进：
+
+目前的输出是从技术方面的主观和经验确定的方案，希望和需求方在操作习惯、实际业务逻辑、数据思维等方面有更深入的交流。
+
+### 需要优化：
+
+细化权限管理；加强数据的对比联系；数据入口需要更灵活等。

Haina/项目/HT数据分析/权限管理.md

@@ -1,6 +1,6 @@
 ---
 Created: 2023-10-23 Mon
-Updated: 2023-10-24 13:44 Tue
+Updated: 2023-11-02 11:49 Thu
 ---
 
 ## 需求
@@ -16,5 +16,8 @@ Updated: 2023-10-24 13:44 Tue
    - 权限角色配置, 路由控制
 3. 借鉴金山文档增加打水印功能防拍照截图。是否有别的建议？是否可行，麻烦你有空的时候给我确认一下啊。该需求为新增，不计入项目开发周期。谢谢
    - 操作限制, 禁用内容复制
-   - 明文水印
+   - [x] 明文水印 ✅ 2023-11-01
    - 盲水印?
+4. 操作记录
+   - 路由 + action记录
+   -