Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf'

src/views/saveWorkbench/index.vue

@@ -7,22 +7,25 @@
       </header>
     </van-sticky>
     <van-notice-bar left-icon="volume-o" :scrollable="true" color="#a09c9c" background="#D5EAFF">
-      <van-swipe
-        class="notice-swipe"
-        :show-indicators="false"
-        width="100vw"
-      >
+      <van-swipe class="notice-swipe" :show-indicators="false" width="100vw">
         <van-swipe-item>危险源系统正式上线</van-swipe-item>
         <van-swipe-item>汛期安全防护会议计划本周日召开</van-swipe-item>
       </van-swipe>
     </van-notice-bar>
     <van-swipe :autoplay="6000">
       <van-swipe-item v-for="(item, index) in images" :key="index">
-        <img style="width:100%;height:200px" :src="item.url"/>
+        <img style="width:100%;height:200px" :src="item.url" />
       </van-swipe-item>
     </van-swipe>
     <div class="con">
-      <van-cell-group inset v-for="(item, index) in riskList" :key="index">
+      <van-cell-group inset v-if="finalRiskList.length > 0">
+        <van-cell value="风险评估管理" />
+        <van-grid :column-num="4">
+          <van-grid-item @click="dangerJump(item.path)" v-for="item in finalRiskList" :key="item.key" :icon="item.imgUrl"
+            :text="item.text" />
+        </van-grid>
+      </van-cell-group>
+      <!-- <van-cell-group inset v-for="(item, index) in riskList" :key="index">
                   <van-cell :value="item.menuName" />
                   <van-grid :column-num="5">
                   <van-grid-item
@@ -33,7 +36,7 @@
                       :text="it.menuName"
                   />
                   </van-grid>
-          </van-cell-group>
+          </van-cell-group> -->
     </div>
     <!-- tanBar -->
     <tab-bar :index="1"></tab-bar>
@@ -49,7 +52,7 @@ export default {
   },
   data() {
     return {
-        value:'',
+      value: '',
       /** 
        *  总公司：任务台账；
        *  区域负责人：任务管理，任务审批，任务台账
@@ -99,8 +102,51 @@ export default {
         //     text: "四色图",
         // },
       ],
-        riskList:[],
-        images:[
+      riskList: [ {
+          key:"1",
+          path: "/taskLedger",
+          imgUrl: require("@/assets/workbench/work-approval.png"),
+          text: "任务台账",
+        },
+        {
+          key:"2",
+          path: "/riskManage",
+          imgUrl: require("@/assets/workbench/risk-report.png"),
+          text: "任务管理",
+        },
+        {
+          key:"3",
+          path: "/taskManage",
+          imgUrl: require("@/assets/workbench/plane-approval.png"),
+          text: "任务审批",
+        },
+        {
+          key:"4",
+          path: "/riskExecution",
+          imgUrl: require("@/assets/workbench/rectification-notice.png"),
+          text: "执行管理",
+        },
+        {
+          key:"5",
+          path: "/riskAssess",
+          imgUrl: require("@/assets/workbench/risk-confirm.png"),
+          text: "风险评估",
+        },
+
+        {
+          key:"6",
+          path: "/riskApprove",
+          imgUrl: require("@/assets/workbench/risk-account.png"),
+          text: "风险审批",
+        },
+        {
+          key:"7",
+          path: "/riskLedger",
+          imgUrl: require("@/assets/workbench/danger-account.png"),
+          text: "风险台账",
+        },],
+      finalRiskList:[],
+      images: [
         {
           url: require('@/assets/workbench/u47.png'),
         },
@@ -117,25 +163,26 @@ export default {
 
   },
   mounted() {
-    this.getMenuList()
+    // this.getMenuList();
+    this.workBenchList();
   },
   methods: {
 
     //查询角色菜单列表
-    getMenuList(){
+    getMenuList() {
       getFun('/menu/roleMenuTreeselect').then((res) => {
         this.riskList = res.list
-        this.riskList.forEach((item,index) => {
-          item.children.forEach((i,k) => {
+        this.riskList.forEach((item, index) => {
+          item.children.forEach((i, k) => {
             let data = this.riskList2.find((y) => y.text == i.menuName)
             if (data) {
               i.icon = data.imgUrl
             }
           })
         });
-        console.log('this.riskList==>>',this.riskList)
+        console.log('this.riskList==>>', this.riskList)
       }).catch((err) => {
-         console.log('err==>>',err)
+        console.log('err==>>', err)
       })
     },
     workBenchList() {
@@ -208,20 +255,24 @@ export default {
     height: 1rem;
   }
 }
+
 .notice-swipe {
   height: 40px;
   line-height: 40px;
   color: #a09c9c;
 }
-.van-swipe-item{
+
+.van-swipe-item {
   width: 100%;
 }
- .my-swipe .van-swipe-item {
+
+.my-swipe .van-swipe-item {
   width: 100%;
   height: 300px;
-  img{
+
+  img {
     width: 100%;
     height: 100%;
   }
- }
+}
 </style>