qinzhipeng_v il y a 5 ans
Parent
commit
6b6d1df66a

+ 40 - 34
src/views/Platform/presentation/PresentReport.vue

@@ -169,42 +169,48 @@ export default {
     getRouterData() {
       console.log(this.clienData, '提测客户端')
       this.dataChange = this.clienData
-      if (this.dataChange.lateStatus === 1) {
-        this.lateStatusBtn1 = 'success'
-        this.lateStatusBtn = 'info'
-        this.lateStatus = 1
-        this.showDelay = false
-      } else {
-        this.lateStatusBtn1 = 'info'
-        this.lateStatusBtn = 'danger'
-        this.lateStatus = 2
-        this.showDelay = true
-      }
-      if (this.dataChange.configInfo !== '') {
-        this.configInBtn = 'success'
-        this.configInBtn1 = 'info'
-        this.confidgIn = 1
-        this.showApollo = true
-      } else {
-        this.configInBtn = 'info'
-        this.configInBtn1 = 'danger'
-        this.configIn = 2
-        this.showApollo = false
+      if (this.dataChange.id) {
+        if (this.dataChange.lateStatus === 1) {
+          this.lateStatusBtn1 = 'success'
+          this.lateStatusBtn = 'info'
+          this.lateStatus = 1
+          this.showDelay = false
+        } else {
+          this.lateStatusBtn1 = 'info'
+          this.lateStatusBtn = 'danger'
+          this.lateStatus = 2
+          this.showDelay = true
+        }
+        if (this.dataChange.configInfo !== '') {
+          this.configInBtn = 'success'
+          this.configInBtn1 = 'info'
+          this.confidgIn = 1
+          this.showApollo = true
+        } else {
+          this.configInBtn = 'info'
+          this.configInBtn1 = 'danger'
+          this.configIn = 2
+          this.showApollo = false
+        }
+        if (this.dataChange.dependentComponents !== '') {
+          this.dependentBtn = 'success'
+          this.dependentBtn1 = 'info'
+          this.dependent = 1
+          this.showRelyOn = true
+        } else {
+          this.dependentBtn = 'info'
+          this.dependentBtn1 = 'danger'
+          this.dependent = 2
+          this.showRelyOn = false
+        }
+        this.$nextTick(() => {
+          this.DetailsOfProposal.txt.html(this.dataChange.joinTest)
+        })
       }
-      if (this.dataChange.dependentComponents !== '') {
-        this.dependentBtn = 'success'
-        this.dependentBtn1 = 'info'
-        this.dependent = 1
-        this.showRelyOn = true
-      } else {
-        this.dependentBtn = 'info'
-        this.dependentBtn1 = 'danger'
-        this.dependent = 2
-        this.showRelyOn = false
+      if (!this.clienData[0] === undefined) {
+        console.log('sssss')
+        Object.assign(this.$data, this.$options.data())
       }
-      this.$nextTick(() => {
-        this.DetailsOfProposal.txt.html(this.dataChange.joinTest)
-      })
     },
     getQueryData(ele) {
       this.dataChange = ele

+ 28 - 26
src/views/Platform/presentation/presentationReport.vue

@@ -174,33 +174,35 @@ export default {
     getRouterData() {
       console.log(this.clienData, '提测服务端')
       this.fromDev = this.clienData
-      if (this.fromDev.lateReason !== '') {
-        this.lateStatusBtn1 = 'info'
-        this.lateStatusBtn = 'danger'
-        this.lateStatus = 2
-        this.showDelay = true
-      } else {
-        this.lateStatusBtn1 = 'success'
-        this.lateStatusBtn = 'info'
-        this.lateStatus = 1
-        this.showDelay = false
-      }
-      if (this.fromDev.safeInfo !== '') {
-        this.getInfoBtn1 = 'info'
-        this.getInfoBtn = 'danger'
-        this.lateStatus = 2
-        this.showData = true
-      } else {
-        this.getInfoBtn1 = 'success'
-        this.getInfoBtn = 'info'
-        this.lateStatus = 1
-        this.showData = false
-        this.$set(this.fromDev, 'safeInfo', '')
+      if (this.fromDev.id) {
+        if (this.fromDev.lateReason !== '') {
+          this.lateStatusBtn1 = 'info'
+          this.lateStatusBtn = 'danger'
+          this.lateStatus = 2
+          this.showDelay = true
+        } else {
+          this.lateStatusBtn1 = 'success'
+          this.lateStatusBtn = 'info'
+          this.lateStatus = 1
+          this.showDelay = false
+        }
+        if (this.fromDev.safeInfo !== '') {
+          this.getInfoBtn1 = 'info'
+          this.getInfoBtn = 'danger'
+          this.lateStatus = 2
+          this.showData = true
+        } else {
+          this.getInfoBtn1 = 'success'
+          this.getInfoBtn = 'info'
+          this.lateStatus = 1
+          this.showData = false
+          this.$set(this.fromDev, 'safeInfo', '')
+        }
+        this.$nextTick(() => {
+          this.fromDev.joinTest !== null ? this.editorContent.txt.html(this.fromDev.joinTest) : ''
+          this.fromDev.moduleInfo !== null ? this.DetailsOfProposal.txt.html(this.fromDev.moduleInfo) : ''
+        })
       }
-      this.$nextTick(() => {
-        this.fromDev.joinTest !== null ? this.editorContent.txt.html(this.fromDev.joinTest) : ''
-        this.fromDev.moduleInfo !== null ? this.DetailsOfProposal.txt.html(this.fromDev.moduleInfo) : ''
-      })
     },
     getQueryData(ele) {
       this.fromDev = ele