Skip to content

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

修改了隐患整改页面

parent 2d409216
Pipeline #7028 passed with stage
    in 11 seconds
    Show whitespace changes
    Inline Side-by-side
    Showing with 239 additions and 103 deletions
    src/service/danger.js
    View file @ f0817410
    ...@@ -265,6 +265,26 @@ export function delayEdit(url, data) { ...@@ -265,6 +265,26 @@ export function delayEdit(url, data) {
    }) })
    } }
    // 隐患整改
    export function list1(url="/rectification/list1", data) {
    return request({
    url,
    method: 'post',
    data
    })
    }
    // 隐患整改已退回
    export function list2(url="/rectification/list2", data) {
    return request({
    url,
    method: 'post',
    data
    })
    }
    // 隐患整改已退回
    ......
    src/views/danger/changeDanger/index.vue
    View file @ f0817410
    <template> <template>
    <div> <div>
    <van-sticky>
    <LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" /> </van-sticky>
    <!-- <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" /> -->
    <!-- tab标签 -->
    <van-tabs
    @click="onClickTab"
    animated
    color="#2980F7"
    :sticky="true"
    offset-top="1.5rem"
    >
    <van-tab title="隐患整改">
    <!-- 内容列表 --> <!-- 内容列表 -->
    <div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
    <van-cell-group <van-cell-group
    ...@@ -39,10 +50,77 @@ ...@@ -39,10 +50,77 @@
    <van-col span="19">{{ item.taskName }}</van-col> <van-col span="19">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index">
    <div class="wrapper" @click.stop="showIndex = null">
    <van-button round type="primary" @click="goDetail(item)"
    >详情</van-button
    >
    <van-button round type="info" @click="goConfirm(item)"
    >确认</van-button
    >
    <van-button round type="info" @click="goDelay(item)"
    >延期</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="isHaveNews"
    >
    暂无数据
    </div>
    </van-tab>
    <van-tab title="隐患整改（已退回）">
    <!-- 内容列表 -->
    <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="5">所属项目:</van-col>
    <van-col span="19">{{ item.proId }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="5">隐患级别:</van-col>
    <van-col span="19">{{ item.hdLev }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="5">适用范围:</van-col>
    <van-col span="19">{{ item.hdRange }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="5">隐患类型:</van-col>
    <van-col span="19">{{ item.hdType }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="5">发现时间:</van-col>
    <van-col span="19">{{ item.hdDiscoveryTime }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="5">超期标识:</van-col>
    <van-col span="19">{{ item.dueDate | formatTime }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="5">状态:</van-col>
    <van-col span="19">{{ item.taskName }}</van-col>
    </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
    <div class="wrapper" @click.stop ="showIndex = null"> <div class="wrapper" @click.stop="showIndex = null">
    <van-button round type="primary" @click="goDetail(item)" <van-button round type="primary" @click="goDetail(item)"
    >详情</van-button >详情</van-button
    > >
    ...@@ -58,17 +136,25 @@ ...@@ -58,17 +136,25 @@
    </div> </div>
    <!-- 暂无数据 --> <!-- 暂无数据 -->
    <div <div
    style="width: 100%;text-align: center; font-size: .48rem;position: fixed; top: 30%;" style="
    width: 100%;
    text-align: center;
    font-size: 0.48rem;
    position: fixed;
    top: 30%;
    "
    v-if="isHaveNews" v-if="isHaveNews"
    > >
    暂无数据 暂无数据
    </div> </div>
    </van-tab>
    </van-tabs>
    </div> </div>
    </template> </template>
    <script> <script>
    import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
    import { dangerRect } from "@/service/danger"; import { dangerRect, list1, list2 } from "@/service/danger";
    export default { export default {
    components: { components: {
    LHeader, LHeader,
    ...@@ -80,39 +166,67 @@ export default { ...@@ -80,39 +166,67 @@ export default {
    isHaveNews: false, isHaveNews: false,
    messageList: [], messageList: [],
    Loop: "", // 定时器 Loop: "", // 定时器
    showIndex: null // 是否显示遮罩层 showIndex: null, // 是否显示遮罩层
    }; };
    }, },
    created() { created() {
    this.postList() this.onClickTab(0);
    }, },
    methods: { methods: {
    onSearch(val) { onSearch(val) {},
    }, onClickTab(val) {
    postList(){ this.showIndex = null;
    this.$toast.loading({ this.$toast.loading({
    message: "加载中...", message: "加载中...",
    forbidClick: true, forbidClick: true,
    loadingType: "spinner", loadingType: "spinner",
    duration: 0 duration: 0,
    }); });
    dangerRect("/rectification/list").then(res =>{
    // 这里根据tab切换调用接口
    [list1, list2]
    [val]()
    .then((res) => {
    this.$toast.clear(); this.$toast.clear();
    this.messageList = res.rows this.messageList = res.rows;
    // 判断有无数据返回 // 判断有无数据返回
    if (this.messageList.length == 0) { if (this.messageList.length == 0) {
    this.isHaveNews = true; this.isHaveNews = true;
    } }
    }).catch(() => { })
    .catch(() => {
    this.$toast.clear(); this.$toast.clear();
    this.$toast.fail("加载失败,请稍后再试"); this.$toast.fail("加载失败,请稍后再试");
    }); });
    }, },
    // 此接口暂时废弃
    // postList() {
    // this.$toast.loading({
    // message: "加载中...",
    // forbidClick: true,
    // loadingType: "spinner",
    // duration: 0,
    // });
    // dangerRect("/rectification/list")
    // .then((res) => {
    // this.$toast.clear();
    // this.messageList = res.rows;
    // // 判断有无数据返回
    // if (this.messageList.length == 0) {
    // this.isHaveNews = true;
    // }
    // })
    // .catch(() => {
    // this.$toast.clear();
    // this.$toast.fail("加载失败,请稍后再试");
    // });
    // },
    touchstart(index, item) { touchstart(index, item) {
    if (this.showIndex != null) { if (this.showIndex != null) {
    this.showIndex = null; this.showIndex = null;
    return return;
    } }
    this.showIndex = index; this.showIndex = index;
    }, },
    ...@@ -122,50 +236,53 @@ export default { ...@@ -122,50 +236,53 @@ export default {
    this.$router.push({ this.$router.push({
    name: "normal-detail", name: "normal-detail",
    params: { params: {
    id: data.taskId id: data.taskId,
    } },
    }); });
    this.showIndex = null; this.showIndex = null;
    }, },
    // 确认 // 确认
    goConfirm(data) { goConfirm(data) {
    this.$router.push({ this.$router.push({
    name:"change-info", name: "change-info",
    params:{ params: {
    data: data, data: data,
    } },
    }); });
    this.showIndex = null; this.showIndex = null;
    }, },
    // 延期 // 延期
    goDelay(data) { goDelay(data) {
    this.$router.push({ this.$router.push({
    name:"delay-info", name: "delay-info",
    params:{ params: {
    "taskId":data.taskId, taskId: data.taskId,
    "taskName":data.taskName taskName: data.taskName,
    } },
    }); });
    this.showIndex = null; this.showIndex = null;
    }
    }, },
    filters:{ },
    formatTime:function(val){ filters: {
    if (new Date(val).getTime() <= new Date().getTime()){ formatTime: function (val) {
    return "超期" if (new Date(val).getTime() <= new Date().getTime()) {
    }else if(new Date(val).getTime()>= new Date().getTime() && new Date(val).getTime() <= new Date().getTime() + 259200000){ return "超期";
    return "临期" } else if (
    }else { new Date(val).getTime() >= new Date().getTime() &&
    return "正常" new Date(val).getTime() <= new Date().getTime() + 259200000
    } ) {
    } return "临期";
    } else {
    return "正常";
    } }
    },
    },
    }; };
    </script> </script>
    <style lang="less" scoped> <style lang="less" scoped>
    /* @import url(); 引入css类 */ /* @import url(); 引入css类 */
    .con-list { .con-list {
    padding: 10px 10px .533333rem; padding: 10px 10px 0.533333rem;
    background-color: #f0f1f5; background-color: #f0f1f5;
    .van-cell-group--inset { .van-cell-group--inset {
    margin: 0; margin: 0;
    ...@@ -173,9 +290,9 @@ export default { ...@@ -173,9 +290,9 @@ export default {
    padding: 10px; padding: 10px;
    font-size: 13px; font-size: 13px;
    position: relative; position: relative;
    .van-row{ .van-row {
    margin-bottom: .133333rem; margin-bottom: 0.133333rem;
    line-height: .64rem; line-height: 0.64rem;
    } }
    .van-overlay { .van-overlay {
    position: absolute; position: absolute;
    ......
    src/views/danger/confirmeDanger/index.vue
    View file @ f0817410
    ...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
    <div> <div>
    <LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
    <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" /> <van-search v-model="searchValue" placeholder="搜索" @search="onSearch" />
    <!-- 内容列表 --> <!-- 内容列表 -->
    <div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
    <van-cell-group <van-cell-group
    ......
    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