Skip to content

9
912project
提交 711dbaf6 authored 作者: CRS's avatar CRS
浏览文件
操作

修改里程碑显示

上级 5e225d9b
显示空白字符变更
内嵌 并排
正在显示 包含 43 行增加 和 32 行删除
package-lock.json
浏览文件 @ 711dbaf6
...@@ -5261,7 +5261,8 @@ ...@@ -5261,7 +5261,8 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
...@@ -5282,12 +5283,14 @@ ...@@ -5282,12 +5283,14 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
...@@ -5302,17 +5305,20 @@ ...@@ -5302,17 +5305,20 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
...@@ -5429,7 +5435,8 @@ ...@@ -5429,7 +5435,8 @@
"inherits": { "inherits": {
"version": "2.0.4", "version": "2.0.4",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
...@@ -5441,6 +5448,7 @@ ...@@ -5441,6 +5448,7 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
...@@ -5455,6 +5463,7 @@ ...@@ -5455,6 +5463,7 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
...@@ -5462,12 +5471,14 @@ ...@@ -5462,12 +5471,14 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.9.0", "version": "2.9.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
...@@ -5486,6 +5497,7 @@ ...@@ -5486,6 +5497,7 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
...@@ -5575,7 +5587,8 @@ ...@@ -5575,7 +5587,8 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
...@@ -5587,6 +5600,7 @@ ...@@ -5587,6 +5600,7 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
...@@ -5672,7 +5686,8 @@ ...@@ -5672,7 +5686,8 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
...@@ -5708,6 +5723,7 @@ ...@@ -5708,6 +5723,7 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
...@@ -5727,6 +5743,7 @@ ...@@ -5727,6 +5743,7 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
...@@ -5770,12 +5787,14 @@ ...@@ -5770,12 +5787,14 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.1.1", "version": "3.1.1",
"bundled": true, "bundled": true,
"dev": true "dev": true,
"optional": true
} }
} }
}, },
......
src/components/evaluationReport/evaluationReport.vue
浏览文件 @ 711dbaf6
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
add(){ add(){
console.log(this.$store.state.userData.userName) console.log(this.$store.state.userData.userName)
this.$router.push({ this.$router.push({
name: "assessmentReport", name: 'assessmentReport',
query: { query: {
username:this.$store.state.userData.userName, username:this.$store.state.userData.userName,
authority: this.$store.state.userData.type, authority: this.$store.state.userData.type,
...@@ -97,8 +97,8 @@ export default { ...@@ -97,8 +97,8 @@ export default {
}, },
// 初始请求 // 初始请求
init() { init() {
var username = '' let username = ''
if(this.$store.state.userData.userName != 'admin'){ if (this.$store.state.userData.userName !== 'admin'){
username =this.$store.state.userData.userName username =this.$store.state.userData.userName
} }
let val = { let val = {
...@@ -135,8 +135,6 @@ export default { ...@@ -135,8 +135,6 @@ export default {
evaluation(row) { evaluation(row) {
console.log(row) console.log(row)
console.log(this.$store.state.userData) console.log(this.$store.state.userData)
// return
this.$router.push({name:'assessmentReport', query: { this.$router.push({name:'assessmentReport', query: {
username: row.username, username: row.username,
id: row.id, id: row.id,
...@@ -180,19 +178,15 @@ export default { ...@@ -180,19 +178,15 @@ export default {
}, },
// 时间换算 // 时间换算
time(value) { time(value) {
// console.log(timestamp)
value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '') value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
if (value !== undefined && value !== null) { if (value !== undefined && value !== null) {
let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000 let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
var day = moment(value).format('YYYY-MM-DD HH:mm:ss'); let day = moment(value).format('YYYY-MM-DD HH:mm:ss');
var day2 = moment(day).utc().format() let day2 = moment(day).utc().format()
// console.log(day)
// console.log(timestamp.length)
return day return day
} else { } else {
return '' return ''
} }
} }
}, },
components: { components: {
......
src/components/home/home.vue
浏览文件 @ 711dbaf6
...@@ -116,16 +116,6 @@ export default { ...@@ -116,16 +116,6 @@ export default {
this.$store.commit('changeHomeClick', val); // 传给导航进行样式定位和点击事件 this.$store.commit('changeHomeClick', val); // 传给导航进行样式定位和点击事件
this.$store.commit('changeNowPath', path); // 当前path传给header作比对 this.$store.commit('changeNowPath', path); // 当前path传给header作比对
this.$router.push({name: path}); this.$router.push({name: path});
},
// 跳转到其他页面
goOther(path) {
if (this.$store.getters.getUserData.type !== 1) {
let val = path + '?username=' + this.$store.getters.getUserData.userName + '&authority=0';
window.open(val);
} else if (this.$store.getters.getUserData.type === 1) {
let val = path + '?username=' + this.$store.getters.getUserData.userName + '&authority=1';
window.open(val);
}
} }
}, },
components: { components: {
......
src/components/projectManagement/projectInformation/projectInformation.vue
浏览文件 @ 711dbaf6
...@@ -204,12 +204,20 @@ export default { ...@@ -204,12 +204,20 @@ export default {
$('.trasLine').css('opacity', '0') $('.trasLine').css('opacity', '0')
} }
if (this.now === 4) { // 终验 if (this.now === 4) { // 终验
if (this.now === 4 && this.forecase === 4) { // 判断当前进度和期望进度都是终验
$('.blueLine').css('width', ''); $('.blueLine').css('width', '');
$('.trasLine').css('opacity', '0') $('.trasLine').css('opacity', '0')
$('.processAll>p:nth-child(1) .processList').addClass('blue'); $('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(2) .processList').addClass('blue'); $('.processAll>p:nth-child(2) .processList').addClass('blue');
$('.processAll>p:nth-child(3) .processList').addClass('blue'); $('.processAll>p:nth-child(3) .processList').addClass('blue');
$('.processAll>p:nth-child(4) .processList').addClass('blue') $('.processAll>p:nth-child(4) .processList').addClass('blue')
} else { // 判断期望进度不是终验
$('.blueLine').css('width', '');
$('.processAll>p:nth-child(1) .processList').addClass('blue');
$('.processAll>p:nth-child(2) .processList').addClass('blue');
$('.processAll>p:nth-child(3) .processList').addClass('blue');
$('.processAll>p:nth-child(4) .processList').addClass('blue')
}
} else if (this.now === 3) { // 试运行阶段 } else if (this.now === 3) { // 试运行阶段
$('.blueLine').css('width', '80%'); $('.blueLine').css('width', '80%');
$('.processAll>p:nth-child(1) .processList').addClass('blue'); $('.processAll>p:nth-child(1) .processList').addClass('blue');
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论