gj_mes
/
gj-erp-kban-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

Browse Source
main
biubiubiu 7 months ago
parent 3e93854416
commit 0c792d4b9d
3 changed files with 1390 additions and 1469 deletions
Show Stats Download Patch File Download Diff File

2737
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
package.json
Unescape View File

@ -36,7 +36,7 @@
"eslint-plugin-import": "^2.25.3", "eslint-plugin-import": "^2.25.3",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^5.1.0", "eslint-plugin-promise": "^5.1.0",
"eslint-plugin-vue": "^8.0.3", "eslint-plugin-vue": "^7.0.0",
"postcss": "^8.4.49", "postcss": "^8.4.49",
"sass": "^1.32.7", "sass": "^1.32.7",
"sass-loader": "^12.0.0", "sass-loader": "^12.0.0",

68
src/components/LineTableAnalysis/index.vue
Unescape View File

@ -134,47 +134,47 @@ export default {
}); });
xbStartData.push( xbStartData.push(
new Date( xbListCopy[item] && xbListCopy[item][0].yf
? new Date(
this.$moment().format("yyyy") + this.$moment().format("yyyy") +
"/" + "/" +
(xbListCopy[item] && xbListCopy[item][0].yf xbListCopy[item][0].yf +
? xbListCopy[item][0].yf
: "") +
"/01" "/01"
) )
: ""
); );
xbEndData.push( xbEndData.push(
new Date( xbListCopy[item] && xbListCopy[item].length > 0
? new Date(
this.$moment().format("yyyy") + this.$moment().format("yyyy") +
"/" + "/" +
(xbListCopy[item] && xbListCopy[item].length > 0 xbListCopy[item][xbListCopy[item].length - 1].yf +
? xbListCopy[item][xbListCopy[item].length - 1].yf
: "") +
"/01" "/01"
) )
: ""
); );
// ===== // =====
ydStartData.push( ydStartData.push(
new Date( ydListCopy[item] && ydListCopy[item].length > 0
? new Date(
this.$moment().format("yyyy") + this.$moment().format("yyyy") +
"/" + "/" +
(ydListCopy[item] && ydListCopy[item].length > 0 ydListCopy[item][0].yf +
? ydListCopy[item][0].yf
: "") +
"/01" "/01"
) )
: ""
); );
ydEndData.push( ydEndData.push(
new Date( ydListCopy[item] && ydListCopy[item].length > 0
? new Date(
this.$moment().format("yyyy") + this.$moment().format("yyyy") +
"/" + "/" +
(ydListCopy[item] && ydListCopy[item].length > 0 ydListCopy[item][ydListCopy[item].length - 1].yf +
? ydListCopy[item][ydListCopy[item].length - 1].yf
: "") +
"/01" "/01"
) )
: ""
); );
}); });
// 船只分析甘特图 // 船只分析甘特图
@ -400,41 +400,49 @@ export default {
}, },
formatter: (params) => { formatter: (params) => {
if (params && params.length) { if (params && params.length) {
var res = ""; var xbRes = "";
var ydRes = "";
var date0 = this.$moment(params[0].data).format("yyyy-MM"); var date0 = this.$moment(params[0].data).format("yyyy-MM");
var date1 = var date1 =
params.length > 1 params.length > 1 && params[1].data
? this.$moment(params[1].data).format("yyyy-MM") ? this.$moment(params[1].data).format("yyyy-MM")
: ""; : "";
var date2 = var date2 =
params.length > 2 params.length > 2 && params[2].data
? this.$moment(params[2].data).format("yyyy-MM") ? this.$moment(params[2].data).format("yyyy-MM")
: ""; : "";
var date3 = var date3 =
params.length > 3 params.length > 3 && params[3].data
? this.$moment(params[3].data).format("yyyy-MM") ? this.$moment(params[3].data).format("yyyy-MM")
: ""; : "";
res =
if (date0 || date1) {
xbRes =
params[0].name + params[0].name +
"</br>" + "</br>" +
(params.length > 1 params[1].marker +
? params[1].marker + params[1].seriesName params[1].seriesName +
: "") +
":</br>" + ":</br>" +
date0 + date0 +
"~" + "~" +
date1 + date1 +
"</br>" + "</br>";
(params.length > 3 } else {
? params[3].marker + params[3].seriesName xbRes = "";
: "") + }
if (date2 || date3) {
ydRes =
params[3].marker +
params[3].seriesName +
":</br>" + ":</br>" +
date2 + date2 +
"~" + "~" +
date3 + date3 +
"</br>"; "</br>";
} else {
return res; ydRes = "";
}
return xbRes + ydRes;
} }
}, },
}, },

Write Preview
Loading…
Cancel
Save