Commit 98dcf66f authored by wei's avatar wei
Browse files

Merge branch 'develop' into dev-lv

parents 59bb8b9c 40c809cf

src/App.vue

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ export default { 
        "riskAssess",

        "riskApprove",

        "taskList",

        "taskDetail",

        "taskDetail"

      ],

      // cachePage预先定义的缓存页面

      otherCache: [],

src/components/selectFloor.vue

+3 −3
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ export default { 
    components: {

        // LHeader

    },

    created() {

    },

    data() {

        return {

            text: "选择人员",
@@ -52,6 +50,9 @@ export default { 
            seletedItem:{}

        };

    },

    mounted(){

        this.seletedItem = this.listdata[0].children[0]

    },

    methods: {

        // 待搜索框内容发生变化

        onInput: debounce(function () {
@@ -62,7 +63,6 @@ export default { 
            this.itemSel = e

        },

        clickItem(data) {

            console.log(data, 'llll')

            this.seletedItem = data

        },

        save() {

src/views/drawCanvas/riskView.vue

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
    <div class="wrap" ref="mapmidbox">

        <van-sticky v-if="showHeader">

            <header class="header">

                <span @click="close" class="iconLeft"> 关闭</span>

                <span @click="close" class="iconLeft"> 返回</span>

                <span>{{text}}</span>

                <span  @click="confim" class="iconRight" v-show="!isViews">确定</span>

                <span  @click="confim" class="iconRight" v-show="!isViews">保存</span>

                <span  class="iconRight" v-show="isViews"></span>

            </header>

        </van-sticky>

src/views/riskProject/add/addCurrent.vue

+207 −153

File changed.

Preview size limit exceeded, changes collapsed.

src/views/riskProject/add/addInherent.vue

+415 −158

File changed.

Preview size limit exceeded, changes collapsed.