Przeglądaj źródła

Merge branch 'master' of http://47.94.222.6:3003/lizuo/VentSystem_2.0_front

lxh 1 rok temu
rodzic
commit
aca28134ac

+ 5 - 0
src/design/vent/comment.less

@@ -32,4 +32,9 @@
 }
 .vent-margin-t-10 {
   margin-top: 10px;
+}
+
+.table-action-link {
+  color: #00e7ff;
+  padding: 0 5px;
 }

+ 9 - 2
src/views/vent/deviceManager/comment/NormalTable.vue

@@ -20,8 +20,14 @@
           </a-button>
         </a-dropdown>
       </template>
-      <template #action="{ record, column }">
-        <TableAction :actions="getActions(record, column)" />
+      <template #action="{ record }">
+        <a class="table-action-link" @click="handleEdit(record)">编辑</a>
+        <a-popconfirm
+          title="确定删除?"
+          @confirm="handleDelete(record)"
+        >
+          <a class="table-action-link">删除</a>
+        </a-popconfirm>
       </template>
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
@@ -258,6 +264,7 @@
 
 <style scoped lang="less">
   @ventSpace: zxm;
+ 
 
   @vent-table-no-hover: #00bfff10;
   :deep(.@{ventSpace}-table-cell-row-hover) {

+ 44 - 36
src/views/vent/performance/comment/NormalTable.vue

@@ -2,7 +2,15 @@
   <div>
     <BasicTable @register="registerTable">
       <template #action="{ record }">
-        <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" />
+        <!-- <TableAction :actions="getActions(record)" :dropDownActions="getDropDownAction(record)" /> -->
+        <a class="table-action-link" @click="handleEdit(record)">编辑</a>
+        <a-popconfirm
+          title="确定删除?"
+          @confirm="handleDelete(record)"
+        >
+          <a class="table-action-link">删除</a>
+        </a-popconfirm>
+        <a class="table-action-link" @click="handleDownLoad(record)">下载</a>
       </template>
       <template #bodyCell="{ column, record }">
         <slot name="filterCell" v-bind="{ column, record }"></slot>
@@ -186,41 +194,41 @@ function downFilePublic(content, fileName) {
   }
 }
 
-/**
- * 操作列定义
- * @param record
- */
-function getActions(record) {
-  return [
-    {
-      label: '详情',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '编辑',
-      onClick: handleEdit.bind(null, record),
-    },
-    {
-      label: '删除',
-      popConfirm: {
-        title: '是否确认删除',
-        confirm: handleDelete.bind(null, record),
-      },
-    },
-    {
-      label: '下载',
-      onClick: handleDownLoad.bind(null, record),
-    },
-    // {
-    //   label: '审批',
-    //   onClick: handleEdit.bind(null, record),
-    // },
-    // {
-    //   label: '查看',
-    //   onClick: handleDetail.bind(null, record),
-    // },
-  ];
-}
+// /**
+//  * 操作列定义
+//  * @param record
+//  */
+// function getActions(record) {
+//   return [
+//     {
+//       label: '详情',
+//       onClick: handleEdit.bind(null, record),
+//     },
+//     {
+//       label: '编辑',
+//       onClick: handleEdit.bind(null, record),
+//     },
+//     {
+//       label: '删除',
+//       popConfirm: {
+//         title: '是否确认删除',
+//         confirm: handleDelete.bind(null, record),
+//       },
+//     },
+//     {
+//       label: '下载',
+//       onClick: handleDownLoad.bind(null, record),
+//     },
+//     // {
+//     //   label: '审批',
+//     //   onClick: handleEdit.bind(null, record),
+//     // },
+//     // {
+//     //   label: '查看',
+//     //   onClick: handleDetail.bind(null, record),
+//     // },
+//   ];
+// }
 /**
  * 下拉操作栏
  */

+ 2 - 2
src/views/vent/performance/fileDetail/index.vue

@@ -283,8 +283,8 @@ onMounted(() => {
   padding: 15px;
   position: relative;
   margin-top: 100px;
-  // background: url(../../../../assets/images/files/homes/bd.png) no-repeat center;
-  // background-size: contain;
+  background: url(../../../../assets/images/files/homes/bd.png) no-repeat center;
+  background-size: contain;
   
   &::after{
     display: block;