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

@@ -31,24 +31,24 @@
             <div class="div_coverage">
 
               <div class="coverage_item"
-                  @click="handleClickCoverage(index)"
+                   @click="handleClickCoverage(index)"
-                  v-for="(item,index) in coverageTypesList"
+                   v-for="(item,index) in coverageTypesList"
-                  :key="index">
+                   :key="index">
                 <img :src="item.select?selImg:noSelImg" />
                 <span>{{item.label}}</span>
               </div>
             </div>
             <div class="div_category">
               <div v-for="(item,index) in categoryListshow"
-                    :key="index"
+                   :key="index"
-                    class="category_item">
+                   class="category_item">
 
                 <div v-for="(colItem,colIndex) in item"
-                      :key="colIndex"
+                     :key="colIndex"
-                      class="list_item"
+                     class="list_item"
-                      @click="handleClickCategory(index,colIndex)">
+                     @click="handleClickCategory(index,colIndex)">
                   <img :src="colItem.dataIcon"
-                        alt />
+                       alt />
                   <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
 
                   </div>
@@ -68,14 +68,14 @@
                         placeholder="请输入搜索内容"
                         v-model="search">
                 <i slot="prefix"
-                  class="icon">
+                   class="icon">
                   <img src="../../../../../assets/img/modules/visual/sousuo.png"
-                      alt />
+                       alt />
                 </i>
               </el-input>
 
               <div class="btn"
-                  @click="handleSearch">搜索</div>
+                   @click="handleSearch">搜索</div>
 
             </div>
             <div class="m-tb">
@@ -89,12 +89,13 @@
 
               </div>
               <div class="m-pagination">
-                <el-pagination hide-on-single-page :current-page="demand.pageNo"
+                <el-pagination hide-on-single-page
-                              :page-size="demand.pageSize"
+                               :current-page="demand.pageNo"
-                              :total="demand.total"
+                               :page-size="demand.pageSize"
-                              background
+                               :total="demand.total"
-                              layout="prev, pager, next,total"
+                               background
-                              @current-change="handlePageNoChange_demand">
+                               layout="prev, pager, next,total"
+                               @current-change="handlePageNoChange_demand">
                 </el-pagination>
               </div>
             </div>
@@ -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) {