diff --git a/src/saas/AppGridManagement/AddGird.vue b/src/saas/AppGridManagement/AddGird.vue index c0c9fc11..73e3d9ff 100644 --- a/src/saas/AppGridManagement/AddGird.vue +++ b/src/saas/AppGridManagement/AddGird.vue @@ -55,11 +55,9 @@ export default { } }, onLoad(option) { - this.$dict.load('girdType').then(() => { this.id = option.id this.fromType = option.fromType this.getDetail() - }) }, onShow() { if (this.fromType == 'add') { @@ -80,7 +78,6 @@ export default { if (this.fromType == 'add') { this.form.parentGirdId = this.detailInfo.id this.form.parentGirdName = this.detailInfo.girdName - this.form.girdType = Number(this.detailInfo.girdType) + 1 this.$forceUpdate() } } diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue index eee208b0..e5c44fbc 100644 --- a/src/saas/AppGridManagement/Map.vue +++ b/src/saas/AppGridManagement/Map.vue @@ -20,10 +20,6 @@
{{ form.girdName }}
-
- 网格类型 - {{ $dict.getLabel('girdType', form.girdType) }} -
网格长 @@ -74,7 +70,6 @@ export default { }, computed: {...mapState(['user', 'config'])}, created() { - this.$dict.load('girdType') this.areaId = this.user.areaId // this.getLeafNodes() uni.$on('goback', e => { diff --git a/src/saas/AppGridManagement/Statistics.vue b/src/saas/AppGridManagement/Statistics.vue index 0a6c3944..cfadee6a 100644 --- a/src/saas/AppGridManagement/Statistics.vue +++ b/src/saas/AppGridManagement/Statistics.vue @@ -35,18 +35,10 @@
-
- 网格类型 - - - {{ $dict.getLabel('girdType', girdMsgList.girdType) || '' }} - -
-
标绘状态 - {{ girdMsgList.plottingStatus== 1 ? '已标绘' : '未标绘' }} + {{ girdMsgList.plottingStatus == 1 ? '已标绘' : '未标绘' }}
@@ -71,12 +63,9 @@ export default { } }, created() { - this.$dict.load('girdType').then(() => { - this.isGirdUser() - this.girdMsgList = this.params - this.getList() - }) - + this.isGirdUser() + this.girdMsgList = this.params + this.getList() uni.$on('goback', (res) => { this.girdMsgList = res this.getList() @@ -99,7 +88,7 @@ export default { }) }, linkTo(url) { - uni.navigateTo({ url }) + uni.navigateTo({url}) }, }, } @@ -115,25 +104,30 @@ export default { border-radius: 16px; margin-top: 32px; padding: 32px 0 60px 0; + .girdPeople { padding: 0 0 56px 24px; font-size: 32px; font-family: PingFangSC-Regular, PingFang SC; color: #333333; } + .card { display: flex; justify-content: space-around; + .box { display: flex; flex-direction: column; align-items: center; + .count { font-size: 64px; font-family: DINAlternate-Bold, DINAlternate; font-weight: bold; color: #3b424a; } + .girdCount { margin-top: 8px; font-size: 28px; @@ -150,16 +144,19 @@ export default { border-radius: 16px; margin-top: 32px; padding: 0 24px 64px 24px; + .girdMsg { padding: 32px 0; font-size: 32px; font-family: PingFangSC-Regular, PingFang SC; color: #333333; } + .girdCont { .boxes { padding: 24px 0 30px 0; box-shadow: inset 0px -1px 0px 0px #d8dde6; + .boxesLeft { font-size: 30px; font-family: PingFang-SC-Heavy, PingFang-SC; @@ -169,6 +166,7 @@ export default { width: 140px; vertical-align: top; } + .boxesRight { margin-left: 40px; font-size: 28px;