소스 검색

全量提交

Ben 4 일 전
부모
커밋
349c51e77a
6개의 변경된 파일13개의 추가작업 그리고 7개의 파일을 삭제
  1. 2 0
      js/pageC.js
  2. 4 3
      page/env/objList.jsp
  3. 1 0
      page/home.jsp
  4. 1 1
      page/homep/taskHomep.jsp
  5. 2 1
      page/homep/urgeHomep_curTask.jsp
  6. 3 2
      page/homep/urgeHomep_hstTask.jsp

+ 2 - 0
js/pageC.js

@@ -0,0 +1,2 @@
+/* 定义页面用到的常量 Ben 20251213 增加 */
+const DOM_SIZE_objInfoTabWidth = 400;//对象变动、修改、查看页,左则选项卡宽度

+ 4 - 3
page/env/objList.jsp

@@ -34,6 +34,7 @@
 
 
 	<%-- 新UI引入的JS --%>
 	<%-- 新UI引入的JS --%>
     <script src="/js/load.js"></script> <%-- ="/newUI/ss/js/base.js"。Lin(新UI) --%>
     <script src="/js/load.js"></script> <%-- ="/newUI/ss/js/base.js"。Lin(新UI) --%>
+	<script src="/js/pageC.js"></script> <%-- 对象变动、修改、查看页,左则选项卡宽度 在里面定义 Ben(20251213) --%>
 
 
     <%-- 改为 <data@ss name="prt"/>。Lin
     <%-- 改为 <data@ss name="prt"/>。Lin
         <tab@ss name="print" enable="viewobject.funcMap.play.print"/> --%>
         <tab@ss name="print" enable="viewobject.funcMap.play.print"/> --%>
@@ -582,7 +583,7 @@ wd.display.initGrowHigh('lmms${item2.bgmbid}','80px',{},null,false);
 		<%-- 新UI初始化查询列表数据的JS --%>
 		<%-- 新UI初始化查询列表数据的JS --%>
 		<script>
 		<script>
 
 
-			leftBarWidth = 400;//弹窗录入、查看页左侧栏宽度
+
 
 
 			window.ss.dom.listConfig = window.ss.dom.listConfig || {};
 			window.ss.dom.listConfig = window.ss.dom.listConfig || {};
 
 
@@ -780,7 +781,7 @@ wd.display.initGrowHigh('lmms${item2.bgmbid}','80px',{},null,false);
 				<ss:equal val='${empty item.service.play}' val2='false'><%-- 有权查看,不需要借阅的情况 --%>
 				<ss:equal val='${empty item.service.play}' val2='false'><%-- 有权查看,不需要借阅的情况 --%>
 					item.titlexxx="${item.service.play.title}";
 					item.titlexxx="${item.service.play.title}";
 					item.onclick=function(){
 					item.onclick=function(){
-						wd.display.showComponent({getSize:1,width:((${item.service.play.width}+leftBarWidth)+""),show:["wdDialog"],url:"<ss:serv name='${item.service.play.service}' dest='${item.service.play.dest}' parm='${item.service.play.param}'/>",title:"${item.service.play.title}",height:"${item.service.play.height}",minHeight:"${item.service.play.minHeight}",maxHeight:"${item.service.play.maxHeight}"});
+						wd.display.showComponent({getSize:1,width:((${item.service.play.width}+DOM_SIZE_objInfoTabWidth)+""),show:["wdDialog"],url:"<ss:serv name='${item.service.play.service}' dest='${item.service.play.dest}' parm='${item.service.play.param}'/>",title:"${item.service.play.title}",height:"${item.service.play.height}",minHeight:"${item.service.play.minHeight}",maxHeight:"${item.service.play.maxHeight}"});
 					}
 					}
 				</ss:equal>
 				</ss:equal>
 
 
@@ -870,7 +871,7 @@ wd.display.initGrowHigh('lmms${item2.bgmbid}','80px',{},null,false);
 										onclick: () => {
 										onclick: () => {
 											<%--列表的变动按钮就在这里,下面的width会根据不同业务对象而不同
 											<%--列表的变动按钮就在这里,下面的width会根据不同业务对象而不同
 											 弹窗参数加上getSize=1,使showComponent弹窗方法不再通过ajax从后台取宽高 --%>
 											 弹窗参数加上getSize=1,使showComponent弹窗方法不再通过ajax从后台取宽高 --%>
-											wd.display.showComponent({getSize:1,width:((${btn.width}+leftBarWidth)+""),show:["wdDialog"],url:"<ss:serv name='${btn.service}' dest='${btn.dest}' parm='${btn.param}'/>",title:"${btn.title}",height:"${btn.height}",minHeight:"${btn.minHeight}",maxHeight:"${btn.maxHeight}"});
+											wd.display.showComponent({getSize:1,width:((${btn.width}+DOM_SIZE_objInfoTabWidth)+""),show:["wdDialog"],url:"<ss:serv name='${btn.service}' dest='${btn.dest}' parm='${btn.param}'/>",title:"${btn.title}",height:"${btn.height}",minHeight:"${btn.minHeight}",maxHeight:"${btn.maxHeight}"});
 
 
 										}
 										}
 									}
 									}

+ 1 - 0
page/home.jsp

@@ -25,6 +25,7 @@
 	<script type="text/javascript" src="/ss/window/dhtmlxcommon.js"></script>
 	<script type="text/javascript" src="/ss/window/dhtmlxcommon.js"></script>
 	<script type="text/javascript" src="/ss/window/dhtmlxwindows.js"></script>
 	<script type="text/javascript" src="/ss/window/dhtmlxwindows.js"></script>
 	<script type="text/javascript" src="/ss/window/dhtmlxcontainer.js"></script>
 	<script type="text/javascript" src="/ss/window/dhtmlxcontainer.js"></script>
+	<script type="text/javascript" src="/js/pageC.js"></script> <%-- 对象变动、修改、查看页,左则选项卡宽度 在里面定义 Ben(20251213) --%>
 
 
 		<%
 		<%
 		if(pageContext.getSession().getAttribute("ssUser")==null){
 		if(pageContext.getSession().getAttribute("ssUser")==null){

+ 1 - 1
page/homep/taskHomep.jsp

@@ -117,7 +117,7 @@ display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 1;overflow
 																		<tr style="height: 41px;line-height: 40px;width: 100%;position: relative;font-size: 14px;" class="file2  cursor-click" data-tt-id="db${item.id}" data-tt-parent-id="db${item.branchid}" >
 																		<tr style="height: 41px;line-height: 40px;width: 100%;position: relative;font-size: 14px;" class="file2  cursor-click" data-tt-id="db${item.id}" data-tt-parent-id="db${item.branchid}" >
 																				<td class="tdBt bb1" style="padding-left: 15px;width:100%;box-sizing: border-box;position: absolute;z-index: 1;"
 																				<td class="tdBt bb1" style="padding-left: 15px;width:100%;box-sizing: border-box;position: absolute;z-index: 1;"
 																				<ss:equal val='${empty item.updateService}' val2='false'>
 																				<ss:equal val='${empty item.updateService}' val2='false'>
-onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${item.updateService.service}' dest='${item.updateService.dest}' parm='${item.updateService.param}'/>",title:"${item.updateService.title}",width:"${item.updateService.width}",height:"${item.updateService.height}",minHeight:"${item.updateService.minHeight}",maxHeight:"${item.updateService.maxHeight}"});'
+onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${item.updateService.service}' dest='${item.updateService.dest}' parm='${item.updateService.param}'/>",title:"${item.updateService.title}",width:((${item.updateService.width}+DOM_SIZE_objInfoTabWidth)+""),height:"${item.updateService.height}",minHeight:"${item.updateService.minHeight}",maxHeight:"${item.updateService.maxHeight}"});'
 																				</ss:equal>
 																				</ss:equal>
 																				>
 																				>
 																						<span class="file"></span>
 																						<span class="file"></span>

+ 2 - 1
page/homep/urgeHomep_curTask.jsp

@@ -34,6 +34,7 @@
 <script type="text/javascript" src="/ss/datePicker/WdatePicker.js"></script>
 <script type="text/javascript" src="/ss/datePicker/WdatePicker.js"></script>
 <script type="text/javascript" src="/ss/js/edit.js"></script>
 <script type="text/javascript" src="/ss/js/edit.js"></script>
 <script src="/js/load.js"></script> <%-- ="/newUI/ss/js/base.js"。Lin(新UI) --%>
 <script src="/js/load.js"></script> <%-- ="/newUI/ss/js/base.js"。Lin(新UI) --%>
+<script type="text/javascript" src="/js/pageC.js"></script> <%-- 对象变动、修改、查看页,左则选项卡宽度 在里面定义 Ben(20251213) --%>
 
 
 <style>
 <style>
 	.icon-unchecked,.icon-checked{
 	.icon-unchecked,.icon-checked{
@@ -65,7 +66,7 @@
 <%-- 去掉闭标签 />,与下面的 </tr> 不配对。Lin
 <%-- 去掉闭标签 />,与下面的 </tr> 不配对。Lin
 		 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名
 		 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名
 			<tr onclick='wd.display.showComponent({show:["wdDialog"],hide:[],url:"<wd:token  service='${button.service}' dest='${button.dest}' param='"dxm":"${dxm}","dxid":"${dxid}","${objectId}":"${dxid}","dataType":"play"' test='false'  />",title:"${button.title}",width:${button.width},height:${button.height},minHeight:${button.minHeight},maxHeight:${button.maxHeight},showTitle:${button.showTitle}});'/> --%>
 			<tr onclick='wd.display.showComponent({show:["wdDialog"],hide:[],url:"<wd:token  service='${button.service}' dest='${button.dest}' param='"dxm":"${dxm}","dxid":"${dxid}","${objectId}":"${dxid}","dataType":"play"' test='false'  />",title:"${button.title}",width:${button.width},height:${button.height},minHeight:${button.minHeight},maxHeight:${button.maxHeight},showTitle:${button.showTitle}});'/> --%>
-			<tr onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${button.service}' dest='${button.dest}' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${objectId}":"${ssObjId}",dataType:"play"}'/>",title:"${button.title}",width:"${button.width}",height:"${button.height}",minHeight:"${button.minHeight}",maxHeight:"${button.maxHeight}",showTitle:"${button.showTitle}"});'>
+			<tr onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${button.service}' dest='${button.dest}' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${objectId}":"${ssObjId}",dataType:"play"}'/>",title:"${button.title}",width:((${button.width}+DOM_SIZE_objInfoTabWidth)+""),height:"${button.height}",minHeight:"${button.minHeight}",maxHeight:"${button.maxHeight}",showTitle:"${button.showTitle}"});'>
 				<td class="hLine">
 				<td class="hLine">
 					<div class="longCardList-info" style="font-size: 0px;display: inline-block;float: left;">
 					<div class="longCardList-info" style="font-size: 0px;display: inline-block;float: left;">
 						<span class="longCardList-highlight" style="margin-bottom: 3px;">
 						<span class="longCardList-highlight" style="margin-bottom: 3px;">

+ 3 - 2
page/homep/urgeHomep_hstTask.jsp

@@ -29,7 +29,8 @@
 <script type="text/javascript" src="/ss/window/dhtmlxcontainer.js"></script>
 <script type="text/javascript" src="/ss/window/dhtmlxcontainer.js"></script>
 <script type="text/javascript" src="/ss/js/common.js"></script>
 <script type="text/javascript" src="/ss/js/common.js"></script>
 <script type="text/javascript" src="/ss/js/display.js"></script>
 <script type="text/javascript" src="/ss/js/display.js"></script>
-	<script src="/js/load.js"></script> <%-- ="/newUI/ss/js/base.js"。Lin(新UI) --%>
+<script src="/js/load.js"></script> <%-- ="/newUI/ss/js/base.js"。Lin(新UI) --%>
+<script type="text/javascript" src="/js/pageC.js"></script> <%-- 对象变动、修改、查看页,左则选项卡宽度 在里面定义 Ben(20251213) --%>
 
 
 <style type="text/css">
 <style type="text/css">
 	.input-div{
 	.input-div{
@@ -58,7 +59,7 @@
 <%-- 去掉闭标签 />,与下面的 </tr> 不配对。Lin
 <%-- 去掉闭标签 />,与下面的 </tr> 不配对。Lin
 		 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名
 		 再改为 WebC.REQ_objName、WebC.REQ_objId,避免与数据表里的 对象名、对象ID 字段重名
 			<tr onclick='wd.display.showComponent({show:["wdDialog"],hide:[],url:"<wd:token  service='${button.service}' dest='${button.dest}' param='"dxm":"${dxm}","dxid":"${dxid}","${objectId}":"${dxid}","dataType":"play"' test='false'  />",title:"${button.title}",width:${button.width},height:${button.height},minHeight:${button.minHeight},maxHeight:${button.maxHeight},showTitle:${button.showTitle}});'/> --%>
 			<tr onclick='wd.display.showComponent({show:["wdDialog"],hide:[],url:"<wd:token  service='${button.service}' dest='${button.dest}' param='"dxm":"${dxm}","dxid":"${dxid}","${objectId}":"${dxid}","dataType":"play"' test='false'  />",title:"${button.title}",width:${button.width},height:${button.height},minHeight:${button.minHeight},maxHeight:${button.maxHeight},showTitle:${button.showTitle}});'/> --%>
-			<tr onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${button.service}' dest='${button.dest}' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${objectId}":"${ssObjId}",dataType:"play"}'/>",title:"${button.title}",width:"${button.width}",height:"${button.height}",minHeight:"${button.minHeight}",maxHeight:"${button.maxHeight}",showTitle:"${button.showTitle}"});'>
+			<tr onclick='wd.display.showComponent({show:["wdDialog"],url:"<ss:serv name='${button.service}' dest='${button.dest}' parm='{ssObjName:"${ssObjName}",ssObjId:"${ssObjId}","${objectId}":"${ssObjId}",dataType:"play"}'/>",title:"${button.title}",width:((${button.width}+DOM_SIZE_objInfoTabWidth)+""),height:"${button.height}",minHeight:"${button.minHeight}",maxHeight:"${button.maxHeight}",showTitle:"${button.showTitle}"});'>
 				<td class="hLine">
 				<td class="hLine">
 					<div class="longCardList-info" style="font-size: 0px;display: inline-block;float: left;">
 					<div class="longCardList-info" style="font-size: 0px;display: inline-block;float: left;">
 						<span class="longCardList-highlight" style="margin-bottom: 3px;">
 						<span class="longCardList-highlight" style="margin-bottom: 3px;">