cq_anquan
/
safety-eval-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-website into dev-tmp1

dev-tmp1
huwei 2026-08-11 14:09:53 +08:00
parent c55b856c34 0a7dd356f1
commit d9014ed326
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/Container/Institution/index.js
View File

@ -1,5 +1,6 @@
import React, { useCallback, useEffect, useMemo, useState } from 'react'; import React, { useCallback, useEffect, useMemo, useState } from 'react';
import DriverBack from '~/pages/Container/Driver/components/DriverBack'; import DriverBack from '~/pages/Container/Driver/components/DriverBack';
import { tools } from "@cqsjjb/jjb-common-lib";
import EnterpriseTypeChart from './components/EnterpriseTypeChart'; import EnterpriseTypeChart from './components/EnterpriseTypeChart';
import ProjectTypeChart from './components/ProjectTypeChart'; import ProjectTypeChart from './components/ProjectTypeChart';
import ProjectCompletionTable from './components/ProjectCompletionTable'; import ProjectCompletionTable from './components/ProjectCompletionTable';
@ -137,7 +138,7 @@ export default function InstitutionDashboard() {
return ( return (
<div className="institution-dashboard"> <div className="institution-dashboard">
<div className="institution-dashboard__toolbar"> <div className="institution-dashboard__toolbar">
<DriverBack /> {!tools.inIframe() && <DriverBack />}
</div> </div>
<div className="dashboard-classic"> <div className="dashboard-classic">

3
src/pages/Container/Supervision/Cockpit/index.js
View File

@ -1,5 +1,6 @@
import React, { useEffect, useMemo, useRef, useState } from 'react'; import React, { useEffect, useMemo, useRef, useState } from 'react';
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import { tools } from "@cqsjjb/jjb-common-lib";
import { import {
AuditOutlined, AuditOutlined,
BellOutlined, BellOutlined,
@ -143,7 +144,7 @@ function EChart({ option, className, events, onInstance }) {
function ScreenHeader({ data }) { function ScreenHeader({ data }) {
return ( return (
<header className="cockpit-header"> <header className="cockpit-header">
<DriverBack theme="dark" className="cockpit-header__back" /> {!tools.inIframe() && <DriverBack theme="dark" className="cockpit-header__back" />}
<div className="cockpit-header__deco cockpit-header__deco--left" /> <div className="cockpit-header__deco cockpit-header__deco--left" />
<h1>{data.title}</h1> <h1>{data.title}</h1>
<div className="cockpit-header__time"><ClockCircleOutlined />{data.currentTime}</div> <div className="cockpit-header__time"><ClockCircleOutlined />{data.currentTime}</div>