diff --git a/.gitignore b/.gitignore index 76efb07..ed55f09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ node_modules .vscode + +dist diff --git a/index.html b/index.html index 38f3861..37fa4f3 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,16 @@ - - - - - Vite App - - -
- - - + + + + + + 仪电项目管理 + + + +
+ + + + \ No newline at end of file diff --git a/package.json b/package.json index 1170f55..c245c59 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "start": "vite", "dev": "vite", "build": "tsc && vite build", + "buildvite": "vite build --base=./", "preview": "vite preview" }, "dependencies": { @@ -21,4 +22,4 @@ "typescript": "^4.7.4", "vite": "^3.0.9" } -} +} \ No newline at end of file diff --git a/src/components/Yidian/Frame427319471/Frame427319471.tsx b/src/components/Yidian/Frame427319471/Frame427319471.tsx index 9b1c9f0..e513553 100644 --- a/src/components/Yidian/Frame427319471/Frame427319471.tsx +++ b/src/components/Yidian/Frame427319471/Frame427319471.tsx @@ -13,7 +13,7 @@ interface Props { frame?: ReactNode; }; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5524:24104 */ diff --git a/src/components/Yidian/Frame427319520/Frame427319520.tsx b/src/components/Yidian/Frame427319520/Frame427319520.tsx index f00867b..31e2783 100644 --- a/src/components/Yidian/Frame427319520/Frame427319520.tsx +++ b/src/components/Yidian/Frame427319520/Frame427319520.tsx @@ -10,7 +10,7 @@ interface Props { root?: string; }; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; _1995526?: ReactNode; }; } diff --git a/src/components/Yidian/Frame427319527/Frame427319527.tsx b/src/components/Yidian/Frame427319527/Frame427319527.tsx index d373f5c..f38a229 100644 --- a/src/components/Yidian/Frame427319527/Frame427319527.tsx +++ b/src/components/Yidian/Frame427319527/Frame427319527.tsx @@ -35,17 +35,17 @@ export const Frame427319527: FC = memo(function Frame427319527(
<_Mini text={{ - Unnamed:
合同签订阶段
, + unnamed:
合同签订阶段
, }} /> <_Mini text={{ - Unnamed:
A级
, + unnamed:
A级
, }} /> <_Mini text={{ - Unnamed:
优秀项目
, + unnamed:
优秀项目
, }} />
diff --git a/src/components/Yidian/Frame876_Property1Variant2/Frame876_Property1Variant2.tsx b/src/components/Yidian/Frame876_Property1Variant2/Frame876_Property1Variant2.tsx index fecae71..7d162d4 100644 --- a/src/components/Yidian/Frame876_Property1Variant2/Frame876_Property1Variant2.tsx +++ b/src/components/Yidian/Frame876_Property1Variant2/Frame876_Property1Variant2.tsx @@ -11,7 +11,7 @@ interface Props { rectangle678?: string; }; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; _100?: ReactNode; }; } diff --git a/src/components/Yidian/Iconbutton_TertiaryLarge/Iconbutton_TertiaryLarge.tsx b/src/components/Yidian/Iconbutton_TertiaryLarge/Iconbutton_TertiaryLarge.tsx index c5041f3..3a4cc00 100644 --- a/src/components/Yidian/Iconbutton_TertiaryLarge/Iconbutton_TertiaryLarge.tsx +++ b/src/components/Yidian/Iconbutton_TertiaryLarge/Iconbutton_TertiaryLarge.tsx @@ -12,7 +12,7 @@ interface Props { root?: string; }; swap?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:1800 */ diff --git a/src/components/Yidian/Yidian.tsx b/src/components/Yidian/Yidian.tsx index dd8cfa5..8f8aa51 100644 --- a/src/components/Yidian/Yidian.tsx +++ b/src/components/Yidian/Yidian.tsx @@ -152,6 +152,7 @@ import { SelectPride } from "./SelectPride"; import Search from "antd/es/input/Search"; import Title from "antd/es/skeleton/Title"; import { + BankOutlined, BookOutlined, ContactsOutlined, FundOutlined, @@ -175,11 +176,11 @@ interface Props { point8?: boolean; point9?: boolean; point10?: boolean; - Unnamed?: boolean; - Unnamed2?: boolean; - Unnamed3?: boolean; - Unnamed4?: boolean; - Unnamed5?: boolean; + unnamed?: boolean; + unnamed2?: boolean; + unnamed3?: boolean; + unnamed4?: boolean; + unnamed5?: boolean; _2?: boolean; _22?: boolean; _23?: boolean; @@ -199,7 +200,12 @@ interface Props { }; } -export type PageName = "project" | "customer" | "dashboard" | "bigscreen"; +export type PageName = + | "project" + | "customer" + | "dashboard" + | "bigscreen-shichang" + | "bigscreen-jituan"; /* @figmaId 5711:168021 */ export const Yidian: FC = memo(function Yidian(props = {}) { @@ -244,11 +250,17 @@ export const Yidian: FC = memo(function Yidian(props = {}) { style: { paddingLeft: "50px" }, }, { - key: "bigscreen", - label: "驾驶舱", + key: "bigscreen-shichang", + label: "驾驶舱-市场", icon: , style: { paddingLeft: "50px" }, }, + { + key: "bigscreen-jituan", + label: "驾驶舱-集团", + icon: , + style: { paddingLeft: "50px" }, + }, { key: "customer", label: "客户信息", @@ -371,13 +383,13 @@ export const Yidian: FC = memo(function Yidian(props = {}) { <_ className={classes.unnamed2} swap={{ - Unnamed: , + unnamed: , }} hide={{ - Unnamed: true, + unnamed: true, }} text={{ - Unnamed: ( + unnamed: (
商机登记
), }} @@ -385,14 +397,14 @@ export const Yidian: FC = memo(function Yidian(props = {}) { <_3 className={classes.unnamed4} swap={{ - Unnamed: , - Unnamed2: , + unnamed: , + unnamed2: , }} hide={{ - Unnamed: true, + unnamed: true, }} text={{ - Unnamed: ( + unnamed: (
合同签订
), }} @@ -400,15 +412,15 @@ export const Yidian: FC = memo(function Yidian(props = {}) { <_4 className={classes.unnamed6} swap={{ - Unnamed: , - Unnamed2: , - Unnamed3: , + unnamed: , + unnamed2: , + unnamed3: , }} hide={{ - Unnamed: true, + unnamed: true, }} text={{ - Unnamed: ( + unnamed: (
合同履约追踪
@@ -418,15 +430,15 @@ export const Yidian: FC = memo(function Yidian(props = {}) { <_4 className={classes.unnamed8} swap={{ - Unnamed: , - Unnamed2: , - Unnamed3: , + unnamed: , + unnamed2: , + unnamed3: , }} hide={{ - Unnamed: true, + unnamed: true, }} text={{ - Unnamed: ( + unnamed: (
跟踪推进
), }} @@ -434,15 +446,15 @@ export const Yidian: FC = memo(function Yidian(props = {}) { <_4 className={classes.unnamed11} swap={{ - Unnamed: , - Unnamed2: , - Unnamed3: , + unnamed: , + unnamed2: , + unnamed3: , }} text={{ - Unnamed: ( + unnamed: (
项目节点
), - Unnamed2: ( + unnamed2: (
未开始
), }} @@ -450,14 +462,14 @@ export const Yidian: FC = memo(function Yidian(props = {}) { <_5 className={classes.unnamed13} swap={{ - Unnamed: , - Unnamed2: , + unnamed: , + unnamed2: , }} hide={{ - Unnamed: true, + unnamed: true, }} text={{ - Unnamed: ( + unnamed: (
项目结束
), }} @@ -901,7 +913,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed:
全部
, + unnamed:
全部
, _2: !props.hide?._2 && (
(1340)
), @@ -912,7 +924,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed: ( + unnamed: (
A级项目
), _2: !props.hide?._22 && ( @@ -925,7 +937,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed: ( + unnamed: (
B级项目
), _2: !props.hide?._23 && ( @@ -938,7 +950,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed: ( + unnamed: (
C级项目
), _2: !props.hide?._24 && ( @@ -951,17 +963,17 @@ export const Yidian: FC = memo(function Yidian(props = {}) {
<_22 text={{ - Unnamed: ( + unnamed: (
合同额
), _323:
2,000
, - Unnamed2: ( + unnamed2: (
万元
), - Unnamed3: ( + unnamed3: (
较上月
), - Unnamed4:
2%
, + unnamed4:
2%
, }} /> = memo(function Yidian(props = {}) {
<_22 text={{ - Unnamed: ( + unnamed: (
利润额
), _323:
1,400
, - Unnamed2: ( + unnamed2: (
万元
), - Unnamed3: ( + unnamed3: (
较上月
), - Unnamed4:
2%
, + unnamed4:
2%
, }} /> = memo(function Yidian(props = {}) {
<_22 text={{ - Unnamed: ( + unnamed: (
回款
), _323:
1,400
, - Unnamed2: ( + unnamed2: (
万元
), - Unnamed3: ( + unnamed3: (
较上月
), - Unnamed4:
2%
, + unnamed4:
2%
, }} /> = memo(function Yidian(props = {}) { 2022年标准化考点建设
@@ -1174,7 +1186,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { className={classes.frame913} classes={{ rectangle678: classes.rectangle678 }} text={{ - Unnamed: ( + unnamed: (
2022年标准化考点建设
@@ -1186,7 +1198,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { className={classes.frame914} classes={{ rectangle678: classes.rectangle6782 }} text={{ - Unnamed: ( + unnamed: (
2022年标准化考点建设
@@ -1198,194 +1210,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { className={classes.frame915} classes={{ rectangle678: classes.rectangle6783 }} text={{ - Unnamed: ( -
- 2022年标准化考点建设 -
- ), - _100:
24
, - }} - /> -
-
- -
-
-
-
涉及板块分析a123
-
-
查看详情
- - ), - }} - /> -
-
-
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
A级
-
45%
-
-
-
-
-
- <_Property1 - text={{ - label: ( -
- 云服务大数据 -
- ), - }} - /> -
-
64.0%
-
-
120
-
-
-
- <_Property1 - classes={{ square: classes.square }} - text={{ - label: ( -
智慧照明
- ), - }} - /> -
-
16.0%
-
-
30
-
-
-
- <_Property1 - classes={{ square: classes.square2 }} - text={{ - label: ( -
智慧教卫
- ), - }} - /> -
-
6.4%
-
-
12
-
-
-
- <_Property1 - classes={{ square: classes.square3 }} - text={{ - label: ( -
智慧交通
- ), - }} - /> -
-
6.4%
-
-
12
-
-
-
- <_Property1 - classes={{ square: classes.square4 }} - text={{ - label: ( -
智能安防
- ), - }} - /> -
-
6.4%
-
-
12
-
-
-
-
-
-
-
重点项目排名
-
-
查看详情
- - ), - }} - /> -
-
-
- - 2022年标准化考点建设 -
- ), - _100:
24
, - }} - /> - - 2022年标准化考点建设 -
- ), - _100:
24
, - }} - /> - - 2022年标准化考点建设 -
- ), - _100:
24
, - }} - /> - 2022年标准化考点建设 @@ -1396,6 +1221,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { +
项目合作情况
@@ -1473,7 +1299,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) {
<_Small text={{ - Unnamed: ( + unnamed: (
战略客户
@@ -1482,21 +1308,21 @@ export const Yidian: FC = memo(function Yidian(props = {}) { /> <_Small2 text={{ - Unnamed: ( + unnamed: (
食品
), }} /> <_Small2 text={{ - Unnamed: ( + unnamed: (
销售
), }} /> <_Small2 text={{ - Unnamed: ( + unnamed: (
零售
), }} @@ -1512,7 +1338,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { 是否上市
), _1995526:
是
, @@ -1523,7 +1349,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { 注册资本
), _1995526: ( @@ -1537,7 +1363,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { 实缴资本
), _1995526: ( @@ -1553,21 +1379,21 @@ export const Yidian: FC = memo(function Yidian(props = {}) {
<_Property1Property2 text={{ - Unnamed: ( + unnamed: (
公司介绍
), }} /> <_Property1Property22 text={{ - Unnamed: ( + unnamed: (
经营范围
), }} /> <_Property1Property22 text={{ - Unnamed: ( + unnamed: (
主营业务
), }} @@ -1954,7 +1780,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { ), }} text={{ - Unnamed: ( + unnamed: (
项目支持记录单
@@ -1976,7 +1802,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { ), }} text={{ - Unnamed: ( + unnamed: (
合同信息登记表
@@ -1998,7 +1824,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { ), }} text={{ - Unnamed: ( + unnamed: (
项目采购单
), }} @@ -2153,31 +1979,31 @@ export const Yidian: FC = memo(function Yidian(props = {}) { {/*
<_2_On text={{ - Unnamed:
全部
, + unnamed:
全部
, }} /> <_2_Off text={{ - Unnamed:
近3天
, + unnamed:
近3天
, }} /> <_2_Off text={{ - Unnamed: ( + unnamed: (
近一周
), }} /> <_2_Off text={{ - Unnamed: ( + unnamed: (
近一月
), }} /> <_2_Off text={{ - Unnamed: ( + unnamed: (
近3月
), }} @@ -2443,7 +2269,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed:
全部
, + unnamed:
全部
, _2: !props.hide?._25 && (
(1340)
), @@ -2454,7 +2280,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed: ( + unnamed: (
优秀项目
), _2: !props.hide?._26 && ( @@ -2467,7 +2293,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed: ( + unnamed: (
标杆项目
), _2: !props.hide?._27 && ( @@ -2480,7 +2306,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { _2: false, }} text={{ - Unnamed: ( + unnamed: (
一般项目
), _2: !props.hide?._28 && ( @@ -2734,7 +2560,12 @@ export const Yidian: FC = memo(function Yidian(props = {}) {
)} - {currentPage == "bigscreen" && } + {currentPage == "bigscreen-jituan" && ( + + )} + {currentPage == "bigscreen-shichang" && ( + + )}
@@ -2743,7 +2574,7 @@ export const Yidian: FC = memo(function Yidian(props = {}) { = memo(function Yidian(props = {}) { = memo(function _Mini(props = {}) { 标签
), }} diff --git a/src/components/Yidian/_Mini2/_Mini2.tsx b/src/components/Yidian/_Mini2/_Mini2.tsx index 7d38384..cbcbc17 100644 --- a/src/components/Yidian/_Mini2/_Mini2.tsx +++ b/src/components/Yidian/_Mini2/_Mini2.tsx @@ -8,7 +8,7 @@ import classes from "./_Mini2.module.css"; interface Props { className?: string; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:2123 */ @@ -18,7 +18,7 @@ export const _Mini2: FC = memo(function _Mini2(props = {}) { 标签 ), }} diff --git a/src/components/Yidian/_Property1Property2/_Property1Property2.tsx b/src/components/Yidian/_Property1Property2/_Property1Property2.tsx index 4b8b1e4..b00be70 100644 --- a/src/components/Yidian/_Property1Property2/_Property1Property2.tsx +++ b/src/components/Yidian/_Property1Property2/_Property1Property2.tsx @@ -8,7 +8,7 @@ import classes from "./_Property1Property2.module.css"; interface Props { className?: string; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:2081 */ diff --git a/src/components/Yidian/_Property1Property22/_Property1Property22.tsx b/src/components/Yidian/_Property1Property22/_Property1Property22.tsx index 84a140f..821d31a 100644 --- a/src/components/Yidian/_Property1Property22/_Property1Property22.tsx +++ b/src/components/Yidian/_Property1Property22/_Property1Property22.tsx @@ -8,7 +8,7 @@ import classes from "./_Property1Property22.module.css"; interface Props { className?: string; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:2063 */ diff --git a/src/components/Yidian/_Small/_Small.tsx b/src/components/Yidian/_Small/_Small.tsx index 05ccd44..6942bc0 100644 --- a/src/components/Yidian/_Small/_Small.tsx +++ b/src/components/Yidian/_Small/_Small.tsx @@ -8,7 +8,7 @@ import classes from "./_Small.module.css"; interface Props { className?: string; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:2125 */ @@ -18,7 +18,7 @@ export const _Small: FC = memo(function _Small(props = {}) { 标签 ), }} diff --git a/src/components/Yidian/_Small2/_Small2.tsx b/src/components/Yidian/_Small2/_Small2.tsx index b48c8e2..08cd596 100644 --- a/src/components/Yidian/_Small2/_Small2.tsx +++ b/src/components/Yidian/_Small2/_Small2.tsx @@ -8,7 +8,7 @@ import classes from "./_Small2.module.css"; interface Props { className?: string; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:2131 */ @@ -18,7 +18,7 @@ export const _Small2: FC = memo(function _Small2(props = {}) { 标签 ), }} diff --git a/src/components/Yidian/unnamed13/unnamed13.tsx b/src/components/Yidian/unnamed13/unnamed13.tsx index bc24edb..3deb41e 100644 --- a/src/components/Yidian/unnamed13/unnamed13.tsx +++ b/src/components/Yidian/unnamed13/unnamed13.tsx @@ -37,7 +37,7 @@ export const Unnamed13: FC = memo(function Unnamed13(props = {}) { )} <_Mini2 text={{ - Unnamed: props.text?.unnamed2 || ( + unnamed: props.text?.unnamed2 || (
国有企事业单位
), }} diff --git a/src/components/Yidian/unnamed8/unnamed8.tsx b/src/components/Yidian/unnamed8/unnamed8.tsx index a174c9e..a659d67 100644 --- a/src/components/Yidian/unnamed8/unnamed8.tsx +++ b/src/components/Yidian/unnamed8/unnamed8.tsx @@ -12,7 +12,7 @@ interface Props { root?: string; }; text?: { - Unnamed?: ReactNode; + unnamed?: ReactNode; }; } /* @figmaId 5403:1005 */ diff --git a/src/screen/bigscreen/bigscreen.module.css b/src/screen/bigscreen/bigscreen.module.css index 1ea1a17..d8675df 100644 --- a/src/screen/bigscreen/bigscreen.module.css +++ b/src/screen/bigscreen/bigscreen.module.css @@ -1,8 +1,4 @@ .screen { - /* position: fixed; */ - /* z-index: 9099; */ - /* top: 0; */ - /* left: 0; */ width: 1920px; height: 1080px; position: absolute; @@ -10,7 +6,7 @@ left: 10px; transform: scale(calc(1695/1920)); transform-origin: 0 0; - /* overflow: scroll; */ + background-size:contain; } .pop{ position: absolute; diff --git a/src/screen/bigscreen/bigscreen.tsx b/src/screen/bigscreen/bigscreen.tsx index 68e7b46..d29c9b8 100644 --- a/src/screen/bigscreen/bigscreen.tsx +++ b/src/screen/bigscreen/bigscreen.tsx @@ -1,19 +1,27 @@ import { FC } from "react"; -import bg from "./大屏.png"; import popAnhui from "./弹窗安徽.png"; import popJiangsu from "./弹窗江苏.png"; import popShanghai from "./弹窗上海.png"; import popZhejiang from "./弹窗浙江.png"; +import bgJituan from "./大屏-集团.png"; +import bgShichang from "./大屏-市场部.png"; + import classes from "./bigscreen.module.css"; -export const BigScreen: FC<{}> = () => { +type Props = { + bg?: "jituan" | "shichang"; +}; + +export const BigScreen: FC = (props) => { + const { bg } = props; + const bgUrl = bg == "jituan" ? bgJituan : bgShichang; return (
= () => { left: "533px", }} > - +
= () => { >
- - {/* - - */}
); }; diff --git a/src/screen/bigscreen/大屏-市场部.png b/src/screen/bigscreen/大屏-市场部.png new file mode 100644 index 0000000..02312fa Binary files /dev/null and b/src/screen/bigscreen/大屏-市场部.png differ diff --git a/src/screen/bigscreen/大屏.png b/src/screen/bigscreen/大屏-集团.png similarity index 100% rename from src/screen/bigscreen/大屏.png rename to src/screen/bigscreen/大屏-集团.png diff --git a/src/screen/bigscreen/弹窗安徽.png b/src/screen/bigscreen/弹窗安徽.png index a9c5fbc..61d8b42 100644 Binary files a/src/screen/bigscreen/弹窗安徽.png and b/src/screen/bigscreen/弹窗安徽.png differ