Skip to content

蔡永松 / fontweb-dc

Go to a project
Toggle navigation
Toggle navigation pinning
bfa5054c by weimo934
Options

提交代码

1 parent 20848d0b
Inline Side-by-side
Showing 10 changed files with 67 additions and 616 deletions
...@@ -2,52 +2,11 @@ ...@@ -2,52 +2,11 @@
2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 2 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
3 <modelVersion>4.0.0</modelVersion> 3 <modelVersion>4.0.0</modelVersion>
4 <groupId>NNOAWEB</groupId> 4 <groupId>NNOAWEB</groupId>
5 <artifactId>frontweb-xayzt</artifactId> 5 <artifactId>frontweb-dc</artifactId>
6 <packaging>war</packaging> 6 <packaging>war</packaging>
7 <version>0.0.1-SNAPSHOT</version> 7 <version>0.0.1-SNAPSHOT</version>
8 <name>frontweb-xayzt Maven Webapp</name> 8 <name>frontweb-xayzt Maven Webapp</name>
9 <url>http://maven.apache.org</url> 9 <url>http://maven.apache.org</url>
10 <dependencies>
11 <!-- <dependency>
12 <groupId>junit</groupId>
13 <artifactId>junit</artifactId>
14 <version>3.8.1</version>
15 <scope>test</scope>
16 </dependency>
17 <dependency>
18 <groupId>org.apache.commons</groupId>
19 <artifactId>commons-lang3</artifactId>
20 <version>3.3.2</version>
21 </dependency>
22 &lt;!&ndash; <dependency>
23 <groupId>org.jasig.cas.client</groupId>
24 <artifactId>cas-client-core</artifactId>
25 <version>3.2.0</version>
26 </dependency> &ndash;&gt;
27 <dependency>
28 <groupId>org.springframework</groupId>
29 <artifactId>spring-context</artifactId>
30 <version>4.1.0.Release</version>
31 </dependency>
32
33 &lt;!&ndash; https://mvnrepository.com/artifact/com.thetransactioncompany/cors-filter &ndash;&gt;
34 <dependency>
35 <groupId>com.thetransactioncompany</groupId>
36 <artifactId>cors-filter</artifactId>
37 <version>2.5</version>
38 </dependency>
39 &lt;!&ndash; https://mvnrepository.com/artifact/com.thetransactioncompany/java-property-utils &ndash;&gt;
40 <dependency>
41 <groupId>com.thetransactioncompany</groupId>
42 <artifactId>java-property-utils</artifactId>
43 <version>1.9</version>
44 </dependency>
45 <dependency>
46 <groupId>cmp</groupId>
47 <artifactId>cmp-project</artifactId>
48 <version>0.0.1-SNAPSHOT</version>
49 </dependency>-->
50 </dependencies>
51 <build> 10 <build>
52 <finalName>frontweb</finalName> 11 <finalName>frontweb</finalName>
53 <plugins> 12 <plugins>
......
...@@ -307,7 +307,7 @@ function leftMenuFormat (data) { ...@@ -307,7 +307,7 @@ function leftMenuFormat (data) {
307 */ 307 */
308 function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) { 308 function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) {
309 //判断路由 2020年6月8日 18:31:37 vers 309 //判断路由 2020年6月8日 18:31:37 vers
310 if(navigator==='规划成果审查'){ 310 /*if(navigator==='规划成果审查'){
311 var activeIconUrlList = [ 311 var activeIconUrlList = [
312 'image/index/menus/reviewmanage/icon_dbsx_select.svg', 312 'image/index/menus/reviewmanage/icon_dbsx_select.svg',
313 'image/index/menus/reviewmanage/icon_ybsx_select.svg', 313 'image/index/menus/reviewmanage/icon_ybsx_select.svg',
...@@ -340,7 +340,7 @@ function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) { ...@@ -340,7 +340,7 @@ function listByRoleIdSucceFunc(data, object, navigator, divId, nav, text) {
340 data[i].iconActive = activeIconUrlList[j] 340 data[i].iconActive = activeIconUrlList[j]
341 } 341 }
342 } 342 }
343 } 343 }*/
344 344
345 // 扁平数组数据转树形数据 345 // 扁平数组数据转树形数据
346 data = leftMenuFormat(data); 346 data = leftMenuFormat(data);
...@@ -856,227 +856,9 @@ function handle() { ...@@ -856,227 +856,9 @@ function handle() {
856 856
857 return "parentw1"; 857 return "parentw1";
858 } 858 }
859 /*//宽度调整
860 function updateSize() {
861 //右侧内容的宽度
862 var widthRightContent = ($(".headbg-logo").css("width").replace("px", "") - 280) + "px";
863 widthRightContentDiv = ($(".headbg-logo").css("width").replace("px", "") - 280) + "px";
864 *//******************此宽度会对公文管理等其它二级菜单的右侧div有影响！！！！！****************************//*
865 $("#iframecontent").css("width","100%");//此宽度会对公文管理等其它二级菜单的右侧div有影响！！！！！ hyh 2017、9、8 修改
866 $("#divContentRight").css("height", window.innerHeight-55);//hyh 新增 2017、12、13
867 $("#iframecontent").css("height", window.innerHeight-55);//hyh 新增 2017、12、13
868
869 *//****hyh 新增 2017、9、27*****//*
870 var wwidth=window.innerWidth;
871 var menuDiv=getMenuLength();
872 menuDivLength=menuDiv+610 >= 1480? menuDiv+610 : 1480;//hyh 新增 最小宽度不小于1450
873 if(wwidth<=menuDivLength){
874 $(".container-fluid").css("overflow", "hidden");// hyh 新增 2017/10/9
875 if(isgis){
876 $("#divContentRight").css("width", menuDivLength);
877 $("#divFrame").css("width", menuDivLength);
878 $("#iframecontent").css("width", menuDivLength);
879 $("#divContentRight").css("left", "0px");
880
881 }
882 else{
883 if(hideOrShow){
884 $("#divContentRight").css("width", menuDivLength-280);
885 $("#divFrame").css("width", menuDivLength-280);//hyh 为了填满页面而加上去的10个像素 2017、9、27
886 $("#iframecontent").css("width", menuDivLength-280);
887 $("#divContentRight").css("left", "275px");
888 }else{
889 $("#divContentRight").css("width", menuDivLength-95);
890 $("#divFrame").css("width", menuDivLength-95);
891 $("#iframecontent").css("width", menuDivLength-95);
892 $("#divContentRight").css("left", "85px");
893 }
894
895 }
896 859
897 $("#bodyContent").parent("div").css("overflow", "auto");
898 $("#menuNav").css("margin-left","0px");
899 $("#menuNav").css("position","fixed");
900 $("#divSearchContent").css("width","150px");
901 $("#searchbtn").css("right","-120px");
902 return;
903 }if(wwidth>menuDivLength){
904 $(".container-fluid").attr("style","padding-left: 0px;padding-right:0px;display:inline-block;");
905 if(isgis){
906 $("#divContentRight").css("width", window.innerWidth);
907 $("#divContentRight").css("left", "0px");
908 }else{
909 if(hideOrShow){
910 $("#divContentRight").css("width", window.innerWidth-280);
911 $("#divContentRight").css("left", "275px");
912 }else{
913 $("#divContentRight").css("width", window.innerWidth-95);
914 $("#divContentRight").css("left", "85px");
915 }
916
917 }
918 $("#divFrame").css("width", "100%");
919 $("#iframecontent").css("width", "100%");
920 $("#bodyContent").parent("div").css("overflow-x", "hidden");
921 if(wwidth<=menuDivLength+220){
922 $("#menuNav").css("margin-left","0px");
923 $("#menuNav").css("position","fixed");
924 $("#divSearchContent").css("width","150px");
925 $("#searchbtn").css("right","-120px");
926 }else{
927 $("#divSearchContent").css("width","243px");
928 $("#searchbtn").css("display","");
929 $("#buttonSearch").css("display","none");
930 $("#searchbtn").css("right","-205px");
931 $("#menuNav").css("margin-left","50px");
932 $("#menuNav").css("position","fixed");
933 }
934 }
935 //获取窗口高度
936 // $("#bodycontent").css("height", window.innerHeight);
937 // $("#divLeftBG").css("min-height", (document.body.clientHeight-170)+"px");
938 }
939 */
940 //宽度调整 860 //宽度调整
941 function updateSizeHome() { 861 function updateSizeHome() {
942 // $("#divContentRight").width((window.innerWidth-275)+"px");
943 // $("#divContentRight").height((window.innerHeight-54)+"px");
944 // FIXME:
945 // $("#divContentRight").width((window.innerWidth-152)+"px");
946 // $("#divContentRight").height((window.innerHeight-54)+"px");
947 /* //右侧内容的宽度
948 var widthRightContent = ($(".headbg-logo").css("width").replace("px", "") - 280) + "px";
949 widthRightContentDiv = ($(".headbg-logo").css("width").replace("px", "") - 280) + "px";
950 *//******************此宽度会对公文管理等其它二级菜单的右侧div有影响！！！！！****************************//*
951 $("#divContentRight").css("height", window.innerHeight-55);
952 $("#iframecontent").css("height", "100%");//hyh 新增 2017、9、14
953 //获取窗口高度
954 $("#divLeftBG").css("display", "block");
955
956 *//****hyh 新增 2017、9、27*****//*
957 var wwidth=window.innerWidth;
958 var menuDiv=getMenuLength();//hyh 新增 获取一级菜单的长度 2017、10、9
959 //var menuDivLength=menuDiv+590 >= 1450? menuDiv+590 : 1450;
960 var menuDivLength=menuDiv+620 >= 1490? menuDiv+620 : 1490;
961 $("#divContentRight").css("left", "275px");
962 if(wwidth<=menuDivLength){
963 var arg=menuDivLength/73;//让任务统计模块变化更好看 hyh 新增 2017、10、16
964 if(!hideOrShow){
965 $("#divContentRight").css("width", window.innerWidth-280);
966 $("#divContentRight").css("left", "275px");
967 }else{
968 $("#divContentRight").css("width", window.innerWidth-95);
969 $("#divContentRight").css("left", "85px");
970 }
971
972 // $("#divContentRight").css("width", menuDivLength-275);
973 $("#bodyContent").parent("div").css("overflow", "auto");
974 $(".container-fluid").css("overflow", "hidden");// hyh 新增 2017/10/9
975
976 $("#divFrame").css("width",menuDivLength-275);
977 $("#iframecontent").css("width", menuDivLength-275);//hyh 在最小宽度的时候把页面撑满
978 $("#menuNav").css("margin-left","0px");
979 $("#menuNav").css("position","fixed");
980 $("#divSearchContent").css("width","150px");
981 $("#searchbtn").css("right","-120px");
982 // $("#divContentRight").css("left", "275px");
983 if(!isgis){
984 $("#iframecontent").contents().find(".div-remind-count").css("font-size","12px");
985 $("#iframecontent").contents().find(".div-remind-type").css("font-size","12px");
986 $("#iframecontent").contents().find(".div-remind-legend .legend").css("height","15px");
987 $("#iframecontent").contents().find(".div-remind-legend .legend").css("width","15px");
988 $("#iframecontent").contents().find("#remindLegendStyle").css("padding-right","0px");
989 $("#iframecontent").contents().find("#remindLegendStyle").css("padding-left","0px");
990 $("#iframecontent").contents().find("#remindLegendStyle").css("margin-left",arg);
991 $("#iframecontent").contents().find("#remindLegendStyle").css("margin-top","5px");
992 }
993 // if(menuDiv<770){
994 if(menuDiv<800){
995 $("#menuNav").css("margin-left","50px");
996 $("#menuNav").css("position","fixed");
997 $("#divSearchContent").css("width","243px");
998 $("#searchbtn").css("display","");
999 $("#buttonSearch").css("display","none");
1000 $("#searchbtn").css("right","-205px");
1001 }
1002 return;
1003 }if(wwidth>menuDivLength){
1004 if(hideOrShow){
1005 $("#divContentRight").css("width", window.innerWidth-280);
1006 $("#divContentRight").css("left", "275px");
1007 }else{
1008 $("#divContentRight").css("width", window.innerWidth-95);
1009 $("#divContentRight").css("left", "85px");
1010 }
1011 // $("#divContentRight").css("width", window.innerWidth-280);
1012 //$("#bothleftright").css("overflow", "hidden");
1013 $("#divFrame").css("width", "100%");
1014 //$("#divFrame").css("width", window.innerWidth-285);
1015 $("#iframecontent").css("width", "100%");
1016 //$("#iframecontent").css("width", window.innerWidth-285);
1017 $("#bodyContent").parent("div").css("overflow-x", "hidden");
1018 $("#bodyContent").parent("div").css("overflow-y", "auto");
1019 $(".container-fluid").attr("style","padding-left: 0px;padding-right:0px;display:inline-block;");//hyh 新增 页面铺不铺满的关键 2017、10、9
1020 // if(wwidth<=1630){
1021 if(wwidth<=menuDivLength+220){
1022 var arg=wwidth/64;//让任务统计模块变化更好看 hyh 新增 2017、10、16
1023 $("#menuNav").css("margin-left","0px");
1024 $("#menuNav").css("position","fixed");
1025 if(!isgis){
1026 $("#iframecontent").contents().find(".div-remind-count").css("font-size","12px");
1027 $("#iframecontent").contents().find(".div-remind-type").css("font-size","12px");
1028 $("#iframecontent").contents().find(".div-remind-legend .legend").css("height","15px");
1029 $("#iframecontent").contents().find(".div-remind-legend .legend").css("width","15px");
1030 $("#iframecontent").contents().find("#remindLegendStyle").css("padding-right","0px");
1031 $("#iframecontent").contents().find("#remindLegendStyle").css("padding-left","10px");
1032 $("#iframecontent").contents().find("#remindLegendStyle").css("margin-left","0px");
1033 $("#iframecontent").contents().find("#remindLegendStyle").css("margin-left",arg);
1034 //$("#iframecontent").contents().find("#remindLegendStyle").css("width","40%");
1035 $("#iframecontent").contents().find("#remindLegendStyle").css("width","35%");
1036 }
1037 $("#divSearchContent").css("width","150px");
1038 $("#searchbtn").css("right","-120px");
1039
1040 }else{
1041 var arg=wwidth/64;//让任务统计模块变化更好看 hyh 新增 2017、10、16
1042 $("#divSearchContent").css("width","243px");
1043 $("#searchbtn").css("display","");
1044 $("#buttonSearch").css("display","none");
1045 $("#searchbtn").css("right","-205px");
1046 $("#menuNav").css("margin-left","50px");
1047 $("#menuNav").css("position","fixed");
1048 if(hideOrShow){
1049 $("#divContentRight").css("left", "275px");
1050 }else{
1051
1052 $("#divContentRight").css("left", "85px");
1053 }
1054 // $("#divContentRight").css("left", "275px");
1055 if(!isgis){
1056 $("#iframecontent").contents().find(".div-remind-count").css("font-size","18px");
1057 $("#iframecontent").contents().find(".div-remind-type").css("font-size","14px");
1058 $("#iframecontent").contents().find(".div-remind-legend .legend").css("height","25px");
1059 $("#iframecontent").contents().find(".div-remind-legend .legend").css("width","25px");
1060 $("#iframecontent").contents().find("#remindLegendStyle").css("padding-right","0px");
1061 //$("#iframecontent").contents().find("#remindLegendStyle").css("padding-left","15px");
1062 $("#iframecontent").contents().find("#remindLegendStyle").css("padding-left","15px");
1063 $("#iframecontent").contents().find("#remindLegendStyle").css("margin-left",arg);
1064 $("#iframecontent").contents().find("#remindLegendStyle").css("margin-top","5px");
1065 $("#iframecontent").contents().find("#remindLegendStyle").css("width","35%");
1066 }
1067 }
1068 }
1069 //if(menuDiv<770){
1070 if(menuDiv<800){
1071 $("#menuNav").css("margin-left","50px");
1072 $("#menuNav").css("position","fixed");
1073 $("#divSearchContent").css("width","243px");
1074 $("#searchbtn").css("display","");
1075 $("#buttonSearch").css("display","none");
1076 $("#searchbtn").css("right","-205px");
1077 }
1078 // $("#divLeftBG").css("min-height", (document.body.clientHeight-200)+"px");
1079 */
1080 } 862 }
1081 863
1082 //显示搜索框 864 //显示搜索框
...@@ -1118,34 +900,6 @@ function hiddenSubMenu() { ...@@ -1118,34 +900,6 @@ function hiddenSubMenu() {
1118 $("#subMenuRoutineWork").css("display", "none"); // 日常活动4/6 900 $("#subMenuRoutineWork").css("display", "none"); // 日常活动4/6
1119 $("#subMenuKeyProject").css("display", "none"); 901 $("#subMenuKeyProject").css("display", "none");
1120 } 902 }
1121
1122 //调整ifram高度
1123 //function iFrameHeight(evt) {
1124 // var ifm = evt.currentTarget;
1125 // $(ifm).css("min-height", (document.body.clientHeight - 130)+"px");
1126 // var subWeb = document.frames ? document.frames["iframecontent"].document : ifm.contentDocument;
1127 // if (subWeb==null || subWeb == undefined) {
1128 // subWeb = ifm[0].contentDocument;
1129 // }
1130 // if (ifm != null && subWeb != null) {
1131 // var ifmHeight = 540;
1132 // try{
1133 // if ($(ifm).attr("src") == homecontenturl){//.attr("class") == "tabindex-0") {
1134 // ifmHeight = subWeb.body.clientHeight;
1135 // } else {
1136 // ifmHeight = ifm.contentDocument.body.clientHeight;
1137 // }
1138 // }catch(e){}
1139 // var divLeft=$("#divLeftBG")[0];
1140 // if(ifmHeight<divLeft.scrollHeight){
1141 // $("#divLeftBG").css("height",divLeft.scrollHeight+"px");
1142 // $(ifm).css("height", divLeft.scrollHeight + "px");
1143 // }else{
1144 // $(ifm).css("height", ifmHeight + "px");
1145 // $("#divLeftBG").css("height", ifmHeight + "px");
1146 // }
1147 // }
1148 //}
1149 //获取参数跳转指定页面 903 //获取参数跳转指定页面
1150 function loadpage() { 904 function loadpage() {
1151 var url = getQueryString("url"); 905 var url = getQueryString("url");
...@@ -1197,11 +951,6 @@ function iframeLoad(resource, tabname, navigator, tabid) { ...@@ -1197,11 +951,6 @@ function iframeLoad(resource, tabname, navigator, tabid) {
1197 var listName; 951 var listName;
1198 function setSecondListName(tabname) { 952 function setSecondListName(tabname) {
1199 listName = tabname; 953 listName = tabname;
1200
1201 //hyh 专门为公文查询和公文管理设置loading 2017/12/12
1202 // if(listName=="公文查询"||listName=="公文管理"){
1203 // $.showLoading();
1204 // }
1205 } 954 }
1206 955
1207 956
...@@ -1213,58 +962,6 @@ function getQueryString(name) { ...@@ -1213,58 +962,6 @@ function getQueryString(name) {
1213 } 962 }
1214 return null; 963 return null;
1215 } 964 }
1216 //关闭tab
1217 /*function removeTab(evt) {
1218 var tab = $(evt.currentTarget).offsetParent();
1219 var id = $(tab).attr("id");
1220 $("." + id).remove();
1221 $(tab).remove();
1222 //关闭后显示最后如果没有选中的tab，默认选中后面那一个
1223 if ($("#ulTabs active").length < 1) {
1224 $("#ulTabs li:last").addClass("active");
1225 $("#divFrame iframe:last").show();
1226 }
1227 //只有一个时换成首页
1228 if ($("#ulTabs li").length == 1) {
1229 $("#ulTabs").hide();
1230 $("#divFrame iframe").show();
1231 displayLeftContent("block");
1232 }
1233 //调整左侧高度
1234 divLetBGHeight($("#divFrame iframe:last"))
1235 }
1236 //切换tab
1237 function switchTab_click(evt) {
1238 var tabid = $(evt.currentTarget).offsetParent().attr("id");
1239 switchTab(tabid);
1240 }
1241 //切换tab
1242 function switchTab(tabid) {
1243 var tab = $("#"+tabid);
1244 if (tabid == "tabindex-0") {
1245 displayLeftContent("block");
1246 } else {
1247 displayLeftContent("none");//隐藏首页左侧
1248 var submenuid = tabid.split("_")[1];
1249 $("#" + submenuid).show();//显示二级目录
1250 }
1251 $("#divFrame iframe").hide();
1252 $("#ulTabs li").removeClass("active");
1253 $("." + tabid).show();
1254 //调整左侧高度
1255 divLetBGHeight($("." + tabid))
1256 $(tab).addClass("active");
1257 }
1258 */
1259 //切换ifram时，调整左边导航高度，=iframe高度+tab高度
1260 //function divLetBGHeight(iframe) {
1261 // var iframeHeight = parseInt($(iframe).css("height").replace("px", ""));
1262 // var leftHeight = iframeHeight;
1263 // /*if ($("#ulTabs").css("display") != "none") {//判断tab是否显示
1264 // leftHeight = (iframeHeight + divTabHeight) + "px";
1265 // } */
1266 // $("#divLeftBG").css("height", leftHeight);
1267 //}
1268 965
1269 function btnQuickMenuItem_Click(evt) { 966 function btnQuickMenuItem_Click(evt) {
1270 var url = evt.currentTarget.children[0].value; 967 var url = evt.currentTarget.children[0].value;
...@@ -1300,26 +997,6 @@ function btnQuickMenuItem_Click(evt) { ...@@ -1300,26 +997,6 @@ function btnQuickMenuItem_Click(evt) {
1300 } 997 }
1301 } 998 }
1302 }); 999 });
1303
1304 // $.post(curserver + "/mvc/resource/quictMenu/resource.do", {
1305 // groupId :group.id,
1306 // menuName:tabname
1307 // }, function(data) {
1308 // if(data){
1309 // if("公文处理" == data.alias){
1310 // loadAllDucumentCount("all");
1311 // }
1312 // initMenu_QuictMenu(data.alias,divId,url,tabname)
1313 // }
1314 // });
1315 //
1316 /* var object = $("#subMenuOfficialDocument");
1317 var divId = object.attr("id");
1318 var navigator = "公文处理";
1319 initMenu(navigator,divId);*/
1320
1321
1322 // iframeLoad(url, tabname, submenuid);
1323 } 1000 }
1324 1001
1325 //获取用户自定义菜单 1002 //获取用户自定义菜单
...@@ -1742,88 +1419,6 @@ function getLoginInfo() { ...@@ -1742,88 +1419,6 @@ function getLoginInfo() {
1742 console.log(errorThrown); 1419 console.log(errorThrown);
1743 } 1420 }
1744 }); 1421 });
1745
1746 // $.post(curserver + global.modelctls.user.loginInfo, function (result) {
1747 // var user=result.data.user;
1748 // userid=user.id;
1749 // if(user!=null||user!=undefined){
1750 // $.cookie("userinfor",JSON.stringify(result.data));
1751 // $("#email").val(user.email);
1752 // $("#username").text(user.realname);
1753 // $("#userId").val(user.id);
1754 // }
1755 // var unit=result.unit;
1756 // if(unit.length!=0){
1757 // $("#status").text(result.unit[0]['name']);
1758 // }
1759 // var userSxe = result.user.sex
1760 // if(userSxe=="1" || userSxe==null)
1761 // $("#imguserphoto").attr("src","image/index/usersecrecy.png")
1762 // else if(userSxe=="2")
1763 // $("#imguserphoto").attr("src","image/index/user.png")
1764 // else if(userSxe=="3")
1765 // $("#imguserphoto").attr("src","image/index/usersx.png")
1766 //
1767 // getrolebyid(userid);
1768 // $.post(curserver + global.modelctls.password.obtain,{
1769 // userId:userid
1770 // },function(result){
1771 // $("#pwd").val(result.data.password.content);
1772 // });
1773 // }).error(function (e) {
1774 // layer.msg("获取用户信息错误",{icon: 2})
1775 // });
1776
1777 // var settings = {
1778 // "async": true,
1779 // "url": curserver + global.modelctls.user.loginInfo,
1780 // "method": "GET",
1781 // "dataType":'json',
1782 // "headers": {
1783 // "content-type": "application/json"
1784 // },
1785 // "processData": false,
1786 // "data": "",
1787 // success:function(result,textStatus){
1788 // alert("success"+result);
1789 // },
1790 // error:function(error){
1791 // alert("error"+error);
1792 // }
1793 // };
1794 // $.ajax(settings);
1795
1796 // $.ajaxSetup({
1797 // error: function(jqXHR, textStatus, errorThrown) {
1798 // if (textStatus == 'error' && errorThrown == '') {
1799 // if (jqXHR.status == 0 || jqXHR.status == 12017) {
1800 // var $iframe = $('<iframe/>', {
1801 // src: curserver + global.modelctls.user.loginInfo,
1802 // style: 'display: none;'
1803 // });
1804 // $iframe.appendTo('body');
1805 // $iframe.load(function() {
1806 // location.reload();
1807 // });
1808 // }
1809 // }
1810 // }
1811 // });
1812
1813 /* $.ajax({
1814 url:curserver + global.modelctls.user.loginInfo,
1815 dataType:'json',
1816 data:"",
1817 jsonp:'callback',
1818 success:function(result) {
1819 alert(result);//循环输出a:1,b:2,etc.
1820 },
1821 error:function(error){
1822 alert(error);
1823 },
1824 timeout:3000
1825 }); */
1826
1827 } 1422 }
1828 1423
1829 function successCallback(result) { 1424 function successCallback(result) {
...@@ -2031,25 +1626,6 @@ function getWeatherService() { ...@@ -2031,25 +1626,6 @@ function getWeatherService() {
2031 } 1626 }
2032 1627
2033 }); 1628 });
2034
2035 // var serviceurl = "http://ws.webxml.com.cn/WebServices/WeatherWebService.asmx?op=getWeatherbyCityName";
2036 // $.ajax({
2037 // async: true,
2038 // type: "POST",
2039 // contentType: "application/json",
2040 // url: serviceurl,
2041 // data: { "theCityName": "西安" },
2042 // dataType: "jsonp",
2043 // success: function (result) {
2044 // weatherData = result.retData; //forecast;//未来四天天气
2045 // getWeather(0);
2046 // }, error: function (e) {
2047 // try {
2048 // $("#spanWeather").text("天气数据获取失败");
2049 // } catch (e) { }
2050 // }
2051 //});
2052
2053 } 1629 }
2054 1630
2055 //获取天气和食堂菜单，day传入0（今天），1（明天），2，3 1631 //获取天气和食堂菜单，day传入0（今天），1（明天），2，3
...@@ -2268,44 +1844,6 @@ function QuickMenuClick(obj) { ...@@ -2268,44 +1844,6 @@ function QuickMenuClick(obj) {
2268 if (menu_attr != undefined) { 1844 if (menu_attr != undefined) {
2269 initMenu(name, menu_attr, QuickList, id); 1845 initMenu(name, menu_attr, QuickList, id);
2270 } 1846 }
2271
2272 //window.initMenu(QuickList,"subMenuOfficialDocument","督办");
2273 // if(QuickList=="督办列表"||QuickList=="传阅公文"||QuickList=="公文管理"||QuickList=="发文草稿"){
2274 // var object = $("#subMenuOfficialDocument");//btnMenuOfficialDocument
2275 // var divId = object.attr("id");
2276 // var navigator = "公文处理";
2277 // initMenu(navigator,divId,QuickList);
2278 // }if(QuickList=="会议列表"||QuickList=="纪要查询"||QuickList=="上会项目"||QuickList=="会议档案"){
2279 // var object = $("#subMenuMeeting");//btnMenuMeeting
2280 // var divId = object.attr("id");
2281 // var navigator = "会议管理";
2282 // initMenu(navigator,divId,QuickList);
2283 // }if(QuickList=="已办项目"||QuickList=="统计报表"||QuickList=="项目管理"||QuickList=="待办项目"||QuickList=="项目查询"){
2284 // var object = $("#subMenuApprovalTask");//btnMenuApprovalTask
2285 // var divId = object.attr("id");
2286 // var navigator = "审批任务";
2287 // initMenu(navigator,divId,QuickList);
2288 // }if(QuickList=="邮件"||QuickList=="发送短信"||QuickList=="会议室管理"||QuickList=="相关下载"||QuickList=="硬件报修"||QuickList=="通讯录"||QuickList=="会议通知"){
2289 // var object = $("#subMenuHelper");//btnMenuHelper
2290 // var divId = object.attr("id");
2291 // var navigator = "办公助手";
2292 // initMenu(navigator,divId,QuickList);
2293 // }if(QuickList=="预算管理"||QuickList=="支付明细"){
2294 // var object = $("#subMenuBudget");//btnMenuBudget
2295 // var divId = object.attr("id");
2296 // var navigator = "预算管理";
2297 // initMenu(navigator,divId,QuickList);
2298 // }if(QuickList=="重点项目列表"){//btnMenuImprotProject
2299 // menuItemSelected("subMenuImportPorject_0");
2300 // iframeLoad("importpoject/porjectList.jsp", "重点项目列表", "subMenuImportPorject_0");
2301 // }if(QuickList=="新建档案"||QuickList=="档案查询"||QuickList=="修改档案"){
2302 // var object = $("#btnMenuArchive");//btnMenuArchive
2303 // var divId = object.attr("id");
2304 // var navigator = "档案管理";
2305 // initMenu(navigator,divId,QuickList);
2306 // }
2307 //编制项目btnMenuReport
2308 //重点项目btnMenuImprotProject subMenuImportPorject
2309 } 1847 }
2310 1848
2311 1849
...@@ -2378,70 +1916,6 @@ function hiddnLeft() { ...@@ -2378,70 +1916,6 @@ function hiddnLeft() {
2378 1916
2379 1917
2380 }); 1918 });
2381 /*$("#switchover").click(function(){
2382 if(hideOrShow==false){
2383 hideOrShow = true;
2384 $(".hideLeftName").css('width','275px');
2385 //$(".submenuitem-selected-hidde").removeClass("submenuitem-selected-hidde").addClass("submenuitem-selected");
2386 $('#divLeftBG').animate({width: '275px'});
2387 $('#divContentRight').animate({left: '275px',width:window.innerWidth-280});
2388 $("#divFrame").animate({left: '275px',width:window.innerWidth-280});
2389 $("#iframecontent").animate({left: '275px',width:window.innerWidth-280});
2390 $('.div-userbg').animate({width: '275px'});
2391 $('#imguserphoto').animate({width:'80px',height:'80px'});
2392 $('#exist').removeAttr('style');
2393 $('.div-userinfo').children().eq(0).css('display','none');
2394 $('.div-userinfo').css('margin-left','30px');
2395 $('.div-userinfo').css('margin-top','35px');
2396 $('.div-username').css('width','157px');
2397 $('.div-userinfo').children().fadeIn(2500);
2398 $('#divQuickMenu').css('overflow-x','');
2399 $('#subMenuOfficialDocument,#subMenuApprovalTask,#subMenuMeeting,#subMenuImportPorject,#subMenuArchive,#subMenuReport,#subMenuBudget,#subMenuHelper').find('span').fadeIn(2000);
2400 //$('#subMenuOfficialDocument,#subMenuApprovalTask,#subMenuMeeting,#subMenuImportPorject,#subMenuArchive,#subMenuReport,#subMenuBudget,#subMenuHelper').find('div').removeAttr('style');
2401 $('.hideLeftName').find('div').removeAttr('style');
2402 if(ishome){
2403 $('#divQuickMenuList').css('margin-left','-5px');
2404 $('.div-quickmenu label').css('width','75px')
2405 $('#divQuickMenu').css('margin-left','20px');
2406 $('.div-lefttitle').css('width','240px');
2407 $('#divLeftBG').css('height','1015px');
2408 $('#divQuickMenu').css('height','');
2409 }
2410
2411 $('#showLeft').hide();
2412 }});*/
2413
2414 //$("#divLeftBG").mouseover(function(e){
2415 // if($('#exist').attr("style")==undefined){
2416 // $('#hiddnLeft').show();
2417 // }else{
2418 // $('#showLeft').show();
2419 // $('#divQuickMenu').css('overflow-y','');
2420 // }
2421 //
2422 //
2423 // $(e.target).find('img').parent().hover(function(){
2424 // if(!hideOrShow){
2425 // $("#leftListName").css('width','275px');
2426 // if(!$(this).hasClass("submenuitem-selected")){
2427 // $('.submenuitem-selected').css('width','85px');
2428 // }else{
2429 // $('.submenuitem-selected').css('width','275px');
2430 // }
2431 // $(this).find('label').css('width','275px');
2432 // $(this).find('label').css('display','block');
2433 // }
2434 // },function(){
2435 // if(!hideOrShow){
2436 // $("#leftListName").css('width','85px');
2437 // $('.submenuitem-selected').css('width','85px');
2438 // $(this).find('label').css('width','85px');
2439 // $(this).find('label').css('display','none');
2440 // }
2441 //
2442 // });
2443
2444 //});
2445 $(".leftMenu").hover(function () { 1919 $(".leftMenu").hover(function () {
2446 1920
2447 $(this).find('img').parent().hover(function () { 1921 $(this).find('img').parent().hover(function () {
......
...@@ -3,7 +3,7 @@ var self = new Vue({ ...@@ -3,7 +3,7 @@ var self = new Vue({
3 data() { 3 data() {
4 return { 4 return {
5 search: '', 5 search: '',
6 flowid: ['t1001_8a8610de737b99270173937337e00133'], 6 flowid: ['t1001_8a8610de737b99270173937337e00133','t1001_8a8610d86125b9a801612600a4c60003','t1001_402885c973b703220173b73ed4e6004d'],
7 userName: '案件查处', 7 userName: '案件查处',
8 pageNum:1, 8 pageNum:1,
9 pageSize:10, 9 pageSize:10,
...@@ -29,7 +29,7 @@ var self = new Vue({ ...@@ -29,7 +29,7 @@ var self = new Vue({
29 const mm = (dt.getMinutes() + '').padStart(2, '0') 29 const mm = (dt.getMinutes() + '').padStart(2, '0')
30 const ss = (dt.getSeconds() + '').padStart(2, '0') 30 const ss = (dt.getSeconds() + '').padStart(2, '0')
31 // yyyy-mm-dd hh:mm:ss 31 // yyyy-mm-dd hh:mm:ss
32 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 32 return `${y}-${m}-${d} `
33 } 33 }
34 }, 34 },
35 directives:{ 35 directives:{
...@@ -43,16 +43,16 @@ var self = new Vue({ ...@@ -43,16 +43,16 @@ var self = new Vue({
43 getData() { 43 getData() {
44 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', null,{ 44 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/workings', null,{
45 params: { 45 params: {
46 flowids: this.flowid.toString(), 46 flowIds: this.flowid.toString(),
47 userName: this.userName, 47 userName: this.userName,
48 pageIndex:this.pageNum, 48 pageIndex:this.pageNum,
49 pageSize:this.pageSize, 49 pageSize:this.pageSize,
50 keyWord:this.search 50 keyWord:this.search
51 } 51 }
52 }).then(res => { 52 }).then(res => {
53 this.total=res.data.data.total; 53 this.total=res.data.total;
54 let data=res.data.data.Data; 54 let data=res.data.data.Data;
55 let result =[] 55 let result =[];
56 if(data.length){ 56 if(data.length){
57 for (let i=0;i<data.length;i++){ 57 for (let i=0;i<data.length;i++){
58 for (let j=0;j<data[i].length;j++){ 58 for (let j=0;j<data[i].length;j++){
...@@ -82,9 +82,26 @@ var self = new Vue({ ...@@ -82,9 +82,26 @@ var self = new Vue({
82 this.pageNum = pageNum 82 this.pageNum = pageNum
83 this.getData() 83 this.getData()
84 }, 84 },
85 click(val) { 85 click(val){
86 if(val==3){
87 this.flowid = []
88 this.flowid.push('t1001_8a8610de737b99270173937337e00133')
89 this.getData()
90 }else if (val==5){
91 this.flowid = []
92 this.flowid.push('t1001_8a8610d86125b9a801612600a4c60003')
93 this.getData()
94 }else if (val =='2'){
95 this.flowid = []
96 this.flowid.push('t1001_402885c973b703220173b73ed4e6004d')
97 this.getData()
98 }else if (val=='1'){
99 this.flowid=[]
100 this.flowid = ['t1001_8a8610de737b99270173937337e00133','t1001_8a8610d86125b9a801612600a4c60003','t1001_402885c973b703220173b73ed4e6004d']
101 this.getData()
102 }
86 this.isActive = val 103 this.isActive = val
87 console.log(val) 104 console.log(this.flowid)
88 }, 105 },
89 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') { 106 openHandleJumpUrl(flowId, itemTypeId, _stats = 'create') {
90 var unique = uuid(); 107 var unique = uuid();
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
143 </el-table-column> 143 </el-table-column>
144 <el-table-column 144 <el-table-column
145 prop="PHXMMC" 145 prop="PHXMMC"
146 width="300" 146 width="500"
147 label="案件名称" 147 label="案件名称"
148 align="center" 148 align="center"
149 ></el-table-column> 149 ></el-table-column>
...@@ -154,13 +154,13 @@ ...@@ -154,13 +154,13 @@
154 width="100" 154 width="100"
155 > 155 >
156 </el-table-column> 156 </el-table-column>
157 <el-table-column 157 <!-- <el-table-column
158 prop="PHZRDW" 158 prop="PHZRDW"
159 label="责任单位" 159 label="责任单位"
160 align="center" 160 align="center"
161 width="200" 161 width="200"
162 > 162 >
163 </el-table-column> 163 </el-table-column>-->
164 <el-table-column 164 <el-table-column
165 prop="PHSSQY" 165 prop="PHSSQY"
166 label="所属区域" 166 label="所属区域"
...@@ -168,13 +168,13 @@ ...@@ -168,13 +168,13 @@
168 width="200" 168 width="200"
169 > 169 >
170 </el-table-column> 170 </el-table-column>
171 <el-table-column 171 <!-- <el-table-column
172 prop="ljr" 172 prop="ljr"
173 label="来件人" 173 label="来件人"
174 align="center" 174 align="center"
175 width="400" 175 width="400"
176 > 176 >
177 </el-table-column> 177 </el-table-column>-->
178 <el-table-column 178 <el-table-column
179 prop="CREATETIME" 179 prop="CREATETIME"
180 label="登记时间" 180 label="登记时间"
...@@ -221,24 +221,24 @@ ...@@ -221,24 +221,24 @@
221 </el-table-column> 221 </el-table-column>
222 <el-table-column 222 <el-table-column
223 prop="PHXMMC" 223 prop="PHXMMC"
224 width="300" 224 width="PHXMMC"
225 label="案件名称" 225 label="案件名称"
226 align="center" 226 align="center"
227 ></el-table-column> 227 ></el-table-column>
228 <el-table-column 228 <el-table-column
229 prop="anlx" 229 prop="PHAJLX"
230 label="案件类型" 230 label="案件类型"
231 align="center" 231 align="center"
232 width="100" 232 width="100"
233 > 233 >
234 </el-table-column> 234 </el-table-column>
235 <el-table-column 235 <!-- <el-table-column
236 prop="PHZRDW" 236 prop="PHZRDW"
237 label="责任单位" 237 label="责任单位"
238 align="center" 238 align="center"
239 width="200" 239 width="200"
240 > 240 >
241 </el-table-column> 241 </el-table-column>-->
242 <el-table-column 242 <el-table-column
243 prop="PHSSQY" 243 prop="PHSSQY"
244 label="所属区域" 244 label="所属区域"
...@@ -246,13 +246,13 @@ ...@@ -246,13 +246,13 @@
246 width="200" 246 width="200"
247 > 247 >
248 </el-table-column> 248 </el-table-column>
249 <el-table-column 249 <!-- <el-table-column
250 prop="ljr" 250 prop="ljr"
251 label="来件人" 251 label="来件人"
252 align="center" 252 align="center"
253 width="400" 253 width="400"
254 > 254 >
255 </el-table-column> 255 </el-table-column>-->
256 <el-table-column 256 <el-table-column
257 prop="CREATETIME" 257 prop="CREATETIME"
258 label="登记时间" 258 label="登记时间"
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
289 </el-table-column> 289 </el-table-column>
290 <el-table-column 290 <el-table-column
291 prop="PHXMMC" 291 prop="PHXMMC"
292 width="300" 292 width="PHXMMC"
293 label="案件名称" 293 label="案件名称"
294 align="center" 294 align="center"
295 ></el-table-column> 295 ></el-table-column>
...@@ -300,13 +300,13 @@ ...@@ -300,13 +300,13 @@
300 width="100" 300 width="100"
301 > 301 >
302 </el-table-column> 302 </el-table-column>
303 <el-table-column 303 <!-- <el-table-column
304 prop="PHZRDW" 304 prop="PHZRDW"
305 label="责任单位" 305 label="责任单位"
306 align="center" 306 align="center"
307 width="200" 307 width="200"
308 > 308 >
309 </el-table-column> 309 </el-table-column>-->
310 <el-table-column 310 <el-table-column
311 prop="PHSSQY" 311 prop="PHSSQY"
312 label="所属区域" 312 label="所属区域"
...@@ -314,13 +314,13 @@ ...@@ -314,13 +314,13 @@
314 width="200" 314 width="200"
315 > 315 >
316 </el-table-column> 316 </el-table-column>
317 <el-table-column 317 <!-- <el-table-column
318 prop="ljr" 318 prop="ljr"
319 label="来件人" 319 label="来件人"
320 align="center" 320 align="center"
321 width="400" 321 width="400"
322 > 322 >
323 </el-table-column> 323 </el-table-column>-->
324 <el-table-column 324 <el-table-column
325 prop="CREATETIME" 325 prop="CREATETIME"
326 label="登记时间" 326 label="登记时间"
...@@ -357,24 +357,24 @@ ...@@ -357,24 +357,24 @@
357 </el-table-column> 357 </el-table-column>
358 <el-table-column 358 <el-table-column
359 prop="PHXMMC" 359 prop="PHXMMC"
360 width="300" 360 width="PHXMMC"
361 label="案件名称" 361 label="案件名称"
362 align="center" 362 align="center"
363 ></el-table-column> 363 ></el-table-column>
364 <el-table-column 364 <el-table-column
365 prop="anlx" 365 prop="PHAJLX"
366 label="案件类型" 366 label="案件类型"
367 align="center" 367 align="center"
368 width="100" 368 width="100"
369 > 369 >
370 </el-table-column> 370 </el-table-column>
371 <el-table-column 371 <!-- <el-table-column
372 prop="PHZRDW" 372 prop="PHZRDW"
373 label="责任单位" 373 label="责任单位"
374 align="center" 374 align="center"
375 width="200" 375 width="200"
376 > 376 >
377 </el-table-column> 377 </el-table-column>-->
378 <el-table-column 378 <el-table-column
379 prop="PHSSQY" 379 prop="PHSSQY"
380 label="所属区域" 380 label="所属区域"
...@@ -382,13 +382,13 @@ ...@@ -382,13 +382,13 @@
382 width="200" 382 width="200"
383 > 383 >
384 </el-table-column> 384 </el-table-column>
385 <el-table-column 385 <!-- <el-table-column
386 prop="ljr" 386 prop="ljr"
387 label="来件人" 387 label="来件人"
388 align="center" 388 align="center"
389 width="400" 389 width="400"
390 > 390 >
391 </el-table-column> 391 </el-table-column>-->
392 <el-table-column 392 <el-table-column
393 prop="CREATETIME" 393 prop="CREATETIME"
394 label="登记时间" 394 label="登记时间"
......
...@@ -30,7 +30,7 @@ var self = new Vue({ ...@@ -30,7 +30,7 @@ var self = new Vue({
30 const mm = (dt.getMinutes() + '').padStart(2, '0') 30 const mm = (dt.getMinutes() + '').padStart(2, '0')
31 const ss = (dt.getSeconds() + '').padStart(2, '0') 31 const ss = (dt.getSeconds() + '').padStart(2, '0')
32 // yyyy-mm-dd hh:mm:ss 32 // yyyy-mm-dd hh:mm:ss
33 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 33 return `${y}-${m}-${d} `
34 } 34 }
35 }, 35 },
36 directives:{ 36 directives:{
...@@ -70,7 +70,7 @@ var self = new Vue({ ...@@ -70,7 +70,7 @@ var self = new Vue({
70 }); 70 });
71 }, 71 },
72 handleSizeChange(pageSize){ 72 handleSizeChange(pageSize){
73 this.pageSize = pageSize 73 this.pageSize = pageSize;
74 this.getData() 74 this.getData()
75 }, 75 },
76 handleCurrentChange(pageNum){ 76 handleCurrentChange(pageNum){
......
...@@ -157,13 +157,13 @@ ...@@ -157,13 +157,13 @@
157 width="100" 157 width="100"
158 > 158 >
159 </el-table-column> 159 </el-table-column>
160 <el-table-column 160 <!-- <el-table-column
161 prop="PHZRDW" 161 prop="PHZRDW"
162 label="责任单位" 162 label="责任单位"
163 align="center" 163 align="center"
164 width="200" 164 width="200"
165 > 165 >
166 </el-table-column> 166 </el-table-column>-->
167 <el-table-column 167 <el-table-column
168 prop="PHSSQY" 168 prop="PHSSQY"
169 label="所属区域" 169 label="所属区域"
...@@ -230,13 +230,13 @@ ...@@ -230,13 +230,13 @@
230 width="100" 230 width="100"
231 > 231 >
232 </el-table-column> 232 </el-table-column>
233 <el-table-column 233 <!-- <el-table-column
234 prop="PHZRDW" 234 prop="PHZRDW"
235 label="责任单位" 235 label="责任单位"
236 align="center" 236 align="center"
237 width="200" 237 width="200"
238 > 238 >
239 </el-table-column> 239 </el-table-column>-->
240 <el-table-column 240 <el-table-column
241 prop="PHSSQY" 241 prop="PHSSQY"
242 label="所属区域" 242 label="所属区域"
...@@ -298,13 +298,13 @@ ...@@ -298,13 +298,13 @@
298 width="100" 298 width="100"
299 > 299 >
300 </el-table-column> 300 </el-table-column>
301 <el-table-column 301 <!-- <el-table-column
302 prop="PHZRDW" 302 prop="PHZRDW"
303 label="责任单位" 303 label="责任单位"
304 align="center" 304 align="center"
305 width="200" 305 width="200"
306 > 306 >
307 </el-table-column> 307 </el-table-column>-->
308 <el-table-column 308 <el-table-column
309 prop="PHSSQY" 309 prop="PHSSQY"
310 label="所属区域" 310 label="所属区域"
......
...@@ -33,7 +33,7 @@ var self = new Vue({ ...@@ -33,7 +33,7 @@ var self = new Vue({
33 const mm = (dt.getMinutes() + '').padStart(2, '0') 33 const mm = (dt.getMinutes() + '').padStart(2, '0')
34 const ss = (dt.getSeconds() + '').padStart(2, '0') 34 const ss = (dt.getSeconds() + '').padStart(2, '0')
35 // yyyy-mm-dd hh:mm:ss 35 // yyyy-mm-dd hh:mm:ss
36 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 36 return `${y}-${m}-${d} `
37 } 37 }
38 }, 38 },
39 directives:{ 39 directives:{
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 prop="PHXMMC" 144 prop="PHXMMC"
145 label="项目名称" 145 label="项目名称"
146 align="center" 146 align="center"
147 width="450" 147 width="400"
148 > 148 >
149 </el-table-column> 149 </el-table-column>
150 <el-table-column 150 <el-table-column
...@@ -175,13 +175,13 @@ ...@@ -175,13 +175,13 @@
175 width="150" 175 width="150"
176 > 176 >
177 </el-table-column> 177 </el-table-column>
178 <el-table-column 178 <!-- <el-table-column
179 prop="PHZRDW" 179 prop="PHZRDW"
180 label="责任单位" 180 label="责任单位"
181 align="center" 181 align="center"
182 width="100" 182 width="100"
183 > 183 >
184 </el-table-column> 184 </el-table-column>-->
185 <el-table-column 185 <el-table-column
186 prop="PHSSQY" 186 prop="PHSSQY"
187 label="所属区域" 187 label="所属区域"
......
...@@ -30,7 +30,7 @@ var self = new Vue({ ...@@ -30,7 +30,7 @@ var self = new Vue({
30 const mm = (dt.getMinutes() + '').padStart(2, '0') 30 const mm = (dt.getMinutes() + '').padStart(2, '0')
31 const ss = (dt.getSeconds() + '').padStart(2, '0') 31 const ss = (dt.getSeconds() + '').padStart(2, '0')
32 // yyyy-mm-dd hh:mm:ss 32 // yyyy-mm-dd hh:mm:ss
33 return `${y}-${m}-${d} ${hh}:${mm}:${ss}` 33 return `${y}-${m}-${d} `
34 } 34 }
35 }, 35 },
36 directives:{ 36 directives:{
...@@ -42,12 +42,13 @@ var self = new Vue({ ...@@ -42,12 +42,13 @@ var self = new Vue({
42 }, 42 },
43 methods:{ 43 methods:{
44 getData() { 44 getData() {
45 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked', { 45 axios.post(CONF_NEWGHSC_SERVERURL + '/dblb/list/worked',null, {
46 params: { 46 params: {
47 pageIndex:this.pageNum, 47 pageIndex:this.pageNum,
48 pageSize:this.pageSize, 48 pageSize:this.pageSize,
49 flowIds: this.flowid.toString(), 49 flowIds: this.flowid.toString(),
50 userName: this.userName, 50 userName: this.userName,
51 keyWord:this.search
51 } 52 }
52 }).then(res => { 53 }).then(res => {
53 /* this.total=res.data.Data.total;*/ 54 /* this.total=res.data.Data.total;*/
......
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
144 prop="PHXMMC" 144 prop="PHXMMC"
145 label="项目名称" 145 label="项目名称"
146 align="center" 146 align="center"
147 width="450" 147 width="400"
148 > 148 >
149 </el-table-column> 149 </el-table-column>
150 <el-table-column 150 <el-table-column
...@@ -175,13 +175,13 @@ ...@@ -175,13 +175,13 @@
175 width="150" 175 width="150"
176 > 176 >
177 </el-table-column> 177 </el-table-column>
178 <el-table-column 178 <!-- <el-table-column
179 prop="PHZZDW" 179 prop="PHZZDW"
180 label="责任单位" 180 label="责任单位"
181 align="center" 181 align="center"
182 width="100" 182 width="100"
183 > 183 >
184 </el-table-column> 184 </el-table-column>-->
185 <el-table-column 185 <el-table-column
186 prop="PHSSQY" 186 prop="PHSSQY"
187 label="所属区域" 187 label="所属区域"
......