Skip to content

B
BCDH-APP
Commit 876add3b authored by 王李辉's avatar 王李辉
Browse files
Options

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

parents 806f8309 98b5b664
Pipeline #8224 passed with stage
    in 5 minutes and 1 second
    Show whitespace changes
    Inline Side-by-side
    Showing with 32 additions and 64 deletions
    src/views/danger/dangerPatrol/dangerPatrolTime/index.vue
    View file @ 876add3b
    ...@@ -67,27 +67,15 @@ export default { ...@@ -67,27 +67,15 @@ export default {
    ] ]
    }; };
    }, },
    mounted() {}, mounted() {
    this.loading()
    },
    methods: { methods: {
    // onClick(val) { loading(){
    // if (val == "执行巡查") { // postWork("portal/cycle").then((res) => {
    // this.$router.push({ // console.log(res)
    // name: "implement" // })
    // }); },
    // } else if (val == "取消巡查") {
    // this.$router.push({
    // name: "cancel-patrol"
    // });
    // } else if (val == "巡查记录") {
    // this.$router.push({
    // name: "record-patrol"
    // });
    // } else if (val == "巡查统计") {
    // this.$router.push({
    // name: "statistics"
    // });
    // }
    // }
    onClick(val) { onClick(val) {
    this.$router.push({ this.$router.push({
    name: "implement" name: "implement"
    ......
    src/views/danger/dangerPatrol/index.vue
    View file @ 876add3b
    ...@@ -59,7 +59,8 @@ export default { ...@@ -59,7 +59,8 @@ export default {
    data() { data() {
    return { return {
    text: "隐患巡查", text: "隐患巡查",
    finalDangerList:[ finalDangerList:[],
    dangerList:[
    { {
    key: "1", key: "1",
    imgUrl: require("@/assets/workbench/danger-report.png"), imgUrl: require("@/assets/workbench/danger-report.png"),
    ...@@ -90,7 +91,7 @@ export default { ...@@ -90,7 +91,7 @@ export default {
    text: "巡查统计", text: "巡查统计",
    path: "/statistics", path: "/statistics",
    } }
    ],//隐患巡查菜单卡 ],
    contentList: [ contentList: [
    // { // {
    // title: "A1", // title: "A1",
    ...@@ -155,48 +156,27 @@ export default { ...@@ -155,48 +156,27 @@ export default {
    } }
    }, },
    // 请求工作台列表 // 请求工作台列表
    // getWorkList() { getWorkList() {
    // postWork("portal/cycle").then((res) => { postWork("mobile/menu2").then((res) => {
    // if (res.code == 0) { if (res.code == 0) {
    // this.powerObj = res.data; this.powerObj = res.data;
    // console.log(this.powerObj) console.log(this.powerObj,'sss')
    // // 隐患排查治理 // 隐患排查治理
    // if (this.powerObj.隐患排查治理) { if (this.powerObj.隐患巡查) {
    // this.finalDangerList = [...this.dangerList].filter( this.finalDangerList = [...this.dangerList].filter(
    // (x) => (x) =>
    // [...this.powerObj.隐患排查治理].some( [...this.powerObj.隐患巡查].some(
    // (y) => y.menuName === x.text (y) => y.menuName === x.text
    // ) )
    // ); );
    // // 如果有隐患上报权限 则在添加一个 上报退回的权限 } else {
    // this.powerObj.隐患排查治理.map((item) => { this.finalDangerList = [];
    // if (item.menuName == "隐患上报") { }
    // let obj = { } else {
    // key: "2", this.powerObj = [];
    // path: "/report-return", }
    // imgUrl: require("@/assets/workbench/rectification-notice.png"), });
    // text: "上报退回", },
    // };
    // this.finalDangerList.splice(1, 0, obj);
    // // 先加上个隐患巡查
    // let obj2 = {
    // key: "13",
    // path: "/danger-patrol",
    // imgUrl: require("@/assets/workbench/danger-account.png"),
    // text: "隐患巡查",
    // };
    // this.finalDangerList.splice(1, 0, obj2);
    // }
    // });
    // } else {
    // this.finalDangerList = [];
    // }
    // } else {
    // this.powerObj = [];
    // }
    // });
    // },
    // onClick(val) { // onClick(val) {
    // if (val == "执行巡查") { // if (val == "执行巡查") {
    // this.$router.push({ // this.$router.push({
    ......
    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