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

src/router/index.js

@@ -526,7 +526,7 @@ const routes = [{
     path: '/risk-big-detail',
     name: 'risk-big-detail',
     meta: {
-      title: '风险历史台账',
+      title: '风险详情',
       index: 1
     },
     component: () => import( /* webpackChunkName: "SaveWorkbench" */ '../views/risk/riskAccount/riskBigDetail'),

src/views/danger/majorDanger/majorSurvey.vue

@@ -68,10 +68,10 @@
         clickable
         name="thinkHdLev"
         :value="thinkLevel"
-        label="认为隐患级别"
+        label="认定隐患级别"
         placeholder="请选择"
         @click="showThinkLevel = true"
-        :rules="[{ required: true, message: '认为隐患级别不能为空' }]"
+        :rules="[{ required: true, message: '认定隐患级别不能为空' }]"
       />
       <van-popup v-model="showThinkLevel" position="bottom">
         <van-picker

src/views/danger/reviewDanger/index.vue

@@ -128,10 +128,11 @@ export default {
     },
     // 确认
     goConfirm(data) {
+      localStorage.setItem('reviewdanger_params',JSON.stringify(data))
       this.$router.push({
         name: "review-add",
         params: {
-          data: data,
+          data,
         }
       });
       this.showIndex = null;

src/views/danger/reviewDanger/reviewAdd.vue

@@ -39,8 +39,6 @@
       <div class="detail">详情</div>
       </van-cell-group>
 
-
-
     <van-form
       @submit="onSubmit"
       :show-error='false'
@@ -127,10 +125,12 @@ export default {
     };
   },
    beforeRouteEnter(to, from, next) {
+    console.log('执行了此钩子')
     next(vm => {
-      if (from.name === "review-danger") {
+      if (from.name === "review-danger"||from.name=="normal-detail") {
         vm.messageList = [];
-        let paramsData = to.params.data;
+        // 修改bug回退获取不到参数有参数的用参数没参数的话用本地缓存
+        let paramsData = to.params.data||JSON.parse(localStorage.getItem('reviewdanger_params'));
         vm.taskId = paramsData.taskId;
         vm.messageList.push(paramsData);
         vm.radio= "1";
@@ -140,7 +140,9 @@ export default {
       }
     });
   },
-   created() {},
+   created() {
+     console.log('执行了此钩子1')
+   },
   methods: {
     selectResult(val) {
       this.radio = val;

src/views/danger/standBook/normalDetail.vue

@@ -187,7 +187,7 @@
                   <van-col span="5"
                     ><span class="field-title">结果：</span></van-col
                   >
-                  <van-col span="19">{{ item.isResult }}</van-col>
+                  <van-col span="19">{{['退回','合格'][item.isResult]}}</van-col>
                 </van-row>
                 <van-row>
                   <van-col span="5"
@@ -203,7 +203,7 @@
                 </van-row>
                 <van-row>
                   <van-col span="9"
-                    ><span class="field-title">认为隐患级别：</span></van-col
+                    ><span class="field-title">认定隐患级别：</span></van-col
                   >
                   <van-col span="10
                   ">{{ item.thinkHdLev }}</van-col>

src/views/risk/riskAccount/riskBigDetail.vue

@@ -215,7 +215,7 @@ export default {
   data() {
     return {
       id: "",
-      text: "风险历史台账",
+      text: "风险详情",
       riskOpen: false,
       riskOpenText: "展开 ▼",
       journalOpen: false,