diff --git a/static/modules/overview_finance.js b/static/modules/overview_finance.js index 49d65c4..6a4ef7f 100644 --- a/static/modules/overview_finance.js +++ b/static/modules/overview_finance.js @@ -57,11 +57,11 @@ function renderFinanceProjectMatrixData(data, container) { var vBtns = financeBtnBar('project_matrix'); var cards = ''; for (var mi = 11; mi >= 0; mi--) { - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; if (isAllZero(data, tenants, keys.filter(function(k) { return k !== 'sign'; }), mi)) continue; - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; @@ -87,7 +87,7 @@ function financeProjectMatrixTbody(data, tenants, mi, keys, labels, mf) { var tCls = 'text-slate-700'; if (ri === 2) tCls = 'text-green-600'; if (ri === keys.length - 1) tCls = ts >= 0 ? 'text-green-600' : 'text-red-600'; - var rh = '' + labels[ri] + '' + mf(ts) + ''; + var rh = '' + labels[ri] + '' + mf(ts) + ''; for (var ti = 0; ti < tenants.length; ti++) { var cls = 'text-slate-700'; if (ri === 2) cls = 'text-green-600'; @@ -118,7 +118,7 @@ function renderOverviewFinanceData(data, view) { btns.push(''); var viewBtns = '
' + btns.join('') + '
'; - var deptThead = '指标年度累计'; + var deptThead = '指标年度累计'; for (var hi = 0; hi < cols; hi++) { deptThead += '' + headers[hi] + ''; } deptThead += ''; @@ -130,7 +130,7 @@ function renderOverviewFinanceData(data, view) { var deptTbody = ''; for (var dri = 0; dri < 3; dri++) { var dr = deptRows[dri], rowCls = dri === 2 ? 'font-semibold' : ''; - var rowHtml = '' + dr.label + ''; + var rowHtml = '' + dr.label + ''; var annualCls = dri === 2 ? (dr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700'; rowHtml += '' + moneyIntL(dr.annual) + ''; for (var i = 0; i < cols; i++) { @@ -149,7 +149,7 @@ function renderOverviewFinanceData(data, view) { var cfTbody = ''; for (var cfri = 0; cfri < 3; cfri++) { var cfr = cfRows[cfri], cfRowCls = cfri === 2 ? 'font-semibold' : ''; - var rowHtml = '' + cfr.label + ''; + var rowHtml = '' + cfr.label + ''; var cAnnualCls = cfri === 2 ? (cfr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700'; rowHtml += '' + moneyIntL(cfr.annual) + ''; for (var i = 0; i < cols; i++) { @@ -163,12 +163,12 @@ function renderOverviewFinanceData(data, view) { var LABELS = ['合同金额','确收金额','确收毛利','成本','支出','回款','项目现金流']; var projVals = [p.sign_monthly || [], p.revenue, p.gross, p.cost, p.paid, p.payment, p.cashflow]; var projAnnual = p.annual; - var projThead = '指标年度累计'; + var projThead = '指标年度累计'; for (var phi = 0; phi < cols; phi++) { projThead += '' + headers[phi] + ''; } projThead += ''; var projTbody = ''; for (var ri = 0; ri < 7; ri++) { - var rowHtml = '' + LABELS[ri] + ''; + var rowHtml = '' + LABELS[ri] + ''; rowHtml += '' + moneyIntL(projAnnual[ri]) + ''; for (var i = 0; i < cols; i++) { var val = projVals[ri] ? (projVals[ri][i] || 0) : 0; @@ -206,7 +206,7 @@ function renderFinanceDeptMatrixData(data, container) { var cards = ''; for (var mi = 11; mi >= 0; mi--) { if (isAllZero(data, tenants, ['project_gross','dept_expense','profit'], mi)) continue; - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; var tb = financeMatrixTbody(data, tenants, mi, ['project_gross','dept_expense','profit'], ['项目毛利','部门费用','利润'], mf); @@ -235,7 +235,7 @@ function renderFinanceCfMatrixData(data, container) { var cards = ''; for (var mi = 11; mi >= 0; mi--) { if (isAllZero(data, tenants, ['project_cf','dept_cf','bl_cf'], mi)) continue; - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; var tb = financeMatrixTbody(data, tenants, mi, ['project_cf','dept_cf','bl_cf'], ['项目现金流','部门现金流','经营现金流'], mf); @@ -269,7 +269,7 @@ function financeMatrixTbody(data, tenants, mi, keys, labels, mf) { vals.push(v); } var tCls = ts >= 0 ? 'text-green-600' : 'text-red-600'; - var rh = '' + labels[ri] + '' + mf(ts) + ''; + var rh = '' + labels[ri] + '' + mf(ts) + ''; for (var ti = 0; ti < tenants.length; ti++) { var cls = vals[ti] >= 0 ? 'text-green-600' : 'text-red-600'; rh += '' + mf(vals[ti]) + ''; diff --git a/static/modules/overview_plan.js b/static/modules/overview_plan.js index dc8a0bf..bf69b4d 100644 --- a/static/modules/overview_plan.js +++ b/static/modules/overview_plan.js @@ -45,12 +45,12 @@ function renderProjectMatrixData(data, container) { var vBtns = btnBar('project_matrix'); var cards = ''; for (var mi = 11; mi >= 0; mi--) { - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; if (isAllZero(data, tenants, keys.filter(function(k) { return k !== 'sign'; }), mi)) continue; - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; @@ -76,7 +76,7 @@ function projectMatrixTbody(data, tenants, mi, keys, labels, mf) { var tCls = 'text-slate-700'; if (ri === 2) tCls = 'text-green-600'; if (ri === keys.length - 1) tCls = ts >= 0 ? 'text-green-600' : 'text-red-600'; - var rh = '' + labels[ri] + '' + mf(ts) + ''; + var rh = '' + labels[ri] + '' + mf(ts) + ''; for (var ti = 0; ti < tenants.length; ti++) { var cls = 'text-slate-700'; if (ri === 2) cls = 'text-green-600'; @@ -113,7 +113,7 @@ function renderOverviewPlanData(data, view) { var viewBtns = '
' + btns.join('') + '
'; // ====== 部门损益情况 ====== - var deptThead = '指标年度累计'; + var deptThead = '指标年度累计'; for (var hi = 0; hi < cols; hi++) { deptThead += '' + headers[hi] + ''; } deptThead += ''; @@ -126,7 +126,7 @@ function renderOverviewPlanData(data, view) { for (var dri = 0; dri < 3; dri++) { var dr = deptRows[dri]; var rowCls = dri === 2 ? 'font-semibold' : ''; - var rowHtml = '' + dr.label + ''; + var rowHtml = '' + dr.label + ''; var annualCls = dri === 2 ? (dr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700'; rowHtml += '' + moneyIntL(dr.annual) + ''; for (var i = 0; i < cols; i++) { @@ -147,7 +147,7 @@ function renderOverviewPlanData(data, view) { for (var cfri = 0; cfri < 3; cfri++) { var cfr = cfRows[cfri]; var cfRowCls = cfri === 2 ? 'font-semibold' : ''; - var rowHtml = '' + cfr.label + ''; + var rowHtml = '' + cfr.label + ''; var cAnnualCls = cfri === 2 ? (cfr.annual >= 0 ? 'text-green-600' : 'text-red-600') : 'text-slate-700'; rowHtml += '' + moneyIntL(cfr.annual) + ''; for (var i = 0; i < cols; i++) { @@ -163,13 +163,13 @@ function renderOverviewPlanData(data, view) { var projVals = [p.sign_monthly || [], p.revenue, p.gross, p.cost, p.paid, p.payment, p.cashflow]; var projAnnual = p.annual; - var projThead = '指标年度累计'; + var projThead = '指标年度累计'; for (var phi = 0; phi < cols; phi++) { projThead += '' + headers[phi] + ''; } projThead += ''; var projTbody = ''; for (var ri = 0; ri < 7; ri++) { - var rowHtml = '' + LABELS[ri] + ''; + var rowHtml = '' + LABELS[ri] + ''; rowHtml += '' + moneyIntL(projAnnual[ri]) + ''; for (var i = 0; i < cols; i++) { var val = projVals[ri] ? (projVals[ri][i] || 0) : 0; @@ -208,7 +208,7 @@ function renderDeptMatrixData(data, container) { var cards = ''; for (var mi = 11; mi >= 0; mi--) { if (isAllZero(data, tenants, ['project_gross','dept_expense','profit'], mi)) continue; - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; @@ -238,12 +238,12 @@ function renderCfMatrixData(data, container) { var vBtns = btnBar('cf_matrix'); var cards = ''; for (var mi = 11; mi >= 0; mi--) { - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; if (isAllZero(data, tenants, ['project_cf','dept_cf','bl_cf'], mi)) continue; - var th = '指标月度合计'; + var th = '指标月度合计'; for (var ti = 0; ti < tenants.length; ti++) { th += '' + sn[ti] + ''; } th += ''; @@ -277,7 +277,7 @@ function matrixTbody(data, tenants, mi, keys, labels, mf) { vals.push(v); } var tCls = ts >= 0 ? 'text-green-600' : 'text-red-600'; - var rh = '' + labels[ri] + '' + mf(ts) + ''; + var rh = '' + labels[ri] + '' + mf(ts) + ''; for (var ti = 0; ti < tenants.length; ti++) { var cls = vals[ti] >= 0 ? 'text-green-600' : 'text-red-600'; rh += '' + mf(vals[ti]) + ''; diff --git a/templates/index.html b/templates/index.html index b1474c2..c274136 100644 --- a/templates/index.html +++ b/templates/index.html @@ -84,7 +84,7 @@
-

OPC Manager v1.2.0.32

+

OPC Manager v1.2.0.33

科普 OPC 工作台