agentworkshop 0.7.27 → 0.7.34

package/app/pages/daq/[id].vue

@@ -333,7 +333,36 @@ let resizeObs: ResizeObserver | null = null
 let liveHidden = false
 function onVisChange(): void {
   liveHidden = document.hidden
-  if (!liveHidden) drawLive()
+  if (!liveHidden) {
+    drawLive()
+    // 后台期间暂停的自动刷新在回到前台时立即补一次拉取(免等待下一个节拍)
+    if (effectiveRefreshMs.value) void loadHistory()
+  }
+}
+
+// ---------- 趋势图自动刷新(时序库拉取展示间隔;与采集/WS 下发三个节拍互相独立) ----------
+/** 用户覆盖值(ms;0 = 跟随服务端 daq.query.displayIntervalMs) */
+const refreshOverrideMs = ref<number>(0)
+/** 实际生效的拉取间隔:用户覆盖优先,否则取服务端缺省;统一下钳到服务端下限 */
+const effectiveRefreshMs = computed(() => {
+  const min = daq.controller.minQueryDisplayIntervalMs ?? 500
+  const base = refreshOverrideMs.value > 0 ? refreshOverrideMs.value : (daq.controller.queryDisplayIntervalMs ?? 0)
+  return base > 0 ? Math.max(min, base) : 0
+})
+let histTimer: ReturnType<typeof setInterval> | null = null
+/** 重挂拉取定时器:间隔变化(用户改值/服务端配置热更)即刻生效 */
+function armHistTimer(): void {
+  if (histTimer) {
+    clearInterval(histTimer)
+    histTimer = null
+  }
+  const ms = effectiveRefreshMs.value
+  if (!import.meta.client || !ms) return
+  histTimer = setInterval(() => {
+    // 后台标签页不查库(省时序库连接);上一拍未结束则跳过(防堆积)
+    if (document.hidden || histLoading.value) return
+    void loadHistory()
+  }, ms)
 }
 onMounted(() => {
   void loadHistory()
@@ -350,15 +379,18 @@ onMounted(() => {
     })
     if (liveCanvas.value) resizeObs.observe(liveCanvas.value)
   }
+  armHistTimer()
 })
 onBeforeUnmount(() => {
   if (uiTimer) clearInterval(uiTimer)
+  if (histTimer) clearInterval(histTimer)
   document.removeEventListener('visibilitychange', onVisChange)
   resizeObs?.disconnect()
   resizeObs = null
 })
 
 watch(bucketMs, () => void loadHistory())
+watch(effectiveRefreshMs, () => armHistTimer())
 </script>
 
 <template>
@@ -716,6 +748,20 @@ watch(bucketMs, () => void loadHistory())
                 {{ b.label }}
               </option>
             </select>
+            <label
+              class="refresh-ctl"
+              :title="$t('daqDetail.k1rfrshint001', { p0: daq.controller.minQueryDisplayIntervalMs ?? 500 })"
+            >
+              <span class="i-tabler-refresh" />
+              <input
+                v-model.number="refreshOverrideMs"
+                type="number"
+                :min="0"
+                max="600000"
+                step="500"
+                :placeholder="String(daq.controller.queryDisplayIntervalMs ?? 5000)"
+              >ms
+            </label>
             <button
               class="pill-btn"
               @click="loadHistory"
@@ -910,7 +956,19 @@ watch(bucketMs, () => void loadHistory())
 /* 历史 */
 .col-hist { min-width: 0; }
 .hist-hd { display: flex; gap: 10px; align-items: center; justify-content: space-between; margin-bottom: 10px; }
-.hist-ctl { display: flex; gap: 6px; }
+.hist-ctl { display: flex; gap: 6px; align-items: center; }
+/* 趋势图拉取间隔(ms;0/空 = 跟随服务端 daq.query.displayIntervalMs) */
+.refresh-ctl { display: inline-flex; gap: 3px; align-items: center; font-size: 11px; color: var(--ink-soft); }
+.refresh-ctl input {
+  width: 62px;
+  padding: 3px 6px;
+  font-size: 11px;
+  color: var(--ink-soft);
+  background: var(--paper-deep);
+  border: 1px solid var(--line-strong);
+  border-radius: var(--radius-chip);
+}
+.refresh-ctl input:focus { outline: none; border-color: var(--accent); }
 .hist-canvas { width: 100%; height: 130px; border: 1px solid var(--line); border-radius: var(--radius-chip); background: var(--paper-deep); }
 .raw-table { width: 100%; margin-top: 10px; font-size: 11px; border-collapse: collapse; }
 .raw-table th, .raw-table td { padding: 4px 6px; text-align: left; border-bottom: 1px solid var(--divider-hair); }

package/app/pages/daq/index.vue

@@ -1664,7 +1664,9 @@ h1 { margin: 2px 0 4px; font-size: 30px; font-weight: 400; letter-spacing: -0.01
 .nodes-table { width: 100%; border-collapse: collapse; font-size: 12.5px; }
 /* 离屏行跳过布局/绘制(102 行长表;contain-intrinsic-size 给出占位高度防滚动条跳动) */
 .nodes-table tbody tr { content-visibility: auto; contain-intrinsic-size: auto 42px; }
-.nodes-table th, .nodes-table td { padding: 9px 12px; text-align: left; border-bottom: 1px solid var(--divider-hair); }
+/* 单元格规则须穿透行组件(:deep):行组件是渲染隔离单元,其内部 td 只带子作用域,
+   父页 scoped 选择器不命中 —— 行内一切样式见 DaqNodeRow.vue 的 scoped 块。 */
+.nodes-table th, .nodes-table :deep(td) { padding: 9px 12px; text-align: left; border-bottom: 1px solid var(--divider-hair); }
 .nodes-table th {
   font-size: 11px;
   font-weight: 600;
@@ -1673,15 +1675,8 @@ h1 { margin: 2px 0 4px; font-size: 30px; font-weight: 400; letter-spacing: -0.01
   color: var(--ink-faint);
   border-bottom: 1px solid var(--line-strong);
 }
-.nodes-table td b { margin-left: 8px; }
-.ch { display: block; margin-top: 2px; font-size: 10px; color: var(--ink-faint); }
-.right { text-align: right; }
-.val { font-size: 13px; }
-.val small { margin-left: 3px; color: var(--ink-faint); }
-/* 数据静默(停用/未运行/采不到数据):最后值置灰呈现,不再冒充实时值 */
-.val.stale { opacity: 0.45; }
-/* 越限实时值:红字(与行红底叠加仍可读) */
-.val.val-alarm { color: var(--tone-danger-dot); font-weight: 700; }
+.nodes-table :deep(td b) { margin-left: 8px; }
+.right, .nodes-table :deep(.right) { text-align: right; }
 
 /* ── 实时告警 + 实时事件双面板(server 权威;玻璃面板语言) ── */
 .ops-panels {
@@ -1788,69 +1783,7 @@ h1 { margin: 2px 0 4px; font-size: 30px; font-weight: 400; letter-spacing: -0.01
 .kind-chip.write { color: var(--tone-info-dot); }
 .kind-chip.rollback { color: var(--tone-warning-dot); }
 
-/* ── 行内实时趋势(WS 读数流直驱;上下限虚线参考) ── */
-.trend-cell { width: 128px; }
-.trend { display: block; width: 120px; height: 26px; }
-.trend .trace {
-  fill: none;
-  stroke: var(--tone-info-dot);
-  stroke-width: 1.4;
-}
-.trend .trace.alarm { stroke: var(--tone-danger-dot); }
-.trend .lim {
-  stroke: color-mix(in srgb, var(--tone-warning-dot) 62%, transparent);
-  stroke-width: 1;
-  stroke-dasharray: 3 3;
-}
-.trend .lim.max { stroke: color-mix(in srgb, var(--tone-danger-dot) 55%, transparent); }
-
-.st-pill {
-  display: inline-block;
-  padding: 2px 9px;
-  font-family: var(--font-mono);
-  font-size: 10.5px;
-  letter-spacing: 0.04em;
-  border-radius: var(--radius-pill);
-}
-.st-pill.ok { color: var(--tone-success-dot); background: var(--tone-success-bg); }
-.st-pill.warn { color: var(--tone-warning-dot); background: var(--tone-warning-bg); }
-.st-pill.alarm { color: var(--tone-danger-dot); background: var(--tone-danger-bg); }
-/* 配方越限行:整行淡红底 + 左缘警示条 */
-tr.row-recipe-alarm { background: color-mix(in srgb, var(--tone-danger-dot, #ff6b6b) 8%, transparent); }
-tr.row-recipe-alarm td:first-child { box-shadow: inset 3px 0 0 var(--tone-danger-dot, #ff6b6b); }
-.st-pill.offline { color: var(--tone-neutral-dot); background: var(--tone-neutral-bg); }
-/* 非故障的静止态(停用/未分配/未运行):同为中性灰,与故障离线区分靠文案与提示 */
-.st-pill.idle, .st-pill.disabled, .st-pill.unassigned { color: var(--tone-neutral-dot); background: var(--tone-neutral-bg); }
-
-.drv-tag {
-  font-family: var(--font-mono);
-  font-size: 10.5px;
-  padding: 2px 7px;
-  border: 1px solid var(--line);
-  border-radius: var(--radius-chip);
-  color: var(--ink-soft);
-}
-.drv-tag.planned { opacity: 0.55; border-style: dashed; }
-
-.console-link { display: inline-flex; gap: 5px; align-items: center; font-size: 12.5px; color: var(--accent); }
-
-/* 单节点 启动/停止采集(R:独立节点控制) */
-.node-toggle {
-  display: inline-flex;
-  gap: 4px;
-  align-items: center;
-  margin-right: 12px;
-  padding: 2px 9px;
-  font-size: 11.5px;
-  border: 1px solid var(--line);
-  border-radius: var(--radius-chip);
-  color: var(--ink);
-  background: transparent;
-  cursor: pointer;
-  transition: border-color 0.15s ease, background 0.15s ease;
-}
-.node-toggle:hover { border-color: var(--accent); background: var(--hover-tint); }
-.node-toggle.off { color: var(--ink-soft); border-style: dashed; opacity: 0.8; }
+/* ── 行内单元格样式(状态 pill/实时值/趋势/驱动/产线/绑定/操作)见行组件 ── */
 
 .err { margin-top: 14px; font-size: 13px; color: var(--tone-danger-dot); }
 @media (prefers-reduced-motion: no-preference) {
@@ -2067,81 +2000,7 @@ tr.row-recipe-alarm td:first-child { box-shadow: inset 3px 0 0 var(--tone-danger
 .flt-search::placeholder { color: var(--ink-fainter); }
 .count { padding-bottom: 4px; font-size: 11px; color: var(--ink-faint); }
 
-.dev-binds { display: flex; flex-wrap: wrap; gap: 4px; align-items: center; }
-.dev-bind-chip { display: inline-flex; gap: 4px; align-items: center; padding: 1px 7px; font-size: 11px; color: var(--accent); background: color-mix(in srgb, var(--accent) 8%, transparent); border: 1px solid color-mix(in srgb, var(--accent) 30%, transparent); border-radius: var(--radius-chip); }
-.dev-unbind { cursor: pointer; opacity: 0.55; font-size: 10px; }
-.dev-unbind:hover { opacity: 1; color: var(--tone-danger-dot); }
-.dev-add { max-width: 130px; font-size: 11px; }
-.line-sel {
-  max-width: 120px;
-  padding: 3px 6px;
-  font-size: 10.5px;
-  color: var(--ink-soft);
-  background: var(--paper-deep);
-  border: 1px solid var(--line-strong);
-  border-radius: var(--radius-chip);
-  transition: border-color 0.15s;
-}
-.line-sel:focus { outline: none; border-color: var(--accent); }
-
-/* 产线运行列:空心点=未运行(中性) / 呼吸绿点=运行中 —— 与产线状态带同一套点语义 */
-.run-pill {
-  display: inline-flex;
-  gap: 6px;
-  align-items: center;
-  padding: 2px 9px;
-  font-size: 10.5px;
-  color: var(--ink-fainter);
-  border: 1px solid var(--line);
-  border-radius: var(--radius-pill);
-}
-.run-pill .rp-dot {
-  width: 6px;
-  height: 6px;
-  border: 1.5px solid currentColor;
-  border-radius: 50%;
-  opacity: 0.7;
-}
-.run-pill.na {
-  border-style: dashed;
-  opacity: 0.75;
-}
-.run-pill.on {
-  color: var(--tone-success-dot);
-  border-color: color-mix(in srgb, var(--tone-success-dot) 40%, transparent);
-  background: var(--tone-success-bg);
-}
-.run-pill.on .rp-dot {
-  background: var(--tone-success-dot);
-  border-color: transparent;
-  opacity: 1;
-}
-@media (prefers-reduced-motion: no-preference) {
-  .run-pill.on .rp-dot { animation: rpPulse 1.8s ease-in-out infinite; }
-}
-@keyframes rpPulse {
-  0%, 100% { box-shadow: 0 0 2px color-mix(in srgb, var(--tone-success-dot) 55%, transparent); }
-  50% { box-shadow: 0 0 7px color-mix(in srgb, var(--tone-success-dot) 85%, transparent); }
-}
-
-/* 产品 / Recipe 列:产品主行 + Recipe 副行(两行紧凑,超长省略) */
-.prod-cell { max-width: 170px; }
-.prod-cell b {
-  display: block;
-  font-weight: 600;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.prod-cell small {
-  display: block;
-  margin-top: 1px;
-  font-size: 10px;
-  color: var(--ink-faint);
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
+/* ── 行内产线/绑定/运行态样式见 DaqNodeRow.vue scoped 块 ── */
 
 /* ── Agent 优化记录面板(调控闭环;与全站玻璃语言同族) ── */
 .opt-card { padding: 0; }