Commit 98bb8971 authored by 田翔's avatar 田翔

fix: 工作台2.0升级

parent d27f3c5c
Pipeline #83451 waiting for manual action with stages
...@@ -67,7 +67,7 @@ const Group = (props) => { ...@@ -67,7 +67,7 @@ const Group = (props) => {
shema?.work.forEach(v => { shema?.work.forEach(v => {
array.push({ ...v, active: item.id === v.id, children: v.children.map(v => ({ ...v, active: false })) }) array.push({ ...v, active: item.id === v.id, children: v.children.map(v => ({ ...v, active: false })) })
}) })
setShema({ ...shema, work: array, active: false }) setShema({ ...shema, work: array, active: false, carousel: { ...shema.carousel, active: false } })
} }
const deleteGroup = (e, item) => { const deleteGroup = (e, item) => {
...@@ -106,7 +106,7 @@ const Group = (props) => { ...@@ -106,7 +106,7 @@ const Group = (props) => {
}) })
array.push({ ...v, active: false, children }) array.push({ ...v, active: false, children })
}) })
setShema({ ...shema, work: array, active: false }) setShema({ ...shema, work: array, active: false, carousel: { ...shema.carousel, active: false } })
} }
return ( return (
...@@ -114,6 +114,10 @@ const Group = (props) => { ...@@ -114,6 +114,10 @@ const Group = (props) => {
className={styles.group} className={styles.group}
onClick={(e) => groupClick(e, props)} onClick={(e) => groupClick(e, props)}
active={`${props.active}`} active={`${props.active}`}
style={{
background: props.hideBackground ? '' : '#FFFFFF',
marginTop: props.hideBackground ? '0' : '10px'
}}
ref={ref} ref={ref}
> >
{ {
......
@imgSrc: '@/assets/images/mobileConfig/WorkDesign'; @imgSrc: '@/assets/images/mobileConfig/WorkDesign';
.group { .group {
margin-top: 10px; margin-top: 10px;
background: #FFFFFF;
border-radius: 5px; border-radius: 5px;
width: 100%; width: 100%;
min-height: 100px; min-height: 100px;
...@@ -107,5 +106,35 @@ ...@@ -107,5 +106,35 @@
background: url('@{imgSrc}/card12.png'); background: url('@{imgSrc}/card12.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
&[widget='OPERATIONSOVERVIEW'] {
height: 60px;
background: url('@{imgSrc}/card101.png');
background-size: 100% 100%;
}
&[widget='PIPELINEASSETS'] {
height: 205px;
background: url('@{imgSrc}/card102.png');
background-size: 100% 100%;
}
&[widget='PIPELINECOLLECTION'] {
height: 43px;
background: url('@{imgSrc}/card103.png');
background-size: 100% 100%;
}
&[widget='INSPECTIONMAINTENANCE'] {
height: 57px;
background: url('@{imgSrc}/card104.png');
background-size: 100% 100%;
}
&[widget='EVENTWORKORDER'] {
height: 46px;
background: url('@{imgSrc}/card105.png');
background-size: 100% 100%;
}
&[widget='SUBSIDIARYBUSINESSRANKING'] {
height: 180px;
background: url('@{imgSrc}/card106.png');
background-size: 100% 100%;
}
} }
} }
\ No newline at end of file
import React, { useRef, useContext, useState, useEffect, forwardRef, useImperativeHandle } from 'react' import React, { useRef, useContext, useState, useEffect, forwardRef, useImperativeHandle } from 'react'
import styles from './index.less' import styles from './index.less'
import { DownOutlined, VerticalAlignTopOutlined, UpOutlined, VerticalAlignBottomOutlined } from '@ant-design/icons' import {
DownOutlined,
VerticalAlignTopOutlined,
UpOutlined,
VerticalAlignBottomOutlined,
CheckOutlined,
CaretDownOutlined,
} from '@ant-design/icons'
import { useDrag, useDrop, DndProvider } from 'react-dnd' import { useDrag, useDrop, DndProvider } from 'react-dnd'
import { GlobalStore } from '../index' import { GlobalStore } from '../index'
import Group from './Group' import Group from './Group'
import moment from 'moment' import moment from 'moment'
import { getSiteTree } from '@/services/siteManage/api' import { getSiteTree } from '@/services/siteManage/api'
import { Carousel } from 'antd'
const btns = [ const btns = [
{ title: '置顶', icon: <VerticalAlignTopOutlined /> }, { title: '置顶', icon: <VerticalAlignTopOutlined /> },
...@@ -24,6 +32,7 @@ const Container = (props, ref) => { ...@@ -24,6 +32,7 @@ const Container = (props, ref) => {
const moblieRef = useRef(null) const moblieRef = useRef(null)
const [currentSite, setCurrentSite] = useState('永吉水务有限公司') const [currentSite, setCurrentSite] = useState('永吉水务有限公司')
const { shema, setShema } = useContext(GlobalStore) const { shema, setShema } = useContext(GlobalStore)
const { carousel } = shema
const [, drop] = useDrop(() => { const [, drop] = useDrop(() => {
return { return {
...@@ -81,6 +90,84 @@ const Container = (props, ref) => { ...@@ -81,6 +90,84 @@ const Container = (props, ref) => {
setShema({ ...shema, work: array, active: false }) setShema({ ...shema, work: array, active: false })
} }
const carouselClick = (e) => {
e.stopPropagation()
let array = []
shema?.work.forEach(v => {
array.push({ ...v, active: false, children: v.children.map(v => ({ ...v, active: false })) })
})
setShema({ ...shema, work: array, active: false, carousel: { ...shema.carousel, active: true } })
}
const getMoblieCenter = () => {
if (shema.themeStyle === '个人版') {
return (
<div
className={styles['moblieCenter-a']}
name={shema.theme}
>
<div className={styles['m-info']}>
<div className={styles['i-company']}>
<span className={styles['c-address']}></span>
<span>{currentSite}</span>
<DownOutlined style={{ fontSize: '12px', marginLeft: '5px' }} />
</div>
<div className={styles['i-date']}>
<span></span>
<span>{currentDate}</span>
<DownOutlined style={{ fontSize: '12px', marginLeft: '5px' }} />
</div>
</div>
<div style={{ padding: '10px' }}>
{
shema?.work?.map((v, i) => <Group key={v.id} index={i} {...v} />)
}
</div>
</div>
)
}
return (
<div
className={styles['moblieCenter-b']}
name={shema.theme}
>
<div
className={styles.slideShow}
onClick={(e) => carouselClick(e)}
active={`${carousel?.active}`}
>
<div className={styles.top}>
<div className={styles['top-left']}>
<span className={styles['l-icon']}></span>
<span className={styles['l-text']}>{currentSite}</span>
<CaretDownOutlined style={{ color: '#999999' }} />
</div>
<div className={styles['top-right']}>
<span className={styles['r-icon']}></span>
<span className={styles['r-text']}>{currentDate}</span>
</div>
</div>
<Carousel autoplay>
{
shema?.carousel?.imgUrls?.map(v => {
return (
<div className={styles['carousel-item']}>
<img style={{ width: '100%', height: '100%' }} src={`${window.origin}/PandaOMS/OMS/FileCenter/DownLoadFiles?module=图库&filePath=${v}`} />
</div>
)
})
}
</Carousel>
</div>
<div style={{ padding: '10px' }}>
{
shema?.work?.map((v, i) => <Group key={v.id} index={i} {...v} />)
}
</div>
</div>
)
}
return ( return (
<div className={styles.container}> <div className={styles.container}>
<div className={styles.content}> <div className={styles.content}>
...@@ -89,29 +176,9 @@ const Container = (props, ref) => { ...@@ -89,29 +176,9 @@ const Container = (props, ref) => {
className={styles.moblie} className={styles.moblie}
onClick={() => pageClick()} onClick={() => pageClick()}
active={`${shema.active}`} active={`${shema.active}`}
style={{ background: shema?.background }}
> >
<div {getMoblieCenter()}
className={styles.moblieCenter}
name={shema.theme}
>
<div className={styles['m-info']}>
<div className={styles['i-company']}>
<span className={styles['c-address']}></span>
<span>{currentSite}</span>
<DownOutlined style={{ fontSize: '12px', marginLeft: '5px' }} />
</div>
<div className={styles['i-date']}>
<span></span>
<span>{currentDate}</span>
<DownOutlined style={{ fontSize: '12px', marginLeft: '5px' }} />
</div>
</div>
<div style={{ padding: '10px' }}>
{
shema?.work?.map((v, i) => <Group key={v.id} index={i} {...v} />)
}
</div>
</div>
</div> </div>
<div className={styles['c-btns']}> <div className={styles['c-btns']}>
{ {
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
&::-webkit-scrollbar { &::-webkit-scrollbar {
width: 0; width: 0;
} }
.moblieCenter { .moblieCenter-a {
padding-top: 110px; padding-top: 110px;
height: 650px; height: 650px;
position: relative; position: relative;
...@@ -94,6 +94,67 @@ ...@@ -94,6 +94,67 @@
} }
} }
} }
.moblieCenter-b {
height: 650px;
position: relative;
.slideShow {
position: relative;
width: 100%;
height: 150px;
.top {
position: absolute;
width: 100%;
padding: 10px;
z-index: 99;
display: flex;
justify-content: space-between;
color: black;
.top-left {
display: flex;
align-items: center;
padding: 2px 10px;
border-radius: 15px;
background: #FFFFFF;
.l-icon {
width: 16px;
height: 16px;
background: url('@{imgSrc}/公司图标.png');
background-size: 100% 100%;
margin-right: 10px;
}
.l-text {
font-size: 14px;
margin-right: 10px;
}
}
.top-right {
padding: 2px 10px;
border-radius: 15px;
background: #FFFFFF;
align-items: center;
display: flex;
align-items: center;
.r-icon {
width: 16px;
height: 16px;
background: url('@{imgSrc}/时间图标.png');
background-size: 100% 100%;
margin-right: 10px;
}
.r-text {
font-size: 14px;
}
}
}
&[active='true'] {
border: 2px solid #001bff;
}
.carousel-item {
height: 150px;
background: #52A2E5;
}
}
}
&[active='true'] { &[active='true'] {
border: 2px solid #001bff; border: 2px solid #001bff;
} }
......
...@@ -59,7 +59,18 @@ const cards = [ ...@@ -59,7 +59,18 @@ const cards = [
}, },
], ],
[ [
{
title: '江西水务集团GIS项目',
count: 1,
children: [
{ name: '运营总览', widget: 'OPERATIONSOVERVIEW', type: '运营' },
{ name: '管网资产', widget: 'PIPELINEASSETS', type: '运营' },
{ name: '管网采集', widget: 'PIPELINECOLLECTION', type: '运营' },
{ name: '巡检运维', widget: 'INSPECTIONMAINTENANCE', type: '运营' },
{ name: '事件工单', widget: 'EVENTWORKORDER', type: '运营' },
{ name: '子公司业务排行', widget: 'SUBSIDIARYBUSINESSRANKING', type: '运营' },
]
},
] ]
] ]
...@@ -243,7 +254,6 @@ const Left = () => { ...@@ -243,7 +254,6 @@ const Left = () => {
})} })}
</div> </div>
<div className={styles.item}> <div className={styles.item}>
{/* <div className={styles['g-title']} style={{ paddingBottom: '0' }}>卡片组件</div> */}
<div className={styles['g-checks']}> <div className={styles['g-checks']}>
<Checkbox.Group <Checkbox.Group
style={{ width: '100%' }} style={{ width: '100%' }}
......
...@@ -50,8 +50,7 @@ ...@@ -50,8 +50,7 @@
font-weight: 700; font-weight: 700;
} }
.g-checks { .g-checks {
// padding: 9px 0; margin: 10px 0 5px 0;
// background: linear-gradient(to top, #F3F3F3, #FFFFFF);
} }
.g-content { .g-content {
padding: 0 10px; padding: 0 10px;
...@@ -142,6 +141,36 @@ ...@@ -142,6 +141,36 @@
background: url('@{imgSrc}/card12.png'); background: url('@{imgSrc}/card12.png');
background-size: 100% 100%; background-size: 100% 100%;
} }
&[widget='OPERATIONSOVERVIEW'] {
height: 60px;
background: url('@{imgSrc}/card101.png');
background-size: 100% 100%;
}
&[widget='PIPELINEASSETS'] {
height: 205px;
background: url('@{imgSrc}/card102.png');
background-size: 100% 100%;
}
&[widget='PIPELINECOLLECTION'] {
height: 43px;
background: url('@{imgSrc}/card103.png');
background-size: 100% 100%;
}
&[widget='INSPECTIONMAINTENANCE'] {
height: 57px;
background: url('@{imgSrc}/card104.png');
background-size: 100% 100%;
}
&[widget='EVENTWORKORDER'] {
height: 46px;
background: url('@{imgSrc}/card105.png');
background-size: 100% 100%;
}
&[widget='SUBSIDIARYBUSINESSRANKING'] {
height: 180px;
background: url('@{imgSrc}/card106.png');
background-size: 100% 100%;
}
} }
} }
&:hover { &:hover {
......
...@@ -19,41 +19,122 @@ ...@@ -19,41 +19,122 @@
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
} }
.mimGroup {
padding-left: 13px;
}
.g-content { .g-content {
display: flex; width: 100%;
justify-content: space-between;
flex-wrap: wrap;
padding: 0 20px; padding: 0 20px;
.c-center { .themeStyles {
.c-img { width: 100%;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
.themeStyle {
width: 120px; width: 120px;
height: 120px; height: 120px;
border-radius: 5px; border-radius: 5px;
overflow: hidden; overflow: hidden;
position: relative;
&:hover { &:hover {
cursor: pointer; cursor: pointer;
} }
&[ative='true'] { &[name='个人版'] {
border: 2px solid #1890ff; background: url('@{imgSrc}/个人版.png');
}
&[name='供水主题背景'] {
background: url('@{imgSrc}/供水主题背景.png');
background-size: 100% 100%; background-size: 100% 100%;
&[ative='true'] {
border: 2px solid #3594FF;
}
} }
&[name='排水主题背景'] { &[name='企业版'] {
background: url('@{imgSrc}/排水通用背景.png'); background: url('@{imgSrc}/企业版.png');
background-size: 100% 100%; background-size: 100% 100%;
&[ative='true'] {
border: 2px solid #20B896;
}
} }
&[name='农饮水主题背景'] { .s-icon {
background: url('@{imgSrc}/农饮水主题背景.png'); color: white;
background-size: 100% 100%; width: 100%;
width: 18px;
height: 18px;
top: 5px;
right: 5px;
position: absolute;
&[name='个人版'] {
background: url('@{imgSrc}/个人版-图标.png');
background-size: 100% 100%;
}
&[name='企业版'] {
background: url('@{imgSrc}/企业版-图标.png');
background-size: 100% 100%;
}
}
.s-text {
color: white;
width: 100%;
height: 25px;
bottom: 0;
left: 0;
text-align: center;
position: absolute;
}
}
}
.c-background {
margin-top: 10px;
width: 100%;
display: flex;
.d-item {
margin-right: 10px;
width: 30px;
height: 30px;
border: 1px solid #C8C8C8;
border-radius: 5px;
display: flex;
justify-content: center;
align-items: center;
&:hover {
cursor: pointer;
} }
} }
.c-text { }
text-align: center; .c-backImg {
&[ative='true'] { display: flex;
color: #1890ff; justify-content: space-between;
font-weight: 700; flex-wrap: wrap;
margin-top: 10px;
.c-center {
.c-img {
width: 120px;
height: 120px;
border-radius: 5px;
overflow: hidden;
&:hover {
cursor: pointer;
}
&[ative='true'] {
border: 2px solid #1890ff;
}
&[name='供水主题背景'] {
background: url('@{imgSrc}/供水主题背景.png');
background-size: 100% 100%;
}
&[name='排水主题背景'] {
background: url('@{imgSrc}/排水通用背景.png');
background-size: 100% 100%;
}
&[name='农饮水主题背景'] {
background: url('@{imgSrc}/农饮水主题背景.png');
background-size: 100% 100%;
}
}
.c-text {
text-align: center;
&[ative='true'] {
color: #1890ff;
font-weight: 700;
}
} }
} }
} }
...@@ -64,6 +145,16 @@ ...@@ -64,6 +145,16 @@
width: 100%; width: 100%;
height: calc(100% - 40px); height: calc(100% - 40px);
overflow: auto; overflow: auto;
.carouselSetting {
.g-title {
padding: 10px;
font-size: 14px;
font-weight: 600;
}
.g-content {
padding: 0 20px;
}
}
.group { .group {
.g-title { .g-title {
padding: 10px; padding: 10px;
...@@ -73,8 +164,8 @@ ...@@ -73,8 +164,8 @@
.g-content { .g-content {
padding: 0 20px; padding: 0 20px;
.c-item { .c-item {
display: flex;
align-items: center; align-items: center;
margin-bottom: 10px;
} }
} }
} }
......
...@@ -39,7 +39,10 @@ const initShema = { ...@@ -39,7 +39,10 @@ const initShema = {
work: [], work: [],
active: true, active: true,
type: '运营组件', type: '运营组件',
theme: '供水主题背景',
themeStyle: '个人版',
} }
const Designer = (props) => { const Designer = (props) => {
const { currentCard, } = props const { currentCard, } = props
...@@ -70,6 +73,7 @@ const Designer = (props) => { ...@@ -70,6 +73,7 @@ const Designer = (props) => {
formData.append('singleFile', file); formData.append('singleFile', file);
const { code, data, msg } = await UploadSingleFile(formData) const { code, data, msg } = await UploadSingleFile(formData)
if (code === 0) { if (code === 0) {
console.log('shema', shema)
props?.saveDesgin?.({ ...currentCard, '卡片结构': JSON.stringify(shema), '路径': data }) props?.saveDesgin?.({ ...currentCard, '卡片结构': JSON.stringify(shema), '路径': data })
} else { } else {
message.error({ content: msg }) message.error({ content: msg })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment