Skip to content

B
BCDH-APP
Commit 8867390d authored by 罗新东's avatar 罗新东
Browse files
Options

新增了我的延期页面

parent 0372edac
Pipeline #7466 passed with stage
    in 12 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 258 additions and 17 deletions
    src/router/index.js
    View file @ 8867390d
    ...@@ -630,7 +630,7 @@ const routes = [{ ...@@ -630,7 +630,7 @@ const routes = [{
    component: () => import('@/views/my/role') component: () => import('@/views/my/role')
    }, },
    { {
    path:'/message-details', path: '/message-details',
    name: 'message-details', name: 'message-details',
    meta: { meta: {
    title: '消息详情', title: '消息详情',
    ...@@ -665,7 +665,15 @@ const routes = [{ ...@@ -665,7 +665,15 @@ const routes = [{
    }, },
    component: () => import('@/views/danger/changeDanger/finishDelayDetail') component: () => import('@/views/danger/changeDanger/finishDelayDetail')
    }, },
    // matrix-grad {
    path: '/my-delay',
    name: 'my-delay',
    meta: {
    title: '我的延期',
    index: 1
    },
    component: () => import('@/views/danger/myDelay/index')
    },
    ] ]
    const router = new VueRouter({ const router = new VueRouter({
    ......
    src/views/danger/changeDanger/index.vue
    View file @ 8867390d
    ...@@ -153,10 +153,10 @@ export default { ...@@ -153,10 +153,10 @@ export default {
    title: "已整改", title: "已整改",
    api: "/rectification/finishList", api: "/rectification/finishList",
    }, },
    { // {
    title: "我的延期", // title: "我的延期",
    api: "/rectification/finishDelayList", // api: "/rectification/finishDelayList",
    }, // },
    ], ],
    }; };
    }, },
    ......
    src/views/danger/delayApproval/index.vue
    View file @ 8867390d
    ...@@ -42,14 +42,18 @@ ...@@ -42,14 +42,18 @@
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">隐患单编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="17">{{ item.businessId||item.id }}</van-col> <van-col span="17">{{
    item.businessId || item.pid
    }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="17">{{ item.proId }}</van-col> <van-col span="17">{{ item.proId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" v-if="item.hdLev">隐患级别：</van-col> <van-col span="7" v-if="item.hdLev"
    >隐患级别：</van-col
    >
    <van-col span="17">{{ <van-col span="17">{{
    item.hdLev | dangerText item.hdLev | dangerText
    }}</van-col> }}</van-col>
    ...@@ -80,8 +84,8 @@ ...@@ -80,8 +84,8 @@
    <van-button <van-button
    round round
    type="primary" type="primary"
    @click="goDetail(item)" @click="goDetail(item, 'normal-detail')"
    >详情</van-button >隐患详情</van-button
    > >
    <van-button <van-button
    round round
    ...@@ -90,12 +94,24 @@ ...@@ -90,12 +94,24 @@
    v-if="active == 0" v-if="active == 0"
    >审批 >审批
    </van-button> </van-button>
    <van-button
    round
    type="info"
    @click="
    goDetail(
    item,
    'finish-delay-detail'
    )
    "
    v-if="active == 1"
    >延期查看</van-button
    >
    </div> </div>
    </van-overlay> </van-overlay>
    </template> </template>
    </van-cell-group> </van-cell-group>
    </div> </div>
    <!-- 暂无数据 --> <!-- 暂无数据 -->
    <div <div
    style=" style="
    width: 100%; width: 100%;
    ...@@ -147,7 +163,7 @@ export default { ...@@ -147,7 +163,7 @@ export default {
    this.getList(); this.getList();
    }, },
    methods: { methods: {
    getList(select='') { getList(select = "") {
    /*接口对接3 START*/ /*接口对接3 START*/
    // 例子： // 例子：
    this.$toast.loading({ this.$toast.loading({
    ...@@ -161,14 +177,14 @@ export default { ...@@ -161,14 +177,14 @@ export default {
    postFun(this.tabs[this.active]["api"], formdata) postFun(this.tabs[this.active]["api"], formdata)
    .then((res) => { .then((res) => {
    this.$toast.clear(); this.$toast.clear();
    this.messageList = res.rows||res.data; this.messageList = res.rows || res.data;
    // 判断有无数据返回 // 判断有无数据返回
    if (this.messageList.length == 0) { if (this.messageList.length == 0) {
    this.isHaveNews = true; this.isHaveNews = true;
    } }
    }) })
    .catch((err) => { .catch((err) => {
    console.log(err) console.log(err);
    this.$toast.clear(); this.$toast.clear();
    this.$toast.fail("加载失败,请稍后再试"); this.$toast.fail("加载失败,请稍后再试");
    }); });
    ...@@ -186,12 +202,14 @@ export default { ...@@ -186,12 +202,14 @@ export default {
    }, },
    // 详情 // 详情
    goDetail(data) {
    let name = this.active==1?'finish-delay-detail':'normal-detail' goDetail(data, name = "normal-detail") {
    let id =
    name == "normal-detail" ? data.businessId || data.pid : data.id;
    this.$router.push({ this.$router.push({
    name, name,
    params: { params: {
    id: data.businessId||data.id, id,
    }, },
    }); });
    this.showIndex = null; this.showIndex = null;
    ......
    src/views/danger/myDelay/index.vue 0 → 100644
    View file @ 8867390d
    <template>
    <div>
    <van-sticky>
    <LHeader :text="text"></LHeader>
    </van-sticky>
    <van-sticky offset-top="1.5rem">
    <van-search
    v-model="searchValue"
    show-action
    placeholder="请输入搜索内容"
    @search="onSearch"
    >
    <template #action>
    <div @click="onSearch">搜索</div>
    </template>
    </van-search>
    </van-sticky>
    <div class="con-list" @touchmove="showIndex = null">
    <van-cell-group
    inset
    v-for="(item, index) in messageList"
    :key="index"
    @click="touchstart(index, item)"
    >
    <van-row gutter="">
    <van-col span="7">隐患单编号：</van-col>
    <van-col span="17">
    {{ item.businessId || item.pid || item.id }}
    </van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="7">所属项目：</van-col>
    <van-col span="17">{{ item.proId }}</van-col>
    </van-row>
    <van-row gutter="" v-show="item.hdLev">
    <van-col span="7">隐患级别：</van-col>
    <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="7">适用范围：</van-col>
    <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="7">隐患类型：</van-col>
    <van-col span="17">{{ item.hdType }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="7">超期标识：</van-col>
    <van-col span="17">{{ item.dueDate | formatTime }}</van-col>
    </van-row>
    <van-row gutter="" v-if="item.taskName">
    <van-col span="7">工单状态：</van-col>
    <van-col span="17">{{ item.taskName }}</van-col>
    </van-row>
    <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index">
    <div class="wrapper" @click.stop="showIndex = null">
    <van-button round type="primary" @click="goDetail(item,'normal-detail')"
    >隐患详情</van-button
    ><van-button round type="info" @click="goDetail(item,'finish-delay-detail')"
    >延期查看</van-button
    >
    </div>
    </van-overlay>
    </van-cell-group>
    </div>
    <!-- 暂无数据 -->
    <div
    style="
    width: 100%;
    text-align: center;
    font-size: 0.48rem;
    position: fixed;
    top: 30%;
    "
    v-if="messageList.length == 0"
    >
    暂无数据
    </div>
    </div>
    </template>
    <script>
    import LHeader from "@/components/header.vue";
    import { getFun, postFun } from "@/service/table.js";
    import { Dialog } from "vant";
    export default {
    components: {
    LHeader,
    },
    data() {
    return {
    text: "我的延期",
    searchValue: "",
    messageList: [],
    showIndex: null,
    };
    },
    created() {
    this.postList();
    },
    methods: {
    onSearch(val) {
    this.postList(this.searchValue);
    },
    postList(select = "") {
    this.$toast.loading({
    message: "加载中...",
    forbidClick: true,
    loadingType: "spinner",
    duration: 0,
    });
    let formdata = new FormData();
    formdata.append("select", select);
    postFun("/rectification/finishDelayList", formdata)
    .then((res) => {
    console.log(res);
    this.$toast.clear();
    this.messageList = res.rows || res.data;
    })
    .catch((err) => {
    console.log(err);
    this.$toast.clear();
    this.$toast.fail("加载失败,请稍后再试");
    });
    },
    touchstart(index, item) {
    if (this.showIndex != null) {
    this.showIndex = null;
    return;
    }
    this.showIndex = index;
    },
    // 详情
    goDetail(data,name='normal-detail') {
    let id=name=='normal-detail'?data.pid:data.id
    this.$router.push({
    name,
    params: {
    id
    },
    });
    this.showIndex = null;
    }
    },
    filters: {
    formatTime: function (val) {
    if (new Date(val).getTime() <= new Date().getTime()) {
    return "超期";
    } else if (
    new Date(val).getTime() >= new Date().getTime() &&
    new Date(val).getTime() <= new Date().getTime() + 259200000
    ) {
    return "临期";
    } else {
    return "正常";
    }
    },
    },
    };
    </script>
    <style lang="less" scoped>
    /* @import url(); 引入css类 */
    #app {
    font-family: "";
    color: #2c3e50;
    }
    .con-list {
    padding: 0;
    background-color: #f0f1f5;
    .van-cell-group--inset {
    margin: 0;
    margin-bottom: 0.26667rem;
    padding: 0.25rem;
    font-size: 0.4rem;
    position: relative;
    border-radius: 4%;
    box-shadow: 0px 0px 10px 2px #f3f3f3;
    width: 90%;
    margin: 0.4rem auto;
    .van-row {
    font-size: 0.4rem;
    line-height: 0.8rem;
    margin-bottom: 0;
    }
    .van-overlay {
    position: absolute;
    .wrapper {
    display: flex;
    align-items: center;
    justify-content: space-evenly;
    height: 100%;
    }
    }
    }
    }
    /deep/.van-tab__pane-wrapper {
    min-height: 8rem;
    }
    .van-tabs__track {
    min-height: 3rem;
    }
    </style>
    src/views/saveWorkbench/index.vue
    View file @ 8867390d
    ...@@ -212,6 +212,12 @@ export default { ...@@ -212,6 +212,12 @@ export default {
    imgUrl: require("@/assets/workbench/inspect-plane.png"), imgUrl: require("@/assets/workbench/inspect-plane.png"),
    text: "经理督办", text: "经理督办",
    }, },
    {
    key: "12",
    path: "/my-delay",
    imgUrl: require("@/assets/workbench/inspect-plane.png"),
    text: "我的延期",
    },
    ], ],
    safetyCheckList: [ safetyCheckList: [
    // 安全监督检查 // 安全监督检查
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment