From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/AssetMaintain.page | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/AssetMaintain.page b/force-app/main/default/pages/AssetMaintain.page
index f5d5eac..937b6a0 100644
--- a/force-app/main/default/pages/AssetMaintain.page
+++ b/force-app/main/default/pages/AssetMaintain.page
@@ -1,4 +1,4 @@
-<apex:page controller="AssetMaintainController" title="鏁版嵁缁存姢" showHeader="true" sidebar="false" id="allPage" action="{!init}" docType="html-5.0">
+<apex:page controller="AssetMaintainController" title="鏁版嵁缁存姢" showHeader="true" sidebar="false" id="allPage" action="{!init}" docType="html-5.0" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -46,6 +46,7 @@
}
div#in_Div_L td.dataCellBorder1 {
border-width: 1px;
+ border-left: 1px solid rgb(229, 229, 229);
}
div#in_Div_R td.dataCellBorder1 {
border-width: 1px;
@@ -885,7 +886,7 @@
<apex:variable var="amdRightApiListStr" value="{!''}{!amdRightApiList}" />
<!-- 鏌ョ湅鍏ㄩ儴淇濇湁璁惧 -->
- <div id="out_Div_L" style="overflow:auto"><!--宸︿晶琛ㄥご-->
+ <div id="out_Div_L" style="overflow:auto">
<table class="list" border="1" style="border-collapse: collapse; table-layout: fixed; border-bottom-width: 0px; border-spacing: 0px; height: 30px;">
<tr class="headerRow" style="background-color: #DCDCDC; text-align: left; vertical-align: top;">
<!-- 鍏ㄩ�� -->
@@ -900,7 +901,7 @@
</tr>
</table>
</div>
- <div id="out_Div_R"><!--鍙充晶琛ㄥご-->
+ <div id="out_Div_R">
<table class="list" border="1" style="border-collapse: collapse; table-layout:fixed; border-bottom-width: 0px; border-spacing:0; width:700px; height: 30px;">
<tr class="headerRow" style="background-color: #DCDCDC; text-align: left; vertical-align: top;">
<apex:variable value="{!0}" var="cnt" />
@@ -914,7 +915,7 @@
</tr>
</table>
</div>
- <div id="in_Div_L" style="overflow:hidden"><!--宸︿晶鏁版嵁-->
+ <div id="in_Div_L" style="overflow:hidden">
<table class="list" border="1" style="border-collapse:collapse;table-layout:fixed;border-bottom-width:0px;border-spacing:0;" id="tableData_L">
<apex:variable value="{!0}" var="Cnt_L" />
<apex:repeat id="dataline_L1" value="{!allAssetInfoShowList}" var="eachAssetData">
@@ -1013,7 +1014,7 @@
}
}
</script>
- <div id="in_Div_R" style="overflow:auto;"><!--鍙充晶鏁版嵁-->
+ <div id="in_Div_R" style="overflow:auto;">
<table class="list" border="1" style="border-collapse:collapse;table-layout:fixed;border-bottom-width:0px;border-spacing:0;width:695px;" id="tableData_R">
<apex:variable value="{!0}" var="Cnt_R" />
--
Gitblit v1.9.1