Commit 7d8a133e authored by 王李辉's avatar 王李辉
Browse files

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

parents e8b9c106 c51fba4a

src/components/TabBar.vue

+10 −8
Original line number Original line Diff line number Diff line
@@ -3,9 +3,8 @@ 
    <van-tabbar v-model="active" @change="onChange">

    <van-tabbar v-model="active" @change="onChange">

      <van-tabbar-item

      <van-tabbar-item

        v-for="(item,index) in tabBarList"

        v-for="(item,index) in tabBarList"

        :key="item.key"

        :key="index"

        :icon="active == index?item.imgUrlActive: item.imgUrl"

        :icon="active==item.name?item.imgUrlActive: item.imgUrl"

        :to="item.path"

        >{{ item.text }}</van-tabbar-item

        >{{ item.text }}</van-tabbar-item

      >

      >

    </van-tabbar>

    </van-tabbar>
@@ -54,15 +53,18 @@ export default { 
  },

  },

  mounted() {

  mounted() {

    this.active = this.index

    this.active = this.index

  },

  methods: {

    onChange(index) {

      this.active = index;

      if(this.active==index){

            this.tabBarList.forEach((item)=>{

            this.tabBarList.forEach((item)=>{

                if(item.name==this.active){

                if(item.name==this.active){

                    this.$router.push(item.path)

                    this.$router.push(item.path)

                }

                }

            })

            })

  },

      }else{

  methods: {

      }

    onChange(index) {

      this.active = index;

    }

    }

  }

  }

};

};

src/views/checked/index.vue

+4 −1
Original line number Original line Diff line number Diff line
@@ -29,16 +29,19 @@ 
            <div>检查地点：{{item.address}}</div>

            <div>检查地点：{{item.address}}</div>

            <div>是否提交：{{item.finish?'已提交':'未提交'}}</div>

            <div>是否提交：{{item.finish?'已提交':'未提交'}}</div>

        </div>

        </div>

        <tab-bar :index="1"></tab-bar>

    </div>

    </div>

</template>

</template>





<script>

<script>

import tabBar from "@/components/TabBar";

import LHeader from '@/components/header.vue'

import LHeader from '@/components/header.vue'

import { getFun,postFun } from '@/service/table'

import { getFun,postFun } from '@/service/table'

export default {

export default {

    name: 'checked',

    name: 'checked',

    components: {

    components: {

        "LHeader":LHeader

        "LHeader":LHeader,

        "tabBar":tabBar

    },

    },

    data() {

    data() {

        return {

        return {

src/views/checked/problem/index.vue

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,9 +19,9 @@ 
            <div>检查地点：{{nums.address}}</div>

            <div>检查地点：{{nums.address}}</div>

        </div>

        </div>

        <div class="button-more">

        <div class="button-more">

            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">检查问题上报{{nums.addTroubleNumber}}</van-button>

            <van-button type="primary" round size="large" @click="problem" :disabled="finish=='true'?true:false">检查问题上报{{'('+nums.addTroubleNumber+')'}}</van-button>

            <van-button type="primary" round size="large" @click="formwork">检查清单模板{{nums.listNumber}}</van-button>

            <van-button type="primary" round size="large" @click="formwork">检查清单模板{{'('+nums.listNumber+')'}}</van-button>

            <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{nums.troubleNumber}}</van-button>

            <van-button type="primary" round size="large" @click="note" :disabled="nums.troubleNumber<1?true:false">检查问题记录{{'('+nums.troubleNumber+')'}}</van-button>

            <van-button type="primary" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>

            <van-button type="primary" round size="large" @click="end" :disabled="finish=='true'?true:false">结束上报</van-button>

        </div>

        </div>

    </div>

    </div>