Merge branch 'master' of http://111.229.35.227:3000/gitadmin/wms-antdvue

src/views/content/layoutItem/layout/index.vue

@@ -1,7 +1,7 @@
 <template>
   <a-modal
     v-model:visible="props.visible"
-    title="选择文章"
+    :title="type==1?'CMS文章':'通知公告'"
     width="1000px"
     @cancel="dialogClose"
     style="top: 20px"

src/views/data/city/index.vue

@@ -17,7 +17,7 @@
         :dataSource="lists"
         @expand="getChild"
         :style="{ minHeight: fwbHeight+'px' }"
-        :scroll="{x:'max-content',y:fwbHeight}"
+        :scroll="{x:'max-content',y:fwbHeight+'px'}"
         rowKey="areaCode"
       >
         <template #bodyCell="{ column, record, index }">