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

src/App.vue

@@ -47,6 +47,8 @@ export default {
                 "noticeList",
                 "confirmNote",
             ],
+            // 不需要展示底部tabbar的页面
+            noTab:["login", "login2", "choose-people","scan",'success','fail','warn','center'],
              // cachePage预先定义的缓存页面
             otherCache: [],
              // 专门处理列表缓存的页面，这些页面缓存逻辑与其他缓存不一样去详情返回列表缓存，但是进入列表必须刷新,如何有需要缓存的列表请放到这里来。
@@ -74,7 +76,7 @@ export default {
     },
     computed: {
         showTab() {
-            return !["login", "login2", "choose-people","scan",'success','fail','warn'].includes(
+            return !this.noTab.includes(
                 this.$route.name
             );
         },
@@ -107,6 +109,7 @@ export default {
 };
 </script>
 
+
 <style lang="less">
 #app {
     font-family: "Avenir", Helvetica, Arial, sans-serif;

src/main.js

@@ -16,8 +16,10 @@ import util from './api/util.js'
 import './permission'
 import Cookies from 'js-cookie'
 import { prefix } from '@/common/js/utils'
-import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,NoticeBar,DatetimePicker,
-Step, Steps, ImagePreview  } from 'vant'
+import { Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell,
+   SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, 
+   Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,NoticeBar,DatetimePicker,
+Step, Steps, ImagePreview,progress} from 'vant'
 import 'lib-flexible/flexible'
 import vueEsign from 'vue-esign'
 import VideoPlayer from 'vue-video-player'
@@ -30,7 +32,7 @@ Vue.use(VideoPlayer)
 Vue.use(Divider).use(Popup).use(Overlay).use(Loading).use(Dialog).use(Toast).use(ContactCard).use(Form).use(AddressEdit).use(AddressList).use(Field).use(CellGroup).use(Cell).use(SwipeCell).use(Icon).use(Stepper).use(Card).use(Button).use(Swipe).use(SwipeItem).use(PullRefresh).use(List).use(Tab).use(Tabs).use(GoodsAction).use(GoodsActionIcon).use(GoodsActionButton).use(SubmitBar).use(Checkbox).use(CheckboxGroup).use(Search).use(Picker).use(Uploader).use(Notify)
 .use(ContactList).use(Calendar).use(Radio).use(RadioGroup).use(Tag).use(Tabbar).use(TabbarItem).use(Sticky)
 .use(Grid).use(GridItem).use(Skeleton).use(Col).use(Row).use(VanImage).use(Badge).use(NoticeBar).use(DatetimePicker)
-.use(Step).use(Steps).use(ImagePreview)
+.use(Step).use(Steps).use(ImagePreview).use(progress)
 Vue.config.productionTip = false
 new Vue({
   router,

src/router/index.js

@@ -710,6 +710,15 @@ const routes = [{
   },
   component: () => import('@/views/common/warn')
 },
+{
+  path: '/center',
+  name: 'center',
+  meta: {
+    title: '',
+    index: 1
+  },
+  component: () => import('@/views/common/center')
+},
 ]
 
 const router = new VueRouter({

src/views/common/center.vue

+<template>
+    <div>
+        <van-progress :percentage="num" :show-pivot="false"/>
+        <div style='text-align:center;margin-top:40px'>
+            跳转中... 
+        </div>
+    </div>
+</template>
+
+<script>
+import { getFun,postFun } from '@/service/table'
+export default {
+    data(){
+        return {
+            num:0,
+            params:{
+                id:0,
+                path:'',
+                theme:'隐患'
+            },
+            api:{
+                隐患:'/hdreport/hdDetailsApp',
+                风险:'/riskMain/riskDetailsApp',
+                安全监督检查:'/check/notify/trouble'
+            }
+        }
+    },
+    methods:{
+        
+    },
+    mounted(){
+        this.num=50
+        postFun(`${this.api[this.params.theme]}/${this.params.id}`)
+        .then(res=>{
+            let data = res.data.hdReport||res.data.riskMain;
+            this.num=100
+            // return false;
+            this.$router.replace({
+                name: this.params.path,
+                params: {
+                    data: {
+                        ...data,
+                        taskId:this.params.id
+                    },
+                    taskId:this.params.id
+                },
+            });
+        })
+        .catch(err=>{
+             this.num=100;
+             this.$router.replace({
+                 name:'fail',
+                 query:{
+                     text:'响应错误',
+                     content:'请联系管理员'
+                 }
+             })
+        })
+    },
+    created(){
+        this.num=10
+        if(this.$route.params.id&&this.$route.params.path){
+            this.num=30
+            this.params=this.$route.params;
+        } else {
+             this.num=100;
+             this.$router.replace({
+                 name:'fail',
+                 query:{
+                     text:'参数错误',
+                     content:'请联系管理员'
+                 }
+             })
+        }
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file

src/views/danger/changeDanger/changeInfo.vue

@@ -27,11 +27,11 @@
         <van-col span="7">发现时间：</van-col>
         <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
       </van-row> -->
-      <van-row gutter="">
+      <van-row gutter="" v-if="item.dueDate">
         <van-col span="7">超期标识：</van-col>
         <van-col span="17">{{ item.dueDate | formatTime }}</van-col>
       </van-row>
-      <van-row gutter="">
+      <van-row gutter="" v-if="item.taskName">
         <van-col span="7">工单状态：</van-col>
         <van-col span="17">{{ item.taskName }}</van-col>
       </van-row>
@@ -176,7 +176,7 @@ export default {
   },
   beforeRouteEnter(to, from, next) {
     next((vm) => {
-      if (from.name === "change-danger") {
+      if (from.name === "center"||from.name === "change-danger") {
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;

src/views/danger/confirmeDanger/confirmeDanger.vue

@@ -201,7 +201,9 @@ export default {
 
   beforeRouteEnter(to, from, next) {
     next((vm) => {
-      if (from.name === "confirme-danger") {
+      console.log(from.name,'进入页面',to.params.data)
+      if (from.name === "confirme-danger"||from.name === "center") {
+         console.log(from.name,'进入判断条件')
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;
@@ -223,6 +225,7 @@ export default {
   created() {},
   methods: {
     getFormList() {
+      console.log(this.taskId)
       if (!this.taskId) {
         return;
       }
@@ -238,7 +241,8 @@ export default {
           this.columnsRect = res.data.rectificationUser;
           this.columnsReview = res.data.rectificationReview;
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log(err);
           this.$toast.clear();
           this.$toast.fail("加载失败,请稍后再试");
         });

src/views/danger/managerDanger/managerSurvey.vue

@@ -75,7 +75,7 @@ export default {
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
-      if (from.name === "manager-danger") {
+      if (from.name === "center"||from.name === "manager-danger") {
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;

src/views/danger/reviewDanger/reviewAdd.vue

@@ -132,7 +132,7 @@ export default {
   beforeRouteEnter(to, from, next) {
     console.log("执行了此钩子");
     next((vm) => {
-      if (from.name === "review-danger" || from.name == "normal-detail") {
+      if (from.name === "center"||from.name === "review-danger" || from.name == "normal-detail") {
         vm.messageList = [];
         // 修改bug回退获取不到参数有参数的用参数没参数的话用本地缓存
         let paramsData =

src/views/danger/standBook/normalDetail.vue

@@ -748,13 +748,7 @@ export default {
                 loadingType: "spinner",
                 duration: 0,
             });
-            (this.$route.params.method == "get" ? getFun : postFun)(
-                `${
-                    this.$route.params.api
-                        ? this.$route.params.api
-                        : "/hdreport/hdDetailsApp/"
-                }${this.id}`
-            )
+            postFun(`/hdreport/hdDetailsApp/${this.id}`)
                 .then((res) => {
                     this.$toast.clear();
                     this.hdReport = res.data.hdReport;

src/views/danger/superviseDanger/superSurvey.vue

@@ -77,7 +77,7 @@ export default {
   },
     beforeRouteEnter(to, from, next) {
     next(vm => {
-      if (from.name === "supervise-danger") {
+      if (from.name === "center"||from.name === "supervise-danger") {
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;

src/views/messageCenter/waitEvent/index.vue

@@ -41,6 +41,7 @@
             inset
             v-for="(item, index) in waitList"
             :key="index"
+            @click="touchstart(index, item)"
           >
             <!-- @click="touchstart(index, item)" -->
 
@@ -177,18 +178,28 @@ export default {
         this.waitList = res.rows;
       });
     },
-
-    touchstart(index, item) {
+     touchstart(index, item) {
       if(item.appUrl){
         this.$router.push({
-        name: item.appUrl,
+        name: 'center',
         params: {
           id: item.pid,
+          path:item.appUrl,
+          theme:item.theme
         },
       });
       }
-     
     },
+    // touchstart(index, item) {
+    //   if(item.appUrl){
+    //     this.$router.push({
+    //     name: item.appUrl,
+    //     params: {
+    //       id: item.pid,
+    //     },
+    //   });
+    //   }
+    // },
     //     // 加载完成后将loading改成 false
     //     this.loading = false;
     //     // 为什么会连续触发 load 事件？  先加上这句 this.finished = true; 以后再删

src/views/risk/riskAdd/index.vue

@@ -455,7 +455,7 @@ export default {
     },
     activated() {
         this.showSetRank = false; // 再次关闭弹出层 以防万一
-        if (this.$route.params.status) {
+        if (this.$route.params.taskId) {
             this.isShowreturnCause = true;
             this.text = "风险上报退回";
             this.taskId = this.$route.params.taskId;
@@ -579,7 +579,7 @@ export default {
         };
     },
     created() {
-        if (this.$route.params.status) {
+        if (this.$route.params.taskId) {
             this.isShowreturnCause = true;
             this.text = "风险上报退回";
             this.taskId = this.$route.params.taskId;

src/views/risk/riskConfirme/riskAffirm.vue

@@ -10,7 +10,7 @@
       >
         <van-row gutter="">
           <van-col span="7">所属项目：</van-col>
-          <van-col span="17">{{ item.proId }}</van-col>
+          <van-col span="17">{{ item.proId || item.pId }}</van-col>
         </van-row>
         <van-row gutter="">
           <van-col span="7">风险等级：</van-col>
@@ -26,7 +26,7 @@
         </van-row>
         <van-row gutter="">
           <van-col span="7">管控层级：</van-col>
-          <van-col span="17">{{ item.controllevel }}</van-col>
+          <van-col span="17">{{ item.controllevel || item.controlLevel}}</van-col>
         </van-row>
         <van-row gutter="">
           <van-col span="7">主责部门：</van-col>
@@ -36,9 +36,9 @@
           <van-col span="7">主责人员：</van-col>
           <van-col span="17">{{ item.responsibilityMember }}</van-col>
         </van-row>
-        <van-row gutter="">
+        <van-row gutter="" v-if="item.taskName">
           <van-col span="7">工单状态：</van-col>
-          <van-col span="17">{{ item.taskName }}</van-col>
+          <van-col span="17">{{ item.taskName}}</van-col>
         </van-row>
         <!-- 详情 -->
         <div class="detail">详情</div>
@@ -126,7 +126,7 @@ export default {
 
   beforeRouteEnter(to, from, next) {
     next((vm) => {
-      if (from.name === "risk-confirme") {
+      if (from.name === "center"||from.name === "risk-confirme") {
         vm.messageList = [];
         let paramsData = to.params.data;
         vm.taskId = paramsData.taskId;