Skip to content

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

修改了搜索切换tab不带参数的bug

parent 8867390d
Pipeline #7511 passed with stage
    in 17 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 855 additions and 830 deletions
    src/views/danger/addDanger/addDanger.vue
    View file @ e571a063
    This diff is collapsed.
    src/views/danger/changeDanger/index.vue
    View file @ e571a063
    ...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    postList(); postList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <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">
    <!-- 内容列表 --> <!-- 内容列表 -->
    ......
    src/views/danger/confirmeDanger/index.vue
    View file @ e571a063
    ...@@ -17,13 +17,13 @@ ...@@ -17,13 +17,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    postList(); postList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <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">
    <!-- 内容列表 --> <!-- 内容列表 -->
    ...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
    > >
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">隐患单编号：</van-col> <van-col span="7">隐患单编号：</van-col>
    <van-col span="17">{{ item.businessId||item.id }}</van-col> <van-col span="17">{{
    item.businessId || item.id
    }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7">所属项目：</van-col> <van-col span="7">所属项目：</van-col>
    ...@@ -75,7 +77,7 @@ ...@@ -75,7 +77,7 @@
    > >
    <van-button <van-button
    round round
    v-if="active==0" v-if="active == 0"
    type="info" type="info"
    @click="goConfirm(item)" @click="goConfirm(item)"
    >确认</van-button >确认</van-button
    ...@@ -149,10 +151,10 @@ export default { ...@@ -149,10 +151,10 @@ export default {
    }); });
    let formdata = new FormData(); let formdata = new FormData();
    formdata.append("select", select); formdata.append("select", select);
    postFun(this.tabs[this.active]['api'], formdata) postFun(this.tabs[this.active]["api"], formdata)
    .then((res) => { .then((res) => {
    this.$toast.clear(); this.$toast.clear();
    this.messageList = res.data||res.rows; this.messageList = res.data || res.rows;
    // 判断有无数据返回 // 判断有无数据返回
    if (this.messageList.length == 0) { if (this.messageList.length == 0) {
    this.isHaveNews = true; this.isHaveNews = true;
    ...@@ -176,7 +178,7 @@ export default { ...@@ -176,7 +178,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;
    ...@@ -229,7 +231,7 @@ export default { ...@@ -229,7 +231,7 @@ export default {
    } }
    } }
    } }
    /deep/.van-tab__pane{ /deep/.van-tab__pane {
    min-height: 8rem; min-height: 8rem;
    } }
    </style> </style>
    src/views/danger/delayApproval/index.vue
    View file @ e571a063
    ...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    getList(); getList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <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 <div
    ......
    src/views/danger/majorDanger/index.vue
    View file @ e571a063
    ...@@ -20,13 +20,13 @@ ...@@ -20,13 +20,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    getList(); getList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <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">
    ......
    src/views/danger/reviewDanger/index.vue
    View file @ e571a063
    ...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    postList(); postList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <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">
    ......
    src/views/danger/standBook/index.vue
    View file @ e571a063
    ...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
    <!-- tab标签 --> <!-- tab标签 -->
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change="postList" @change="postList(searchValue);showIndex=null"
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title" :sticky="true" <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title" :sticky="true"
    offset-top="3rem"> offset-top="2.93rem">
    <div v-show="key == active"> <div v-show="key == active">
    <div class="con-list" @touchmove="showIndex = null"> <div class="con-list" @touchmove="showIndex = null">
    <van-cell-group <van-cell-group
    ......
    src/views/danger/standBook/normalDetail.vue
    View file @ e571a063
    ...@@ -29,14 +29,6 @@ ...@@ -29,14 +29,6 @@
    > >
    <van-col span="18">{{ hdReport.proId }}</van-col> <van-col span="18">{{ hdReport.proId }}</van-col>
    </van-row> </van-row>
    <van-row gutter="">
    <van-col span="6"
    ><span class="field-title"
    >隐患级别：</span
    ></van-col
    >
    <van-col span="18">{{ hdReport.hdLev }}</van-col>
    </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -53,7 +45,7 @@ ...@@ -53,7 +45,7 @@
    > >
    <van-col span="18">{{ hdReport.hdType }}</van-col> <van-col span="18">{{ hdReport.hdType }}</van-col>
    </van-row> </van-row>
    <!-- hdProjectId -->
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -62,18 +54,29 @@ ...@@ -62,18 +54,29 @@
    > >
    <van-col span="18">{{ hdReport.hdProjectId }}</van-col> <van-col span="18">{{ hdReport.hdProjectId }}</van-col>
    </van-row> </van-row>
    <van-row gutter="">
    <van-col span="6"
    ><span class="field-title"
    >隐患级别：</span
    ></van-col
    >
    <van-col span="18">{{ hdReport.hdLev }}</van-col>
    </van-row>
    <van-row gutter="">
    <van-col span="6"
    ><span class="field-title"
    >隐患项目名称：</span
    ></van-col
    >
    <van-col span="18">{{
    hdReport.hdProjectName
    }}</van-col>
    </van-row>
    <!-- hdProjectId -->
    <!-- 隐藏的字段 --> <!-- 隐藏的字段 -->
    <div v-show="reportOpen"> <div v-show="reportOpen">
    <van-row gutter="">
    <van-col span="6"
    ><span class="field-title"
    >隐患项目名称：</span
    ></van-col
    >
    <van-col span="18">{{
    hdReport.hdProjectName
    }}</van-col>
    </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -84,7 +87,6 @@ ...@@ -84,7 +87,6 @@
    hdReport.hdDiscoveryTime hdReport.hdDiscoveryTime
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -103,6 +105,7 @@ ...@@ -103,6 +105,7 @@
    > >
    <van-col span="18">{{ 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="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -123,6 +126,7 @@ ...@@ -123,6 +126,7 @@
    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="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -138,6 +142,7 @@ ...@@ -138,6 +142,7 @@
    :key="index" :key="index"
    > >
    <van-image <van-image
    radius="6px"
    width="100" width="100"
    height="100" height="100"
    :src="item.filePath" :src="item.filePath"
    ...@@ -146,6 +151,7 @@ ...@@ -146,6 +151,7 @@
    </div> </div>
    </van-col> </van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="6" <van-col span="6"
    ><span class="field-title" ><span class="field-title"
    ...@@ -164,8 +170,9 @@ ...@@ -164,8 +170,9 @@
    <van-icon <van-icon
    name="play" name="play"
    size="1rem" size="1rem"
    color="#fff"
    style=" style="
    border: solid 3px black; border: solid 3px #fff;
    position: absolute; position: absolute;
    top: 50%; top: 50%;
    left: 50%; left: 50%;
    ...@@ -215,7 +222,6 @@ ...@@ -215,7 +222,6 @@
    v-for="(item, index) in hdConfirm" v-for="(item, index) in hdConfirm"
    :key="index" :key="index"
    > >
    <div class="step-wrap"> <div class="step-wrap">
    <van-row> <van-row>
    <van-col span="24" <van-col span="24"
    ...@@ -224,7 +230,7 @@ ...@@ -224,7 +230,7 @@
    </div></van-col </div></van-col
    > >
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="9" <van-col span="9"
    ><span class="field-title" ><span class="field-title"
    >隐患确认信息：</span >隐患确认信息：</span
    ...@@ -272,8 +278,8 @@ ...@@ -272,8 +278,8 @@
    item.endTime item.endTime
    }}</van-col> }}</van-col>
    </van-row> </van-row>
    <van-row gutter=""> <van-row gutter="">
    <van-col span="7" <van-col span="7"
    ><span class="field-title" ><span class="field-title"
    >认定意见：</span >认定意见：</span
    ...@@ -351,7 +357,7 @@ ...@@ -351,7 +357,7 @@
    <van-col span="9" <van-col span="9"
    ><span class="field-title" ><span class="field-title"
    >认定隐患级别：</span >认定隐患级别：</span
    ></van-col ></van-col
    > >
    <van-col <van-col
    span="10 span="10
    ...@@ -412,6 +418,7 @@ ...@@ -412,6 +418,7 @@
    :key="index" :key="index"
    > >
    <van-image <van-image
    radius="0.16rem"
    width="100" width="100"
    height="100" height="100"
    :src="itemTwo.filePath" :src="itemTwo.filePath"
    ...@@ -431,7 +438,20 @@ ...@@ -431,7 +438,20 @@
    class="detail_video" class="detail_video"
    v-for="(itemTwo, index) in item.hdVideoList" v-for="(itemTwo, index) in item.hdVideoList"
    :key="index" :key="index"
    style="position: relative"
    > >
    <van-icon
    name="play"
    size="1rem"
    color="#fff"
    style="
    border: solid 3px #fff;
    position: absolute;
    top: 50%;
    left: 50%;
    transform: translate(-50%, -50%);
    "
    />
    <video <video
    :src="itemTwo.filePath" :src="itemTwo.filePath"
    @click="videoUrl = itemTwo.filePath" @click="videoUrl = itemTwo.filePath"
    ...@@ -490,6 +510,7 @@ ...@@ -490,6 +510,7 @@
    :key="index" :key="index"
    > >
    <van-image <van-image
    radius="0.16rem"
    width="100" width="100"
    height="100" height="100"
    :src="itemTwo.filePath" :src="itemTwo.filePath"
    ...@@ -876,19 +897,22 @@ export default { ...@@ -876,19 +897,22 @@ export default {
    z-index: 99; z-index: 99;
    } }
    .detail_pic { .detail_pic {
    margin-right: 0.266667rem; margin: 0 0.266667rem 0.266667rem 0;
    float: left; float: left;
    border-radius: 6px;
    overflow: hidden;
    box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
    } }
    .detail_video { .detail_video {
    width: 2.666667rem; width: 2.666667rem;
    height: 2.666667rem; height: 2.666667rem;
    margin-right: 0.266667rem; margin:0 0.266667rem 0.266667rem 0;
    float: left; float: left;
    overflow: hidden; overflow: hidden;
    // video { box-shadow: rgba(50, 50, 93, 0.25) 0px 13px 27px -5px, rgba(0, 0, 0, 0.3) 0px 8px 16px -8px;
    // width: 2.666667rem; border-radius: 6px;
    // height: 2.666667rem; overflow: hidden;
    // }
    } }
    } }
    ......
    src/views/risk/riskAccount/index.vue
    View file @ e571a063
    ...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    getList(); getList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <van-tab <van-tab
    v-for="(item, key) in tabs" v-for="(item, key) in tabs"
    ......
    src/views/risk/riskConfirme/index.vue
    View file @ e571a063
    ...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
    <van-tabs <van-tabs
    v-model="active" v-model="active"
    @change=" @change="
    postList(); postList(searchValue);
    showIndex = null; showIndex = null;
    " "
    color="#2980f7" color="#2980f7"
    animated animated
    :sticky="true" :sticky="true"
    offset-top="3rem" offset-top="2.93rem"
    > >
    <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">
    <!-- 内容列表 --> <!-- 内容列表 -->
    ......
    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