无等级网格版合并

src/apps/AppGridManagement/Statistics.vue

@@ -26,27 +26,14 @@
 
     <div class="bottom">
       <div class="girdMsg">网格信息</div>
-
       <div class="girdCont">
         <div class="boxes">
           <span class="boxesLeft">网格名称</span>
-
-          <span class="boxesRight">{{ girdMsgList.girdName || '' }}</span>
-          <!-- <span class="boxesRight">{{ girdUser.appGirdInfo.girdName }}</span> -->
+          <span class="boxesRight">{{ gridInfo.girdName || '' }}</span>
         </div>
-
         <div class="boxes">
-          <span class="boxesLeft">网格类型</span>
-
-          <span class="boxesRight">
-            {{ $dict.getLabel('girdType', girdMsgList.girdType) || '' }}
-          </span>
-        </div>
-
-        <div class="boxes">
-          <span class="boxesLeft">网格层级</span>
-
-          <span class="boxesRight">{{ $dict.getLabel('girdLevel', girdMsgList.girdLevel) || '' }}</span>
+          <span class="boxesLeft">标绘状态</span>
+          <span class="boxesRight">{{ gridInfo.plottingStatus == 1 ? '已标绘' : '未标绘' }}</span>
         </div>
       </div>
     </div>
@@ -64,56 +51,37 @@ export default {
   },
   data() {
     return {
-      girdUser: [],
       peopleList: {},
-      girdMsgList: {},
+      gridInfo: {},
       checkType: '',
     }
   },
-  computed: {},
-  watch: {},
-  onLoad() {},
   created() {
-    this.$dict.load('girdType', 'girdLevel').then(() => {
-      this.isGirdUser()
-      this.girdMsgList = this.params
-      this.getList()
-    })
-
+    this.gridInfo = this.params
+    this.getList()
     uni.$on('goback', (res) => {
-      this.girdMsgList = res
+      this.gridInfo = res
       this.getList()
     })
   },
   methods: {
-    isGirdUser() {
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
-          this.girdUser = res.data
-        }
-      })
-    },
-
     getList() {
-      this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.girdMsgList.id}`).then((res) => {
-        if (res.code == 0) {
+      this.$http.post(`/app/appgirdmemberinfo/girdMemberAndResidentStatistic?girdId=${this.gridInfo.id}`).then((res) => {
+        if (res?.data) {
           this.peopleList = res.data
         }
       })
     },
     linkTo(url) {
-      uni.navigateTo({ url })
+      uni.navigateTo({url})
     },
   },
 }
 </script>
 
 <style scoped lang="scss">
-uni-page-body {
-  height: 100%;
-}
 .Statistics {
-  padding: 0 30px 0;
+  padding: 0 30px;
   box-sizing: border-box;
 
   .middle {
@@ -121,25 +89,30 @@ uni-page-body {
     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;
@@ -156,16 +129,19 @@ uni-page-body {
     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;
@@ -175,6 +151,7 @@ uni-page-body {
           width: 140px;
           vertical-align: top;
         }
+
         .boxesRight {
           margin-left: 40px;
           font-size: 28px;