diff --git a/czl-web/js/common_methon.js b/czl-web/js/common_methon.js index 23ef918..6496d73 100644 --- a/czl-web/js/common_methon.js +++ b/czl-web/js/common_methon.js @@ -102,8 +102,8 @@ function reloading() { */ function openFile(filePaths, fileNames, fileTimes, fileDownloadName) { console.log("openFile----------") - var height = '80%'; - var width = '60%'; + var height = '75%'; + var width = '75%'; var index = layer.open({ title: ["查看", 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -126,8 +126,8 @@ function openFile(filePaths, fileNames, fileTimes, fileDownloadName) { */ function openFileAndUpLoad(filePaths, fileNames, fileTimes, fileDownloadName) { console.log("openFile----------") - var height = '98%'; - var width = '98%'; + var height = '97.5%'; + var width = '97.5%'; var index = layer.open({ title: [fileNames, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, @@ -454,7 +454,7 @@ function layerOpenFormForSencond(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, btn: ['确定'], success: function (layero, index) { @@ -494,7 +494,7 @@ function toLeadInto(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['70%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, success: function (layero, index) { }, @@ -659,7 +659,7 @@ function layerOpenFormForSencondss(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['50%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, btn: ['确定'], success: function (layero, index) { @@ -812,7 +812,7 @@ function layerOpenView(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, }); } @@ -843,7 +843,7 @@ function layerOpenViewForSencond(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, end: function () { var t = changeProTeam(contentUrl, title, index); @@ -868,7 +868,7 @@ function layerOpenFormTeamMember(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, success: function (layero, index) { }, diff --git a/czl-web/js/companypro/proManageTeamList.js b/czl-web/js/companypro/proManageTeamList.js index 7f55468..bef7767 100644 --- a/czl-web/js/companypro/proManageTeamList.js +++ b/czl-web/js/companypro/proManageTeamList.js @@ -120,7 +120,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { if ($.inArray('sysFirmContent:delete', pers) > 0) { if (d.status != 1){ text +=' | '; - text +='删除'; + text +='删除'; } } return text; @@ -286,4 +286,4 @@ function reloadTip(tip,message,type){ type: type, message: message }); -} \ No newline at end of file +} diff --git a/czl-web/js/ownteam/ownTeamList.js b/czl-web/js/ownteam/ownTeamList.js index 41ab72a..c2b9065 100644 --- a/czl-web/js/ownteam/ownTeamList.js +++ b/czl-web/js/ownteam/ownTeamList.js @@ -128,7 +128,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { if ($.inArray('freeTeam:del', pers) > 0) { if (d.status != 1){ text +=' | '; - text +='删除'; + text +='删除'; } } return text; @@ -314,4 +314,4 @@ function reloadTip(tip,message,type){ type: type, message: message }); -} \ No newline at end of file +} diff --git a/czl-web/js/project/lineProjectList.js b/czl-web/js/project/lineProjectList.js index 21e933c..a4a5917 100644 --- a/czl-web/js/project/lineProjectList.js +++ b/czl-web/js/project/lineProjectList.js @@ -129,7 +129,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { let proStatus = d.proStatus; if ($.inArray('sysFirmContent:completed', pers) > 0) { if (proStatus == "1") { - text +='完工'; + text +='完工'; text +=' | '; } } @@ -138,7 +138,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { text +=' | '; } if ($.inArray('sysFirmContent:delete', pers) > 0) { - text +='删除'; + text +='删除'; } return text; } @@ -386,4 +386,4 @@ function reloadTip(tip,message,type){ type: type, message: message }); -} \ No newline at end of file +} diff --git a/czl-web/js/project/proScheduleManagementList.js b/czl-web/js/project/proScheduleManagementList.js index 52e84be..f137a0a 100644 --- a/czl-web/js/project/proScheduleManagementList.js +++ b/czl-web/js/project/proScheduleManagementList.js @@ -131,7 +131,7 @@ function layerOpenProgressView(title,contentUrl){ title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, cancel:function (){ reloadTable() @@ -150,4 +150,4 @@ function reloadTable(){ voltageLevel: "", } //设定异步数据接口的额外参数 }); -} \ No newline at end of file +} diff --git a/czl-web/js/project/proScheduleManagementView.js b/czl-web/js/project/proScheduleManagementView.js index b76eaab..f22bfb4 100644 --- a/czl-web/js/project/proScheduleManagementView.js +++ b/czl-web/js/project/proScheduleManagementView.js @@ -442,7 +442,7 @@ function layerOpenFormForSecond(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, btn: ['保存'], success: function (layero, index) { @@ -471,7 +471,7 @@ function layerOpenProgressView(title, contentUrl) { title: [title, 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'], type: 2, content: contentUrl, - area: ['90%', '95%'], + area: ['97.5%', '97.5%'], maxmin: false, end:function () { changeTab(); @@ -586,4 +586,4 @@ function ajaxCommonMethod(url,data,success,error){ } } }); -} \ No newline at end of file +} diff --git a/czl-web/js/project/rnProjectBind.js b/czl-web/js/project/rnProjectBind.js index 6430050..a70c4a7 100644 --- a/czl-web/js/project/rnProjectBind.js +++ b/czl-web/js/project/rnProjectBind.js @@ -104,7 +104,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { let text = ""; if(d.mach == '1'){ if ($.inArray('sysRnProject:untie', pers) > 0) { - text +='解绑'; + text +='解绑'; } }else { if ($.inArray('sysRnProject:bind', pers) > 0) { diff --git a/czl-web/js/project/towerProjectList.js b/czl-web/js/project/towerProjectList.js index 507afd5..688b4b8 100644 --- a/czl-web/js/project/towerProjectList.js +++ b/czl-web/js/project/towerProjectList.js @@ -117,7 +117,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { text +=' | '; } if ($.inArray('sysTowerProject:del', pers) > 0) { - text +='删除'; + text +='删除'; } return text; } @@ -205,4 +205,4 @@ function reloadTip(tip,message,type){ type: type, message: message }); -} \ No newline at end of file +} diff --git a/czl-web/js/subTeamResource/SubcontractaList.js b/czl-web/js/subTeamResource/SubcontractaList.js index 9e3ad6c..13aa46c 100644 --- a/czl-web/js/subTeamResource/SubcontractaList.js +++ b/czl-web/js/subTeamResource/SubcontractaList.js @@ -86,7 +86,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { text +=' | '; } if ($.inArray('Subcontract:del', pers) > 0) { - text +='删除'; + text +='删除'; } return text; } @@ -179,4 +179,4 @@ function reloadTip(tip,message,type){ type: type, message: message }); -} \ No newline at end of file +} diff --git a/czl-web/js/subTeamResource/subTeamList.js b/czl-web/js/subTeamResource/subTeamList.js index b566ca7..66a1926 100644 --- a/czl-web/js/subTeamResource/subTeamList.js +++ b/czl-web/js/subTeamResource/subTeamList.js @@ -129,7 +129,7 @@ layui.use(['table', 'form','notice', 'layNotify'], function () { if ($.inArray('SubTeams:delete', pers) > 0) { if (d.status != 1){ text +=' | '; - text +='删除'; + text +='删除'; } } return text; @@ -316,4 +316,4 @@ function reloadTip(tip,message,type){ type: type, message: message }); -} \ No newline at end of file +} diff --git a/czl-web/pages/companypro/FreeInQuiryForm.html b/czl-web/pages/companypro/FreeInQuiryForm.html index f27143b..2827b58 100644 --- a/czl-web/pages/companypro/FreeInQuiryForm.html +++ b/czl-web/pages/companypro/FreeInQuiryForm.html @@ -16,8 +16,12 @@ line-height: 20px; text-align: right; } + + thead { + background-color: #FAFAFA !important; + } -
+ @@ -146,4 +150,4 @@ }); } - \ No newline at end of file + diff --git a/czl-web/pages/companypro/FreeInquiryList.html b/czl-web/pages/companypro/FreeInquiryList.html index 3cb74b4..4d77740 100644 --- a/czl-web/pages/companypro/FreeInquiryList.html +++ b/czl-web/pages/companypro/FreeInquiryList.html @@ -19,6 +19,10 @@ padding: 0px 10px; font-size: 16px; } + + thead { + background-color: #FAFAFA !important; + } -