Merge branch 'dev-身份验证1114'

src/views/modules/visual/command/cpts/popup.vue

@@ -360,7 +360,7 @@
         </div>
         <div class="item">
           规模：
-          <span>{{ info.scale || "--" }}</span>
+          <span>{{ info.scaleName || "--" }}</span>
         </div>
         <div class="item">
           负责人：

src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue

@@ -92,7 +92,8 @@
 
             </div>
             <div class="m-pagination">
-              <el-pagination hide-on-single-page :current-page="demand.pageNo"
+              <el-pagination hide-on-single-page
+                             :current-page="demand.pageNo"
                              :page-size="demand.pageSize"
                              :total="demand.total"
                              background
@@ -321,7 +322,7 @@
             <span>{{ selInfo.address }}</span>
           </div>
           <div class="popContentTitle">规模：
-            <span>{{ selInfo.scale }}</span>
+            <span>{{ selInfo.scaleName }}</span>
           </div>
           <div class="popContentTitle">负责人：
             <span>{{ selInfo.personInCharge }}</span>

src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@@ -89,7 +89,8 @@
 
               </div>
               <div class="m-pagination">
-                <el-pagination hide-on-single-page :current-page="demand.pageNo"
+                <el-pagination hide-on-single-page
+                               :current-page="demand.pageNo"
                                :page-size="demand.pageSize"
                                :total="demand.total"
                                background
@@ -318,7 +319,7 @@
             <span>{{ selInfo.address }}</span>
           </div>
           <div class="popContentTitle">规模：
-            <span>{{ selInfo.scale }}</span>
+            <span>{{ selInfo.scaleName  }}</span>
           </div>
           <div class="popContentTitle">负责人：
             <span>{{ selInfo.personInCharge }}</span>
@@ -1035,7 +1036,7 @@ const vueGis = {
     async loadEnterprisePartrol (info) {
       const url = "/gov/org/enterprise/detail/" + info.id
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
-
+      debugger
       const { data, code, msg } = await requestPost(url)
 
       if (code === 0) {