qiukai/opc-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'
All checks were successful
Deploy / deploy (push) Successful in 12s
Details

Browse Source
This commit is contained in:
mac
2026-07-07 18:44:10 +08:00
parent 9dc5631574 76da3a2106
commit a3d78b3ca0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/routes.py
View File

@@ -331,6 +331,7 @@ def bootstrap():
def t_expense_sum(m_range): def t_expense_sum(m_range):
total = 0 total = 0
for r in t_expense: for r in t_expense:
if (r.get("status") or "") == "暂不计入": continue
m = (r.get("expense_month") or "").strip() m = (r.get("expense_month") or "").strip()
if not m or "-" not in m: continue if not m or "-" not in m: continue
try: try:
@@ -459,6 +460,7 @@ def bootstrap():
def expense_sum(month_range): def expense_sum(month_range):
total = 0 total = 0
for r in expense: for r in expense:
if (r.get("status") or "") == "暂不计入": continue
m = (r.get("expense_month") or "").strip() m = (r.get("expense_month") or "").strip()
if not m or "-" not in m: continue if not m or "-" not in m: continue
try: try:

2
templates/index.html
View File

@@ -76,7 +76,7 @@
<header class="topbar border-b border-slate-200 bg-white px-8 py-5"> <header class="topbar border-b border-slate-200 bg-white px-8 py-5">
<div class="flex items-center gap-3 w-full"> <div class="flex items-center gap-3 w-full">
<div class="flex-1"> <div class="flex-1">
<p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.6</span></p> <p class="eyebrow text-xs font-semibold uppercase tracking-[0.18em] text-blue-700">OPC Manager <span class="ml-2 text-xs font-normal text-slate-400 tracking-normal">v1.0.0.7</span></p>
<div class="flex items-center gap-4 mt-1"> <div class="flex items-center gap-4 mt-1">
<h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1> <h1 class="text-2xl font-semibold" id="workspaceTitle">科普 OPC 工作台</h1>
<div class="hidden sm:flex items-center gap-1.5 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-100 rounded-full px-4 py-1.5"> <div class="hidden sm:flex items-center gap-1.5 bg-gradient-to-r from-blue-50 to-indigo-50 border border-blue-100 rounded-full px-4 py-1.5">