Skip to content

B
BCDH-APP
Commit 74a6ae88 authored by 13841799530's avatar 13841799530
Browse files
Options

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

parents e0c9bcce 6a34c5ab
Pipeline #7380 passed with stage
    in 11 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 922 additions and 840 deletions
    src/App.vue
    View file @ 74a6ae88
    ...@@ -7,133 +7,147 @@ ...@@ -7,133 +7,147 @@
    * 版权所有，侵权必究！ * 版权所有，侵权必究！
    * *
    --> -->
    <template> <template>
    <div id="app" :style="{height:appHeight}"> <div id="app">
    <transition :name="transitionName"> <div :style="{ height: showTab ?appHeight:'100%' }" id="app-content">
    <keep-alive :include="cachePage"> <transition :name="transitionName">
    <router-view class="router-view" /> <keep-alive :include="cachePage">
    </keep-alive> <router-view class="router-view" />
    </transition> </keep-alive>
    <div :style="{height:tabH}"></div> </transition>
    <tab-bar v-if="showTab"></tab-bar> </div>
    </div> <tab-bar v-if="showTab"></tab-bar>
    </div>
    </template> </template>
    <script> <script>
    import tabBar from "@/components/TabBar"; import tabBar from "@/components/TabBar";
    export default { export default {
    components: { components: {
    tabBar, tabBar,
    }, },
    data() { data() {
    return { return {
    appHeight: "", appHeight: "",
    tabH: "", tabH: "",
    rempx:0, rempx: 0,
    headH:'', headH: "",
    screenH: "", screenH: "",
    transitionName: "slide-left", transitionName: "slide-left",
    cachePage: [ cachePage: [
    "add-danger", "add-danger",
    "change-info", "change-info",
    "affirm-danger", "affirm-danger",
    "risk-affirm", "risk-affirm",
    "manager-survey", "manager-survey",
    "super-survey", "super-survey",
    "major-survey", "major-survey",
    "risk-add", "risk-add",
    "noticeList", "noticeList",
    "confirmNote", "confirmNote",
    ], ],
    }; };
    }, },
    mounted() {
    let tabH = mounted() {
    document.getElementsByTagName("html")[0].style.fontSize.split("px")[0] * let tabH =
    1.33333; document
    let sH = window.screen.height; .getElementsByTagName("html")[0]
    this.headH=document.getElementsByTagName("html")[0].style.fontSize.split("px")[0] * .style.fontSize.split("px")[0] * 1.33333;
    1.5;+'px' let sH = document.documentElement.clientHeight;
    this.appHeight = sH - tabH + "px"; this.headH =
    this.tabH = tabH + "px"; document
    this.screenH = sH + "px"; .getElementsByTagName("html")[0]
    }, .style.fontSize.split("px")[0] * 1.5;
    computed: { +"px";
    showTab() { this.appHeight = sH - tabH + "px";
    return !["login", "login2","choose-people"].includes(this.$route.name); this.tabH = tabH + "px";
    this.screenH = sH + "px";
    },
    computed: {
    showTab() {
    return !["login", "login2", "choose-people"].includes(
    this.$route.name
    );
    },
    }, },
    }, watch: {
    watch: { $route(to, from) {
    $route(to, from) { // 有主级到次级
    // 有主级到次级 if (to.meta.index > from.meta.index) {
    if (to.meta.index > from.meta.index) { this.transitionName = "slide-left"; // 向左滑动
    this.transitionName = "slide-left"; // 向左滑动 } else if (to.meta.index < from.meta.index) {
    } else if (to.meta.index < from.meta.index) { // 由次级到主级
    // 由次级到主级 this.transitionName = "slide-right";
    this.transitionName = "slide-right"; } else {
    } else { this.transitionName = ""; //同级无过渡效果
    this.transitionName = ""; //同级无过渡效果 }
    } },
    }, },
    },
    }; };
    </script> </script>
    <style lang="less"> <style lang="less">
    // body{
    // overflow: hidden;
    // }
    #app { #app {
    font-family: "Avenir", Helvetica, Arial, sans-serif; font-family: "Avenir", Helvetica, Arial, sans-serif;
    -webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
    -moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
    // text-align: center; // text-align: center;
    color: #2c3e50; color: #2c3e50;
    box-sizing: border-box; box-sizing: border-box;
    overflow: hidden; overflow: hidden;
    position: relative; position: relative;
    overflow: hidden; overflow: hidden;
    // z-index:999999999999 height: 100vh;
    // z-index:999999999999
    }
    #app-content {
    box-sizing: border-box;
    overflow: hidden;
    position: absolute;
    left: 0;
    top: 0;
    width: 100%;
    overflow: hidden;
    } }
    .router-view { .router-view {
    width: 100%; width: 100%;
    height: auto; height: auto;
    position: absolute; position: absolute;
    top: 0; top: 0;
    bottom: 0; bottom: 0;
    margin: 0 auto; margin: 0 auto;
    -webkit-overflow-scrolling: touch; -webkit-overflow-scrolling: touch;
    background-color: #f0f1f5; background-color: #f0f1f5;
    overflow: auto; overflow: auto;
    } }
    .slide-right-enter-active, .slide-right-enter-active,
    .slide-right-leave-active, .slide-right-leave-active,
    .slide-left-enter-active, .slide-left-enter-active,
    .slide-left-leave-active { .slide-left-leave-active {
    height: 100%; height: 100%;
    will-change: transform; will-change: transform;
    transition: all 500ms; transition: all 500ms;
    position: absolute; position: absolute;
    backface-visibility: hidden; backface-visibility: hidden;
    } }
    .slide-right-enter { .slide-right-enter {
    opacity: 0; opacity: 0;
    transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
    } }
    .slide-right-leave-active { .slide-right-leave-active {
    opacity: 0; opacity: 0;
    transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
    } }
    .slide-left-enter { .slide-left-enter {
    opacity: 0; opacity: 0;
    transform: translate3d(100%, 0, 0); transform: translate3d(100%, 0, 0);
    } }
    .slide-left-leave-active { .slide-left-leave-active {
    opacity: 0; opacity: 0;
    transform: translate3d(-100%, 0, 0); transform: translate3d(-100%, 0, 0);
    } }
    </style> </style>
    src/assets/myTerritory/role.png
    View replaced file @ e0c9bcce View file @ 74a6ae88
    src/assets/myTerritory/role.png

    4.64 KB | W: | H:

    src/assets/myTerritory/role.png

    695 Bytes | W: | H:

    src/assets/myTerritory/role.png
    src/assets/myTerritory/role.png
    src/assets/myTerritory/role.png
    src/assets/myTerritory/role.png
    • 2-up
    • Swipe
    • Onion skin
    src/service/danger.js
    View file @ 74a6ae88
    ...@@ -25,7 +25,7 @@ export function postHdName(url, data) { ...@@ -25,7 +25,7 @@ export function postHdName(url, data) {
    data data
    }) })
    } }
    // 隐患项目编号和隐患级别 // 隐患单编号和隐患级别
    export function postHdInventories(url, data) { export function postHdInventories(url, data) {
    return request({ return request({
    url: url, url: url,
    ......
    src/views/danger/addDanger/addDanger.vue
    View file @ 74a6ae88
    ...@@ -128,9 +128,9 @@ ...@@ -128,9 +128,9 @@
    v-model="dangerNum" v-model="dangerNum"
    readonly readonly
    name="hdProjectId" name="hdProjectId"
    label="隐患项目编号" label="隐患单编号"
    placeholder="请选择" placeholder="请选择"
    :rules="[{ required: true, message: '隐患项目编号不能为空' }]" :rules="[{ required: true, message: '隐患单编号不能为空' }]"
    /> />
    <van-field <van-field
    required required
    ...@@ -421,7 +421,7 @@ export default { ...@@ -421,7 +421,7 @@ export default {
    this.dangerName = ""; //隐患项目名称 this.dangerName = ""; //隐患项目名称
    this.showDangerName = false; this.showDangerName = false;
    this.columnsDangerName = []; this.columnsDangerName = [];
    this.dangerNum = ""; //隐患项目编号 this.dangerNum = ""; //隐患单编号
    this.dangerLevel = ""; //隐患项目级别 this.dangerLevel = ""; //隐患项目级别
    this.findTime = ""; //隐患发现时间 this.findTime = ""; //隐患发现时间
    this.showFindTime = false; this.showFindTime = false;
    ...@@ -470,7 +470,7 @@ export default { ...@@ -470,7 +470,7 @@ export default {
    dangerName: "", //隐患项目名称 dangerName: "", //隐患项目名称
    showDangerName: false, showDangerName: false,
    columnsDangerName: [], columnsDangerName: [],
    dangerNum: "", //隐患项目编号 dangerNum: "", //隐患单编号
    dangerLevel: "", //隐患项目级别 dangerLevel: "", //隐患项目级别
    findTime: "", //隐患发现时间 findTime: "", //隐患发现时间
    showFindTime: false, showFindTime: false,
    ...@@ -744,7 +744,7 @@ export default { ...@@ -744,7 +744,7 @@ export default {
    } }
    this.dangerName = value.hdName; this.dangerName = value.hdName;
    this.showDangerName = false; this.showDangerName = false;
    // 请求隐患项目编号和隐患级别 // 请求隐患单编号和隐患级别
    postHdInventories( postHdInventories(
    `/hdreport/showHdInventories/${this.range}/${this.type}/${this.dangerName}` `/hdreport/showHdInventories/${this.range}/${this.type}/${this.dangerName}`
    ).then((res) => { ).then((res) => {
    ......
    src/views/danger/changeDanger/changeInfo.vue
    View file @ 74a6ae88
    ...@@ -8,32 +8,32 @@ ...@@ -8,32 +8,32 @@
    @click="goDetail(item.taskId)" @click="goDetail(item.taskId)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">超期标识：</van-col> <van-col span="7">超期标识：</van-col>
    <van-col span="18">{{ item.dueDate | formatTime }}</van-col> <van-col span="17">{{ item.dueDate | formatTime }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 详情 --> <!-- 详情 -->
    <div class="detail">详情</div> <div class="detail">详情</div>
    ......
    src/views/danger/changeDanger/index.vue
    View file @ 74a6ae88
    ...@@ -37,42 +37,42 @@ ...@@ -37,42 +37,42 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18"> <van-col span="17">
    {{ item.businessId || item.id }} {{ item.businessId || item.id }}
    </van-col> </van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ <van-col span="17">{{
    item.hdLev | dangerText item.hdLev | dangerText
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">超期标识：</van-col> <van-col span="7">超期标识：</van-col>
    <van-col span="18">{{ <van-col span="17">{{
    item.dueDate | formatTime item.dueDate | formatTime
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.taskName"> <van-row gutter="" v-if="item.taskName">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    ......
    src/views/danger/confirmeDanger/confirmeDanger.vue
    View file @ 74a6ae88
    ...@@ -7,34 +7,34 @@ ...@@ -7,34 +7,34 @@
    :key="index" :key="index"
    @click="goDetail(item)" @click="goDetail(item)"
    > >
    {{item}} <!-- {{item}} -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.businessId || item.id}}</van-col> <van-col span="17">{{ item.businessId || item.id}}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.taskName"> <van-row gutter="" v-if="item.taskName">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <!-- 详情 --> <!-- 详情 -->
    <div class="detail">详情</div> <div class="detail">详情</div>
    ......
    src/views/danger/confirmeDanger/index.vue
    View file @ 74a6ae88
    ...@@ -35,34 +35,34 @@ ...@@ -35,34 +35,34 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.businessId||item.id }}</van-col> <van-col span="17">{{ item.businessId||item.id }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ <van-col span="17">{{
    item.hdLev | dangerText item.hdLev | dangerText
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.taskName"> <van-row gutter="" v-if="item.taskName">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
    ......
    src/views/danger/delayApproval/index.vue
    View file @ 74a6ae88
    <template> <template>
    <div> <div>
    <van-sticky offset-top="0"> <van-sticky offset-top="0">
    <LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
    </van-sticky> </van-sticky>
    <!-- <van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
    <van-search <van-search
    v-model="searchValue" v-model="searchValue"
    show-action show-action
    placeholder="请输入搜索内容" placeholder="请输入搜索内容"
    @search="onSearch" @search="onSearch"
    > >
    <template #action> <template #action>
    <div @click="onSearch">搜索</div> <div @click="onSearch">搜索</div>
    </template> </template>
    </van-search> </van-search>
    </van-sticky> --> </van-sticky>
    <!-- 内容列表 --> <!-- 内容列表 -->
    <!-- 接口对接4 START --> <!-- 接口对接4 START -->
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    getList(); getList();
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="1.5rem" offset-top="3rem"
    >
    <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
    <div
    class="con-list"
    @touchmove="showIndex = null"
    v-if="key == active"
    > >
    <van-cell-group <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
    inset <div
    v-for="(item, index) in messageList" class="con-list"
    :key="index" @touchmove="showIndex = null"
    @click="touchstart(index, item)" v-if="key == active"
    > >
    <van-row gutter=""> <van-cell-group
    <van-col span="6">隐患编号：</van-col> inset
    <van-col span="18">{{ item.businessId }}</van-col> v-for="(item, index) in messageList"
    </van-row> :key="index"
    <van-row gutter=""> @click="touchstart(index, item)"
    <van-col span="6">所属项目：</van-col> >
    <van-col span="18">{{ item.proId }}</van-col> <van-row gutter="">
    </van-row> <van-col span="7">隐患单编号：</van-col>
    <van-row gutter=""> <van-col span="17">{{ item.businessId }}</van-col>
    <van-col span="6">隐患级别：</van-col> </van-row>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-row gutter="">
    </van-row> <van-col span="7">所属项目：</van-col>
    <van-row gutter="" v-show="item.examineResult"> <van-col span="17">{{ item.proId }}</van-col>
    <van-col span="6">是否通过：</van-col> </van-row>
    <van-col span="17">{{ item.examineResult==1?'是':'否'}}</van-col> <van-row gutter="">
    </van-row> <van-col span="7">隐患级别：</van-col>
    <van-row gutter="" v-show="item.examineReason"> <van-col span="17">{{
    <van-col span="6">意见：</van-col> item.hdLev | dangerText
    <van-col span="18">{{ item.examineReason }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.taskName"> <van-row gutter="" v-show="item.examineResult">
    <van-col span="6">工单状态：</van-col> <van-col span="7">是否通过：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{
    </van-row> item.examineResult == 1 ? "是" : "否"
    <!-- 长按显示遮罩层 --> }}</van-col>
    <template> </van-row>
    <van-overlay :show="showIndex == index"> <van-row gutter="" v-show="item.examineReason">
    <div class="wrapper" @click.stop="showIndex = null"> <van-col span="7">意见：</van-col>
    <van-button round type="primary" @click="goDetail(item)" <van-col span="17">{{
    >详情</van-button item.examineReason
    > }}</van-col>
    <van-button round type="info" @click="goConfirm(item)" </van-row>
    v-if="active == 0" <van-row gutter="" v-if="item.taskName">
    >审批 <van-col span="7">工单状态：</van-col>
    </van-button> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row>
    <!-- 长按显示遮罩层 -->
    <template>
    <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)"
    v-if="active == 0"
    >审批
    </van-button>
    </div>
    </van-overlay>
    </template>
    </van-cell-group>
    </div> </div>
    </van-overlay> </van-tab>
    </template> </van-tabs>
    </van-cell-group> </div>
    </div>
    </van-tab>
    </van-tabs>
    </div>
    </template> </template>
    <script> <script>
    ...@@ -91,127 +106,127 @@ import { getFun, postFun } from "@/service/table.js"; ...@@ -91,127 +106,127 @@ import { getFun, postFun } from "@/service/table.js";
    import { delayList } from "@/service/danger"; import { delayList } from "@/service/danger";
    export default { export default {
    components: { components: {
    LHeader, LHeader,
    },
    data() {
    return {
    text: "延期审批",
    searchValue: "",
    isHaveNews: false,
    messageList: [],
    Loop: "", // 定时器
    showIndex: null, // 是否显示遮罩层
    active: 0,
    tabs: [
    {
    title: "待审批",
    api: "/delayApply/list",
    },
    {
    title: "已审批",
    api: "/delayApply/finishList",
    },
    ],
    };
    },
    created() {
    this.getList();
    },
    methods: {
    getList(select) {
    /*接口对接3 START*/
    // 例子：
    this.$toast.loading({
    message: "加载中...",
    forbidClick: true,
    loadingType: "spinner",
    duration: 0,
    });
    let formdata = new FormData();
    formdata.append("select", select);
    postFun(this.tabs[this.active]["api"], formdata)
    .then((res) => {
    this.$toast.clear();
    this.messageList = res.rows;
    // 判断有无数据返回
    if (this.messageList.length == 0) {
    this.isHaveNews = true;
    }
    })
    .catch(() => {
    this.$toast.clear();
    this.$toast.fail("加载失败,请稍后再试");
    });
    /*接口对接3 END*/
    }, },
    onSearch() { data() {
    this.getList(this.searchValue); return {
    text: "延期审批",
    searchValue: "",
    isHaveNews: false,
    messageList: [],
    Loop: "", // 定时器
    showIndex: null, // 是否显示遮罩层
    active: 0,
    tabs: [
    {
    title: "待审批",
    api: "/delayApply/list",
    },
    {
    title: "已审批",
    api: "/delayApply/finishList",
    },
    ],
    };
    }, },
    touchstart(index, item) { created() {
    if (this.showIndex != null) { this.getList();
    this.showIndex = null;
    return;
    }
    this.showIndex = index;
    }, },
    methods: {
    getList(select) {
    /*接口对接3 START*/
    // 例子：
    this.$toast.loading({
    message: "加载中...",
    forbidClick: true,
    loadingType: "spinner",
    duration: 0,
    });
    let formdata = new FormData();
    formdata.append("select", select);
    postFun(this.tabs[this.active]["api"], formdata)
    .then((res) => {
    this.$toast.clear();
    this.messageList = res.rows;
    // 判断有无数据返回
    if (this.messageList.length == 0) {
    this.isHaveNews = true;
    }
    })
    .catch(() => {
    this.$toast.clear();
    this.$toast.fail("加载失败,请稍后再试");
    });
    /*接口对接3 END*/
    },
    onSearch() {
    this.getList(this.searchValue);
    },
    touchstart(index, item) {
    if (this.showIndex != null) {
    this.showIndex = null;
    return;
    }
    this.showIndex = index;
    },
    // 详情 // 详情
    goDetail(data) { goDetail(data) {
    this.$router.push({ this.$router.push({
    name: "normal-detail", name: "normal-detail",
    params: { params: {
    id: data.businessId, id: data.businessId,
    },
    });
    this.showIndex = null;
    }, },
    }); // 审批
    this.showIndex = null; goConfirm(data) {
    }, this.$router.push({
    // 审批 name: "ratify-info",
    goConfirm(data) { params: {
    this.$router.push({ taskId: data.taskId,
    name: "ratify-info", },
    params: { });
    taskId: data.taskId, this.showIndex = null;
    }, },
    });
    this.showIndex = null;
    }, },
    },
    }; };
    </script> </script>
    <style lang="less" scoped> <style lang="less" scoped>
    /* @import url(); 引入css类 */ /* @import url(); 引入css类 */
    #app { #app {
    font-family: ""; font-family: "";
    color: #2c3e50; color: #2c3e50;
    } }
    .con-list { .con-list {
    padding: 0; padding: 0;
    background-color: #f0f1f5; background-color: #f0f1f5;
    .van-cell-group--inset { .van-cell-group--inset {
    margin: 0; margin: 0;
    margin-bottom: 0.26667rem; margin-bottom: 0.26667rem;
    padding: 0.25rem; padding: 0.25rem;
    font-size: 0.4rem; font-size: 0.4rem;
    position: relative; position: relative;
    border-radius: 4%; border-radius: 4%;
    box-shadow: 0px 0px 10px 2px #f3f3f3; box-shadow: 0px 0px 10px 2px #f3f3f3;
    width: 90%; width: 90%;
    margin: 0.4rem auto; margin: 0.4rem auto;
    .van-row { .van-row {
    font-size: 0.4rem; font-size: 0.4rem;
    line-height: 0.8rem; line-height: 0.8rem;
    margin-bottom: 0; margin-bottom: 0;
    } }
    .van-overlay { .van-overlay {
    position: absolute; position: absolute;
    .wrapper { .wrapper {
    display: flex; display: flex;
    align-items: center; align-items: center;
    justify-content: space-evenly; justify-content: space-evenly;
    height: 100%; height: 100%;
    } }
    }
    } }
    }
    } }
    </style> </style>
    src/views/danger/insertDanger/list.vue
    View file @ 74a6ae88
    ...@@ -23,28 +23,28 @@ ...@@ -23,28 +23,28 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.id }}</van-col> <van-col span="17">{{ item.id }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
    ......
    src/views/danger/majorDanger/index.vue
    View file @ 74a6ae88
    ...@@ -3,18 +3,18 @@ ...@@ -3,18 +3,18 @@
    <van-sticky :offset-top="0"> <van-sticky :offset-top="0">
    <LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
    </van-sticky> </van-sticky>
    <!-- <van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
    <van-search <van-search
    v-model="searchValue" v-model="searchValue"
    show-action show-action
    placeholder="请输入搜索内容" placeholder="请输入搜索内容"
    @search="onSearch" @search="onSearch"
    > >
    <template #action> <template #action>
    <div @click="onSearch">搜索</div> <div @click="onSearch">搜索</div>
    </template> </template>
    </van-search> </van-search>
    </van-sticky> --> </van-sticky>
    <!-- 内容列表 --> <!-- 内容列表 -->
    <!-- 接口对接4 START --> <!-- 接口对接4 START -->
    <van-tabs <van-tabs
    ...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="1.5rem" offset-top="3rem"
    > >
    <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title"> <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title">
    <div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
    ...@@ -37,24 +37,24 @@ ...@@ -37,24 +37,24 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ <van-col span="16">{{
    item.businessId || item.id item.businessId || item.id
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ <van-col span="17">{{
    item.hdLev | dangerText item.hdLev | dangerText
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- *接口对接4 END --> <!-- *接口对接4 END -->
    ...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
    >详情</van-button >详情</van-button
    > >
    <van-button <van-button
    v-show="active == 1" v-show="active == 0"
    round round
    type="info" type="info"
    @click="goConfirm(item)" @click="goConfirm(item)"
    ...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
    active: 0, active: 0,
    tabs: [ tabs: [
    { {
    title: "待确认", title: "待审批",
    api: "/majorapprove/list", api: "/majorapprove/list",
    }, },
    { {
    ...@@ -186,7 +186,7 @@ export default { ...@@ -186,7 +186,7 @@ export default {
    this.$router.push({ this.$router.push({
    name: "normal-detail", name: "normal-detail",
    params: { params: {
    id: data.taskId||data.id, id: data.taskId || data.id,
    }, },
    }); });
    this.showIndex = null; this.showIndex = null;
    ......
    src/views/danger/majorDanger/majorSurvey.vue
    View file @ 74a6ae88
    ...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
    > >
    <!-- {{item}} --> <!-- {{item}} -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="17">{{ item.businessId }}</van-col> <van-col span="17">{{ item.businessId }}</van-col>
    </van-row> </van-row>
    ...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
    rows="3" rows="3"
    type="textarea" type="textarea"
    placeholder="请输入" placeholder="请输入"
    required :required="radio==1?false:true"
    :rules="[{ required: true, message: '审批意见不能为空' }]" :rules="[{ required: radio==1?false:true, message: '审批意见不能为空' }]"
    /> />
    </div> </div>
    ......
    src/views/danger/managerDanger/index.vue
    View file @ 74a6ae88
    ...@@ -23,24 +23,24 @@ ...@@ -23,24 +23,24 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.pid }}</van-col> <van-col span="17">{{ item.pid }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ item.projectName }}</van-col> <van-col span="17">{{ item.projectName }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.taskName"> <van-row gutter="" v-if="item.taskName">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <!-- *接口对接4 END --> <!-- *接口对接4 END -->
    ......
    src/views/danger/managerDanger/managerSurvey.vue
    View file @ 74a6ae88
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    @click="goDetail(item.pid)" @click="goDetail(item.pid)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="17">{{ item.pid }}</van-col> <van-col span="17">{{ item.pid }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    ......
    src/views/danger/reportReturn/index.vue
    View file @ 74a6ae88
    ...@@ -22,32 +22,32 @@ ...@@ -22,32 +22,32 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.businessId }}</van-col> <van-col span="17">{{ item.businessId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText}}</van-col> <van-col span="17">{{ item.hdLev | dangerText}}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- {{ item.taskName }} --> <!-- {{ item.taskName }} -->
    ......
    src/views/danger/reviewDanger/index.vue
    View file @ 74a6ae88
    ...@@ -36,38 +36,38 @@ ...@@ -36,38 +36,38 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.businessId || item.id}}</van-col> <van-col span="17">{{ item.businessId || item.id}}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ <van-col span="17">{{
    item.hdLev | dangerText item.hdLev | dangerText
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">超期标识：</van-col> <van-col span="7">超期标识：</van-col>
    <van-col span="18">{{ item | formatTime }}</van-col> <van-col span="17">{{ item | formatTime }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
    ......
    src/views/danger/reviewDanger/reviewAdd.vue
    View file @ 74a6ae88
    ...@@ -8,32 +8,32 @@ ...@@ -8,32 +8,32 @@
    @click="goDetail(item.taskId)" @click="goDetail(item.taskId)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">超期标识：</van-col> <van-col span="7">超期标识：</van-col>
    <van-col span="18">{{ item | formatTime }}</van-col> <van-col span="17">{{ item | formatTime }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 详情 --> <!-- 详情 -->
    <div class="detail">详情</div> <div class="detail">详情</div>
    ......
    src/views/danger/standBook/index.vue
    View file @ 74a6ae88
    <template> <template>
    <div> <div>
    <van-sticky> <van-sticky :offset-top="0">
    <LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
    </van-sticky> </van-sticky>
    <!-- <van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
    <van-search <van-search
    v-model="searchValue" v-model="searchValue"
    show-action show-action
    placeholder="请输入搜索内容" placeholder="请输入搜索内容"
    @search="onSearch" @search="onSearch"
    > >
    <template #action> <template #action>
    <div @click="onSearch">搜索</div> <div @click="onSearch">搜索</div>
    </template> </template>
    </van-search> </van-search>
    </van-sticky> --> </van-sticky>
    <!-- tab标签 --> <!-- tab标签 -->
    <van-tabs v-model="active" @change="postList" color="#2980f7" animated <van-tabs
    :sticky="true" v-model="active"
    offset-top="1.5rem"> @change="postList"
    <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title"> color="#2980f7"
    <div v-show="key == active"> animated
    <div class="con-list" @touchmove="showIndex = null"> :sticky="true"
    <van-cell-group offset-top="3rem"
    inset >
    v-for="(item, index) in messageList" <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title" :sticky="true"
    :key="index" offset-top="3rem">
    @click="touchstart(index, item)" <div v-show="key == active">
    > <div class="con-list" @touchmove="showIndex = null">
    <van-row gutter=""> <van-cell-group
    <van-col span="6">隐患编号：</van-col> inset
    <van-col span="18">{{ item.businessId }}</van-col> v-for="(item, index) in messageList"
    </van-row> :key="index"
    <van-row gutter=""> @click="touchstart(index, item)"
    <van-col span="6">所属项目：</van-col> >
    <van-col span="18">{{ item.proId }}</van-col> <van-row gutter="">
    </van-row> <van-col span="7">隐患单编号：</van-col>
    <van-row gutter=""> <van-col span="17">{{
    <van-col span="6">隐患级别：</van-col> item.businessId
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> }}</van-col>
    </van-row> </van-row>
    <!--<van-row gutter=""> <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.proId }}</van-col>
    </van-row>
    <van-row gutter="">
    <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.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">适用范围：</van-col> <van-col span="7">适用范围：</van-col>
    <van-col span="18">{{ item.hdRange }}</van-col> <van-col span="17">{{ item.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患类型：</van-col> <van-col span="7">隐患类型：</van-col>
    <van-col span="18">{{ item.hdType }}</van-col> <van-col span="17">{{ item.hdType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">超期标识：</van-col> <van-col span="7">超期标识：</van-col>
    <van-col span="18">{{ item | formatTime }}</van-col> <van-col span="17">{{
    </van-row> item | formatTime
    <van-row gutter=""> }}</van-col>
    <van-col span="6">工单状态</van-col> </van-row>
    <van-col span="18">{{ item | formatTime }}</van-col> <van-row gutter="">
    </van-row> <van-col span="7">工单状态</van-col>
    <!-- 长按显示遮罩层 --> <van-col span="17">{{
    <van-overlay :show="showIndex == index"> item | formatTime
    <div class="wrapper" @click.stop="showIndex = null"> }}</van-col>
    <van-button round type="primary" @click="goDetail(item)" </van-row>
    >详情</van-button <!-- 长按显示遮罩层 -->
    > <van-overlay :show="showIndex == index">
    </div> <div
    </van-overlay> class="wrapper"
    </van-cell-group> @click.stop="showIndex = null"
    </div> >
    </div> <van-button
    <div round
    v-if="messageList.length == 0" type="primary"
    style=" @click="goDetail(item)"
    width: 100%; >详情</van-button
    text-align: center; >
    font-size: 0.48rem; </div>
    position: fixed; </van-overlay>
    top: 30%; </van-cell-group>
    " </div>
    > </div>
    暂无数据 <div
    </div> v-if="messageList.length == 0"
    </van-tab> style="
    </van-tabs> width: 100%;
    </div> text-align: center;
    font-size: 0.48rem;
    position: fixed;
    top: 30%;
    "
    >
    暂无数据
    </div>
    </van-tab>
    </van-tabs>
    </div>
    </template> </template>
    <script> <script>
    ...@@ -93,137 +113,137 @@ import LHeader from "@/components/header.vue"; ...@@ -93,137 +113,137 @@ import LHeader from "@/components/header.vue";
    import { getFun, postFun } from "@/service/table.js"; import { getFun, postFun } from "@/service/table.js";
    import { dangerStandBook } from "@/service/danger"; import { dangerStandBook } from "@/service/danger";
    export default { export default {
    components: { components: {
    LHeader, LHeader,
    },
    data() {
    return {
    text: "隐患历史台账",
    active: 0,
    searchValue: "",
    isHaveNews: false,
    messageList: [],
    Loop: "", // 定时器
    showIndex: null, // 是否显示遮罩层
    tabs: [
    {
    title: "已完结",
    api: "/hdreport/doneList",
    },
    {
    title: "已挂账",
    api: "/hdreport/doneListRectification",
    },
    {
    title: "已整改",
    api: "/hdreport/doneListReview",
    },
    ],
    };
    },
    created() {
    this.postList();
    },
    methods: {
    onSearch(val) {
    this.postList(this.searchValue);
    }, },
    postList(select = "") { data() {
    this.$toast.loading({ return {
    message: "加载中...", text: "隐患历史台账",
    forbidClick: true, active: 0,
    loadingType: "spinner", searchValue: "",
    duration: 0, isHaveNews: false,
    }); messageList: [],
    let formdata = new FormData(); Loop: "", // 定时器
    formdata.append("select", select); showIndex: null, // 是否显示遮罩层
    postFun(this.tabs[this.active * 1]["api"], formdata) tabs: [
    .then((res) => { {
    this.$toast.clear(); title: "已完结",
    this.messageList = res.rows; api: "/hdreport/doneList",
    // 判断有无数据返回 },
    if (this.messageList.length == 0) { {
    this.isHaveNews = true; title: "已挂账",
    } api: "/hdreport/doneListRectification",
    }) },
    .catch(() => { {
    this.$toast.clear(); title: "已整改",
    this.$toast.fail("加载失败,请稍后再试"); api: "/hdreport/doneListReview",
    }); },
    ],
    };
    }, },
    created() {
    touchstart(index, item) { this.postList();
    if (this.showIndex != null) {
    this.showIndex = null;
    return;
    }
    this.showIndex = index;
    }, },
    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(this.tabs[this.active * 1]["api"], formdata)
    .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) {
    if (this.showIndex != null) {
    this.showIndex = null;
    return;
    }
    this.showIndex = index;
    },
    // 详情 // 详情
    goDetail(data) { goDetail(data) {
    this.$router.push({ this.$router.push({
    name: "normal-detail", name: "normal-detail",
    params: { params: {
    id: data.businessId, id: data.businessId,
    },
    });
    this.showIndex = null;
    }, },
    });
    this.showIndex = null;
    }, },
    }, filters: {
    filters: { formatTime: function (row) {
    formatTime: function (row) { if (row.dueDate <= row.rectificationTime) {
    if (row.dueDate <= row.rectificationTime) { return "超期";
    return "超期"; } else if (
    } else if ( row.dueDate >= row.rectificationTime &&
    row.dueDate >= row.rectificationTime && row.dueDate - 259200000 <= row.rectificationTime
    row.dueDate - 259200000 <= row.rectificationTime ) {
    ) { //三天
    //三天 return "临期";
    return "临期"; } else {
    } else { return "正常";
    return "正常"; }
    } },
    }, },
    },
    }; };
    </script> </script>
    <style lang="less" scoped> <style lang="less" scoped>
    /* @import url(); 引入css类 */ /* @import url(); 引入css类 */
    #app { #app {
    font-family: ""; font-family: "";
    color: #2c3e50; color: #2c3e50;
    } }
    .con-list { .con-list {
    padding: 0; padding: 0;
    background-color: #f0f1f5; background-color: #f0f1f5;
    .van-cell-group--inset { .van-cell-group--inset {
    margin: 0; margin: 0;
    margin-bottom: 0.26667rem; margin-bottom: 0.26667rem;
    padding: 0.25rem; padding: 0.25rem;
    font-size: 0.4rem; font-size: 0.4rem;
    position: relative; position: relative;
    border-radius: 4%; border-radius: 4%;
    box-shadow: 0px 0px 10px 2px #f3f3f3; box-shadow: 0px 0px 10px 2px #f3f3f3;
    width: 90%; width: 90%;
    margin: 0.4rem auto; margin: 0.4rem auto;
    .van-row { .van-row {
    font-size: 0.4rem; font-size: 0.4rem;
    line-height: 0.8rem; line-height: 0.8rem;
    margin-bottom: 0; margin-bottom: 0;
    } }
    .van-overlay { .van-overlay {
    position: absolute; position: absolute;
    .wrapper { .wrapper {
    display: flex; display: flex;
    align-items: center; align-items: center;
    justify-content: space-evenly; justify-content: space-evenly;
    height: 100%; height: 100%;
    } }
    }
    } }
    }
    } }
    /deep/.van-tab__pane{ /deep/.van-tab__pane {
    min-height: 8rem; min-height: 8rem;
    } }
    </style> </style>
    src/views/danger/standBook/normalDetail.vue
    View file @ 74a6ae88
    ...@@ -15,113 +15,113 @@ ...@@ -15,113 +15,113 @@
    <p>隐患上报</p> <p>隐患上报</p>
    <van-cell-group inset> <van-cell-group inset>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title">隐患编号</span ><span class="field-title">隐患单编号</span
    >：</van-col >：</van-col
    > >
    <van-col span="17">{{ hdReport.id }}</van-col> <van-col span="18">{{ hdReport.id }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >所属项目：</span >所属项目：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ hdReport.proId }}</van-col> <van-col span="18">{{ hdReport.proId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患级别：</span >隐患级别：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ hdReport.hdLev }}</van-col> <van-col span="18">{{ hdReport.hdLev }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >适用范围：</span >适用范围：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ hdReport.hdRange }}</van-col> <van-col span="18">{{ hdReport.hdRange }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患类型：</span >隐患类型：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ hdReport.hdType }}</van-col> <van-col span="18">{{ hdReport.hdType }}</van-col>
    </van-row> </van-row>
    <!-- 隐藏的字段 --> <!-- 隐藏的字段 -->
    <div v-show="reportOpen"> <div v-show="reportOpen">
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患项目名称：</span >隐患项目名称：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.hdProjectName hdReport.hdProjectName
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患发现时间：</span >隐患发现时间：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.hdDiscoveryTime hdReport.hdDiscoveryTime
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >风险源：</span >风险源：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.dangerSource hdReport.dangerSource
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >风险源因素：</span >风险源因素：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ hdReport.dangerId }}</van-col> <van-col span="18">{{ hdReport.dangerId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >检查部位：</span >检查部位：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.hdPosition hdReport.hdPosition
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患描述：</span >隐患描述：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.hdDescribe hdReport.hdDescribe
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="hdReport.hdPictureList"> <van-row gutter="" v-if="hdReport.hdPictureList">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患照片：</span >隐患照片：</span
    ></van-col ></van-col
    > >
    <van-col span="17"> <van-col span="18">
    <div <div
    class="detail_pic" class="detail_pic"
    v-for="( v-for="(
    ...@@ -139,12 +139,12 @@ ...@@ -139,12 +139,12 @@
    </van-col> </van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患视频：</span >隐患视频：</span
    ></van-col ></van-col
    > >
    <van-col span="17"> <van-col span="18">
    <div <div
    class="detail_video" class="detail_video"
    v-for="( v-for="(
    ...@@ -172,22 +172,22 @@ ...@@ -172,22 +172,22 @@
    </van-col> </van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="hdReport.hdExpirationTime"> <van-row gutter="" v-if="hdReport.hdExpirationTime">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患到期时间：</span >隐患到期时间：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.hdExpirationTime hdReport.hdExpirationTime
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="hdReport.rectificationUser"> <van-row gutter="" v-if="hdReport.rectificationUser">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患整改人：</span >隐患整改人：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ <van-col span="18">{{
    hdReport.rectificationUser hdReport.rectificationUser
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    ...@@ -242,12 +242,12 @@ ...@@ -242,12 +242,12 @@
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.endTime"> <van-row gutter="" v-if="item.endTime">
    <van-col span="8" <van-col span="9"
    ><span class="field-title" ><span class="field-title"
    >整改截止时间：</span >整改截止时间：</span
    ></van-col ></van-col
    > >
    <van-col span="16">{{ <van-col span="15">{{
    item.endTime item.endTime
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    ...@@ -382,20 +382,20 @@ ...@@ -382,20 +382,20 @@
    :key="index" :key="index"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >整改详情描述：</span >整改详情描述：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ item.details }}</van-col> <van-col span="18">{{ item.details }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患照片：</span >隐患照片：</span
    ></van-col ></van-col
    > >
    <van-col span="17"> <van-col span="18">
    <div <div
    class="detail_pic" class="detail_pic"
    v-for="(itemTwo, index) in item.hdPictureList" v-for="(itemTwo, index) in item.hdPictureList"
    ...@@ -411,12 +411,12 @@ ...@@ -411,12 +411,12 @@
    </van-col> </van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.hdVideoList"> <van-row gutter="" v-if="item.hdVideoList">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >隐患视频：</span >隐患视频：</span
    ></van-col ></van-col
    > >
    <van-col span="17"> <van-col span="18">
    <div <div
    class="detail_video" class="detail_video"
    v-for="(itemTwo, index) in item.hdVideoList" v-for="(itemTwo, index) in item.hdVideoList"
    ...@@ -430,12 +430,12 @@ ...@@ -430,12 +430,12 @@
    </van-col> </van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >创建时间：</span >创建时间：</span
    ></van-col ></van-col
    > >
    <van-col span="17">{{ item.creatTime }}</van-col> <van-col span="18">{{ item.creatTime }}</van-col>
    </van-row> </van-row>
    </van-cell-group> </van-cell-group>
    </div> </div>
    ...@@ -448,15 +448,15 @@ ...@@ -448,15 +448,15 @@
    :key="index" :key="index"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7"> <van-col span="6">
    <span class="field-title"> 复查结果 </span> <span class="field-title"> 复查结果 </span>
    </van-col> </van-col>
    <van-col span="17">{{ <van-col span="18">{{
    item.reviewResult == 1 ? "合格" : "不合格" item.reviewResult == 1 ? "合格" : "不合格"
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.reviewDetails"> <van-row gutter="" v-if="item.reviewDetails">
    <van-col span="7" <van-col span="6"
    ><span class="field-title"> ><span class="field-title">
    {{ {{
    item.reviewResult == 1 item.reviewResult == 1
    ...@@ -465,15 +465,15 @@ ...@@ -465,15 +465,15 @@
    }} }}
    </span></van-col </span></van-col
    > >
    <van-col span="17">{{ item.reviewDetails }}</van-col> <van-col span="18">{{ item.reviewDetails }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-if="item.hdPictureList['length']"> <van-row gutter="" v-if="item.hdPictureList['length']">
    <van-col span="7" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    >复查照片：</span >复查照片：</span
    ></van-col ></van-col
    > >
    <van-col span="17"> <van-col span="18">
    <div <div
    class="detail_pic" class="detail_pic"
    v-for="(itemTwo, index) in item.hdPictureList" v-for="(itemTwo, index) in item.hdPictureList"
    ......
    src/views/danger/superviseDanger/index.vue
    View file @ 74a6ae88
    ...@@ -23,20 +23,20 @@ ...@@ -23,20 +23,20 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="18">{{ item.pid }}</van-col> <van-col span="17">{{ item.pid }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ item.projectName }}</van-col> <van-col span="17">{{ item.projectName }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.hdLev | dangerText }}</van-col> <van-col span="17">{{ item.hdLev | dangerText }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.hdDiscoveryTime }}</van-col> <van-col span="17">{{ item.hdDiscoveryTime }}</van-col>
    </van-row> --> </van-row> -->
    <!-- *接口对接4 END --> <!-- *接口对接4 END -->
    ......
    src/views/danger/superviseDanger/superSurvey.vue
    View file @ 74a6ae88
    ...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
    @click="goDetail(item.pid)" @click="goDetail(item.pid)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">隐患编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="17">{{ item.pid }}</van-col> <van-col span="17">{{ item.pid }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    ......
    src/views/my/index.vue
    View file @ 74a6ae88
    ...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
    <!-- 个人信息 --> <!-- 个人信息 -->
    <van-cell-group inset> <van-cell-group inset>
    <van-row gutter="20"> <van-row gutter="20">
    <van-col span="6"> <van-col span="7">
    <div> <div>
    <van-image <van-image
    width="2rem" width="2rem"
    ...@@ -20,15 +20,15 @@ ...@@ -20,15 +20,15 @@
    /> />
    </div> </div>
    </van-col> </van-col>
    <van-col span="18"> <van-col span="17">
    <div class="user-info-wrap"> <div class="user-info-wrap">
    <div class="user-name">{{ userInfo.name }}</div> <div class="user-name">{{ userInfo.name }}</div>
    <p>{{ userInfo.position }}</p> <p>{{ userInfo.position }}</p>
    <div class="tag-wrap"> <!-- <div class="tag-wrap">
    <van-tag color="#cbcdfb">隐患上报人</van-tag> <van-tag color="#cbcdfb">隐患上报人</van-tag>
    <van-tag color="#b5e2f1">隐患整改人</van-tag> <van-tag color="#b5e2f1">隐患整改人</van-tag>
    <van-tag color="#bed9fd">检查专员</van-tag> <van-tag color="#bed9fd">检查专员</van-tag>
    </div> </div> -->
    </div> </div>
    </van-col> </van-col>
    </van-row> </van-row>
    ...@@ -90,8 +90,8 @@ export default { ...@@ -90,8 +90,8 @@ export default {
    ], ],
    userInfo: { userInfo: {
    portrait: require("@/assets/myTerritory/touxiang.png"), portrait: require("@/assets/myTerritory/touxiang.png"),
    name: getUserInfo() ? getUserInfo().userName : "刘华强", name: getUserInfo() ? getUserInfo().userName : "xxx",
    position: getUserInfo() ? getUserInfo().deptName : "技术安全部", position: getUserInfo() ? getUserInfo().deptName : "xx部",
    // name: "刘华强", // name: "刘华强",
    // position: "技术安全部" // position: "技术安全部"
    // jurisdiction: [ // jurisdiction: [
    ...@@ -135,7 +135,8 @@ export default { ...@@ -135,7 +135,8 @@ export default {
    flex-direction: column; flex-direction: column;
    justify-content: space-between; justify-content: space-between;
    .user-name { .user-name {
    font-size: 17px; padding-top:0.3rem;
    font-size: 18px;
    font-weight: none; font-weight: none;
    } }
    ......
    src/views/my/role.vue
    View file @ 74a6ae88
    ...@@ -5,27 +5,45 @@ ...@@ -5,27 +5,45 @@
    <!-- 通知 --> <!-- 通知 -->
    <van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
    <van-notice-bar <van-notice-bar
    left-icon="volume-o" left-icon="volume-o"
    text="提示：系统使用时请核实应用权限如有问题请联系管理员。" text="提示：系统使用时请核实应用权限如有问题请联系管理员。"
    /> />
    </van-sticky> </van-sticky>
    <!-- 权限卡片 --> <!-- 权限卡片 -->
    <div>
    <template>
    <div class="title">{{ userInfo.position }}</div>
    <van-cell-group inset>
    <div class="tag-wrap">
    <van-tag :color="getColor()" plain round
    >隐患上报人</van-tag
    >
    <van-tag :color="getColor()" plain round
    >隐患整改人</van-tag
    >
    <van-tag :color="getColor()" plain round>检查专员</van-tag>
    </div>
    </van-cell-group>
    </template>
    </div>
    <div v-for="(item, key) in role_list" :key="key"> <div v-for="(item, key) in role_list" :key="key">
    <template v-if="item"> <template v-if="item">
    <div class="title">{{ key }}</div> <div class="title">{{ key }}</div>
    <van-cell-group inset> <van-cell-group inset>
    <div class="tag-wrap"> <div class="tag-wrap">
    <van-tag <van-skeleton title :row="2" :loading="!item['length']">
    :color="getColor()" <van-tag
    v-for="(i, index) in item" :color="getColor()"
    :key="index" v-for="(i, index) in item"
    plain :key="index"
    round plain
    > round
    <template v-if="i"> >
    {{ i }} <template v-if="i">
    </template> {{ i }}
    </van-tag> </template>
    </van-tag>
    </van-skeleton>
    </div> </div>
    </van-cell-group> </van-cell-group>
    </template> </template>
    ...@@ -36,13 +54,14 @@ ...@@ -36,13 +54,14 @@
    <script> <script>
    import LHeader from "@/components/header.vue"; import LHeader from "@/components/header.vue";
    import { getFun, postFun } from "@/service/table.js"; import { getFun, postFun } from "@/service/table.js";
    import { getUserInfo } from "@/utils/userInfo";
    export default { export default {
    components: { components: {
    LHeader, LHeader,
    }, },
    data() { data() {
    return { return {
    tabColor: ["red", "orange", "skyblue",'yellowgreen'], tabColor: ["red", "orange", "skyblue", "yellowgreen"],
    role_list: { role_list: {
    "政务大数据项目cs-401": [], "政务大数据项目cs-401": [],
    ...@@ -51,6 +70,11 @@ export default { ...@@ -51,6 +70,11 @@ export default {
    "项目工程cs-001": [], "项目工程cs-001": [],
    "项目工程cs-002": [], "项目工程cs-002": [],
    }, },
    userInfo: {
    portrait: require("@/assets/myTerritory/touxiang.png"),
    name: getUserInfo() ? getUserInfo().userName : "xxx",
    position: getUserInfo() ? getUserInfo().deptName : "xx部",
    },
    }; };
    }, },
    methods: { methods: {
    ...@@ -59,7 +83,7 @@ export default { ...@@ -59,7 +83,7 @@ export default {
    // console.log(res) // console.log(res)
    if (res) { if (res) {
    this.role_list = res.data; this.role_list = res.data;
    }else{ } else {
    this.$toast.fail("加载失败,请稍后再试"); this.$toast.fail("加载失败,请稍后再试");
    } }
    }, },
    ...@@ -158,8 +182,8 @@ export default { ...@@ -158,8 +182,8 @@ export default {
    margin-right: 0.3rem; margin-right: 0.3rem;
    margin-bottom: 0.3rem; margin-bottom: 0.3rem;
    } }
    .van-tag{ .van-tag {
    padding: 0.03rem 0.2rem; padding: 0.03rem 0.2rem;
    font-size: 0.25rem; font-size: 0.25rem;
    } }
    </style> </style>
    \ No newline at end of file
    src/views/risk/my-insert/index.vue
    View file @ 74a6ae88
    ...@@ -24,40 +24,40 @@ ...@@ -24,40 +24,40 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险编号：</van-col> <van-col span="7">风险编号：</van-col>
    <van-col span="18">{{ item.id }}</van-col> <van-col span="17">{{ item.id }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ item.pId }}</van-col> <van-col span="17">{{ item.pId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">隐患级别：</van-col> <van-col span="7">隐患级别：</van-col>
    <van-col span="18">{{ item.riskLevel | riskText }}</van-col> <van-col span="17">{{ item.riskLevel | riskText }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险源：</van-col> <van-col span="7">风险源：</van-col>
    <van-col span="18">{{ item.riskSource }}</van-col> <van-col span="17">{{ item.riskSource }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">事故类型：</van-col> <van-col span="7">事故类型：</van-col>
    <van-col span="18">{{ item.accidentType }}</van-col> <van-col span="17">{{ item.accidentType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">管控层级：</van-col> <van-col span="7">管控层级：</van-col>
    <van-col span="18">{{ item["controlLevel"] }}</van-col> <van-col span="17">{{ item["controlLevel"] }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责部门：</van-col> <van-col span="7">主责部门：</van-col>
    <van-col span="18">{{ item.responsibilityDept }}</van-col> <van-col span="17">{{ item.responsibilityDept }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责人员：</van-col> <van-col span="7">主责人员：</van-col>
    <van-col span="18">{{ item.responsibilityMember }}</van-col> <van-col span="17">{{ item.responsibilityMember }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
    ......
    src/views/risk/riskAccount/index.vue
    View file @ 74a6ae88
    ...@@ -4,18 +4,18 @@ ...@@ -4,18 +4,18 @@
    <van-sticky offset-top="0"> <van-sticky offset-top="0">
    <LHeader :text="text"></LHeader> <LHeader :text="text"></LHeader>
    </van-sticky> </van-sticky>
    <!-- <van-sticky offset-top="1.5rem"> <van-sticky offset-top="1.5rem">
    <van-search <van-search
    v-model="searchValue" v-model="searchValue"
    show-action show-action
    placeholder="请输入搜索内容" placeholder="请输入搜索内容"
    @search="onSearch" @search="onSearch"
    > >
    <template #action> <template #action>
    <div @click="onSearch">搜索</div> <div @click="onSearch">搜索</div>
    </template> </template>
    </van-search> </van-search>
    </van-sticky> --> </van-sticky>
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    ...@@ -25,9 +25,13 @@ ...@@ -25,9 +25,13 @@
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="1.5rem" offset-top="3rem"
    > >
    <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title"> <van-tab
    v-for="(item, key) in tabs"
    :key="key"
    :title="item.title"
    >
    <div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
    <van-cell-group <van-cell-group
    inset inset
    ...@@ -36,29 +40,29 @@ ...@@ -36,29 +40,29 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险编号：</van-col> <van-col span="7">风险编号：</van-col>
    <van-col span="18">{{ item.businessId }}</van-col> <van-col span="17">{{ item.businessId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">风险级别：</van-col> <van-col span="7">风险级别：</van-col>
    <van-col span="18">{{ item.riskLevel }}</van-col> <van-col span="17">{{ item.riskLevel }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.startDate }}</van-col> <van-col span="17">{{ item.startDate }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险源：</van-col> <van-col span="7">风险源：</van-col>
    <van-col span="18">{{ item.riskSource }}</van-col> <van-col span="17">{{ item.riskSource }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- *接口对接4 END --> <!-- *接口对接4 END -->
    ...@@ -142,7 +146,7 @@ export default { ...@@ -142,7 +146,7 @@ export default {
    this.getList(); this.getList();
    }, },
    methods: { methods: {
    getList() { getList(select='') {
    /*接口对接3 START*/ /*接口对接3 START*/
    // 例子： // 例子：
    this.$toast.loading({ this.$toast.loading({
    ...@@ -151,7 +155,9 @@ export default { ...@@ -151,7 +155,9 @@ export default {
    loadingType: "spinner", loadingType: "spinner",
    duration: 0, duration: 0,
    }); });
    postFun(this.tabs[this.active]["api"]) let formdata= new FormData();
    formdata.append('select',select)
    postFun(this.tabs[this.active]["api"],formdata)
    .then((res) => { .then((res) => {
    this.$toast.clear(); this.$toast.clear();
    this.messageList = res.rows; this.messageList = res.rows;
    ...@@ -162,7 +168,9 @@ export default { ...@@ -162,7 +168,9 @@ export default {
    }); });
    /*接口对接3 END*/ /*接口对接3 END*/
    }, },
    onSearch(val) {}, onSearch(val) {
    this.getList(this.searchValue)
    },
    touchstart(index, item) { touchstart(index, item) {
    if (this.showIndex != null) { if (this.showIndex != null) {
    ......
    src/views/risk/riskAccount/riskBigDetail.vue
    View file @ 74a6ae88
    ...@@ -167,28 +167,28 @@ ...@@ -167,28 +167,28 @@
    > >
    </van-row> </van-row>
    <van-row> <van-row>
    <van-col span="6" <van-col span="7"
    ><span class="field-title">操作人：</span></van-col ><span class="field-title">操作人：</span></van-col
    > >
    <van-col span="18">{{item.userName}}</van-col> <van-col span="17">{{item.userName}}</van-col>
    </van-row> </van-row>
    <van-row> <van-row>
    <van-col span="6" <van-col span="7"
    ><span class="field-title">节点：</span></van-col ><span class="field-title">节点：</span></van-col
    > >
    <van-col span="18">{{item.logNode}}</van-col> <van-col span="17">{{item.logNode}}</van-col>
    </van-row> </van-row>
    <van-row> <van-row>
    <van-col span="6" <van-col span="7"
    ><span class="field-title">结果：</span></van-col ><span class="field-title">结果：</span></van-col
    > >
    <van-col span="18">{{item.logResult}}</van-col> <van-col span="17">{{item.logResult}}</van-col>
    </van-row> </van-row>
    <van-row> <van-row>
    <van-col span="6" <van-col span="7"
    ><span class="field-title">部门：</span></van-col ><span class="field-title">部门：</span></van-col
    > >
    <van-col span="18">{{item.deptName}}</van-col> <van-col span="17">{{item.deptName}}</van-col>
    </van-row> </van-row>
    </div> </div>
    ......
    src/views/risk/riskConfirme/index.vue
    View file @ 74a6ae88
    ...@@ -41,44 +41,44 @@ ...@@ -41,44 +41,44 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险编号：</van-col> <van-col span="7">风险编号：</van-col>
    <van-col span="18">{{ item['businessId']||item['id']}}</van-col> <van-col span="17">{{ item['businessId']||item['id']}}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{item['proId']||item['pId']}}</van-col> <van-col span="17">{{item['proId']||item['pId']}}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险级别：</van-col> <van-col span="7">风险级别：</van-col>
    <van-col span="18">{{ item.riskLevel }}</van-col> <van-col span="17">{{ item.riskLevel }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.startDate }}</van-col> <van-col span="17">{{ item.startDate }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险源：</van-col> <van-col span="7">风险源：</van-col>
    <van-col span="18">{{ item.riskSource }}</van-col> <van-col span="17">{{ item.riskSource }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">事故类型：</van-col> <van-col span="7">事故类型：</van-col>
    <van-col span="18">{{ item.accidentType }}</van-col> <van-col span="17">{{ item.accidentType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">管控层级：</van-col> <van-col span="7">管控层级：</van-col>
    <van-col span="18">{{ item[['controllevel','controlLevel'][active]] }}</van-col> <van-col span="17">{{ item[['controllevel','controlLevel'][active]] }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责部门：</van-col> <van-col span="7">主责部门：</van-col>
    <van-col span="18">{{ item.responsibilityDept }}</van-col> <van-col span="17">{{ item.responsibilityDept }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责人员：</van-col> <van-col span="7">主责人员：</van-col>
    <van-col span="18">{{ item.responsibilityMember }}</van-col> <van-col span="17">{{ item.responsibilityMember }}</van-col>
    </van-row> </van-row>
    <van-row gutter="" v-show="item.taskName"> <van-row gutter="" v-show="item.taskName">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    <van-overlay :show="showIndex == index"> <van-overlay :show="showIndex == index">
    ......
    src/views/risk/riskConfirme/riskAffirm.vue
    View file @ 74a6ae88
    ...@@ -9,36 +9,36 @@ ...@@ -9,36 +9,36 @@
    @click="goDetail(item.taskId)" @click="goDetail(item.taskId)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">风险等级：</van-col> <van-col span="7">风险等级：</van-col>
    <van-col span="18">{{ item.riskLevel }}</van-col> <van-col span="17">{{ item.riskLevel }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险源：</van-col> <van-col span="7">风险源：</van-col>
    <van-col span="18">{{ item.riskSource }}</van-col> <van-col span="17">{{ item.riskSource }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">事故类型：</van-col> <van-col span="7">事故类型：</van-col>
    <van-col span="18">{{ item.accidentType }}</van-col> <van-col span="17">{{ item.accidentType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">管控层级：</van-col> <van-col span="7">管控层级：</van-col>
    <van-col span="18">{{ item.controllevel }}</van-col> <van-col span="17">{{ item.controllevel }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责部门：</van-col> <van-col span="7">主责部门：</van-col>
    <van-col span="18">{{ item.responsibilityDept }}</van-col> <van-col span="17">{{ item.responsibilityDept }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责人员：</van-col> <van-col span="7">主责人员：</van-col>
    <van-col span="18">{{ item.responsibilityMember }}</van-col> <van-col span="17">{{ item.responsibilityMember }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 详情 --> <!-- 详情 -->
    <div class="detail">详情</div> <div class="detail">详情</div>
    ......
    src/views/risk/riskReturn/index.vue
    View file @ 74a6ae88
    ...@@ -22,44 +22,44 @@ ...@@ -22,44 +22,44 @@
    @click="touchstart(index, item)" @click="touchstart(index, item)"
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险编号：</van-col> <van-col span="7">风险编号：</van-col>
    <van-col span="18">{{ item.businessId }}</van-col> <van-col span="17">{{ item.businessId }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    <van-col span="18">{{ 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="6">风险级别：</van-col> <van-col span="7">风险级别：</van-col>
    <van-col span="18">{{ item.riskLevel }}</van-col> <van-col span="17">{{ item.riskLevel }}</van-col>
    </van-row> </van-row>
    <!-- <van-row gutter=""> <!-- <van-row gutter="">
    <van-col span="6">发现时间：</van-col> <van-col span="7">发现时间：</van-col>
    <van-col span="18">{{ item.startDate }}</van-col> <van-col span="17">{{ item.startDate }}</van-col>
    </van-row> --> </van-row> -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">风险源：</van-col> <van-col span="7">风险源：</van-col>
    <van-col span="18">{{ item.riskSource }}</van-col> <van-col span="17">{{ item.riskSource }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">事故类型：</van-col> <van-col span="7">事故类型：</van-col>
    <van-col span="18">{{ item.accidentType }}</van-col> <van-col span="17">{{ item.accidentType }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">管控层级：</van-col> <van-col span="7">管控层级：</van-col>
    <van-col span="18">{{ item.controllevel }}</van-col> <van-col span="17">{{ item.controllevel }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责部门：</van-col> <van-col span="7">主责部门：</van-col>
    <van-col span="18">{{ item.responsibilityDept }}</van-col> <van-col span="17">{{ item.responsibilityDept }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">主责人员：</van-col> <van-col span="7">主责人员：</van-col>
    <van-col span="18">{{ item.responsibilityMember }}</van-col> <van-col span="17">{{ item.responsibilityMember }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6">工单状态：</van-col> <van-col span="7">工单状态：</van-col>
    <van-col span="18">{{ item.taskName }}</van-col> <van-col span="17">{{ item.taskName }}</van-col>
    </van-row> </van-row>
    <!-- 长按显示遮罩层 --> <!-- 长按显示遮罩层 -->
    ......
    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