diff --git a/src/views/sz/zzjgck/index.less b/src/views/sz/zzjgck/index.less
index e69de29bb..234c82eb9 100644
--- a/src/views/sz/zzjgck/index.less
+++ b/src/views/sz/zzjgck/index.less
@@ -0,0 +1,24 @@
+.org-parent{
+ font-size: 20px;
+ color: '#000';
+ padding: 20px;
+ background: url(../../../../public/assets/images/one.png) 0 0 no-repeat;
+}
+.org-parent1{
+ font-size: 18px;
+ color: '#000';
+ padding: 10px;
+ background: url(../../../../public/assets/images/two.png) 0 0 no-repeat;
+}
+.org-parent2{
+ font-size: 18px;
+ color: '#000';
+ padding: 10px;
+ background: url(../../../../public/assets/images/three.png) 0 0 no-repeat;
+}
+.org-parent3{
+ font-size: 18px;
+ color: '#000';
+ padding: 10px;
+ background: url(../../../../public/assets/images/four.png) 0 0 no-repeat;
+}
\ No newline at end of file
diff --git a/src/views/sz/zzjgck/jgoption.js b/src/views/sz/zzjgck/jgoption.js
index 7e4bd30b6..e4b93d36b 100644
--- a/src/views/sz/zzjgck/jgoption.js
+++ b/src/views/sz/zzjgck/jgoption.js
@@ -1,93 +1,20 @@
-const getBackground = () => {
+
+export default function jgOption(data1) {
+ console.log("123",data1);
+ const one = `${process.env.PUBLIC_URL}/assets/images/one.png`;
+ const two = `${process.env.PUBLIC_URL}/assets/images/two.png`;
+ const three = `${process.env.PUBLIC_URL}/assets/images/three.png`;
+ const four = `${process.env.PUBLIC_URL}/assets/images/four.png`;
return {
- type: 'linear',
- x: 0,
- y: 0,
- x2: 0,
- y2: 1,
- colorStops: [{
- offset: 0, color: '#ffffff' // 0% 处的颜色
- }, {
- offset: 0.5, color: 'blue' // 100% 处的颜色
- }, {
- offset: 1, color: '#ffffff' // 100% 处的颜色
- }],
- global: false // 缺省为 false
- }
-}
-const data = {
- name: '销售部',
- children: [{
- name: '销售一部',
- children: [{
- name: '任务名称1',
- itemStyle: { color: "#ff9800" },
- },
- {
- name: '任务名称2',
- itemStyle: { color: "#4d8dd9" },
- },
- {
- name: '任务名称3',
- itemStyle: { color: "#22b07b" },
- },
- {
- name: '任务名称4'
- },
- {
- name: '任务名称5'
- },
- {
- name: '任务名称6'
- },
- {
- name: '任务名称7'
- },
- {
- name: '任务名称8'
- }
- ]
- },
- {
- name: '销售二部',
- },
- {
- name: '销售三部',
- children: [{
- name: '任务3-1'
- },
- {
- name: '任务3-2'
- }
- ]
- },
- {
- name: '销售四部',
- children: [{
- name: '任务4-1'
- },
- {
- name: '任务4-2'
- }
- ]
- }
- ]
-}
-export default function jgOption() {
- return {
- tooltip: {
- trigger: 'item',
- triggerOn: 'mousemove'
- },
series: [{
type: 'tree',
id: 0,
name: 'tree1',
- data: [data],
+ data: data1,
top: '10%',
- left: '10%',
+ left: '0%',
bottom: '20%',
- right: '10%',
+ right: '25%',
avoidLabelOverlap: true,//防止标签重叠
roam: true, //移动+缩放 'scale' 或 'zoom'：只能够缩放。 'move' 或 'pan'：只能够平移。
scaleLimit:{ //缩放比例
@@ -101,85 +28,101 @@ export default function jgOption() {
symbol: 'circle', //图形形状 rect方形 roundRect圆角 emptyCircle圆形 circle实心圆
symbolSize: 14, //状态大小
edgeShape: 'polyline', //线条类型 curve曲线
- initialTreeDepth: 1, //初始展开的层级
+ initialTreeDepth: 3, //初始展开的层级
expandAndCollapse: true,//子树折叠和展开的交互，默认打开
lineStyle: {//结构线条样式
- width: 0.7,
+ width: 1,
color: '#1E9FFF',
- type: 'broken'
+ type: 'solid'
},
label: {
// 每个节点对应的文本标签样式
show: true, // 是否显示标签
+ // rotate:90,
distance: 8, // 文本距离图形元素的距离
position: ['50%', '50%'], // 标签位置
verticalAlign: 'middle', // 文字垂直对齐方式，默认自动，top，middle，bottom
align: 'center', // 文字水平对齐方式，默认自动，left，right，center
fontSize: 16, // 字体大小
- color: '#333', // 字体颜色
- // color: 'red', // 字体颜色
- backgroundColor: '#F8F9FA', // 文字块的背景颜色
- borderColor: '#CED4DA', // 文字块边框颜色
- borderWidth: 1, // 文字块边框宽度
- borderType: 'solid', // 文字块边框描边类型 solid dashed dotted
- borderRadius: 2, // 文字块的圆角
- padding: [6, 6], // 文字块内边距
- shadowColor: 'rgba(0,121,221,0.3)', // 文字块的背景阴影颜色
- shadowBlur: 6, // 文字块的背景阴影长度
+ color: '#000', // 字体颜色
formatter: (params) => {
let newName = ''
- let len = params.data.name.length
- let strLen = params.data.relationType === 0 ? 100 : 1 //一行显示几个字
+ let len = params.data.title.length
+ let strLen = (params.data.parentId === 0 || params.data.parentId === 100 ) ? 100 : 1 //一行显示几个字
let rowNum = Math.ceil(len / strLen)
if (len > strLen) {
+
for (let p = 0; p < rowNum; p++) {
let tempStr = ''
let start = p * strLen
let end = start + strLen
if (p == rowNum - 1) {
- tempStr = params.data.name.substring(start, len)
+ tempStr = params.data.title.substring(start, len)
} else {
- tempStr = params.data.name.substring(start, end) + '\n'
+ tempStr = params.data.title.substring(start, end) + '\n'
}
newName += tempStr
}
} else {
- newName = params.data.name
+ newName = params.data.title
}
let n = newName
if (n.length > 16) {
n = n.slice(0, 16) + '...'
}
- let str = `{name|${n}}`
- let isMain = params.data.relationType === 0
- str = isMain ? `{name|${n}} {current|本企业} {main|总部}` : str
- return str
+ let parentId = params.data.parentId
+ let userId = params.data.userId;
+ let str = parentId === 0 ? `{parent|${n}}` :
+ parentId === 100 ? `{parent1|${n}}` : userId != undefined ? `{parent3|${n}}` : `{parent2|${n}}`
+ // let str = parentId === 0 ? `
${n}
` :
+ // parentId === 100 ? `
${n}
` : userId != undefined ? `
${n}
` : `
${n}
`
+ return str;
},
+
rich: {
- name: {
- fontSize: 14
+ parent: {
+ color: '#000',
+ padding: [20, 20],
+ backgroundColor: {
+ image:one
+ },
+
+ fontSize: 20
},
- current: {
- fontSize: 12,
- padding: 0,
- color: '#07CA42',
- fontWeight: 600,
- backgroundColor: '#E5F7EA',
- borderRadius: 2
+ parent1: {
+ color: '#000',
+ padding: [10, 10],
+ backgroundColor: {
+ image:two
+ },
+ fontSize: 18
+ },
+ parent2: {
+ fontSize: 18,
+ color: '#000',
+ align: 'center',
+ padding: [10, 10],
+ backgroundColor: {
+ image: three,
+ repeat: "no-repeat",
+ },
+ },
+ parent3: {
+ color: '#000',
+ padding: [10, 10],
+ backgroundColor: {
+ image: four,
+ repeat: "no-repeat",
+ },
+ fontSize: 18
},
- main: {
- color: '#0780ED',
- fontSize: 12,
- padding: 0,
- fontWeight: 600,
- backgroundColor: '#E6F2FD',
- borderRadius: 2
- }
}
},
+
+
leaves: { //叶子节点文本样式
label: {
- //backgroundColor: '#81c5f7',
+ // backgroundColor: '#81c5f7',
backgroundColor: '#fff',
color:'#333',
position: 'bottom',
@@ -187,15 +130,15 @@ export default function jgOption() {
verticalAlign: 'middle',
align: 'center',
//文本框内文字超过6个字折行
- /* formatter: function(val) {
- let strs = val.name.split(''); //字符串数组
- let str = ''
- for(let i = 0, s; s = strs[i++];) { //遍历字符串数组
- str += s;
- if(!(i % 6)) str += '\n'; //按需要求余，目前是一个字换一行
- }
- return str
- }, */
+ // formatter: function(val) {
+ // let strs = val.name.split(''); //字符串数组
+ // let str = ''
+ // for(let i = 0, s; s = strs[i++];) { //遍历字符串数组
+ // str += s;
+ // if(!(i % 6)) str += '\n'; //按需要求余，目前是一个字换一行
+ // }
+ // return str
+ // },
//或者
overflow:'break',//break为文字折行， truncate为文字超出部分省略号显示
lineOverflow:'truncate',//文字超出高度后 直接截取
diff --git a/src/views/zbgl/zbrz/toolbar.js b/src/views/zbgl/zbrz/toolbar.js
index f86e904ca..fdbd94c96 100644
--- a/src/views/zbgl/zbrz/toolbar.js
+++ b/src/views/zbgl/zbrz/toolbar.js
@@ -12,26 +12,26 @@ const ToolBar = ({ setSearchVal, onSave, exportFile,role }) => {
const onFinish = (values) => {
- let dataSo;
+ let dateSo;
if (values.tm) {
- dataSo = {
+ dateSo = {
start: moment(values.tm[0]).format('YYYY-MM-DD HH:mm:ss'),
end: moment(values.tm[1]).format('YYYY-MM-DD HH:mm:ss')
}
}
delete values.tm
- setSearchVal({...values, startTime:dataSo?.start,endTime:dataSo?.end});
+ setSearchVal({...values, startTime:dateSo?.start,endTime:dateSo?.end});
}
useEffect(() => {
let time = [moment().subtract(7,"days"),moment()]
- let dataSo = {
+ let dateSo = {
start:moment(time[0]).format('YYYY-MM-DD 00:00:00'),
end:moment(time[1]).format('YYYY-MM-DD 23:59:59'),
}
form.setFieldValue("tm",time)
- setSearchVal(dataSo)
+ setSearchVal(dateSo)
}, [])
return (
<>