Forráskód Böngészése

住户审核单元问题

Shannon_mu 3 éve
szülő
commit
97ee9170a6

+ 21 - 5
operationSupport/src/views/ownerManagement/ownerReview/toExamine.vue

@@ -56,11 +56,7 @@
                 <div class="formContent-formList house" v-for="(item, index) in formData.houseList" :key="index">
                     <div class="block-title">
                         <div class="floor list-title">
-                            {{
-                                `${item.buildingName} ${
-                                    item.unitName.indexOf('单元') !== -1 ? item.unitName : !!item.unitName ? item.unitName + '单元' : ''
-                                }${item.roomNumber}`
-                            }}
+                            {{ `${item.buildingName} ${!!item.unitName ? CheckChinese(item.unitName, '单元') : ''}${item.roomNumber}` }}
                         </div>
                         <img class="bg-img" src="@/assets/img/ownerManagement/bg_card@2x.png" alt="" />
                         <img class="bg-imgIoc" src="@/assets/img/ownerManagement/icon_building@2x.png" alt="" />
@@ -372,6 +368,26 @@ export default {
                     }
                 })
                 .catch(() => {});
+        },
+        dimension(arr) {
+            arr.map((item, index) => {
+                if (!!item.children) {
+                    this.dimension(item.children);
+                    if (item.type == 'unit') {
+                        item.name = this.CheckChinese(item.name, '单元');
+                    } else if (item.type == 'building') {
+                        item.name = this.CheckChinese(item.name, '楼栋');
+                    }
+                }
+            });
+        },
+        CheckChinese(val, name) {
+            var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
+            let newVal = val;
+            if (!reg.test(val)) {
+                newVal = val + name;
+            }
+            return newVal;
         }
     }
 };

+ 3 - 3
operationSupport/src/views/patrolManagement/popups/pathSimplifierIns.js

@@ -97,13 +97,13 @@ export default {
                 }
 
                 // 初始化坐标点
-                if (_this.lineArr.length > 0) {
-                    that.actualList = _this.lineArr;
+                if (that.lineArr.length > 0) {
+                    that.actualList = that.lineArr;
 
                     //创建一个巡航轨迹路线
                     that.pathSimplifierIns = new PathSimplifier({
                         zIndex: 100, //地图层级,
-                        map: this.map, //所属的地图实例
+                        map: that.map, //所属的地图实例
                         //巡航路线轨迹列表
                         getPath: (pathData, pathIndex) => {
                             return pathData.path;