Merge branch 'develop' into aly_dev

src/components/editLengend.vue

@@ -105,12 +105,12 @@
                     </el-table>
                 </div>-->
             </div>
-
+            <div class='lengend-text'>广场上没有的图例数量填写为0</div>
             <div class='swich'>
                 <el-switch v-model='value' @change='changeSwitch'></el-switch>
                 <span>隐藏数量为0的项目</span>
             </div>
-            <div class='lengend-text'>广场上没有的图例需要填写数量，值为0</div>
+
             <div class='legendFoot'>
                 <el-button size='mini' @click='cancel'>取消</el-button>
                 <el-button size='mini' v-if='editNum.length==0' type='primary' disabled style='opacity: 0.5'>保存</el-button>
@@ -313,6 +313,7 @@ export default {
         font-size: 12px;
         color: red;
         padding-left: 16px;
+        margin-top: -50px;
     }
     .legendFoot {
         position: absolute;

src/components/viewLengend.vue

@@ -39,7 +39,7 @@
                 <el-table-column prop='Name' :show-overflow-tooltip='true' label='项目' width='100'>
                     <template slot-scope='{row}'>{{row.Name||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop='Num' label='数量' align='center'>
+                <el-table-column prop='Num' label='数量' align='right'>
                     <template slot-scope='{row}'>
                         <span v-if='row.Num || row.Num==0'>{{row.Num}}</span>
                         <span v-else-if='row.Num==null'></span>

src/views/room/room1.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class='jf-inner' style='width:100%;height:85vh;overflow:hidden'>
+    <div class='jf-inner' style='width:100%;overflow:hidden'>
         <rotation :rotationImg='tableImg' :type='3'></rotation>
     </div>
 </template>