Signed-off-by: liuboyan <632697560@qq.com>

table-css-style

src/assets/css/public.scss

@@ -175,6 +175,12 @@
     width: 100%;
   }
 }
+.el-table__fixed-right{
+  .table-flex-column-right{
+    right: -1px;
+    border-right: 2px solid #EBEEF5;
+  }
+}
 ::-webkit-scrollbar {
   width: 8px;
   height: 8px;

src/views/device/deviceList.vue

@@ -133,7 +133,7 @@
                             <el-table-column label="是否重点设备" minWidth="120" align="center">
                                 <template #default="scope">{{scope.row.isImportant == 1 ? '是': '否'}}</template>
                             </el-table-column>
-                            <el-table-column label="操作" width="230" align="center" fixed="right">
+                            <el-table-column label="操作" width="230" align="center" fixed="right" class-name="table-flex-column-right">
                                 <template #default="scope">
                                     <el-button size="mini" type="primary" @click="handleEdit(scope.row)" v-if="checkMenuLimit('room/device/Edit')">查看</el-button>
                                     <el-button size="mini" type="primary" @click="handleDownload(scope.row)" v-if="checkMenuLimit('room/device/Qrcode')">二维码</el-button>

src/views/device/deviceType.vue

@@ -29,7 +29,7 @@
                             <el-table-column prop="rank" label="等级" minWidth="120" align="center"></el-table-column>
                             <el-table-column prop="patrolHour" label="巡检工时（分钟）" minWidth="140" align="center"></el-table-column>
                             <el-table-column prop="maintainHour" label="维保工时（分钟）" minWidth="140" align="center"></el-table-column>
-                            <el-table-column label="操作" width="150" align="center" fixed="right">
+                            <el-table-column label="操作" width="150" align="center" fixed="right" class-name="table-flex-column-right">
                                 <template #default="scope">
                                     <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)" v-if="checkMenuLimit('room/deviceType/Level/Edit')">编辑</el-button>
                                     <el-button size="mini" type="danger" @click="handleDelete(scope.$index, scope.row)" v-if="checkMenuLimit('room/deviceType/Level/Delete')">删除</el-button>

src/views/device/processRoute.vue

@@ -29,7 +29,7 @@
                             <el-table-column prop="craftName" label="路线名称" minWidth="140" align="center"></el-table-column>
                             <el-table-column prop="lpCategoryName" label="类别" width="80" align="center"></el-table-column>
                             <el-table-column prop="projectCatagory" label="业态" minWidth="80" align="center"></el-table-column>
-                            <el-table-column label="操作" width="80" align="center" fixed="right">
+                            <el-table-column label="操作" width="80" align="center" fixed="right" class-name="table-flex-column-right">
                                 <template #default="scope">
                                     <i class="tree-icon el-icon-edit-outline" @click="routeEdit(scope.row)" v-if="checkMenuLimit('room/craft/Edit')"></i>
                                     <i class="tree-icon el-icon-delete" @click="routeDel(scope.row)" v-if="checkMenuLimit('room/craft/Delete')"></i>
@@ -66,7 +66,7 @@
                             </el-table-column>
                             <el-table-column prop="colType" label="任务类型" width="140" align="center"></el-table-column>
                             <el-table-column prop="isReq" label="是否必填" width="100" align="center"></el-table-column>
-                            <el-table-column label="操作" width="110" align="center" fixed="right">
+                            <el-table-column label="操作" width="110" align="center" fixed="right" class-name="table-flex-column-right">
                                 <template #default="scope">
                                     <el-button size="mini" type="primary" @click="handleAdd(scope.row)" v-if="scope.row.level == 1 && checkMenuLimit('room/craft/standard/Add')">添加步骤</el-button>
                                     <el-button size="mini" type="danger" @click="handleDel(scope.row)" v-if="scope.row.level == 2 && checkMenuLimit('room/craft/standard/Delete')">删除</el-button>

src/views/device/standardInstall.vue

@@ -36,7 +36,7 @@
                             <el-table-column prop="scan" label="强制扫码" minWidth="120" align="center">
                                 <template #default="scope">{{dictionaryData.scanList[scope.row.scan].label}}</template>
                             </el-table-column>
-                            <el-table-column label="操作" width="150" align="center" fixed="right">
+                            <el-table-column label="操作" width="150" align="center" fixed="right" class-name="table-flex-column-right">
                                 <template #default="scope">
 <!--                                    <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)">查看</el-button>-->
                                     <el-button size="mini" type="primary" @click="handleEdit(scope.$index, scope.row)" v-if="checkMenuLimit('room/deviceStandard/Edit')">编辑</el-button>

src/views/maintain/roomManage.vue

@@ -25,8 +25,9 @@
                                     :show-file-list="false"
                                     :on-success="uploadSuccess"
                                     v-if="checkMenuLimit('room/room/Import')"
+                                    :disabled="!tableData.selectNode"
                                     style="margin-left: 8px">
-                                    <el-button size="mini" type="primary">批量导入</el-button>
+                                    <el-button size="mini" type="primary" :disabled="!tableData.selectNode">批量导入</el-button>
                                 </el-upload>
                             </span>
                         </div>
@@ -75,7 +76,7 @@
                         </el-table-column>
                         <el-table-column prop="currentYearRepairNum" label="本年维保次数" minWidth="120" align="center"></el-table-column>
                         <el-table-column prop="latelyRepairTime" label="最近维保时间" width="180" align="center"></el-table-column>
-                        <el-table-column label="操作" width="90" align="center" fixed="right">
+                        <el-table-column label="操作" width="90" align="center" fixed="right" class-name="table-flex-column-right">
                             <template #default="scope">
                                 <el-button size="mini" type="primary" @click="handleDetail(scope.row)">详情</el-button>
                             </template>
@@ -165,8 +166,9 @@
                                     :show-file-list="false"
                                     :on-success="uploadSuccess"
                                     v-if="checkMenuLimit('room/room/AssetImport')"
+                                    :disabled="!tableData.selectNode"
                                     style="margin-left: 8px">
-                                <el-button size="mini" type="primary">批量导入</el-button>
+                                <el-button size="mini" type="primary" :disabled="!tableData.selectNode">批量导入</el-button>
                             </el-upload>
                         </div>
                         <el-table :data="tableData.assetsTableList" v-loading="tableData.assetsTableLoading" :height="props.resizeHeight - 290" stripe border fit>
@@ -177,8 +179,8 @@
                             <el-table-column prop="purchasePrice" label="购买/赔偿价" minWidth="120" align="center"></el-table-column>
                             <el-table-column label="操作" width="160" align="center">
                                 <template #default="scope">
-                                    <el-button size="mini" type="primary" @click="handleAssetsDetail" v-if="checkMenuLimit('room/room/AssetEdit')">编辑</el-button>
-                                    <el-button size="mini" type="danger" @click="handleAssetsDelete" v-if="checkMenuLimit('room/room/AssetDelete')">删除</el-button>
+                                    <el-button size="mini" type="primary" @click="handleAssetsDetail(scope.row)" v-if="checkMenuLimit('room/room/AssetEdit')">编辑</el-button>
+                                    <el-button size="mini" type="danger" @click="handleAssetsDelete(scope.row)" v-if="checkMenuLimit('room/room/AssetDelete')">删除</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -305,6 +307,7 @@
             //  树形结构点击节点
             function nodeClick (node, data) {
                 tableData.tableList = []
+                tableData.selectNode = null
                 if (node.level == 2){
                     tableData.selectNode = node
                     getRoomTypeDictionary({

src/views/maintain/roomPlan.vue

@@ -123,7 +123,7 @@
                 <el-table-column prop="colType" label="暂停" width="120" align="center">
                     <template #default="scope">{{scope.row.pauseFlag == 0 ? '否' : '是'}}</template>
                 </el-table-column>
-                <el-table-column label="操作" width="300" align="center" fixed="right">
+                <el-table-column label="操作" width="300" align="center" fixed="right" class-name="table-flex-column-right">
                     <template #default="scope">
                         <el-button size="mini" type="primary" @click="handleEdit(scope.row)" v-if="checkMenuLimit('room/plan/Detail')">详情</el-button>
                         <el-button size="mini" type="primary" @click="handleCheck(scope.row)" v-if="checkMenuLimit('room/plan/DeviceSelect')">查看设备</el-button>

src/views/maintain/roomTask.vue

@@ -124,7 +124,7 @@
                 </el-table-column>
                 <el-table-column prop="workingTime" label="工时（分钟）" minWidth="120" align="center"></el-table-column>
                 <el-table-column prop="serverTime" label="同步时间" minWidth="180" align="center"></el-table-column>
-                <el-table-column label="操作" width="300" align="center" fixed="right">
+                <el-table-column label="操作" width="300" align="center" fixed="right" class-name="table-flex-column-right">
                     <template #default="scope">
                         <el-button size="mini" type="primary" @click="handleDetail(scope.row)" v-if="checkMenuLimit('room/task/Detail')">详情</el-button>
                         <el-button size="mini" type="primary" @click="handleClose(scope.row)"