GuoYuFu123 5 years ago
parent
commit
7bc20f65ed

+ 2 - 2
src/components/ledger/handsontables/assets.vue

@@ -87,8 +87,8 @@
         暂无数据
     </div>
     <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
-    <div class='right'>
-        <my-pagination v-show="main && main.length" @change="getMain" :page="page"></my-pagination>
+    <div v-show="main && main.length" class='right'>
+        <my-pagination @change="getMain" :page="page"></my-pagination>
     </div>
     <dialog-assets
       :assetType="[this.mess.deviceId]"

+ 7 - 2
src/components/ledger/handsontables/device.vue

@@ -5,7 +5,7 @@
         style="width:20px;float:left;display:block;height:20px;cursor: pointer;"
         @click="changeAssetsFalg"
       >
-        <i class="iconfont icon-xiaolian"></i>
+        <i class="el-icon-fa  el-icon-fa-compass"></i>
       </span>
       <span>当前筛选条件下共{{page.total || '--'}}设备</span>
       <div style="float:right;overflow:hidden;">
@@ -464,7 +464,9 @@ export default {
         this.$confirm('<p>真的要在这里修改设备关联的资产么?</p><p>真的能通过列表信息找到想关联的资产么?</p><p>在这里修改关联的资产一定是因为之前关联错了要修改么?</p>', '提示', {
           dangerouslyUseHTMLString: true,
           confirmButtonText: '没错!我要改关联的资产',
-          cancelButtonText: '我就点开看看'
+          cancelButtonText: '我就点开看看',
+           confirmButtonClass: 'cancelButtonClass',
+          cancelButtonClass: 'cancelButtonClass'
         }).then(_ => {
           this.linkNameFalg = true
         }).catch(_ => {
@@ -1301,4 +1303,7 @@ export default {
     // margin-right: 10px;
   }
 }
+ .cancelButtonClass {
+    width: 180px;
+}
 </style>

+ 2 - 2
src/components/ledger/handsontables/system.vue

@@ -67,8 +67,8 @@
         暂无数据
     </div>
     <div v-show="mess.deviceId && main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
-    <div class="right">
-        <my-pagination v-show="mess.deviceId && main && main.length" @change="getMain" :page="page"></my-pagination>
+    <div v-show="mess.deviceId && main && main.length" class="right">
+        <my-pagination @change="getMain" :page="page"></my-pagination>
     </div>
     <dialog-assets
       :assetType="[this.mess.deviceId]"