free-sun
/
Highways4Good
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
Browse Source

tijiao

dev
wangyue 2 years ago
parent
cf3e8fce18
commit
fc39871362
9 changed files with 1851 additions and 15 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 102
      api/log/development.log
  2. 4
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
  3. 8
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
  4. 8
      web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js
  5. 4
      web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js
  6. 2
      web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
  7. 2
      web/client/src/sections/quanju/containers/heand/index.js
  8. 1734
      web/log/development.txt
  9. 2
      web/package.json

102
api/log/development.log
View File

@ -10816,3 +10816,105 @@ headers: {}
2022-07-30 17:48:40.152 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-07-30 17:48:40.152 - info: [FS-AUTH] Inject auth and api mv into router.
>>>>>>> d8f96cea72338cf7a61dea293bd6d0cd5da48bb0
2022-08-12 09:20:22.775 - debug: [FS-LOGGER] Init.
2022-08-12 09:20:23.676 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:20:23.676 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 09:20:23.978 - error: [app]
{
message: "Unexpected token '<<'",
stack: 'f:\\Highways4Good\\api\\app\\lib\\controllers\\data\\index.js:84\n' +
'<<<<<<< HEAD\n' +
'^^\n' +
'\n' +
"SyntaxError: Unexpected token '<<'\n" +
' at wrapSafe (internal/modules/cjs/loader.js:915:16)\n' +
' at Module._compile (internal/modules/cjs/loader.js:963:27)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at Object.<anonymous> (f:\\Highways4Good\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' +
' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:11:17\n' +
' at Array.forEach (<anonymous>)\n' +
' at f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:9:60\n' +
' at Array.forEach (<anonymous>)\n' +
' at module.exports (f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:7:31)\n' +
' at Object.module.exports.entry (f:\\Highways4Good\\api\\app\\lib\\index.js:21:14)\n' +
' at f:\\Highways4Good\\api\\node_modules\\fs-web-server-scaffold\\index.js:74:20\n' +
' at Array.forEach (<anonymous>)'
}
2022-08-12 09:20:31.177 - debug: [FS-LOGGER] Init.
2022-08-12 09:20:31.259 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:20:31.259 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 09:20:31.270 - error: [app]
{
message: "Unexpected token '<<'",
stack: 'f:\\Highways4Good\\api\\app\\lib\\controllers\\data\\index.js:84\n' +
'<<<<<<< HEAD\n' +
'^^\n' +
'\n' +
"SyntaxError: Unexpected token '<<'\n" +
' at wrapSafe (internal/modules/cjs/loader.js:915:16)\n' +
' at Module._compile (internal/modules/cjs/loader.js:963:27)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at Object.<anonymous> (f:\\Highways4Good\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' +
' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:11:17\n' +
' at Array.forEach (<anonymous>)\n' +
' at f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:9:60\n' +
' at Array.forEach (<anonymous>)\n' +
' at module.exports (f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:7:31)\n' +
' at Object.module.exports.entry (f:\\Highways4Good\\api\\app\\lib\\index.js:21:14)\n' +
' at f:\\Highways4Good\\api\\node_modules\\fs-web-server-scaffold\\index.js:74:20\n' +
' at Array.forEach (<anonymous>)'
}
2022-08-12 09:22:44.217 - debug: [FS-LOGGER] Init.
2022-08-12 09:22:44.296 - info: [FS-ATTACHMENT] Inject attachment mw into router.
2022-08-12 09:22:44.297 - info: [FS-AUTH] Inject auth and api mv into router.
2022-08-12 09:22:44.306 - error: [app]
{
message: "Unexpected token '<<'",
stack: 'f:\\Highways4Good\\api\\app\\lib\\controllers\\data\\index.js:84\n' +
'<<<<<<< HEAD\n' +
'^^\n' +
'\n' +
"SyntaxError: Unexpected token '<<'\n" +
' at wrapSafe (internal/modules/cjs/loader.js:915:16)\n' +
' at Module._compile (internal/modules/cjs/loader.js:963:27)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at Object.<anonymous> (f:\\Highways4Good\\api\\app\\lib\\routes\\data\\index.js:10:19)\n' +
' at Module._compile (internal/modules/cjs/loader.js:999:30)\n' +
' at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)\n' +
' at Module.load (internal/modules/cjs/loader.js:863:32)\n' +
' at Function.Module._load (internal/modules/cjs/loader.js:708:14)\n' +
' at Module.require (internal/modules/cjs/loader.js:887:19)\n' +
' at require (internal/modules/cjs/helpers.js:74:18)\n' +
' at f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:11:17\n' +
' at Array.forEach (<anonymous>)\n' +
' at f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:9:60\n' +
' at Array.forEach (<anonymous>)\n' +
' at module.exports (f:\\Highways4Good\\api\\app\\lib\\routes\\index.js:7:31)\n' +
' at Object.module.exports.entry (f:\\Highways4Good\\api\\app\\lib\\index.js:21:14)\n' +
' at f:\\Highways4Good\\api\\node_modules\\fs-web-server-scaffold\\index.js:74:20\n' +
' at Array.forEach (<anonymous>)'
}

4
web/client/src/sections/quanju/containers/footer/leadership/centerleft/daolu.js
View File

@ -59,9 +59,9 @@ const Right = (props) => {
num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
<img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>南昌县大道路段三号路口西南门路</p>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>养护类型<span style={{ color: "#EEF4FF", marginLeft: "30px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>日常养护</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>负责人<span style={{ color: "#EEF4FF", marginLeft: "45px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>老王老肖</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>负责人<span style={{ color: "#EEF4FF", marginLeft: "45px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>{item.user?.name ? item.user.name : "--"}</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>日期<span style={{ color: "#EEF4FF", marginLeft: "60px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>{moment(item.time).format("YYYY-MM-DD") ? moment(item.time).format("YYYY-MM-DD") : "--"}</span></p>
</div>
</div> : ""

8
web/client/src/sections/quanju/containers/footer/leadership/centerleft/handong.js
View File

@ -59,15 +59,15 @@ const Right = (props) => {
<p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
<p style={{ textAlign: "right", width: "30%", position: "absolute", right: "3%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}</p>
<p style={{ textAlign: "right", width: "30%", position: "absolute", right: "3%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-DD HH:mm:ss") ? moment(item.time).format("YYYY-MM-DD HH:mm:ss") : "--"}</p>
{
num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
<img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>南昌县大道路段三号路口西南门路</p>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>养护类型<span style={{ color: "#EEF4FF", marginLeft: "30px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>日常养护</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>负责人<span style={{ color: "#EEF4FF", marginLeft: "45px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>老王老肖</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>日期<span style={{ color: "#EEF4FF", marginLeft: "60px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>2022-06-05</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>负责人<span style={{ color: "#EEF4FF", marginLeft: "45px", fontFamily: " PingFangSC-Medium, PingFang SC" }}> {item.user?.name ? item.user.name : "--"}</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>日期<span style={{ color: "#EEF4FF", marginLeft: "60px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>{moment(item.time).format("YYYY-MM-DD") ? moment(item.time).format("YYYY-MM-DD") : "--"}</span></p>
</div>
</div> : ""
}

8
web/client/src/sections/quanju/containers/footer/leadership/centerleft/qiqoliang.js
View File

@ -51,15 +51,15 @@ const Right = (props) => {
<p style={{ textAlign: "center", width: "10%", position: "absolute", left: "43%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >日常养护</p>
{item.user?.name ? <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.user.name}</p> : <p style={{ textAlign: "center", width: "10%", position: "absolute", right: "28.5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >--</p>}
<p style={{ textAlign: "left", width: "25%", position: "absolute", left: "5%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }} >{item.road ? item.road : "--"}</p>
<p style={{ textAlign: "right", width: "30%", position: "absolute", right: "3%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-Do HH:mm:ss") ? moment(item.time).format("YYYY-MM-Do HH:mm:ss") : "--"}</p>
<p style={{ textAlign: "right", width: "30%", position: "absolute", right: "3%", color: beijing == index ? "#ffffff" : "rgba(216,240,255,0.8)" }}>{moment(item.time).format("YYYY-MM-DD HH:mm:ss") ? moment(item.time).format("YYYY-MM-DD HH:mm:ss") : "--"}</p>
{
num == index ? <div style={{ position: "fixed", width: "400px", height: "200px", zIndex: 100, left: "50%", marginTop: "0", top: "35%" }}>
<img src='/assets/images/leadership/beijinglan.png' style={{ width: "100%", height: "100%" }} />
<div style={{ position: "absolute", top: "0", width: "50%", left: "50%", paddingRight: "10px" }}>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>南昌县大道路段三号路口西南门路</p>
<p style={{ marginTop: "20px", color: "#FFFFFF", fontSize: "16px", fontFamily: "YouSheBiaoTiHei" }}>{item.roadSectionStart ? item.roadSectionStart : ""}{item.roadSectionStart && item.roadSectionEnd ? "——" : ""}{item.roadSectionEnd ? item.roadSectionEnd : ""}{item.roadSectionStart || item.roadSectionEnd ? "" : "--"}</p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>养护类型<span style={{ color: "#EEF4FF", marginLeft: "30px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>日常养护</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>负责人<span style={{ color: "#EEF4FF", marginLeft: "45px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>老王老肖</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>日期<span style={{ color: "#EEF4FF", marginLeft: "60px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>2022-06-05</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>负责人<span style={{ color: "#EEF4FF", marginLeft: "45px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>{item.user?.name ? item.user.name : "--"}</span></p>
<p style={{ color: "rgba(216,240,255,0.8)", fontSize: "14px", fontFamily: "PingFangSC-Regular, PingFang SC" }}>日期<span style={{ color: "#EEF4FF", marginLeft: "60px", fontFamily: " PingFangSC-Medium, PingFang SC" }}>{moment(item.time).format("YYYY-MM-DD") ? moment(item.time).format("YYYY-MM-DD") : "--"}</span></p>
</div>
</div> : ""
}

4
web/client/src/sections/quanju/containers/footer/leadership/left/echarts/leftbottomecharts.js
View File

@ -154,11 +154,11 @@ const Leftbottomecharts = (props) => {
<div onClick={() => {
setFlag(true)
}} style={{ position: "absolute", top: "75%", left: "75%", width: "72px", height: "20px", backgroundColor: "rgba(216,240,255,0.1000)", float: "right", textAlign: "center", zIndex: 100, marginRight: "4%", borderLeft: "solid 2px #6E7A83" }} >
<p style={{ color: flag == false ? "rgba(216,240,255,0.8000)" : "#fff", fontSize: "0.4vh", lineHeight: "20px" }}>已建</p></div>
<p style={{ color: flag == false ? "rgba(216,240,255,0.8000)" : "#fff", fontSize: "0.4vh", lineHeight: "20px" }}>修建</p></div>
<div onClick={() => {
setFlag(false)
}} style={{ position: "absolute", width: "72px", left: "45%", top: "75%", height: "20px", backgroundColor: "rgba(216,240,255,0.1000)", float: "right", textAlign: "center", marginRight: "4%", borderLeft: "solid 2px #6E7A83" }}>
<p style={{ color: flag == true ? "rgba(216,240,255,0.8000)" : "#fff", fontSize: "0.4vh", lineHeight: "20px" }} >未建</p></div >
<p style={{ color: flag == true ? "rgba(216,240,255,0.8000)" : "#fff", fontSize: "0.4vh", lineHeight: "20px" }} >改建</p></div >
<div ref={chartRef} style={{
height: "18vh", width: "100%", position: "absolute", top: "77%"
}}></div>

2
web/client/src/sections/quanju/containers/footer/leadership/right/right-bottom.js
View File

@ -19,7 +19,7 @@ const Rightbottom = (props) => {
let d = res.payload.data?.overSpeedList?.filter((item, index) => {
return /.*[\u4e00-\u9fa5_a-zA-Z]+.*$/.test(item.processingTime) == false
})
console.log(res);
d.map((item, index) => {
if (parseInt(item.processingTime.match(/([^.]*)$/)[0]) < 10) {
return item.processingTime = `${(item.processingTime.match(/^([^.]*)(.[^.]*)/)[0])}.0${parseInt(item.processingTime.match(/([^.]*)$/)[0])}`

2
web/client/src/sections/quanju/containers/heand/index.js
View File

@ -34,7 +34,7 @@ const Header = (props) => {
<div className={tabKey == "operation" ? "tabKey-map" : "notabKey"} style={{ left: "76%", backgroundImage: "url(/assets/images/quanju/youbeijing.png)", backgroundSize: "100% 100%" }} onClick={() => {
onClick("operation")
}}><a>运营</a></div>
<div style={{ cursor: "pointer", color: "#DBFAFF", position: "absolute", left: "90%", top: "15px", fontSize: "0.6vw", width: "10%", textAlign: "center" }} onClick={() => dianji()}>南昌县运输交通总局</div>
<div style={{ cursor: "pointer", color: "#DBFAFF", position: "absolute", left: "90%", top: "15px", fontSize: "0.6vw", width: "10%", textAlign: "center" }} onClick={() => dianji()}>南昌县交通运输局</div>
</div>
)
}

1734
web/log/development.txt
View File

File diff suppressed because it is too large

2
web/package.json
View File

@ -6,7 +6,7 @@
"scripts": {
"test": "mocha",
"start": "cross-env NODE_ENV=development npm run start-params",
"start-params": "node server -p 5000 -u http://10.8.30.157:9119/ --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
"start-params": "node server -p 4000 -u http://localhost:14000 --qndmn http://rfkimpwbb.hn-bkt.clouddn.com",
"deploy": "export NODE_ENV=production&&npm run color && npm run build && node server",
"build-dev": "export NODE_ENV=development&&webpack --config webpack.config.js",
"build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js",

Write Preview
Loading…
Cancel
Save