From 77bb088d2a1bd0092b0fba5ccd24ceccbfe95606 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 23 Dec 2023 19:22:13 +0800
Subject: [PATCH] 修复优化部分问题
---
subPackage/user/editUserInfo/editUserInfo.vue | 5
subPackage/bs/components/list/rentList.vue | 40 +++-
subPackage/house/roomControl/index.vue | 2
subPackage/label/hotel.vue | 18 +-
subPackage/label/form.vue | 2
subPackage/workbench/views/audit.vue | 55 ++++--
pages/user/center.vue | 6
subPackage/house/roomDetails/detail.vue | 6
subPackage/house/roomDetails/index.vue | 20 ++
pages/home/index.vue | 8
subPackage/label/bail.vue | 2
subPackage/label/schoolList.vue | 2
subPackage/workbench/views/bailReportDetail.vue | 9
subPackage/workbench/views/cscj.vue | 193 +++++++++++++----------
common/setting.js | 4
subPackage/statistics/index.vue | 35 +++
subPackage/label/school.vue | 22 +-
17 files changed, 267 insertions(+), 162 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index e37c393..783deec 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -13,10 +13,10 @@
// devUrl: 'http://192.168.1.156:9528',
// devUrl:'http://192.168.1.50:9528',
// devUrl: 'http://192.168.0.106:9528',
- devUrl:'https://srgdjczzxtpt.com:2080/api',
+ // devUrl:'https://srgdjczzxtpt.com:2080/api',
// devUrl:'http://z4042833u6.wicp.vip',
// devUrl: 'http://192.168.0.103:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ devUrl: 'https://srgdjczzxtpt.com:2080/api',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl:"http://192.168.0.103:9528/",
// minioBaseUrl: 'https://srgdjczzxtpt.com:2080/',
diff --git a/pages/home/index.vue b/pages/home/index.vue
index dbad42a..35fdeec 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -31,7 +31,7 @@
</view>
</view>
- <view class="block flex a-i-c j-c-s-b mb-20" v-if="roleType == 1">
+ <view class="block flex a-i-c j-c-s-b mb-20" v-if="roleType == 1 || roleType == 3">
<view @click="scan" class="block-item">
<image class="block-item-bg" src="/static/icon/nav-bg-04.png" mode="aspectFill" />
<view class="block-item-box flex a-i-c ">
@@ -415,9 +415,9 @@
this.roleType = 2
this.roleTypeName = "居民"
} else if (roleName == '民警') {
- type = 3
+ type = 1
this.roleType = 3
- this.roleTypeName = "街道社区网格"
+ this.roleTypeName = "街道社区"
}
const res = await getFuncList(type, roleName)
this.columnData = res.data;
@@ -721,7 +721,7 @@
if (addressLevel == 4) { //自建房
// this.showAction(code)
this.$u.func.globalNavigator(
- `/subPackage/house/roomDetail/detail?code=${code}`, "navTo")
+ `/subPackage/house/roomDetails/detail?code=${code}`, "navTo")
} else { //商铺
this.$u.func.globalNavigator(
`/subPackage/house/houseNumber/index?stdId=${code}`, "navTo")
diff --git a/pages/user/center.vue b/pages/user/center.vue
index c1e8923..5e428ab 100644
--- a/pages/user/center.vue
+++ b/pages/user/center.vue
@@ -64,9 +64,9 @@
<u-cell title="修改密码" :border="false" isLink url="/subPackage/user/password/index">
<image slot="icon" src="/static/icon/menu-center-03.png" class="icon" mode=""></image>
</u-cell>
- <u-cell title="测试页面" :border="false" isLink url="/subPackage/house/roomDetails/detail">
+ <!-- <u-cell title="测试页面" :border="false" isLink url="/subPackage/house/roomDetails/detail">
<image slot="icon" src="/static/icon/menu-center-03.png" class="icon" mode=""></image>
- </u-cell>
+ </u-cell> -->
<!-- <u-cell-item title="评分">
<image slot="icon" src="/static/images/user/c5.png" class="icon" mode=""></image>
</u-cell-item>
@@ -78,7 +78,7 @@
</u-cell-item> -->
</u-cell-group>
</view>
- <view class="cell-box">
+ <view class="cell-box" >
<u-cell-group :border="false">
<u-cell title="退出登录" :border="false" @click="logOut" isLink>
<image slot="icon" src="/static/icon/menu-center-04.png" class="icon" mode=""></image>
diff --git a/subPackage/bs/components/list/rentList.vue b/subPackage/bs/components/list/rentList.vue
index 3b597cd..5780bc1 100644
--- a/subPackage/bs/components/list/rentList.vue
+++ b/subPackage/bs/components/list/rentList.vue
@@ -16,13 +16,26 @@
</view>
</view>
- <view class="list-btn">
- <u-button icon="edit-pen" class="btn-item" type="primary" plain text="修改"
+ <view class="list-btn flex j-c-s-b">
+ <!-- <u-button icon="edit-pen" class="btn-item" type="primary" plain text="修改"
:disabled="item.status == 1 || item.status == 2" @click="pushPage(item)"></u-button>
<u-button icon="calendar" class="btn-item" type="primary" plain text="续租" :disabled="item.status == 2"
@click="xzHandleClick(item)"></u-button>
<u-button icon="order" class="btn-item" type="primary" plain text="终止"
- :disabled="item.status == 1 || item.status == 2" @click="terminate(item)"></u-button>
+ :disabled="item.status == 1 || item.status == 2" @click="terminate(item)"></u-button> -->
+ <view class="btn-item">
+ <u-button class="bgc-main" type="primary" size='small' text="修改"
+ :disabled="item.status == 1 || item.status == 2" @click="pushPage(item)"></u-button>
+ </view>
+ <view class="btn-item">
+ <u-button class="bgc-main" type="primary" size='small' text="续租"
+ :disabled="item.status == 2" @click="xzHandleClick(item)"></u-button>
+ </view>
+
+ <view class="btn-item">
+ <u-button class="bgc-main" type="primary" size='small' text="终止"
+ :disabled="item.status == 1 || item.status == 2" @click="terminate(item)"></u-button>
+ </view>
</view>
</view>
@@ -104,11 +117,13 @@
this.$emit('refreshData')
},
pushPage(item) {
+ console.log("item===>",item);
+ // const {
+ // houseCode
+ // } = this.$route.query
const {
+ id,
houseCode
- } = this.$route.query
- const {
- id
} = item
this.$u.func.globalNavigator(
`/subPackage/bs/views/rentDetail?houseCode=${houseCode}&id=${id}`)
@@ -207,7 +222,7 @@
}
.l {
- font-weight: 700;
+ // font-weight: 700;
text {
color: #0682EF;
@@ -222,13 +237,12 @@
.list-btn {
padding: 24rpx;
- display: flex;
-
.btn-item {
- margin: 0 10rpx;
- border: 0;
- color: #009FFF;
- font-weight: 700;
+ width: 180rpx;
+ // margin: 0 10rpx;
+ // border: 0;
+ // color: #009FFF;
+ // font-weight: 700;
}
}
}
diff --git a/subPackage/house/roomControl/index.vue b/subPackage/house/roomControl/index.vue
index 615d871..2e28565 100644
--- a/subPackage/house/roomControl/index.vue
+++ b/subPackage/house/roomControl/index.vue
@@ -5,7 +5,7 @@
<u-form labelWidth="70" :model="form" ref="form" :rules="rules">
<view class="basic-info">
<u-form-item class="form-item" labelWidth="100" label="绑定手机" required prop="phone">
- <u--input border="none" v-model="form.phone" placeholder="请输入">
+ <u--input border="none" v-model="form.phone" :disabled="roleType == 2?true:false" placeholder="请输入">
</u--input>
</u-form-item>
diff --git a/subPackage/house/roomDetails/detail.vue b/subPackage/house/roomDetails/detail.vue
index d5a5b4d..8075ce5 100644
--- a/subPackage/house/roomDetails/detail.vue
+++ b/subPackage/house/roomDetails/detail.vue
@@ -35,6 +35,9 @@
onLoad(option) {
// this.tabIndex = option.type;
+ uni.setNavigationBarTitle({
+ title:"门牌信息"
+ })
this.code = option.code;
this.$refs.house.stdId = option.code;
this.$refs.house.getBuildingDetail();
@@ -49,6 +52,9 @@
if(e.index == this.tabIndex) return;
this.tabIndex = e.index;
if (e.index == 0) {
+ uni.setNavigationBarTitle({
+ title:"门牌信息"
+ })
this.$refs.house.stdId = this.code;
this.$refs.house.getBuildingDetail();
} else {
diff --git a/subPackage/house/roomDetails/index.vue b/subPackage/house/roomDetails/index.vue
index c61ced6..a1292ed 100644
--- a/subPackage/house/roomDetails/index.vue
+++ b/subPackage/house/roomDetails/index.vue
@@ -3,7 +3,7 @@
<view class="main">
<view class="content">
<view class="base b-c-w">
- <view class="flex a-i-c header">
+ <view class="flex a-i-c header" v-if="houseInfo.houseTitle">
<u-icon name="/static/icon/map.png" width="15" height="18"></u-icon>
<view class="text">
<text>当前小区：</text>
@@ -16,7 +16,7 @@
<text>{{houseInfo.addressName}}</text>
</view>
- <view class="flex j-c-s-b info-content">
+ <view class="flex j-c-s-b info-content" v-if="houseInfo.buildingName">
<view class="house-info">
<text>{{houseInfo.buildingName}}{{houseInfo.unitName?houseInfo.unitName:"一单元"}}{{ houseInfo.houseName}}室</text>
<text class="c-aa">（共{{ houseInfo.allNum }}人）</text>
@@ -26,6 +26,15 @@
text="房屋管理"></u-button>
</view>
</view>
+
+ <view class="flex j-c-f-e info-content" v-if="!houseInfo.buildingName">
+
+ <view class="flex a-i-c">
+ <u-button @click="rommManage" size='small' type="primary" class="u_btn_blue"
+ text="房屋管理"></u-button>
+ </view>
+ </view>
+
</view>
<view class="mt-40 owner-box b-c-w" v-for="(item, index) in ownerInfoList" :key="index">
@@ -297,10 +306,15 @@
this.houseInfo.houseTitle = aoiName || subAoi
this.houseInfo.buildingName = buildingName
this.houseInfo.addressName = addressName
- if (this.from) {
+ if (this.from && this.houseInfo.houseTitle) {
+
uni.setNavigationBarTitle({
title: `${this.houseInfo.houseTitle}${this.houseInfo.buildingName}${this.houseInfo.unitName}${this.houseInfo.houseName }室`
})
+ }else {
+ uni.setNavigationBarTitle({
+ title:"房屋详情"
+ })
}
// 判断当前租客有没有过期
diff --git a/subPackage/label/bail.vue b/subPackage/label/bail.vue
index d84ac7b..d9cb1a9 100644
--- a/subPackage/label/bail.vue
+++ b/subPackage/label/bail.vue
@@ -121,7 +121,7 @@
onLoad(option) {
let siteInfo = uni.getStorageSync("siteInfo");
let userInfo = uni.getStorageSync("userInfo");
- this.$set(this.info, "houseCode", siteInfo.id);
+ this.$set(this.info, "houseCode", siteInfo.houseCode);
this.$set(this.info, "districtName", siteInfo.name);
this.$set(this.info,"checkUserName",userInfo.real_name);
this.$set(this.info,"checkTelephone",userInfo.phone);
diff --git a/subPackage/label/form.vue b/subPackage/label/form.vue
index eaaf145..b3dcebd 100644
--- a/subPackage/label/form.vue
+++ b/subPackage/label/form.vue
@@ -146,7 +146,7 @@
let siteInfo = uni.getStorageSync("siteInfo");
let userInfo = uni.getStorageSync("userInfo");
- this.$set(this.info, "houseCode", siteInfo.id);
+ this.$set(this.info, "houseCode", siteInfo.houseCode);
this.$set(this.info, "districtName", siteInfo.name);
this.$set(this.info, "userId", userInfo.user_id);
},
diff --git a/subPackage/label/hotel.vue b/subPackage/label/hotel.vue
index 6934a7a..b0be414 100644
--- a/subPackage/label/hotel.vue
+++ b/subPackage/label/hotel.vue
@@ -4,7 +4,7 @@
<u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="100"
:labelStyle="{fontSize:'28rpx'}">
<view class="content">
- <u-form-item label="社区名称" prop="districtName" borderBottom required>
+ <u-form-item label="社区名称" prop="districtName" borderBottom >
<view class="content-name f-28">
{{info.districtName}}
</view>
@@ -201,12 +201,12 @@
reportType:2
},
rules: {
- 'districtName': {
- type: 'string',
- required: true,
- message: '请输入社区名称',
- trigger: ['blur', 'change']
- },
+ // 'districtName': {
+ // type: 'string',
+ // required: true,
+ // message: '请输入社区名称',
+ // trigger: ['blur', 'change']
+ // },
'hotelName': {
type: 'string',
required: true,
@@ -328,8 +328,8 @@
onLoad(option) {
let siteInfo = uni.getStorageSync("siteInfo");
let userInfo = uni.getStorageSync("userInfo");
- this.$set(this.info, "houseCode", siteInfo.id);
- this.$set(this.info, "districtName", siteInfo.neiName);
+ this.$set(this.info, "houseCode", siteInfo.houseCode);
+ this.$set(this.info, "districtName", siteInfo.neiName || "");
this.$set(this.info,"checkUserName",userInfo.real_name);
this.$set(this.info,"checkTelephone",userInfo.phone);
this.$set(this.info, "checkUserId", userInfo.user_id);
diff --git a/subPackage/label/school.vue b/subPackage/label/school.vue
index 8e7b7d4..cc11187 100644
--- a/subPackage/label/school.vue
+++ b/subPackage/label/school.vue
@@ -138,7 +138,7 @@
</u-form-item>
</view>
- <view class="upload bgc-ff mb-20">
+ <view class="upload bgc-ff mb-20" v-if="info.antiCollision == '有'">
<view class="f-28 mb-20">校园防撞装置照片</view>
<view class="mt-20">
<u-upload :fileList="antiCollisionImageUrls" :previewFullImage="uploadConfig.previewFullImage"
@@ -180,10 +180,10 @@
<view class="upload bgc-ff mb-20">
<view class="f-28 mb-20">高空抛物监控（一是监控照片，一是此监控拍摄到的图像）</view>
<view class="mt-20">
- <u-upload :fileList="uanImageUrls" :previewFullImage="uploadConfig.previewFullImage"
+ <u-upload :fileList="haImageUrls" :previewFullImage="uploadConfig.previewFullImage"
:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
:maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
- @afterRead="afterReadImgs($event,'uanImageUrls')" @delete="deletePics($event,'uanImageUrls')">
+ @afterRead="afterReadImgs($event,'haImageUrls')" @delete="deletePics($event,'haImageUrls')">
<view class="upload-item upload-icon flex_base">
<u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
</view>
@@ -233,12 +233,12 @@
reportType:6
},
rules: {
- 'districtName': {
- type: 'string',
- required: true,
- message: '请输入社区名称',
- trigger: ['blur', 'change']
- },
+ // 'districtName': {
+ // type: 'string',
+ // required: true,
+ // message: '请输入社区名称',
+ // trigger: ['blur', 'change']
+ // },
'campusName': {
type: 'string',
required: true,
@@ -370,8 +370,8 @@
onLoad(option) {
let siteInfo = uni.getStorageSync("siteInfo");
let userInfo = uni.getStorageSync("userInfo");
- this.$set(this.info, "houseCode", siteInfo.id);
- this.$set(this.info, "districtName", siteInfo.neiName);
+ this.$set(this.info, "houseCode", siteInfo.houseCode);
+ this.$set(this.info, "districtName", siteInfo.neiName || "");
this.$set(this.info, "checkUserName", userInfo.real_name);
this.$set(this.info, "checkTelephone", userInfo.phone);
this.$set(this.info, "checkUserId", userInfo.user_id);
diff --git a/subPackage/label/schoolList.vue b/subPackage/label/schoolList.vue
index 09c0209..2bc3e8d 100644
--- a/subPackage/label/schoolList.vue
+++ b/subPackage/label/schoolList.vue
@@ -10,7 +10,7 @@
</view>
<view class="item-row flex a-i-c j-c-s-b">
<text class="f-28">时间</text>
- <text class="f-28 c-66">{{i.createTime}}</text>
+ <text class="f-28 c-66">{{i.checkTime}}</text>
</view>
</view>
</view>
diff --git a/subPackage/statistics/index.vue b/subPackage/statistics/index.vue
index c2c6699..4991d2d 100644
--- a/subPackage/statistics/index.vue
+++ b/subPackage/statistics/index.vue
@@ -50,7 +50,7 @@
<text class="f-28">物业人员</text>
</view>
<view class="menu-item flex f-d-c a-i-c">
- <text class="c-main f-32 fw mb-20">0</text>
+ <text class="c-main f-32 fw mb-20">{{gridData.ownersStatistics}}</text>
<text class="f-28">业委会</text>
</view>
<!-- <view class="menu-item flex f-d-c a-i-c">
@@ -102,7 +102,7 @@
</u-grid-item>
<u-grid-item bgColor="#fff">
<view class="grid-item flex f-d-c a-i-c">
- <text class="f-32 fw c-main mb-20">{{Number(reportData.result2) * 100}}</text>
+ <text class="f-32 fw c-main mb-20">{{ setNumber(reportData.result2)}</text>
<text class="f-28">办结比例</text>
</view>
</u-grid-item>
@@ -225,10 +225,33 @@
},
methods: {
+
+ getRoleType(){
+ let roleName = uni.getStorageSync("activeRole").roleName;
+ if(roleName == "网格员"){
+ return 1;
+ }else if (roleName == "系统管理员"){
+ return 2
+ }else if(roleName == "民警"){
+ return 3;
+ }
+ },
+
+ setNumber(num){
+ if(num){
+ let n = Number(reportData.result2) * 100
+ return n.toFixed(2)
+ }else {
+ return num
+ }
+
+ },
+
+
getHouseHoldData() {
statisticsModal.getHouseholdStatistics({
code: this.siteInfo.id,
- roleType: uni.getStorageSync("activeRole").roleAlias == "wgy" ? 1 : 2
+ roleType: this.getRoleType()
}).then(res => {
// this.houseHoldData = res.data;
let data = res.data;
@@ -273,7 +296,7 @@
getHouseData() {
statisticsModal.getHouseStatistics({
code: this.siteInfo.id,
- roleType: uni.getStorageSync("activeRole").roleAlias == "wgy" ? 1 : 2
+ roleType: this.getRoleType()
}).then(res => {
this.houseData = res.data;
})
@@ -283,7 +306,7 @@
getReportData() {
statisticsModal.getReportStatistics({
code: this.siteInfo.id,
- roleType: uni.getStorageSync("activeRole").roleAlias == "wgy" ? 1 : 2
+ roleType: this.getRoleType()
}).then(res => {
console.log(res);
this.reportData = res.data;
@@ -294,7 +317,7 @@
getGridData() {
statisticsModal.getGridStatistics({
code: this.siteInfo.id,
- roleType: uni.getStorageSync("activeRole").roleAlias == "wgy" ? 1 : 2
+ roleType: this.getRoleType()
}).then(res => {
console.log(res);
this.gridData = res.data;
diff --git a/subPackage/user/editUserInfo/editUserInfo.vue b/subPackage/user/editUserInfo/editUserInfo.vue
index c80d99c..5fb429a 100644
--- a/subPackage/user/editUserInfo/editUserInfo.vue
+++ b/subPackage/user/editUserInfo/editUserInfo.vue
@@ -36,7 +36,8 @@
avatar:"",
info:{
avatar:"",
- nick_name:""
+ nick_name:"",
+ id:""
},
header: {},
uploadConfig: {
@@ -50,6 +51,8 @@
this.avatar = this.userInfo.avatar;
this.info.avatar = this.userInfo.avatar;
this.info.nick_name = this.userInfo.nick_name;
+ this.info.id = uni.getStorageSync("userInfo").user_id
+ this.info.deptId = uni.getStorageSync("userInfo").dept_id
},
methods:{
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index 953998a..e6d96c0 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -5,7 +5,7 @@
:activeStyle="{color:'#017BFC'}"></u-tabs>
</view>
<view class="list">
- <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.name,i.id)">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.name,i.id,i.reportType)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{i.name}}</text>
<u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
@@ -52,23 +52,33 @@
loadingStatus: 'nomore',
currentPage: 1,
frequency: '',
+ reportType:""
}
},
onLoad(option) {
- if (option.type == 1) {
+ // if (option.type == 1) {
+ // uni.setNavigationBarTitle({
+ // title: "一次性"
+ // })
+ // this.frequency = 1
+ // }
+ // if (option.type == 2) {
+ // uni.setNavigationBarTitle({
+ // title: "周期性"
+ // })
+ // this.frequency = 2
+ // }
+
+ if(option.reportType){
+ this.reportType = option.reportType;
uni.setNavigationBarTitle({
- title: "一次性"
+ title:"取保候审"
})
- this.frequency = 1
- }
- if (option.type == 2) {
- uni.setNavigationBarTitle({
- title: "周期性"
- })
- this.frequency = 2
}
this.getList()
+
+
},
onReachBottom() {
this.currentPage++
@@ -84,12 +94,18 @@
this.getList();
},
getList() {
- getAuditReportingList({
+ let params = {
page: this.currentPage,
size: 20,
status: this.currentStatus,
frequency: this.frequency,
- }).then(res => {
+ }
+
+ if(this.reportType){
+ params.reportType = this.reportType
+ }
+
+ getAuditReportingList(params).then(res => {
if (res.code != 200) {
uni.showToast({
title: '数据请求失败',
@@ -102,16 +118,15 @@
this.loadingStatus = 'nomore'
})
},
- navTo(name, id) {
- if (name == "旅馆安全") {
- this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
- } else if (name == "取保候审") {
+ navTo(name,id,type) {
+ if(type == 1){
this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
- } else if(name == "校园安全自查"){
- this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
- }
- else {
+ }else if (type == 2){
+ this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
+ }else if (type == 3 || type == 4 || type == 5){
this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
+ }else if(type == 6){
+ this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
}
}
}
diff --git a/subPackage/workbench/views/bailReportDetail.vue b/subPackage/workbench/views/bailReportDetail.vue
index fcc9e0d..8374a9d 100644
--- a/subPackage/workbench/views/bailReportDetail.vue
+++ b/subPackage/workbench/views/bailReportDetail.vue
@@ -118,12 +118,17 @@
</view>
- <view class="bottom-btn" v-if="roleType == 1 && status == 1">
+ <!-- <view class="bottom-btn" v-if="roleType == 1 && status == 1">
<u-button type="primary" @click="submit">提交审核</u-button>
</view>
<view class="bottom-btn" v-if="roleType == 2 && status == 2">
<u-button type="primary" @click="submit">提交</u-button>
- </view>
+ </view> -->
+
+ <footer-btn v-if="roleType == 1 && status == 1" text="提交审核" @click="submit" />
+ <footer-btn v-if="roleType == 2 && status == 2" text="提交" @click="submit" />
+
+
<u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="goOutDate[tabIndex]" mode="datetime"
:formatter="formatter" @confirm="confirmDate" @cancel="cancelPickerDate"></u-datetime-picker>
<u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
diff --git a/subPackage/workbench/views/cscj.vue b/subPackage/workbench/views/cscj.vue
index ad90a23..361994d 100644
--- a/subPackage/workbench/views/cscj.vue
+++ b/subPackage/workbench/views/cscj.vue
@@ -16,26 +16,40 @@
</view>
<u-form-item class="form-item" labelWidth="100" label="场所名称:" :required="isRequiredPlace"
:disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入">
+ <u--input v-if="!currentId" border="none" v-model="form.placeName" placeholder="请输入">
</u--input>
+ <view class="f-30" v-if="currentId">
+ {{form.placeName || "暂无数据"}}
+ </view>
</u-form-item>
<u-form-item @click="popup" class="form-item" labelWidth="100" label="标签:" :required="isRequired"
:disabled="isDisabled" prop="label">
- <u--input border="none" disabled disabledColor="#ffffff" placeholder="请选择">
+ <u--input border="none" v-model="categoryValue" disabled disabledColor="#ffffff" placeholder="请选择">
</u--input>
- <u-icon slot="right" name="arrow-right"></u-icon>
+ <u-icon slot="right" name="arrow-right" v-if="!currentId"></u-icon>
</u-form-item>
- <view v-if="showLabelList.length" class="label" style="border-bottom:1px solid eff1f3;">
+ <!-- <view v-if="showLabelList.length" class="label" style="border-bottom:1px solid eff1f3;">
<view v-for="(item,index) in showLabelList" :key="index" class="activeLabel">
<u-tag :closable="currentId?false:true" :show="!item.isClose" size="mini"
@close="delTag(item)" :text="item.text"></u-tag>
</view>
- </view>
-
+ </view> -->
+
+ <!-- <view v-if="categoryValue.length" class="label" style="border-bottom:1px solid eff1f3;">
+ <view v-for="(item,index) in categoryValue" :key="index" class="activeLabel">
+ <u-tag :closable="currentId?false:true" size="mini"
+ @close="delTag()" :text="item.categoryName"></u-tag>
+ </view>
+ </view> -->
+
<u-form-item class="form-item" labelWidth="100" label="备注:" prop="remark">
- <u--input border="none" v-model="form.remark" placeholder="请输入">
+ <u--input v-if="!currentId" border="none" v-model="form.remark" placeholder="请输入">
</u--input>
+ <view class="f-30" v-if="currentId">
+ {{form.remark || "暂无数据"}}
+ </view>
+
</u-form-item>
<!-- <u-form-item class="form-item" labelWidth="100" label="经纬度:" prop="location">
@@ -45,14 +59,14 @@
<u-form-item label="经纬度:" prop="location" labelWidth="100">
- <view class="address-row flex">
+ <view class="address-row flex j-c-s-b a-i-c">
<view class="address-content f-28" v-if="form.jwd">
{{form.jwd}}
</view>
<view class="address-content f-28" v-if="!form.jwd" style="color: #c0c4cc;">
请选择地址
</view>
- <view class="location-btn c-main f-24" @click="getLocation()">
+ <view class="location-btn c-main f-24" @click="getLocation()" v-if="!currentId">
获取地址
</view>
</view>
@@ -97,7 +111,7 @@
<template slot="titleMore">
<view class="title-more">
<view class="red item"></view>
- <view class="orange item">85.9</view>
+ <view class="orange item"></view>
<view class="green item"></view>
</view>
</template>
@@ -127,7 +141,7 @@
<template slot="titleMore">
<view class="title-more">
<view class="red item"></view>
- <view class="orange item">85.9</view>
+ <view class="orange item"></view>
<view class="green item"></view>
</view>
</template>
@@ -152,11 +166,11 @@
</view>
<footer-btn @click="submit" v-if="!currentId" />
- <uni-popup class="citys_win popup_win" ref="uniPopup" type="bottom">
+ <!-- <uni-popup class="citys_win popup_win" ref="uniPopup" type="bottom">
<wyh-tree-select :items="labelList" title="标签选择" :showNav="true" defaultActiveColor="#4586fe"
:activeIds="activeIds" @clickItem="labelClick" :showCancel="false" :showConfirm="false">
</wyh-tree-select>
- </uni-popup>
+ </uni-popup> -->
<u-picker :show="showPicker" :defaultIndex="defaultIndex" ref="uPicker" keyName="name" :loading="pickerLoading"
@@ -164,8 +178,8 @@
@cancel="showPicker = false"></u-picker>
- <u-picker :show="isShowCatePicker" ref="catePicker" keyName="categoryName" :columns="categoryList" @confirm="confirmCategory"
- @change="changeCategory" @cancel="isShowCatePicker = false"></u-picker>
+ <u-picker :show="isShowCatePicker" :defaultIndex="categoryIndex" ref="catePicker" keyName="categoryName" :columns="categoryList"
+ @confirm="confirmCategory" @change="changeCategory" @cancel="isShowCatePicker = false"></u-picker>
</view>
@@ -379,20 +393,20 @@
categoryIndex: [],
firstId: "",
secondId: "",
- categoryValue:[]
+ categoryValue: []
}
},
- watch: {
- activeIds: {
- handler(newVal) {
- this.form.label = newVal.join(",")
- }
- },
- "form.buildingCode": {
- handler(newVal) {}
- },
- showLabelList(newVal) {}
- },
+ // watch: {
+ // activeIds: {
+ // handler(newVal) {
+ // this.form.label = newVal.join(",")
+ // }
+ // },
+ // "form.buildingCode": {
+ // handler(newVal) {}
+ // },
+ // showLabelList(newVal) {}
+ // },
created() {
this.buildColumn()
@@ -410,7 +424,7 @@
if (option.addressType) {
this.addressType = option.addressType
}
- if (option.id) {
+ if (option.id) {
this.currentId = option.id
}
if (option.houseCode) {
@@ -425,36 +439,36 @@
title: '详情'
})
}
- // this.getCategory();
-
+ this.getCategory();
+
},
-
+
onShow() {
this.getLabel()
// this.getLocation()
},
-
- watch:{
-
- firstId:{
- handler(newVal,oldVal){
- if(newVal){
- this.getCategory(2,this.firstId);
+
+ watch: {
+
+ firstId: {
+ handler(newVal, oldVal) {
+ if (newVal) {
+ this.getCategory(3, this.firstId);
}
},
- immediate:true
+ immediate: true
}
-
+
// secondId:{
- // handler(newVal,oldVal){
+ // handler(newVal,oldVal){
// this.getCategory(3,this.secondId);
// },
// immediate:true
// }
-
+
},
-
-
+
+
methods: {
// getBuildingDetail(params = {}) {
// getDoorplateAddressDetail(Object.assign(params, {
@@ -502,36 +516,39 @@
// },
//获取分类
- getCategory(level = 1, id) {
+ getCategory(level = 2, id) {
let params = {
level
}
- if (level != 1) {
+ if (level == 3) {
params.parentNo = id
}
getLabelCate(params).then(res => {
console.log(res)
if (res.code == 200) {
- let index = level- 1;
- this.$set(this.categoryList,index,res.data);
- if(level == 1){
+ let index = level - 2;
+ this.$set(this.categoryList, index, res.data);
+ if (level == 2) {
this.firstId = res.data[0].categoryNo
}
}
})
},
- //选择分类
+ //选择分类
confirmCategory(e) {
- console.log("confirm=>",e)
- let {indexs,value} = e;
- this.categoryIndex = indexs;
- this.categoryValue = value;
- this.form.label = value[value.length -1].id;
- this.isShowCatePicker = false;
+ console.log("confirm=>", e)
+ let {
+ indexs,
+ value
+ } = e;
+ this.categoryIndex = indexs;
+ this.categoryValue = value[value.length - 1].categoryName;
+ this.form.label = value[value.length - 1].categoryNo;
+ this.isShowCatePicker = false;
},
- //切换分类
+ //切换分类
changeCategory(e) {
const {
columnIndex,
@@ -541,9 +558,9 @@
// 微信小程序无法将picker实例传出来，只能通过ref操作
picker = this.$refs.catePicker
} = e
-
- console.log("change=>",e)
-
+
+ console.log("change=>", e)
+
// 当第一列值发生变化时，变化第二列(后一列)对应的选项
if (columnIndex === 0) {
// picker为选择器this实例，变化第二列对应的选项
@@ -553,9 +570,9 @@
// this.getCategory(2,this.firstId);
}
// else if ( columnIndex === 1){
- // picker.setColumnValues(2, this.categoryList[index])
- // this.secondId = e.value[columnIndex].categoryNo;
- // this.getCategory(3,this.secondId)
+ // picker.setColumnValues(2, this.categoryList[index])
+ // this.secondId = e.value[columnIndex].categoryNo;
+ // this.getCategory(3,this.secondId)
// }
},
@@ -625,18 +642,26 @@
}
})
-
this.form.jwd = `${Number(data.lng).toFixed(6)},${Number(data.lat).toFixed(6)}`
-
this.form.building = arr.join("")
- setTimeout(() => {
- data.placePoiLabelVOList.forEach(item => {
- let label = this.labelList[0].children.find(sl => sl.text === item
- .labelName) || {}
- label['isClose'] = false
- label?.text && this.showLabelList.push(label)
- })
- }, 500)
+ this.firstId = data.placePoiLabelVOList[0].poiCode;
+ // setTimeout(() => {
+ // data.placePoiLabelVOList.forEach(item => {
+ // let label = this.labelList[0].children.find(sl => sl.text === item
+ // .labelName) || {}
+ // label['isClose'] = false
+ // label?.text && this.showLabelList.push(label)
+ // })
+ // }, 500)
+ this.categoryValue = data.placePoiLabelVOList[data.placePoiLabelVOList.length-1].labelName;
+ uni.$u.sleep(500).then(() => {
+ data.placePoiLabelVOList.forEach(item=>{
+ let firstIndex = this.categoryList[0].findIndex(i => i.categoryNo==item.poiCode)
+ let childIndex = this.categoryList[1].findIndex(i => i.categoryNo == item.poiCode)
+ this.categoryIndex = [firstIndex,childIndex]
+ })
+ })
+
Object.keys(this.comprehensiveData).forEach(key => {
this.comprehensiveData[key].forEach(item => {
if (!data[item.name]) {
@@ -738,7 +763,7 @@
this.form.lat = res.latitude;
this.form.lng = res.longitude;
this.form.jwd =
- `${Number(res.latitude).toFixed(6)},${Number(res.longitude).toFixed(6)}`
+ `${Number(res.longitude).toFixed(6)},${Number(res.latitude).toFixed(6)}`
}
})
},
@@ -813,10 +838,10 @@
},
//弹出层打开
- popup() {
- this.$refs.uniPopup.open()
- // this.isShowCatePicker = true;
-
+ popup() {
+ // this.$refs.uniPopup.open()
+ this.isShowCatePicker = true;
+
},
getLabel() {
@@ -853,10 +878,12 @@
this.showLabelList.sort((a, b) => a.sort - b.sort)
},
- delTag(label) {
- label.isClose = true
- this.showLabelList = this.showLabelList.filter(e => e.id != label.id)
- this.activeIds = this.activeIds.filter(e => e != label.id)
+ delTag() {
+ // label.isClose = true
+ // this.showLabelList = this.showLabelList.filter(e => e.id != label.id)
+ // this.activeIds = this.activeIds.filter(e => e != label.id)
+ this.categoryIndex = [];
+ this.categoryValue = "";
},
imgPreview(value) {
@@ -983,8 +1010,6 @@
.address-row {
flex: 1;
- justify-content: flex-end;
- align-items: center;
}
.address-content {
--
Gitblit v1.9.3