更新

Lou

2024-01-02 8b4858535b373bfaec2606b504590e1691300cf0

更新

 api/user.js

@@ -116,6 +116,16 @@
        }
    })
}

// 获取人员类型
export const getPeopleType = (params) => {
    return http.request({
        url: '/blade-system/user/getPeopleType',
        method: 'GET',
        params: params
    })
}



export default {

 common/setting.js

@@ -9,10 +9,10 @@
    // 版本号
    version: '2.0.0',
    // 开发环境接口Url
    devUrl: 'http://z4042833u6.wicp.vip',
    // devUrl: 'http://z4042833u6.wicp.vip',
    // devUrl: 'http://192.168.0.106:9528',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl:'https://kt39592615.goho.co',
    devUrl: 'https://kt39592615.goho.co',
    minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
    // minioBaseUrl:"http://192.168.0.103:9528/",
    // 数据中台接口url

 subPackage/bs/views/addRepair.vue

@@ -115,7 +115,7 @@
        },

        onShow() {

            this.curSelectSite = uni.getStorageSync('siteInfo')

            this.info.addressCode = this.curSelectSite.id
            this.info.addressCode = this.curSelectSite.houseCode

            console.log(this.curSelectSite);

        },

        methods: {

@@ -221,15 +221,18 @@
        color: #fff;

        margin-top: 50rpx;

    }



    .address-row{

        flex:1;

        justify-content: flex-end;

        align-items:center;

    }



    .address-content{

        width:calc(100% - 116rpx - 20rpx);

        margin-right:20rpx;

    }



    .location-btn{

        width:116rpx;

        height:46rpx;


 subPackage/house/houseNumber/index.vue

@@ -38,6 +38,13 @@
                        </view>

                    </template>

                </line-item>

                <view class="cell flex j-c-s-b a-i-c" @click="navTo(1)">

                    <view class="cell-title">历史事件</view>

                    <view class="flex a-i-c">

                        <view class="cell-value mr-20"></view>

                        <u-icon name="arrow-right"></u-icon>

                    </view>

                </view>

            </view>

            <view class="item">

                <view class="box-title">

@@ -50,6 +57,13 @@
                </view>

                <line-item :list="policeData"></line-item>

                <line-item :list="firemanData"></line-item>

                <view class="cell flex j-c-s-b a-i-c" @click="navTo(2)">

                    <view class="cell-title">历史事件</view>

                    <view class="flex a-i-c">

                        <view class="cell-value mr-20"></view>

                        <u-icon name="arrow-right"></u-icon>

                    </view>

                </view>

            </view>

        </view>
        <u-toast ref="uToast"></u-toast>

@@ -74,7 +88,9 @@
        getPlaceDetail

    } from '@/api/place/place.js'

    import boxTitle from '../components/boxTitle/index2.vue'

    import { minioBaseUrl } from "../../../common/setting";

    import {

        minioBaseUrl

    } from "../../../common/setting";

    export default {

        components: {

            lineItem,

@@ -136,27 +152,28 @@
                        value: '未完善'

                    }

                ],

                collectData: [{

                        title: '场所照片',

                        name: 'imageUrls',

                        isUseSlot: true,

                        value: '未完善'

                    },

                    {

                        title: '场所负责人',

                        name: 'username',

                        value: '未完善'

                    },

                    {

                        title: '采集人',

                        name: 'createUser',

                        value: '未完善'

                    },

                    {

                        title: '采集时间',

                        name: 'createTime',

                        value: '未完善'

                    },

                collectData: [

                    // {

                    //     title: '场所照片',

                    //     name: 'imageUrls',

                    //     isUseSlot: true,

                    //     value: '未完善'

                    // // },

                    // {

                    //     title: '场所负责人',

                    //     name: 'username',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '采集人',

                    //     name: 'createUser',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '采集时间',

                    //     name: 'createTime',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '历史事件',

                    //     value: '未完善'

@@ -183,26 +200,27 @@
                        value: '未完善'

                    }

                ],

                firemanData: [{

                        title: '消防照片',

                        value: '未完善'

                    },

                    {

                        title: '采集人',

                        value: '未完善'

                    },

                    {

                        title: '消防责任人',

                        value: '未完善'

                    },

                    {

                        title: '采集时间',

                        value: '未完善'

                    },

                    {

                        title: '历史事件',

                        value: '未完善'

                    }

                firemanData: [

                    // {

                    //     title: '消防照片',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '采集人',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '消防责任人',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '采集时间',

                    //     value: '未完善'

                    // },

                    // {

                    //     title: '历史事件',

                    //     value: '未完善'

                    // }

                ],

                id: 1,

                lngLat: {

@@ -341,7 +359,8 @@
            },

            cscjClick() {

                // this.$u.func.globalNavigator('/subPackage/workbench/views/cscj?stdId=' + this.stdId)

                this.$u.func.globalNavigator(`/subPackage/workbench/views/cscj?houseCode=${this.stdId}&addressType=${this.addressType}`)

                this.$u.func.globalNavigator(

                    `/subPackage/workbench/views/cscj?houseCode=${this.stdId}&addressType=${this.addressType}`)

            },

            csjlClick() {

                let url = `/subPackage/workbench/views/csjl?stdId=${this.stdId}&name=${this.placeName}&from=place`

@@ -351,6 +370,14 @@
                

            navToEventDetail(){

                this.$u.func.globalNavigator(`eventDetail?type=${this.eventType}`)

            },



            navTo(type) {

                if (type == 1) {

                    this.$u.func.globalNavigator(`/subPackage/workbench/views/report?code=${this.stdId}`)

                } else {

                    this.$u.func.globalNavigator(`/subPackage/workbench/views/audit?code=${this.stdId}`)

                }

            }

        },

    }

@@ -446,10 +473,12 @@
        font-size: 32rpx;

        background-color: #fff;

        border-bottom: 1rpx solid #f6f6f6;



        .cell-title {

            flex-shrink: 0;

            width: 200rpx;

        }



        .cell-value {

            color: #989898;

            word-wrap: break-word;


 subPackage/house/member/index.vue

@@ -686,7 +686,7 @@
            navTo() {
                let data = JSON.parse(JSON.stringify(this.form));
                this.$u.func.globalNavigator(
                    `/subPackage/bs/views/bsList?data=${JSON.stringify(data)}`)
                    `householdLabel?data=${JSON.stringify(data)}`)
            }
        }
    }

 subPackage/workbench/views/audit.vue

@@ -74,6 +74,7 @@
                frequency: '',
                reportType: "",
                selectDate: [],
                houseCode: ""
            }
        },

@@ -89,9 +90,10 @@
                this.tabIndex = 1;
                this.currentStatus = 1;
            }
            if (option.code) {
                this.houseCode = option.code;
            }
            this.getList()


        },
        onReachBottom() {
            this.currentPage++
@@ -125,9 +127,12 @@
                    frequency: this.frequency,
                }
                if (this.selectDate.length) {
                    params.startTime = this.selectDate[0],
                    params.startTime = this.selectDate[0]
                        params.endTime = this.selectDate[1]
                }
                if (this.houseCode) {
                    params.houseCode = this.houseCode;
                }

                if (this.reportType) {
                    params.reportType = this.reportType

 subPackage/workbench/views/cscj.vue

@@ -26,7 +26,7 @@
                        <u-input border="none" v-model="categoryValue" disabled disabledColor="#ffffff"

                            placeholder="请选择">

                        </u-input>

                        <u-icon v-if="!currentId" slot="right" name="arrow-right"></u-icon>

                        <u-icon slot="right" name="arrow-right"></u-icon>

                    </u-form-item>

                    <!-- <view v-if="showLabelList.length" class="label" style="border-bottom:1px solid eff1f3;">

                        <view v-for="(item,index) in showLabelList" :key="index" class="activeLabel">


 subPackage/workbench/views/editExamine.vue

@@ -141,7 +141,7 @@
                        this.form.location = address

                        this.form.lat = latitude;

                        this.form.lng = longitude;

                        this.jwd = `${Number(longitude).toFixed(6)},${Number(data.latitude).toFixed(6)}`

                        this.jwd = `${Number(longitude).toFixed(6)},${Number(latitude).toFixed(6)}`

                    }

                })

            },


 subPackage/workbench/views/report.vue

@@ -23,7 +23,9 @@
            <view class="list-item bgc-ff mb-20" v-for="item in reportList" :key="item.id" @click="pushPage(item)">

                <view class="item-title flex a-i-c j-c-s-b mb-20">

                    <text class="f-32 fw">{{ findObjValue(item.type, typeList, 'type').name }}</text>

                    <u-tag class="u_tag" size="mini" plain plainFill :text="findObjValue(item.confirmFlag, tabList, 'status').name" :type="findObjValue(item.confirmFlag, tabList, 'status').type"></u-tag>
                    <u-tag class="u_tag" size="mini" plain plainFill

                        :text="findObjValue(item.confirmFlag, tabList, 'status').name"

                        :type="findObjValue(item.confirmFlag, tabList, 'status').type"></u-tag>

                </view>

                <view class="item-row flex a-i-c j-c-s-b">

                    <text class="f-28">姓名</text>

@@ -86,8 +88,7 @@
                        type: 'error'

                    },

                ],
                typeList: [
                    {
                typeList: [{

                        name: "公共维修",
                        type: 1
                    },
@@ -112,7 +113,8 @@
                tabStatus:"",

                keyWord: '',

                loadingStatus: 'nomore',

                selectDate:[]

                selectDate: [],

                houseCode: ""

            }

        },

        

@@ -120,6 +122,9 @@
            if(option.from){

                this.tabIndex = 1;

                this.tabStatus = 1;

            }

            if (option.code) {

                this.houseCode = option.code;

            }

        },

        

@@ -143,7 +148,12 @@
                     params.startTime = this.selectDate[0],

                     params.endTime = this.selectDate[1]

                }
                const { roleName } = this.currentRole

                if (this.houseCode) {

                    params.addressCode = this.houseCode;

                }

                const {

                    roleName

                } = this.currentRole

                const res = await getPage({

                    ...params,
                    roleName,

@@ -219,6 +229,7 @@


    .hander {

        background-color: #fff;



.tab {

            width: 100%;

        }

@@ -226,6 +237,7 @@
        .tab-filter {

            padding: 0 20rpx;

        }



        .search {

            padding: 20rpx 70rpx;

        }

@@ -246,6 +258,7 @@


        .item-row {

            padding: 10rpx 0;



            .address {

                width: 75%;

                text-align: right;


 subPackage/workbench/views/reportAudit.vue

@@ -30,13 +30,15 @@
            <caption-row title="审核信息"  />

            <view class="audit-form">

                <u-form labelWidth="70" :model="form" class="form" ref="form">

                    <u-form-item label="事件状态" @click="showPicker" class="form-item">

                    <!-- <u-form-item label="事件状态" @click="showPicker" class="form-item">

                        <u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"

                            border="none" :placeholder="defaultPlaceholder"  inputAlign="right"  color="#333"></u--input>

                        <u-icon slot="right" name="arrow-right"  v-show="from == 'list'"></u-icon>

                    </u-form-item>

                    <u-form-item label="处理情况" class="form-item"  v-if="from == 'list' || (from == 'record' && form.confirmNotion)">

                        <u--input v-model="form.confirmNotion" :border="from == 'list'?'surround':'none'" inputAlign="right" color="#333" :disabled="from == 'record'?true:false"></u--input>

                    </u-form-item> -->

                    <u-form-item label="处理情况" class="form-item"

                        v-if="from == 'list' || (from == 'record' && form.confirmNotion)">

                        <u--input v-model="form.confirmNotion" :border="from == 'list'?'surround':'none'"

                            inputAlign="right" color="#333" :disabled="from == 'record'?true:false"></u--input>

                    </u-form-item>

                </u-form>

            </view>

@@ -45,10 +47,17 @@
            <u-button type="primary" @click="submit">提交处理</u-button>

        </view> -->

        

        <footer-btn  @click="submit"  v-if="from == 'list'"></footer-btn>

        <!-- <footer-btn  @click="submit"  v-if="from == 'list'"></footer-btn> -->

        

        <u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"

            :columns="columns" keyName="name" @cancel="isPickerShow = false" @confirm="handleConfirm"></u-picker>



        <view class="footer flex a-i-c j-c-s-b" v-if="from == 'list'">

            <button class="footer-btn" @click="submit()">处置</button>

            <button class="footer-btn">转办</button>

        </view>



        <u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false"

            :show="isPickerShow" ref="uPicker" :columns="columns" keyName="name" @cancel="isPickerShow = false"

            @confirm="handleConfirm"></u-picker>

    </view>

</template>



@@ -58,7 +67,12 @@
    import {

        checkReportForRepairsData

    } from '@/api/task/taskReportForRepairs.js'

    import { minioBaseUrl } from "@/common/setting.js"

    import {

        getPeopleType

    } from '@/api/user.js'

    import {

        minioBaseUrl

    } from "@/common/setting.js"

    export default {

        components: {

            captionRow,

@@ -138,7 +152,20 @@
                        },

                    ]

                ],

                from:"list"

                from: "list",

                peopleList: [

                    [{

                            name: "网格员",

                            type: 1

                        },

                        {

                            name: "物业人员",

                            type: 2

                        }

                    ],



                ]



            }

        },

        onLoad(option) {

@@ -156,6 +183,12 @@
            this.setDefaultValue()

        },

        methods: {



            getPeopleList() {

                getPeopleType().then(res => {



                })

            },

            

            showPicker(){

                if(this.from == "list"){

@@ -176,7 +209,8 @@
                const res = await checkReportForRepairsData({

                    // id: this.currentId,
                    id: this.defaultData.id,

                    confirmFlag: this.findObjValue(confirmFlag, this.columns[0], 'name').status,

                    // confirmFlag: this.findObjValue(confirmFlag, this.columns[0], 'name').status,

                    confirmFlag: 3,

                    confirmNotion

                })



@@ -264,6 +298,7 @@
        }



        .pic-box {



            // margin-top: 20rpx;

            .pic-data {

                padding:0 20rpx;

@@ -278,6 +313,7 @@


            .audit-form {

                padding:0 20rpx;



                .form {

                    font-size: 30rpx;



@@ -322,4 +358,34 @@
    /deep/ .uni-input-placeholder {

        font-size: 30rpx;

    }



    .footer {

        width: 100%;

        padding: 20rpx 30rpx;

        box-sizing: border-box;

        position: fixed;

        bottom: 0;

        left: 0;

        background-color: #fff;

        z-index: 10;

        padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);

        z-index: 999;

        background-color: #fff;

        box-shadow: 0rpx 0rpx 10rpx 1rpx rgba(0, 0, 0, 0.1);



        .footer-btn {

            width: 300rpx;

            height: 78rpx;

            border-radius: 8rpx;

            font-size: 32rpx;

            color: #fff;

            border: none;

            background: linear-gradient(163deg, #01BDFC 0%, #017BFC 100%);

        }



        .footer-btn:after {

            border: none;

        }



    }

</style>