linwe
2024-06-12 c0588e7e7d7ef9b99c3dbc95b39ac9a32aed2561
校园安全优化
6 files modified
5 files added
53 ■■■■ changed files
common/common.js 14 ●●●●● patch | view | raw | blame | history
common/setting.js 4 ●●●● patch | view | raw | blame | history
pages/home/index.vue 10 ●●●●● patch | view | raw | blame | history
pages/user/center.vue 4 ●●●● patch | view | raw | blame | history
static/icon/aqyh.png patch | view | raw | blame | history
static/icon/hxdk.png patch | view | raw | blame | history
static/icon/jfmdpc.png patch | view | raw | blame | history
static/icon/xyaqjc.png patch | view | raw | blame | history
static/icon/xyrw.png patch | view | raw | blame | history
subPackage/school/security.vue 10 ●●●●● patch | view | raw | blame | history
subPackage/school/troubleDetail.vue 11 ●●●●● patch | view | raw | blame | history
common/common.js
@@ -198,5 +198,19 @@
                url: '/pages/user/center'
            }
        ]
    } else if (roleType == 5) { //校园主体和通用
        return [{
                name: '首页',
                iconPathSelected: '/static/img/tabbar-01-selected.png',
                iconPath: '/static/img/tabbar-01.png',
                url: '/pages/home/index'
            },
            {
                name: '我的',
                iconPathSelected: '/static/img/tabbar-03-selected.png',
                iconPath: '/static/img/tabbar-03.png',
                url: '/pages/user/center'
            }
        ]
    }
}
common/setting.js
@@ -10,8 +10,8 @@
    version: '2.0.0',
    // 开发环境接口Url
    // devUrl: 'http://z4042833u6.wicp.vip',
    // devUrl: 'http://192.168.204.1:9528',
    devUrl: 'https://srgdjczzxtpt.com:2080/api',
    devUrl: 'http://localhost:9528',
    // devUrl: 'https://srgdjczzxtpt.com:2080/api',
    // devUrl: 'https://kt39592615.goho.co',
    minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
    // minioBaseUrl: "http://192.168.0.101:9528/",
pages/home/index.vue
@@ -171,7 +171,7 @@
                    </view>
                </view>
                <view class="" v-if="roleType == 4 &&  curSelectSite.addressType == 2">
                <view class="" v-if="roleType == 5 &&  curSelectSite.addressType == 2">
                    <view class="tabs flex">
                        <view class="tabs-item" :class="k == tabIndex?'tabs-active':''" v-for="(i,k) in tabs4"
                            @click="changeTabs(k)">
@@ -215,9 +215,7 @@
                            <u-grid-item @click="navToSchoolClockIn()" v-if="roleName == 'xyty'">
                                <view class="nav-item flex f-d-c a-i-c">
                                    <u-icon
                                        name="https://srgdjczzxtpt.com:2080/gminio/jczz/upload/20240514/a5a4f90058204b79a74c0e5e0aff920e.png"
                                        width="80rpx" height="80rpx"></u-icon>
                                    <u-icon name="/static/icon/hxdk.png" width="80rpx" height="80rpx"></u-icon>
                                    <text class="nav-item-text f-26  mt-10">护学打卡</text>
                                </view>
                            </u-grid-item>
@@ -1056,8 +1054,8 @@
                    this.$set(this.background, "banner",
                        "linear-gradient( 180deg, #0A3A9A 70%,#0940A3 30%,  rgba(1,97,203,0) 99%)");
                } else if (roleName == '校园主体' || roleName == '校园通用') {
                    this.tabList = getTabbarList(1);
                    this.roleType = 4
                    this.tabList = getTabbarList(5);
                    this.roleType = 5
                    this.roleTypeName = "校园"
                } else {
                    this.tabList = getTabbarList(1);
pages/user/center.vue
@@ -158,8 +158,8 @@
                // this.tabbarIndex = 2;
                this.tabbarIndex = 3;
            } else if (role.roleName == '校园主体' || role.roleName == '校园通用') {
                this.tabbarList = getTabbarList(1);
                this.roleType = 4
                this.tabbarList = getTabbarList(5);
                this.roleType = 5
            } else {
                this.tabbarList = getTabbarList(1)
                this.roleType = 1
static/icon/aqyh.png
static/icon/hxdk.png
static/icon/jfmdpc.png
static/icon/xyaqjc.png
static/icon/xyrw.png
subPackage/school/security.vue
@@ -10,10 +10,17 @@
        </view>
        <view class="info-row flex j-c-s-b a-i-c bgc-ff" @click="isShowPopup = true" v-if="!from">
            <text class="f-28">校园名称</text>
            <text class="f-28">校园名称:</text>
            <view class="flex">
                <text class="mr-10">{{selectedPlace.placeName}}</text>
                <u-icon name="arrow-right"></u-icon>
            </view>
        </view>
        <view class="info-row flex j-c-s-b a-i-c bgc-ff" v-if="!from">
            <text class="f-28">地址:</text>
            <view class="flex">
                <text class="mr-10">{{selectedPlace.address}}</text>
                <!-- <u-icon name="arrow-right"></u-icon> -->
            </view>
        </view>
@@ -239,6 +246,7 @@
                            this.info.houseCode = code;
                            this.info.placeName = res.data.aoiName;
                            this.selectedPlace.placeName = res.data.aoiName;
                            this.selectedPlace.address = res.data.addressName;
                            this.info.location = res.data.addressName;
                            this.info.lng = res.data.x;
                            this.info.lat = res.data.y;
subPackage/school/troubleDetail.vue
@@ -48,6 +48,11 @@
            <text>{{info.isHandle == 1?"是":"否"}}</text>
        </view>
        <view class="item-row flex j-c-s-b a-i-c" v-if="info.handleRemark">
            <text>处理描述</text>
            <text>{{info.handleRemark}}</text>
        </view>
        <view class="image-wrap bgc-ff" v-if="images.length">
            <view class="mb-20">
                图片
@@ -107,6 +112,11 @@
                            :label="item.name" :name="item.id">
                        </u-radio>
                    </u-radio-group>
                </u-form-item>
                <u-form-item label="处理备注:" labelWidth="100" prop="isHandle" v-if="form.isProblem == 1">
                    <u--textarea v-model="form.handleRemark" placeholder="请输入内容"></u--textarea>
                </u-form-item>
                <!-- <u-form-item label="是否上报:" labelWidth="100" prop="isReporting" v-if="form.isHandle == 2">
@@ -290,6 +300,7 @@
                        data.confirmFlag = 2;
                    } else if (this.form.isHandle == 1) {
                        data.confirmFlag = 2;
                        data.handleRemark = this.form.handleRemark
                    } else {
                        data.confirmFlag = 1;
                    }