From c0588e7e7d7ef9b99c3dbc95b39ac9a32aed2561 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 12 Jun 2024 19:01:58 +0800
Subject: [PATCH] 校园安全优化
---
pages/user/center.vue | 4 ++--
common/common.js | 14 ++++++++++++++
static/icon/xyaqjc.png | 0
pages/home/index.vue | 10 ++++------
static/icon/jfmdpc.png | 0
static/icon/xyrw.png | 0
subPackage/school/troubleDetail.vue | 11 +++++++++++
common/setting.js | 4 ++--
static/icon/hxdk.png | 0
static/icon/aqyh.png | 0
subPackage/school/security.vue | 10 +++++++++-
11 files changed, 42 insertions(+), 11 deletions(-)
diff --git a/common/common.js b/common/common.js
index e4db5b0..b186b74 100644
--- a/common/common.js
+++ b/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'
+ }
+ ]
}
}
\ No newline at end of file
diff --git a/common/setting.js b/common/setting.js
index 982fe4d..b05d714 100644
--- a/common/setting.js
+++ b/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/",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 117aba9..a2deff1 100644
--- a/pages/home/index.vue
+++ b/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);
diff --git a/pages/user/center.vue b/pages/user/center.vue
index f9ebb1a..7cb1470 100644
--- a/pages/user/center.vue
+++ b/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
diff --git a/static/icon/aqyh.png b/static/icon/aqyh.png
new file mode 100644
index 0000000..bb6d5c5
--- /dev/null
+++ b/static/icon/aqyh.png
Binary files differ
diff --git a/static/icon/hxdk.png b/static/icon/hxdk.png
new file mode 100644
index 0000000..7814015
--- /dev/null
+++ b/static/icon/hxdk.png
Binary files differ
diff --git a/static/icon/jfmdpc.png b/static/icon/jfmdpc.png
new file mode 100644
index 0000000..62e90a2
--- /dev/null
+++ b/static/icon/jfmdpc.png
Binary files differ
diff --git a/static/icon/xyaqjc.png b/static/icon/xyaqjc.png
new file mode 100644
index 0000000..b507d0a
--- /dev/null
+++ b/static/icon/xyaqjc.png
Binary files differ
diff --git a/static/icon/xyrw.png b/static/icon/xyrw.png
new file mode 100644
index 0000000..4a9e197
--- /dev/null
+++ b/static/icon/xyrw.png
Binary files differ
diff --git a/subPackage/school/security.vue b/subPackage/school/security.vue
index 8c30323..1f8f0bf 100644
--- a/subPackage/school/security.vue
+++ b/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;
diff --git a/subPackage/school/troubleDetail.vue b/subPackage/school/troubleDetail.vue
index e13c79f..2f62ecf 100644
--- a/subPackage/school/troubleDetail.vue
+++ b/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;
}
--
Gitblit v1.9.3