From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/inspectionProject/InspectionProjectRight.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
index 4a56fb1..c72aba8 100644
--- a/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
+++ b/src/views/eam/modules/inspectionProject/InspectionProjectRight.vue
@@ -101,7 +101,7 @@
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"
- :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
+ :scroll="{ x: 'calc(600px + 50%)', y: 900 }"
>
<!--瀛楃涓茶秴闀挎埅鍙栫渷鐣ュ彿鏄剧ず-->
<span
@@ -309,27 +309,27 @@
// align: "center",
// dataIndex: 'inspectionTool',
// },
- {
- title: '鍒涘缓浜�',
- align: "center",
- dataIndex: 'createBy',
- },
- {
- title: '鍒涘缓鏃堕棿',
- align: "center",
- dataIndex: 'createTime',
- },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: "center",
+ // dataIndex: 'createBy',
+ // },
+ // {
+ // title: '鍒涘缓鏃堕棿',
+ // align: "center",
+ // dataIndex: 'createTime',
+ // },
{
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
+ width: 150,
scopedSlots: {
customRender: 'action'
},
- fixed: 'right',
},
- // width: 150,
+ // fixed: 'right',
],
url: {
list: '/eam/inspectionProject/list',
--
Gitblit v1.9.3