修改里程碑显示

package-lock.json

@@ -5261,7 +5261,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5282,12 +5283,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5302,17 +5305,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5429,7 +5435,8 @@
         "inherits": {
           "version": "2.0.4",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5441,6 +5448,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5455,6 +5463,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5462,12 +5471,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5486,6 +5497,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5575,7 +5587,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5587,6 +5600,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5672,7 +5686,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5708,6 +5723,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5727,6 +5743,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5770,12 +5787,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },

src/components/evaluationReport/evaluationReport.vue

@@ -67,7 +67,7 @@
 
 <script>
 import $ from 'jquery';
-import moment from "moment"; 
+import moment from "moment";
 export default {
     data () {
         return {
@@ -86,23 +86,23 @@ export default {
     methods: {
         add(){
             console.log(this.$store.state.userData.userName)
-               this.$router.push({
-          name: "assessmentReport",
-          query: {
-            username:this.$store.state.userData.userName,
-            authority: this.$store.state.userData.type,
-            id: null,
-          }
-        });
+            this.$router.push({
+                name: 'assessmentReport',
+                query: {
+                    username:this.$store.state.userData.userName,
+                    authority: this.$store.state.userData.type,
+                    id: null,
+                }
+            });
         },
         // 初始请求
         init() {
-            var username = ''
-            if(this.$store.state.userData.userName != 'admin'){
-                 username =this.$store.state.userData.userName
+            let username = ''
+            if (this.$store.state.userData.userName !== 'admin'){
+                username =this.$store.state.userData.userName
             }
             let val = {
-                   'username':username,
+                'username':username,
                 'projectName': this.searchVal,
             }
             this.$server.getEvaluationList(this.currentPage,this.pagesize,val).then(res=>{
@@ -135,23 +135,21 @@ export default {
         evaluation(row) {
             console.log(row)
             console.log(this.$store.state.userData)
-            // return
-            
-           this.$router.push({name:'assessmentReport',  query: {
-            username: row.username,
-            id: row.id,
-            authority: this.$store.state.userData.type
-          }})
+            this.$router.push({name:'assessmentReport',  query: {
+                username: row.username,
+                id: row.id,
+                authority: this.$store.state.userData.type
+            }})
             // this.$router.push({name: 'complaintManagementDetail',params:{'value': row}});
         },
         // 报告
         report(row) {
             console.log(row)
-                 this.$router.push({name:'reportAssess',query: {
+            this.$router.push({name:'reportAssess',query: {
                 username: row.username,
                 id:row.id,
                 authority:this.$store.state.userData.type,
-                }})
+            }})
         },
         // 删除
         del(row) {
@@ -180,19 +178,15 @@ export default {
         },
         // 时间换算
         time(value) {
-          // console.log(timestamp)
-           value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
-          if (value !== undefined && value !== null) {
-              let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
-              var day = moment(value).format('YYYY-MM-DD HH:mm:ss');
-            var day2 = moment(day).utc().format()
-              // console.log(day)
-              // console.log(timestamp.length)
-           return day
-          } else {
-              return ''
-          }
-      
+            value = value.replace(/-/g, '/').replace('T', ' ').replace('.000+0000', '')
+            if (value !== undefined && value !== null) {
+                let date = new Date(value); // 时间戳为10位需*1000，时间戳为13位的话不需乘1000
+                let day = moment(value).format('YYYY-MM-DD HH:mm:ss');
+                let day2 = moment(day).utc().format()
+                return day
+            } else {
+                return ''
+            }
         }
     },
     components: {

src/components/home/home.vue

@@ -116,16 +116,6 @@ export default {
             this.$store.commit('changeHomeClick', val); // 传给导航进行样式定位和点击事件
             this.$store.commit('changeNowPath', path); // 当前path传给header作比对
             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: {

src/components/projectManagement/projectInformation/projectInformation.vue

@@ -204,12 +204,20 @@ export default {
                 $('.trasLine').css('opacity', '0')
             }
             if (this.now === 4) { // 终验
-                $('.blueLine').css('width', '');
-                $('.trasLine').css('opacity', '0')
-                $('.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')
+                if (this.now === 4 && this.forecase === 4) { // 判断当前进度和期望进度都是终验
+                    $('.blueLine').css('width', '');
+                    $('.trasLine').css('opacity', '0')
+                    $('.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 { // 判断期望进度不是终验
+                    $('.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) { // 试运行阶段
                 $('.blueLine').css('width', '80%');
                 $('.processAll>p:nth-child(1) .processList').addClass('blue');