diff --git a/src/military/qz2022.js b/src/military/qz2022.js index a24acc864..c7b92a71a 100644 --- a/src/military/qz2022.js +++ b/src/military/qz2022.js @@ -101,8 +101,6 @@ const Qz2022 = (props) => { referStatus = !applyStatus && Date.parse(new Date()) < Date.parse(new Date(qzDetail.upload_date)); } - console.log(qzDetail); - return ( {/* banner图+选项 */} diff --git a/src/military/qz2022/chat/index.jsx b/src/military/qz2022/chat/index.jsx index 2aa9e183b..b0050cae7 100644 --- a/src/military/qz2022/chat/index.jsx +++ b/src/military/qz2022/chat/index.jsx @@ -1,5 +1,6 @@ import React from "react"; -import chatSvg from "../image/chat.svg"; +// import chatSvg from "../image/chat.svg"; +import chatBanner from '../image/chat_banner.png'; import btn from "../image/btn-right.png"; import './index.scss'; import '../../index.scss'; @@ -10,7 +11,7 @@ function Chat({ form, showNotification, match, history }) { return (
- +
交流互动
diff --git a/src/military/qz2022/contact/index.jsx b/src/military/qz2022/contact/index.jsx index 972a7ed00..71b258881 100644 --- a/src/military/qz2022/contact/index.jsx +++ b/src/military/qz2022/contact/index.jsx @@ -9,21 +9,13 @@ function Contact({ aboutUs }) { return (
-
-
- -
联系我们
-
+
- {/*

主办方：JWJWJW联合参谋部、科学技术委员会

-

协办方：军事科学院、航天科技集团

*/} - {/*
-

地址：北京市海淀区西三环北路72号

-

Email：osredm@163.com

-

电话：+86-010-66357650

-
*/} +
+
+
diff --git a/src/military/qz2022/contact/index.scss b/src/military/qz2022/contact/index.scss index 4cea2afef..bfe002ae8 100644 --- a/src/military/qz2022/contact/index.scss +++ b/src/military/qz2022/contact/index.scss @@ -5,13 +5,18 @@ } .contact { margin: 0 auto; - padding: 1rem 1.5rem; + padding: 3rem; background: #fff; - .contact-top{ - position: relative; - } + display: flex; + justify-content: space-between; + + .contact-png{ - width: 100%; + width: 55%; + margin-left:1rem; + img{ + width: 100%; + } } .contact-tit{ @@ -24,7 +29,7 @@ font-weight: 700; } .contact-words { - padding: 1.5rem; + max-width: 45%; } .contact-content { diff --git a/src/military/qz2022/image/chat_banner.png b/src/military/qz2022/image/chat_banner.png new file mode 100644 index 000000000..b1f13370c Binary files /dev/null and b/src/military/qz2022/image/chat_banner.png differ diff --git a/src/military/qz2022/image/contact.png b/src/military/qz2022/image/contact.png index 6e0bd90e8..c8a8d9fb2 100644 Binary files a/src/military/qz2022/image/contact.png and b/src/military/qz2022/image/contact.png differ diff --git a/src/military/qz2022/introduce/index.jsx b/src/military/qz2022/introduce/index.jsx index cff6edbd5..075057293 100644 --- a/src/military/qz2022/introduce/index.jsx +++ b/src/military/qz2022/introduce/index.jsx @@ -8,14 +8,17 @@ function Introduce({ qzDetail }) { let content= qzDetail&&qzDetail.content; let video_url= qzDetail&&qzDetail.video_url; - console.log(qzDetail); return (
+<<<<<<< HEAD <<<<<<< HEAD
“启智”2022作战概念·JSJSJS需求创新大赛
+======= +
“启智-2022”作战概念·JSJSJS需求创新大赛
+>>>>>>> 2805cd0d (修改样式等)
======= diff --git a/src/military/qz2022/statistics/EchartBar/index.jsx b/src/military/qz2022/statistics/EchartBar/index.jsx index 323de39a3..d0add82d3 100644 --- a/src/military/qz2022/statistics/EchartBar/index.jsx +++ b/src/military/qz2022/statistics/EchartBar/index.jsx @@ -14,8 +14,8 @@ if (clientWidth < 1000) { } let fontSizeTitle = 1.25 * fontSizeText; -const colorArr0 = ['rgba(226, 217, 255, 1)', 'rgba(251, 201, 0, 0.36)', 'rgba(145, 193, 255, 0.61)']; -const colorArr1 = ['rgba(155, 128, 245, 1)', 'rgba(254, 140, 0, 1)', 'rgba(37, 109, 255, 1)']; +const colorArr0 = ['rgba(226, 217, 255, 1)', 'rgba(254, 230, 147, 1)', 'rgba(187, 217, 255, 1)']; +const colorArr1 = ['rgba(189, 170, 255, 1)', 'rgba(251, 184, 103, 1)', 'rgba(112, 159, 255, 1)']; export default ({ id, className, title, legendArr, xData, yData }) => { @@ -24,181 +24,62 @@ export default ({ id, className, title, legendArr, xData, yData }) => { let textColor = "#7988a5"; let normalColor = "#e8e8ed"; - // var colors = [ - // { - // type: 'linear', - // x: 0, x2: 1, y: 0, y2: 0, - // colorStops: [{ - // offset: 0, - // color: '#218bd1' - // }, { - // offset: 0.5, - // color: '#7EC3F0' - // }, { - // offset: 0.5, - // color: '#1985cd' - // }, { - // offset: 1, - // color: '#1985cd' - // }] - // }, - // { - // type: 'linear', - // x: 0, x2: 1, y: 0, y2: 0, - // colorStops: [{ - // offset: 0, - // color: '#6DD4E5' - // }, { - // offset: 0.5, - // color: '#6DD4E5' - // }, { - // offset: 0.5, - // color: '#0EADC9' - // }, { - // offset: 1, - // color: '#218bd1' - // }] - // }, - // { - // type: 'linear', - // x: 0, x2: 1, y: 0, y2: 0, - // colorStops: [{ - // offset: 0, - // color: '#acace6' - // }, { - // offset: 0.5, - // color: '#acace6' - // }, { - // offset: 0.5, - // color: '#6161bd' - // }, { - // offset: 1, - // color: '#6161bd' - // }] - // } + let colors = [ + { + type: 'linear', + x: 0, x2: 1, y: 0, y2: 0, + colorStops: [{ + offset: 0, + color: colorArr0[0]//'#218bd1' + }, { + offset: 0.5, + color: colorArr0[0]//'#7EC3F0' + }, { + offset: 0.5, + color: colorArr1[0]// '#1985cd' + }, { + offset: 1, + color: colorArr0[0]//'#1985cd' + }] + }, + { + type: 'linear', + x: 0, x2: 1, y: 0, y2: 0, + colorStops: [{ + offset: 0, + color: colorArr0[1]//'#6DD4E5' + }, { + offset: 0.5, + color: colorArr0[1]//'#6DD4E5' + }, { + offset: 0.5, + color: colorArr1[1]//'#0EADC9' + }, { + offset: 1, + color: colorArr0[1]//'#218bd1' + }] + }, + { + type: 'linear', + x: 0, x2: 1, y: 0, y2: 0, + colorStops: [{ + offset: 0, + color: colorArr0[2]//'#acace6' + }, { + offset: 0.5, + color: colorArr0[2]//'#acace6' + }, { + offset: 0.5, + color: colorArr1[2]//'#6161bd' + }, { + offset: 1, + color: colorArr0[2]//'#6161bd' + }] + } + ]; - // ]; - // var barWidth = 35; - - // let option = { - // title: { - // text: 'Awesome Chart' - // }, - // xAxis: { - // data: ['Sun', 'Mon', 'Tue'] - // }, - // legend: { - // data: ['高一', '高二', '高三'], - // textStyle: { - // color: 'white', //坐标的字体颜色 - // }, - // }, - // tooltip: { - // trigger: 'axis', - // formatter: function (params) { - // // let paramsData=params.filter(i=>{return i.seriesType==='bar'}) - // // console.log(paramsData); - // // // return ( - - // // // ) - // return params.filter(i => { return i.seriesType === 'bar' }); - // } - // }, - // yAxis: {}, - // series: [ - // { - // z: 1, - // name: '高一', - // type: 'bar', - // barWidth: barWidth, - // data: [320, 200, 260], - // itemStyle: { - // normal: { - // color: colors[0] - // } - // }, - // } - // , - // { - // z: 3, - // name: '左上部1', - // type: 'pictorialBar', - // symbolPosition: 'end', - // data: [320, 200, 260], - // symbol: 'diamond', - // symbolOffset: ['-150%', '-50%'], - // symbolSize: [barWidth - 4, 10 * (barWidth - 4) / barWidth], - // itemStyle: { - // normal: { - // borderColor: '#218bd1', - // borderWidth: 2, - // color: '#218bd1' - // } - // }, - // }, - // { - // z: 1, - // name: '高二', - // type: 'bar', - // barWidth: barWidth, - // data: [170, 182, 191], - // itemStyle: { - // normal: { - // color: colors[1] - // } - // }, - // } - // , - // { - // z: 3, - // name: '中上部1', - // type: 'pictorialBar', - // symbolPosition: 'end', - // data: [170, 182, 191], - // symbol: 'diamond', - // symbolOffset: ['0%', '-50%'], - // symbolSize: [barWidth - 4, 10 * (barWidth - 4) / barWidth], - // itemStyle: { - // normal: { - // borderColor: '#2edaf8', - // borderWidth: 2, - // color: '#2edaf8' - // } - // }, - // }, - // { - // z: 1, - // type: 'bar', - // name: '高三', - // barWidth: barWidth, - // data: [220, 182, 191], - // itemStyle: { - // normal: { - // color: colors[2] - // } - // }, - // }, - // { - // z: 3, - // name: '右上部1', - // type: 'pictorialBar', - // symbolPosition: 'end', - // data: [220, 182, 191], - // symbol: 'diamond', - // symbolOffset: ['145%', '-50%'], - // symbolSize: [barWidth - 4, 10 * (barWidth - 4) / barWidth], - // itemStyle: { - // normal: { - // borderColor: '#7b7be1', - // borderWidth: 2, - // color: '#7b7be1' - // } - // }, - // }, - - // ] - // }; + let barWidth = 25; let option = { grid: { @@ -231,6 +112,28 @@ export default ({ id, className, title, legendArr, xData, yData }) => { backgroundColor: 'rgba(255,255,255,0.8)', textStyle: { color: "#333" + }, + formatter: function (params) { + let paramsData = params.filter(i => { return i.seriesType === 'bar' }); + // console.log(params); + return ( + paramsData[0].name + + '
' + + paramsData[0].marker + + paramsData[0].seriesName + + '：' + + paramsData[0].value + + '
' + + paramsData[1].marker + + paramsData[1].seriesName + + '：' + + paramsData[1].value + + '
' + + paramsData[2].marker + + paramsData[2].seriesName + + '：' + + paramsData[2].value + ) } }, legend: { @@ -290,6 +193,7 @@ export default ({ id, className, title, legendArr, xData, yData }) => { show: false }, splitLine: { + // show: false, lineStyle: { color: normalColor, type: 'dotted', @@ -300,47 +204,56 @@ export default ({ id, className, title, legendArr, xData, yData }) => { }; yData.forEach((data, i) => { option.series.push({ + z: 1, name: legendArr[i], type: "bar", - data: data, - barWidth: "20%", - // itemStyle: { - // normal: { - // color: colors[i] - // } - // }, + index: i, + data, + barWidth: barWidth, itemStyle: { normal: { - color: { - type: "linear", - x: 0, - y: 0, - x2: 0, - y2: 1, - colorStops: [{ - offset: 0, - color: colorArr0[i], - }, - { - offset: 1, - color: colorArr1[i] - } - ], - globalCoord: false - } + color: colors[i] } }, - label: { - show: true, - position: "top", - color: '#fff', - fontSize: fontSizeText, - formatter: function (params) { - return params.value || '' - }, + }); + + // option.series.push({ + // z: 2, + // name: legendArr[i] + '下', + // type: 'pictorialBar', + // data, + // symbol: 'diamond', + // symbolOffset: [(i - 1) * 150 + '%', '50%'], + // symbolSize: [barWidth - 4, 10 * (barWidth - 4) / barWidth], + // itemStyle: { + // normal: { + // borderWidth: 0, + // color: colorArr1[i] + // } + // }, + // }); + + option.series.push({ + z: 100, + name: legendArr[i] + '上', + type: 'pictorialBar', + symbolPosition: 'end', + data, + symbol: 'diamond', + symbolOffset: [(i - 1) * 130 + '%', '-50%'], + symbolSize: [barWidth, 10 * (barWidth - 3) / barWidth], + itemStyle: { + normal: { + borderWidth: 0, + color: colorArr0[i] + } } }); + }); + + console.log(option.series); + newEchartBar && newEchartBar.setOption(option); }, [id, title, xData, yData]) diff --git a/src/military/qz2022/statistics/index.jsx b/src/military/qz2022/statistics/index.jsx index f0179284a..f537457f5 100644 --- a/src/military/qz2022/statistics/index.jsx +++ b/src/military/qz2022/statistics/index.jsx @@ -22,7 +22,6 @@ const initPieArr = [ }, ]; -const initLegendArr = ["战略方向", "前沿技术", "作战领域"]; const initBarYData = [[0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0]]; @@ -31,7 +30,7 @@ function Statistics({ showNotification, qzDetail }) { const [pieArr, setPieArr] = useState(initPieArr); const [barXData, setBarXData] = useState(['LJLJLJ', 'HJHJHJ', 'KJKJKJ', 'HJJHJJHJJ', 'ZLZYBD', '联勤保障', 'WJWJWJ']); - const [legendArr, setLegendArr] = useState(initLegendArr); + const [legendArr, setLegendArr] = useState([]); const [barYData, setBarYData] = useState(initBarYData); const [uploadCount, setUploadCount] = useState(0); const [enrollCount, setEnrollCount] = useState(0); @@ -112,7 +111,9 @@ function Statistics({ showNotification, qzDetail }) {
} {/* 内网 */} - {is_local &&
+ { + is_local && +