Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/components/addPage/addPage.vue

@@ -439,7 +439,7 @@
             response.data.rectifyDeadline = response.data.rectifyDeadline?response.data.rectifyDeadline:"";
             for(let i=0;i<response.data.checkHazardDtoList.length;i++){
               response.data.checkHazardDtoList[i].lookType = true;
-              response.data.checkHazardDtoList[i].voiceRemark = JSON.parse(response.data.checkHazardDtoList[i].voiceRemark);
+              response.data.checkHazardDtoList[i].voiceRemark = response.data.checkHazardDtoList[i].voiceRemark?JSON.parse(response.data.checkHazardDtoList[i].voiceRemark):[];
             }
           }else if(response.data.checkCategory==2){//专项检查
             response.data.rectifyNotice = response.data.rectifyNotice?response.data.rectifyNotice:"";
@@ -449,7 +449,7 @@
                 item.lookType = true;
                 item.checkHazardDtoList.forEach(function(item2) {
                   item2.hazardCheckCode=item2.code
-                  item2.voiceRemark=JSON.parse(item2.voiceRemark)
+                  item2.voiceRemark=item2.voiceRemark?JSON.parse(item2.voiceRemark):[];
                 })
               })
             }

src/views/safetyCheck/components/infoPage/infoPage.vue

@@ -312,7 +312,7 @@ import { getToken } from '@/utils/auth'
             response.data.rectifyDeadline = response.data.rectifyDeadline?response.data.rectifyDeadline:"";
             for(let i=0;i<response.data.checkHazardDtoList.length;i++){
               response.data.checkHazardDtoList[i].lookType = true;
-              response.data.checkHazardDtoList[i].voiceRemark = JSON.parse(response.data.checkHazardDtoList[i].voiceRemark);
+              response.data.checkHazardDtoList[i].voiceRemark = response.data.checkHazardDtoList[i].voiceRemark?JSON.parse(response.data.checkHazardDtoList[i].voiceRemark):[];
             }
           } else if(response.data.checkCategory==2){//专项检查
             if(response.data.checkHazardInfoVoList[0]){
@@ -320,7 +320,7 @@ import { getToken } from '@/utils/auth'
                 item.lookType = true;
                 item.checkHazardDtoList.forEach(function(item2) {
                   item2.hazardCheckCode=item2.code
-                  item2.voiceRemark=JSON.parse(item2.voiceRemark)
+                  item2.voiceRemark=item2.voiceRemark?JSON.parse(item2.voiceRemark):[];
                 })
               })
             }