Merge branch 'apiupdate' of git.sagacloud.cn:web/ibms into apiupdate-zy

src/components/ledger/handsontables/device.vue

@@ -1,22 +1,22 @@
 <template>
   <div style="height: calc(100% - 44.5px);padding: 0px 10px 10px;box-sizing: border-box;">
     <div class="hanson-bar">
-      <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
-        <i v-show="!onlyRead" class="el-icon-fa  el-icon-fa-compass"></i>
-      </span>
-      <span>当前筛选条件下共{{page.total || '--'}}设备</span>
       <div style="float:right;overflow:hidden;">
-        <el-select v-model="onlyRead" @change="getHeaderData(mess)" style="width:100px;margin-right:20px;vertical-align:bottom;">
-          <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-        <el-select v-model="showType" @change="initTable" style="width:100px;margin-right:10px;vertical-align:bottom;">
-          <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
-        </el-select>
-        <el-button size="small" style='width: 80px;' @click="download" icon="iconfont icon-xiazai">下载</el-button>
-        <el-button size="small" style='width: 80px;' @click="addDevice" icon="iconfont icon-tianjia">添加设备</el-button>
-        <el-button size="small" style='width: 80px;' @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
-        <el-button size="small" style='width: 80px;' v-show="!onlyRead" @click="undo" icon="iconfont icon-undo">撤销</el-button>
+        <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
+          <i v-show="!onlyRead" class="el-icon-fa  el-icon-fa-compass"></i>
+        </span>
+        <span>当前筛选条件下共{{page.total || '--'}}设备</span>
       </div>
+      <el-select v-model="onlyRead" @change="getHeaderData(mess)" style="width:100px;margin-right:20px;vertical-align:bottom;">
+        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
+      </el-select>
+      <el-select v-model="showType" @change="initTable" style="width:100px;margin-right:10px;vertical-align:bottom;">
+        <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
+      </el-select>
+      <el-button size="small" style='width: 80px;' @click="download" icon="iconfont icon-xiazai">下载</el-button>
+      <el-button size="small" style='width: 80px;' @click="addDevice" icon="iconfont icon-tianjia">添加设备</el-button>
+      <el-button size="small" style='width: 80px;' @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
+      <el-button size="small" style='width: 80px;' v-show="!onlyRead" @click="undo" icon="iconfont icon-undo">撤销</el-button>
     </div>
     <!-- 二维码弹窗 -->
     <qrcode :dialog="myDialog" :qrcodeUrl="qrcodeUrl" :addBody="true" ref="qrcode"></qrcode>
@@ -190,8 +190,8 @@ export default {
       loading: false,
       deviceType: {}, //族3位编码及名称
       floorData: [],
-      curDevice:'',//当前点击的设备id
-      addData:{}, //添加设备选择的设备类型
+      curDevice: '',//当前点击的设备id
+      addData: {}, //添加设备选择的设备类型
     };
   },
   created() { },
@@ -350,19 +350,19 @@ export default {
     addDevice() {
       this.myDialog.addDevice = true
       if (this.mess.deviceId) {
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.$refs.cascader.setValue([this.mess.deviceId])
         })
-      } 
+      }
     },
     //下一步
-    toAddDevice(){
+    toAddDevice() {
       if (this.addData.deviceId) {
         this.$router.push({
           path: "/ledger/addevice",
           query: this.addData
         });
-      } 
+      }
     },
     //选择设备类型-添加设备
     changeAddType(val) {
@@ -850,7 +850,7 @@ export default {
 <style lang="less">
 .hanson-bar {
   height: 40px;
-  padding: 5px 10px;
+  padding: 5px 0;
   font-size: 14px;
   overflow: hidden;
   margin-top: 0;