Commit 0c0c17b9 authored by yf's avatar yf
Browse files

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

parents f701b6b8 a9115a80
Loading
Loading
Loading
Loading
+139 −88
Original line number Original line Diff line number Diff line
@@ -7,11 +7,7 @@
      </header>
      </header>
    </van-sticky>
    </van-sticky>
    <van-notice-bar left-icon="volume-o" :scrollable="true" color="#a09c9c" background="#D5EAFF">
    <van-notice-bar left-icon="volume-o" :scrollable="true" color="#a09c9c" background="#D5EAFF">
      <van-swipe
      <van-swipe class="notice-swipe" :show-indicators="false" width="100vw">
        class="notice-swipe"
        :show-indicators="false"
        width="100vw"
      >
        <van-swipe-item>危险源系统正式上线</van-swipe-item>
        <van-swipe-item>危险源系统正式上线</van-swipe-item>
        <van-swipe-item>汛期安全防护会议计划本周日召开</van-swipe-item>
        <van-swipe-item>汛期安全防护会议计划本周日召开</van-swipe-item>
      </van-swipe>
      </van-swipe>
@@ -22,7 +18,14 @@
      </van-swipe-item>
      </van-swipe-item>
    </van-swipe>
    </van-swipe>
    <div class="con">
    <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-cell :value="item.menuName" />
                  <van-grid :column-num="5">
                  <van-grid :column-num="5">
                  <van-grid-item
                  <van-grid-item
@@ -33,7 +36,7 @@
                      :text="it.menuName"
                      :text="it.menuName"
                  />
                  />
                  </van-grid>
                  </van-grid>
          </van-cell-group>
          </van-cell-group> -->
    </div>
    </div>
    <!-- tanBar -->
    <!-- tanBar -->
    <tab-bar :index="1"></tab-bar>
    <tab-bar :index="1"></tab-bar>
@@ -99,7 +102,50 @@ export default {
        //     text: "四色图",
        //     text: "四色图",
        // },
        // },
      ],
      ],
        riskList:[],
      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: [
      images: [
        {
        {
          url: require('@/assets/workbench/u47.png'),
          url: require('@/assets/workbench/u47.png'),
@@ -117,7 +163,8 @@ export default {


  },
  },
  mounted() {
  mounted() {
    this.getMenuList()
    // this.getMenuList();
    this.workBenchList();
  },
  },
  methods: {
  methods: {


@@ -208,17 +255,21 @@ export default {
    height: 1rem;
    height: 1rem;
  }
  }
}
}

.notice-swipe {
.notice-swipe {
  height: 40px;
  height: 40px;
  line-height: 40px;
  line-height: 40px;
  color: #a09c9c;
  color: #a09c9c;
}
}

.van-swipe-item {
.van-swipe-item {
  width: 100%;
  width: 100%;
}
}

.my-swipe .van-swipe-item {
.my-swipe .van-swipe-item {
  width: 100%;
  width: 100%;
  height: 300px;
  height: 300px;

  img {
  img {
    width: 100%;
    width: 100%;
    height: 100%;
    height: 100%;