Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/service/danger.js

@@ -8,4 +8,62 @@ export function dangerReturn(url,data) {
       method: 'post',
       data
     })
-}
\ No newline at end of file
+}
+
+// 请求新增表单数据信息的
+export function getFormList(url,params) {
+  return request({
+    url: url,
+    method: 'get',
+    params
+  })
+}
+// 隐患类型
+export function postHdTyp(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+// 隐患项目名称
+export function postHdName(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+// 隐患项目编号和隐患级别
+export function postHdInventories(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+// 风险源带出来的字段
+export function postHdRiskSource(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+// 隐患整改人接口
+export function postHdShowPeople(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}
+
+// 隐患上报保存接口
+export function postHdReportAdd(url,data) {
+  return request({
+    url: url,
+    method: 'post',
+    data
+  })
+}

src/views/danger/reportReturn/returned.vue

@@ -83,8 +83,8 @@ export default {
     goDetail(data) {
       console.log(data);
       this.$router.push({
-         path: '/add-danger',
-         query: {status: "退回"}
+         name: 'add-danger',
+         params: {status: "退回"}
          });
       this.showIndex = null;
     },

src/views/risk/riskAdd/index.vue

@@ -324,7 +324,9 @@ export default {
     };
   },
   created() {
-    if (this.$route.query.status) {
+    console.log(this.$route.params);
+
+    if (this.$route.params.status) {
       this.isShowreturnCause = true;
       this.text = "风险上报退回"
     }

src/views/risk/riskReturn/riskReturned.vue

@@ -83,8 +83,8 @@ export default {
     goDetail(data) {
       console.log(data);
       this.$router.push({
-         path: '/risk-add',
-         query: {status: "退回"}
+         name: 'risk-add',
+         params: {status: "退回"}
          });
       this.showIndex = null;
     },