合并冲突

src/views/risk/riskAccount/riskBigDetail.vue

@@ -242,7 +242,7 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      postriskDetail(`/riskMain/postriskDetailsApp/${this.id}`)
+      postriskDetail(`/riskMain/riskDetailsApp/${this.id}`)
         .then(res => {
           this.$toast.clear();
           this.riskMain = res.data.riskMain

src/views/risk/riskAdd/index.vue

@@ -270,14 +270,7 @@
 
 <script>
 import LHeader from "@/components/header.vue";
-import {
-  getFormList,
-  postHdSource,
-  postHdType,
-  postHdPeople,
-  postReAdd,
-  postriskConiCause
-} from "@/service/risk";
+import { getFormList,postHdSource, postHdType, postHdPeople, postReAdd, postriskConiCause,postRiskShowMeasures } from "@/service/risk";
 export default {
   components: {
     LHeader
@@ -488,7 +481,13 @@ export default {
     onConTrouble(value) {
       this.trouble = value.accidentType;
       this.showTrouble = false;
-      //
+      // 请求三个措施
+      postRiskShowMeasures(`/riskMain/showmeasures/${this.factor}/${this.source}/${this.trouble}`).then(res =>{
+        console.log(res.data)
+        this.technology = res.data[0].measuresProject
+        this.administration = res.data[0].measuresAdministration
+        this.urgent = res.data[0].measuresEmergency
+      })
     },
     // 风险定级
     onConSetRank(value) {